diff --git a/.github/check_alpha_release.js b/.github/check_alpha_release.js
index 332305a69137..30d732d3659b 100644
--- a/.github/check_alpha_release.js
+++ b/.github/check_alpha_release.js
@@ -3,12 +3,21 @@
 const fs = require("node:fs");
 
 module.exports = async function checkAlphaRelease({ github, context, core }) {
+    async function skipRelease(reason) {
+        core.info(`Skipping scheduled release: ${reason}`);
+        await github.rest.actions.cancelWorkflowRun({
+            ...context.repo,
+            run_id: context.runId,
+        });
+        // Cancellation is asynchronous. Keep this step alive so cancelWorkflowRun can kill it.
+        await keepProcessAlive();
+    }
+
     const metadata = JSON.parse(
         fs.readFileSync("AnkiDroid/build/outputs/release-metadata.json", "utf8"),
     );
     if (metadata.releaseType !== "alpha") {
-        core.info("Skipping scheduled release: main is not on an alpha version.");
-        return false;
+        return await skipRelease("main is not on an alpha version.");
     }
 
     const releases = await github.paginate(github.rest.repos.listReleases, {
@@ -22,18 +31,16 @@ module.exports = async function checkAlphaRelease({ github, context, core }) {
         release => !release.draft && today - Math.floor(Date.parse(release.published_at) / day) < 7,
     );
     if (recentRelease) {
-        core.info(
-            `Skipping scheduled release: ${recentRelease.tag_name} was published fewer than seven UTC calendar days ago.`,
+        return await skipRelease(
+            `${recentRelease.tag_name} was published fewer than seven UTC calendar days ago.`,
         );
-        return false;
     }
 
     const latestAlpha = releases
         .filter(release => !release.draft && /^v\d+\.\d+\.\d+alpha\d+$/.test(release.tag_name))
         .sort((a, b) => Date.parse(b.published_at) - Date.parse(a.published_at))[0];
     if (!latestAlpha) {
-        core.info("Skipping scheduled release: no published alpha to compare against.");
-        return false;
+        return await skipRelease("no published alpha to compare against.");
     }
 
     const { data: comparison } = await github.rest.repos.compareCommitsWithBasehead({
@@ -41,10 +48,7 @@ module.exports = async function checkAlphaRelease({ github, context, core }) {
         basehead: `${latestAlpha.tag_name}...${context.sha}`,
     });
     if (comparison.status !== "ahead" || comparison.ahead_by === 0) {
-        core.info(
-            `Skipping scheduled release: no new commits descending from ${latestAlpha.tag_name}.`,
-        );
-        return false;
+        return await skipRelease(`no new commits descending from ${latestAlpha.tag_name}.`);
     }
 
     core.info(
@@ -52,3 +56,9 @@ module.exports = async function checkAlphaRelease({ github, context, core }) {
     );
     return true;
 };
+
+async function keepProcessAlive() {
+    // Fail after five minutes if cancellation never arrives.
+    await new Promise(resolve => setTimeout(resolve, 5 * 60 * 1000));
+    throw new Error("Timed out waiting for workflow cancellation.");
+}
diff --git a/.github/config.yml b/.github/config.yml
index 22c2f778b71b..32f22e6eacd2 100644
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -5,12 +5,14 @@
 # Comment to be posted to on first time issues
 newIssueWelcomeComment: >
   Hello! 👋 Thanks for logging this issue. Please remember we are all volunteers here, so some patience may be required before we can get to the issue. Also remember that the fastest way to get resolution on an issue is to propose a change directly, https://github.com/ankidroid/Anki-Android/wiki/Contributing
+  Please read our [AI Policy](https://github.com/ankidroid/Anki-Android/blob/main/AI_POLICY.md) before contributing.
 
 # Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
 
 # Comment to be posted to on PRs from first time contributors in your repository
 newPRWelcomeComment: >
   First PR! 🚀 We sincerely appreciate that you have taken the time to propose a change to AnkiDroid! Please have patience with us as we are all volunteers - we will get to this as soon as possible.
+  Please ensure your contribution meets our [AI Policy](https://github.com/ankidroid/Anki-Android/blob/main/AI_POLICY.md) before contributing.
 
 # Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
 
diff --git a/.github/report_test_failures.py b/.github/report_test_failures.py
index 718bcdbbfe3a..7acc7ed803a3 100644
--- a/.github/report_test_failures.py
+++ b/.github/report_test_failures.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-"""Report failures and skipped tests from JUnit XML using the standard library."""
+"""Report failures, skipped tests, and overview summary from JUnit XML using the standard library."""
 
 import argparse
 import html
@@ -12,6 +12,19 @@
 import xml.etree.ElementTree as ET
 
 
+TABLE_HEADER = (
+    "## Test Results\n\n"
+    "| Suite | Result | Duration | Tests | Passed | Failed | Skipped |\n"
+    "| ----- | ------ | -------- | ----- | ------ | ------ | ------- |\n"
+)
+
+
+def format_duration(seconds):
+    minutes = int(seconds // 60)
+    rem_seconds = seconds % 60
+    return f"{minutes:02d}m {rem_seconds:06.3f}s"
+
+
 def read_ignored_tests(log_file):
     ignored = set()
     failed = set()
@@ -26,22 +39,61 @@ def read_ignored_tests(log_file):
     return ignored - failed
 
 
-def main(results_dir, log_file=None, pattern="TEST-*.xml", title="Test failures"):
+def get_report_duration(root):
+    suites = root.findall("testsuite")
+    if suites:
+        total = 0.0
+        for s in suites:
+            try:
+                total += float(s.get("time", 0) or 0)
+            except (ValueError, TypeError):
+                pass
+        if total > 0.0:
+            return total
+    try:
+        root_time = float(root.get("time", 0) or 0)
+        if root_time > 0.0:
+            return root_time
+    except (ValueError, TypeError):
+        pass
+    total = 0.0
+    for tc in root.iter("testcase"):
+        try:
+            total += float(tc.get("time", 0) or 0)
+        except (ValueError, TypeError):
+            pass
+    return total
+
+
+def main(results_dir, log_file=None, pattern="TEST-*.xml", title="Test failures", suite=None):
     failures = []
     skipped = []
     ignored = read_ignored_tests(log_file)
+    total_duration = 0.0
+    passed_count = 0
+    failed_count = 0
+    skipped_count = 0
+
     for report in sorted(results_dir.rglob(pattern)):
         try:
             root = ET.parse(report).getroot()
         except (ET.ParseError, OSError) as error:
-            failures.append(f"Could not read {report}: {error}")
+            if os.environ.get("GITHUB_ACTIONS") == "true":
+                print(f"::warning::Could not read {report}: {error}")
+            else:
+                print(f"Warning: Could not read {report}: {error}", file=sys.stderr)
             continue
 
+        total_duration += get_report_duration(root)
+
         for test in root.iter("testcase"):
+            name = f"{test.get('classname', '')}.{test.get('name', '')}"
+            has_failure = False
+            has_skipped = False
+
             for result in test:
                 if result.tag not in ("failure", "error", "skipped"):
                     continue
-                name = f"{test.get('classname', '')}.{test.get('name', '')}"
                 details = "".join(result.itertext()).strip()
                 message = result.get("message", "")
                 # Android can report assumption violations as failures or errors.
@@ -56,10 +108,30 @@ def main(results_dir, log_file=None, pattern="TEST-*.xml", title="Test failures"
                     "org.junit.AssumptionViolatedException",
                     "org.junit.internal.AssumptionViolatedException",
                 ):
+                    has_skipped = True
                     skipped.append(f"{name}\n{details or result.get('type', 'Test skipped')}")
                 else:
+                    has_failure = True
                     failures.append(f"{name}\n{details or result.get('type', 'Test failed')}")
 
+            if has_failure:
+                failed_count += 1
+            elif has_skipped:
+                skipped_count += 1
+            else:
+                passed_count += 1
+
+    total_tests = passed_count + failed_count + skipped_count
+    is_successful = failed_count == 0 and total_tests > 0
+    result_text = "SUCCESS" if is_successful else "FAILURE"
+    elapsed = format_duration(total_duration)
+
+    if suite:
+        print(
+            f"{suite}: {result_text} ({elapsed}) - "
+            f"{total_tests} tests: {passed_count} passed, {failed_count} failed, {skipped_count} skipped"
+        )
+
     for failure in failures:
         if os.environ.get("GITHUB_ACTIONS") == "true":
             # GitHub renders the escaped message as a multiline error in the log.
@@ -79,19 +151,27 @@ def main(results_dir, log_file=None, pattern="TEST-*.xml", title="Test failures"
         if os.environ.get("GITHUB_ACTIONS") == "true":
             print("::endgroup::")
 
-    if (failures or skipped) and os.environ.get("GITHUB_STEP_SUMMARY"):
-        with open(os.environ["GITHUB_STEP_SUMMARY"], "a", encoding="utf-8") as summary:
+    if os.environ.get("GITHUB_STEP_SUMMARY"):
+        with open(os.environ["GITHUB_STEP_SUMMARY"], "a+", encoding="utf-8") as summary:
+            summary.seek(0)
+            existing_content = summary.read()
+            if suite:
+                if "## Test Results" not in existing_content:
+                    summary.write(TABLE_HEADER)
+                summary.write(f"| {suite} | **{result_text}** | {elapsed} | {total_tests} | {passed_count} | {failed_count} | {skipped_count} |\n\n")
+
             if failures:
                 summary.write(f"### {title}\n\n")
                 for failure in failures:
                     summary.write(f"<pre>{html.escape(failure)}</pre>\n\n")
             if skipped:
+                skipped_title = f"Skipped tests ({len(skipped)})"
                 summary.write(f"<details><summary>{skipped_title}</summary>\n\n")
                 for skip in skipped:
                     summary.write(f"<pre>{html.escape(skip)}</pre>\n\n")
                 summary.write("</details>\n\n")
 
-    return 1 if failures else 0
+    return 1 if (failures or (suite and not is_successful)) else 0
 
 
 if __name__ == "__main__":
@@ -100,5 +180,6 @@ def main(results_dir, log_file=None, pattern="TEST-*.xml", title="Test failures"
     parser.add_argument("log_file", type=Path, nargs="?")
     parser.add_argument("--pattern", default="TEST-*.xml", help="Recursive report glob relative to results_dir")
     parser.add_argument("--title", default="Test failures", help="Failure heading in the job summary")
+    parser.add_argument("--suite", help="Suite name for markdown summary table")
     args = parser.parse_args()
-    sys.exit(main(args.results_dir, args.log_file, args.pattern, args.title))
+    sys.exit(main(args.results_dir, args.log_file, args.pattern, args.title, args.suite))
diff --git a/.github/with_emulator_cleanup.sh b/.github/with_emulator_cleanup.sh
new file mode 100644
index 000000000000..1152597454cb
--- /dev/null
+++ b/.github/with_emulator_cleanup.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+set -euo pipefail
+
+# Only for dedicated Linux CI runners with one emulator and -no-snapshot-save.
+# Forced shutdown must not interrupt saving a snapshot for subsequent jobs.
+stop_emulator() {
+  # #22613 `emu kill` can report success while QEMU keeps running and
+  # holds the emulator action's output pipes open. Bound both ADB and QEMU.
+  timeout -s KILL 5s "$ANDROID_HOME/platform-tools/adb" -s "emulator-$EMULATOR_PORT" emu kill || true
+
+  local emulator_pattern="^$ANDROID_HOME/emulator/qemu/"
+  local deadline=$((SECONDS + 20))
+  while pgrep -f "$emulator_pattern" > /dev/null; do
+    if ((SECONDS >= deadline)); then
+      echo "Emulator did not stop within 20 seconds; killing QEMU." >&2
+      pkill -KILL -f "$emulator_pattern" || true
+      break
+    fi
+    sleep 1
+  done
+}
+
+# Preserve the exit status
+trap stop_emulator EXIT
+"$@"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index a4361bf82d18..e4d72dc5f713 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -20,6 +20,9 @@ on:
   schedule:
     - cron: '42 12 * * 1'
 
+env:
+  JAVA_TOOL_OPTIONS: -Dkotlin.daemon.options=autoshutdownIdleSeconds=10
+
 jobs:
   analyze:
     name: Analyze (${{ matrix.language }})
diff --git a/.github/workflows/compare_apk_size.yml b/.github/workflows/compare_apk_size.yml
index 29127679994e..0385fa82352d 100644
--- a/.github/workflows/compare_apk_size.yml
+++ b/.github/workflows/compare_apk_size.yml
@@ -18,6 +18,9 @@ permissions:
   pull-requests: write
 
 
+env:
+  JAVA_TOOL_OPTIONS: -Dkotlin.daemon.options=autoshutdownIdleSeconds=10
+
 jobs:
   sizeCheck:
     name: APK Size Check
diff --git a/.github/workflows/conflict.yaml b/.github/workflows/conflict.yaml
index ac85a1f3b8d3..251f771638f4 100644
--- a/.github/workflows/conflict.yaml
+++ b/.github/workflows/conflict.yaml
@@ -2,6 +2,8 @@ name: 🛠️ Conflict Scan
 
 on:
   push:
+    branches-ignore:
+      - 'gh-readonly-queue/**'
   schedule:
   - cron: "0 * * * *"
 
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
index 2fd5dbe5b228..9fad62b93163 100644
--- a/.github/workflows/label.yml
+++ b/.github/workflows/label.yml
@@ -14,6 +14,7 @@ jobs:
     steps:
     - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
       with:
+        retries: 3
         script: |
           let removeLabelsList = [
             "Pending Merge", 
@@ -42,6 +43,7 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               issue_number: context.issue.number,
+              request: { retries: 0 },
               body: `Maintainers: Please [Sync Translations](https://github.com/ankidroid/Anki-Android/actions/workflows/sync_translations.yml) to produce a commit with only the automated changes from this PR.
               
           Read more about updating strings on the wiki,
@@ -80,6 +82,7 @@ jobs:
     steps:
       - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
+          retries: 3
           script: |
             const I18N_FILES = [
                 "01-core",
@@ -133,6 +136,7 @@ jobs:
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 issue_number: context.issue.number,
+                request: { retries: 0 },
                 body: `> [!IMPORTANT]
             > **Maintainers**: This PR contains https://github.com/ankidroid/Anki-Android/labels/Strings changes
             
@@ -207,6 +211,7 @@ jobs:
     steps:
       - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
+          retries: 3
           script: |
             const creator = context.payload.sender.login
             const opts = github.rest.issues.listForRepo.endpoint.merge({
@@ -240,6 +245,7 @@ jobs:
     steps:
       - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
+          retries: 3
           script: |
             await github.rest.issues.addLabels({
               issue_number: context.issue.number,
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index d5596bdd4277..0eaf7d866b58 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -20,6 +20,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  JAVA_TOOL_OPTIONS: -Dkotlin.daemon.options=autoshutdownIdleSeconds=10
+
 jobs:
   lintKotlin:
     name: Lint Kotlin
diff --git a/.github/workflows/merge_requirements.yml b/.github/workflows/merge_requirements.yml
index 81302dff8745..dfad37a8f666 100644
--- a/.github/workflows/merge_requirements.yml
+++ b/.github/workflows/merge_requirements.yml
@@ -9,13 +9,13 @@ on:
 
 permissions: {}
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+# Don't cancel runs: this is a fast check which shows as a failing check when canceled.
 
 jobs:
   squashMerge:
     name: Squash merge
+    # perf: stops 'merge_group' from allocating a runner
+    if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 7080bae85db7..ae28495b4f4c 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -24,9 +24,15 @@ concurrency:
   group: ${{ github.workflow }}
   cancel-in-progress: false
 
+env:
+  JAVA_TOOL_OPTIONS: -Dkotlin.daemon.options=autoshutdownIdleSeconds=10
+
 jobs:
   check_release:
     name: 'Check whether a release is due'
+    permissions:
+      contents: read
+      actions: write # Cancel this run when a scheduled publish is skipped.
     if: github.event_name == 'schedule' && github.repository == 'ankidroid/Anki-Android' && github.ref == 'refs/heads/main'
     timeout-minutes: 20
     runs-on: ubuntu-latest
diff --git a/.github/workflows/screenshot_comment.yml b/.github/workflows/screenshot_comment.yml
index 1e994a187b84..8b28f9a291a1 100644
--- a/.github/workflows/screenshot_comment.yml
+++ b/.github/workflows/screenshot_comment.yml
@@ -64,7 +64,7 @@ jobs:
         name: Check if there are valid files
         shell: bash
         run: |
-          # Find Roborazzi diff PNGs in the downloaded artifact (in <TestClass>/).
+          # Find Roborazzi diff PNGs in the downloaded artifact (in <module>/<TestClass>/).
           mapfile -t files_to_add < <(find . -name "*_compare.png" -type f)
           if [ ${#files_to_add[@]} -gt 0 ]; then
             exist_valid_files="true"
@@ -82,13 +82,14 @@ jobs:
           BASE_REF: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.pull_requests[0].base.ref || github.event.repository.default_branch }}
         shell: bash
         run: |
-          # Find Roborazzi diff PNGs to mention in the comment (in <TestClass>/).
+          # Find Roborazzi diff PNGs to mention in the comment (in <module>/<TestClass>/).
           mapfile -t files < <(find . -name "*_compare.png" -type f | sort)
           total=${#files[@]}
           # Cap the full list so we remain within GitHub's comment limit
           max_details=100
 
-          # Group by test class - the file's immediate parent directory.
+          # Group by test class, module prefix is dropped for readability.
+          # Reconsider it once we are heavily mutlimodule.
           declare -A class_counts class_files
           for file in "${files[@]}"; do
             class_dir="${file%/*}"
diff --git a/.github/workflows/screenshot_compare.yml b/.github/workflows/screenshot_compare.yml
index 0d9599f012d4..7070e6c74962 100644
--- a/.github/workflows/screenshot_compare.yml
+++ b/.github/workflows/screenshot_compare.yml
@@ -27,6 +27,9 @@ on:
 
 permissions: {}
 
+env:
+  JAVA_TOOL_OPTIONS: -Dkotlin.daemon.options=autoshutdownIdleSeconds=10
+
 jobs:
   compare-screenshot-test:
     name: compare
@@ -38,6 +41,17 @@ jobs:
       actions: write # for upload-artifact
 
     steps:
+      # Work around Ubuntu 26.04's RAM-backed /tmp until the image fix rolls out.
+      # https://github.com/actions/runner-images/pull/14814
+      - name: Keep /tmp on disk
+        if: runner.os == 'Linux'
+        run: |
+          if [ "$(findmnt -n -o FSTYPE --target /tmp)" = "tmpfs" ]; then
+            sudo systemctl mask tmp.mount
+            sudo umount -l /tmp
+          fi
+          df -hT /tmp
+
       - name: Checkout
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
@@ -57,13 +71,14 @@ jobs:
           gradle-version: wrapper
 
       - name: Warm Gradle Cache
-        # This makes sure we fetch gradle network resources with a retry
+        # Keep compilation here: robolectricSdkDownload only downloads SDK jars.
+        # Compiling resolves test dependencies within the retry (Issue 21682).
         uses: nick-fields/retry@ad984534de44a9489a53aefd81eb77f87c70dc60 # v4.0.0
         with:
           timeout_minutes: 10
           retry_wait_seconds: 60
           max_attempts: 3
-          command: ./gradlew robolectricSdkDownload :AnkiDroid:compilePlayDebugUnitTestKotlin -Pscreenshot --daemon
+          command: ./gradlew robolectricSdkDownload compileScreenshotTests -Pscreenshot --daemon
 
       - name: Download base branch screenshots
         uses: dawidd6/action-download-artifact@eab87c9830c39eff17e5a6eadb20bfb4bc880477 # v27
@@ -72,11 +87,12 @@ jobs:
           name: screenshot
           workflow: screenshot_store.yml
           branch: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref || github.event.repository.default_branch }}
+          event: push
 
       - name: Compare screenshots
         id: compare-screenshot-test
         run: |
-          ./gradlew compareRoborazziPlayDebug -Pscreenshot --stacktrace
+          ./gradlew compareScreenshots -Pscreenshot --stacktrace
 
       - name: Stage screenshot diffs
         if: ${{ always() }}
@@ -84,18 +100,19 @@ jobs:
           # Folder name inside the artifact (e.g. "screenshot-diff-pr-12345" on PRs, "screenshot-diff-main" on push)
           SUBDIR: ${{ github.event_name == 'pull_request' && format('screenshot-diff-pr-{0}', github.event.number) || format('screenshot-diff-{0}', github.ref_name) }}
         run: |
-          # Trim 'AnkiDroid/build/outputs/roborazzi' from the artifact
-          # Only keep the _compare images of failing cases: <class>/diffs/*_compare.png moves to <class>/
+          # Preserve module paths so identically named tests cannot overwrite one another.
           mkdir -p "screenshot-diff/$SUBDIR"
-          shopt -s nullglob
-          for diffs_dir in AnkiDroid/build/outputs/roborazzi/*/diffs; do
-            class_name="$(basename "$(dirname "$diffs_dir")")"
-            compares=("$diffs_dir"/*_compare.png)
-            if (( ${#compares[@]} )); then
-              mkdir -p "screenshot-diff/$SUBDIR/$class_name"
-              mv "${compares[@]}" "screenshot-diff/$SUBDIR/$class_name/"
-            fi
-          done
+          while IFS= read -r -d '' compare; do
+            module="${compare%%/build/reports/screenshot-diffs/*}"
+            relative="${compare#*/build/reports/screenshot-diffs/}"
+            # Flatten local /diffs/ directory: keeps baselines apart from
+            # diffs while testing, and means nothing inside artifact
+            class="${relative%%/*}"
+            name="${relative##*/}"
+            destination="screenshot-diff/$SUBDIR/${module#./}/$class/$name"
+            mkdir -p "$(dirname "$destination")"
+            cp "$compare" "$destination"
+          done < <(find . -type f -path '*/build/reports/screenshot-diffs/*_compare.png' -print0)
 
       - name: Upload screenshot diffs
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
@@ -132,4 +149,4 @@ jobs:
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: pr  # downloaded by screenshot_comment.yml
-          path: pr/
\ No newline at end of file
+          path: pr/
diff --git a/.github/workflows/screenshot_store.yml b/.github/workflows/screenshot_store.yml
index dc53a73d5829..5ac3539a4bc0 100644
--- a/.github/workflows/screenshot_store.yml
+++ b/.github/workflows/screenshot_store.yml
@@ -26,22 +26,29 @@ on:
   push:
     branches:
       - main
+      - dependency-updates
   # On PRs, only run this when structural changes occur, to be sure 'main' can still store baselines
   pull_request:
     paths:
       - '.github/workflows/screenshot_*.yml'
       - 'gradle/libs.versions.toml'
-      - 'AnkiDroid/build.gradle'
-      - 'AnkiDroid/build.gradle.kts' # future-proof
+      - '**/build.gradle'
+      - '**/build.gradle.kts'
+      - 'settings.gradle.kts'
       - '**/ScreenshotTest.kt'
+      - '**/ScreenshotTestCategory.kt'
+      - 'buildSrc/src/main/kotlin/ankidroid.plugins.screenshots.gradle.kts'
       - 'tools/compare-screenshot-test.sh'
 
 permissions: {}
 
+env:
+  JAVA_TOOL_OPTIONS: -Dkotlin.daemon.options=autoshutdownIdleSeconds=10
+
 jobs:
   store-screenshot-test:
     # On PRs, this verifies the workflow runs on `main`, it's not a store
-    name: ${{ github.ref == 'refs/heads/main' && 'store' || 'test' }}
+    name: ${{ github.event_name == 'push' && 'store' || 'test' }}
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -50,6 +57,17 @@ jobs:
       actions: write # for upload-artifact
 
     steps:
+      # Work around Ubuntu 26.04's RAM-backed /tmp until the image fix rolls out.
+      # https://github.com/actions/runner-images/pull/14814
+      - name: Keep /tmp on disk
+        if: runner.os == 'Linux'
+        run: |
+          if [ "$(findmnt -n -o FSTYPE --target /tmp)" = "tmpfs" ]; then
+            sudo systemctl mask tmp.mount
+            sudo umount -l /tmp
+          fi
+          df -hT /tmp
+
       - name: Checkout
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
@@ -70,20 +88,21 @@ jobs:
           gradle-version: wrapper
 
       - name: Warm Gradle Cache
-        # This makes sure we fetch gradle network resources with a retry
-        # TODO: --rerun-tasks in 'Record screenshots' discards the compilation performed here
+        # Keep compilation here: robolectricSdkDownload only downloads SDK jars.
+        # Compiling resolves test dependencies within the retry (Issue 21682).
+        # --rerun-tasks repeats compilation but reuses downloaded dependencies.
         uses: nick-fields/retry@ad984534de44a9489a53aefd81eb77f87c70dc60 # v4.0.0
         with:
           timeout_minutes: 10
           retry_wait_seconds: 60
           max_attempts: 3
-          command: ./gradlew robolectricSdkDownload :AnkiDroid:compilePlayDebugUnitTestKotlin -Pscreenshot --daemon
+          command: ./gradlew robolectricSdkDownload compileScreenshotTests -Pscreenshot --daemon
 
       - name: Record screenshots
         id: record-test
         run: |
           # Use --rerun-tasks to disable cache for test task
-          ./gradlew recordRoborazziPlayDebug -Pscreenshot --stacktrace --rerun-tasks
+          ./gradlew recordScreenshots -Pscreenshot --stacktrace --rerun-tasks
 
       - name: Upload screenshot baseline
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
@@ -110,4 +129,4 @@ jobs:
           name: screenshot-test-results
           path: |
             **/build/test-results
-          retention-days: 30
\ No newline at end of file
+          retention-days: 30
diff --git a/.github/workflows/tests_emulator.yml b/.github/workflows/tests_emulator.yml
index a8e5dd5abd77..617148033b75 100644
--- a/.github/workflows/tests_emulator.yml
+++ b/.github/workflows/tests_emulator.yml
@@ -29,6 +29,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name == 'schedule' && 'scheduled' || 'ci' }}
   cancel-in-progress: true
 
+env:
+  JAVA_TOOL_OPTIONS: -Dkotlin.daemon.options=autoshutdownIdleSeconds=10
+
 jobs:
   # We want to generate our matrix dynamically
   # Initial job generates the matrix as a JSON, and following job will use deserialize and use the result
@@ -68,13 +71,23 @@ jobs:
             // try different architectures, targets, delays etc
             let arch = ['x86_64'];
             let target = ['google_apis', 'google_apis_ps16k'];
-            // Keep API 37 and the 16 KB emulator off the per-change CI path.
-            // Scheduled and manual runs exercise both API levels and targets.
+            let include = [];
+            // Keep API 37, the 16 KB emulator and the tablet off the per-change CI path.
+            // Scheduled and manual runs exercise both API levels and targets, plus a tablet.
             if (context.eventName !== 'schedule' && context.eventName !== 'workflow_dispatch') {
               target = ['google_apis'];
             } else {
               // Keep the minor version: SDK 37 packages use android-37.0.
               apiLevel.push('37.0');
+              include = iterationArray.map((iteration) => ({
+                "iteration": iteration,
+                "api-level": 36,
+                "arch": "x86_64",
+                "target": "google_apis",
+                "first-boot-delay": 600,
+                "device": "tablet",
+                "profile": "pixel_tablet"
+              }));
             }
             let firstBootDelay = [600];
 
@@ -83,7 +96,9 @@ jobs:
               "api-level": apiLevel,
               "arch": arch,
               "target": target,
-              "first-boot-delay": firstBootDelay
+              "first-boot-delay": firstBootDelay,
+              "device": ["phone"],
+              "include": include
             }
       - name: Debug Output
         run: echo "${{ steps.build-matrix.outputs.result }}"
@@ -91,7 +106,7 @@ jobs:
   # This uses the matrix generated from the matrix-prep stage
   # it will run unit tests on whatever OS combinations are desired
   emulator_test:
-    name: Android Emulator Test (${{ matrix.api-level }}, ${{ matrix.arch }}, ${{ matrix.target }}, ${{ matrix.first-boot-delay }}, ${{ matrix.iteration }})
+    name: Android Emulator Test (${{ matrix.api-level }}, ${{ matrix.arch }}, ${{ matrix.target }}, ${{ matrix.first-boot-delay }}, ${{ matrix.iteration }}${{ matrix.device == 'tablet' && ', tablet' || '' }})
     runs-on: ubuntu-latest
     needs: matrix_prep
     timeout-minutes: 75
@@ -152,7 +167,7 @@ jobs:
 
         # Cache only the per-change emulator: the 16 KB snapshot costs about 2.5 GiB.
       - name: AVD cache
-        if: matrix.target == 'google_apis'
+        if: matrix.target == 'google_apis' && matrix.device == 'phone'
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         id: avd-cache
         with:
@@ -163,6 +178,9 @@ jobs:
           restore-keys: |
             avd-${{ matrix.api-level }}-${{ matrix.arch }}-${{matrix.target}}-v2
 
+      - name: Pin Build Time
+        run: echo "ORG_GRADLE_PROJECT_buildTime=$(date +%s000)" >> "$GITHUB_ENV"
+
       - name: Warm Gradle Cache
         # This makes sure we fetch gradle network resources with a retry
         uses: nick-fields/retry@ad984534de44a9489a53aefd81eb77f87c70dc60 # v4.0.0
@@ -202,15 +220,16 @@ jobs:
             "${ANDROID_HOME:?}/system-images/android-${SDK_API_LEVEL:?}/${SDK_TARGET:?}/${SDK_ARCH:?}/.installer"
 
       - name: AVD Boot and Snapshot Creation
-        # Warm up the uncached 16 KB emulator on every run; otherwise only on main cache misses.
+        # Warm up the uncached 16 KB and tablet emulators on every run; otherwise only on main cache misses.
         # Comment the if out to generate snapshots on branch for performance testing
-        if: "${{ matrix.target == 'google_apis_ps16k' || (steps.avd-cache.outputs.cache-hit != 'true' && github.ref == 'refs/heads/main') }}"
+        if: "${{ matrix.target == 'google_apis_ps16k' || matrix.device == 'tablet' || (steps.avd-cache.outputs.cache-hit != 'true' && github.ref == 'refs/heads/main') }}"
         uses: reactivecircus/android-emulator-runner@a421e43855164a8197daf9d8d40fe71c6996bb0d # v2.38.0
         with:
           api-level: ${{ matrix.api-level }}
           force-avd-creation: false
           target: ${{ matrix.target }}
           arch: ${{ matrix.arch }}
+          profile: ${{ matrix.profile }}
           emulator-options: ${{ env.EMULATOR_OPTIONS }}
           ram-size: ${{ env.EMULATOR_RAM_SIZE }}
           pre-emulator-launch-script: ${{ env.EMULATOR_PRE_LAUNCH_SCRIPT }}
@@ -225,10 +244,10 @@ jobs:
 
         # This step is separate so pure install time may be calculated as a step
       - name: Emulator Snapshot After Firstboot Warmup
-        # Always warm up the 16 KB emulator. The default emulator only needs it on main cache misses.
+        # Always warm up the 16 KB and tablet emulators. The default emulator only needs it on main cache misses.
         # Switch the if statements via comment if generating snapshots for performance testing
         # if: matrix.first-boot-delay != '0'
-        if: "${{ matrix.target == 'google_apis_ps16k' || (steps.avd-cache.outputs.cache-hit != 'true' && github.ref == 'refs/heads/main') }}"
+        if: "${{ matrix.target == 'google_apis_ps16k' || matrix.device == 'tablet' || (steps.avd-cache.outputs.cache-hit != 'true' && github.ref == 'refs/heads/main') }}"
         env:
           FIRST_BOOT_DELAY: ${{ matrix.first-boot-delay }}
         uses: reactivecircus/android-emulator-runner@a421e43855164a8197daf9d8d40fe71c6996bb0d # v2.38.0
@@ -237,6 +256,7 @@ jobs:
           force-avd-creation: false
           target: ${{ matrix.target }}
           arch: ${{ matrix.arch }}
+          profile: ${{ matrix.profile }}
           emulator-options: ${{ env.EMULATOR_OPTIONS }}
           ram-size: ${{ env.EMULATOR_RAM_SIZE }}
           pre-emulator-launch-script: ${{ env.EMULATOR_PRE_LAUNCH_SCRIPT }}
@@ -260,6 +280,7 @@ jobs:
           force-avd-creation: false
           target: ${{ matrix.target }}
           arch: ${{ matrix.arch }}
+          profile: ${{ matrix.profile }}
           emulator-options: -no-snapshot-save ${{ env.EMULATOR_OPTIONS }}
           ram-size: ${{ env.EMULATOR_RAM_SIZE }}
           pre-emulator-launch-script: ${{ env.EMULATOR_PRE_LAUNCH_SCRIPT }}
@@ -274,11 +295,31 @@ jobs:
             bash .github/adb_retry.sh emu screenrecord start --time-limit 1800 video.webm
             sleep 5
             bash .github/with_emulator_log.sh adb-log.txt python3 .github/run_emulator_tests.py
-            TEST_RELEASE_BUILD=false ./gradlew :baselineprofile:connectedBenchmarkBenchmarkAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=com.ichi2.anki.baselineprofile.ReleaseSmokeTest -Pandroid.testInstrumentationRunnerArguments.releaseSmokeTest=true --daemon
 
       - name: Report Emulator Test Results
         if: always() && hashFiles('AnkiDroid/build/outputs/androidTest-results/connected/**/TEST-*.xml') != ''
-        run: python3 .github/report_test_failures.py AnkiDroid/build/outputs/androidTest-results/connected adb-log.txt --title "Emulator test failures"
+        run: python3 .github/report_test_failures.py AnkiDroid/build/outputs/androidTest-results/connected adb-log.txt --title "Emulator test failures" --suite ":AnkiDroid:connectedPlayReleaseAndroidTest"
+
+      - name: Build Release Smoke Test
+        run: TEST_RELEASE_BUILD=false ./gradlew packagePlayRelease :baselineprofile:packageBenchmarkBenchmark --daemon
+
+      - name: Run Release Smoke Test
+        uses: reactivecircus/android-emulator-runner@a421e43855164a8197daf9d8d40fe71c6996bb0d # v2.38.0
+        timeout-minutes: 10
+        with:
+          api-level: ${{ matrix.api-level }}
+          force-avd-creation: false
+          target: ${{ matrix.target }}
+          arch: ${{ matrix.arch }}
+          emulator-options: -no-snapshot-save ${{ env.EMULATOR_OPTIONS }}
+          ram-size: ${{ env.EMULATOR_RAM_SIZE }}
+          pre-emulator-launch-script: ${{ env.EMULATOR_PRE_LAUNCH_SCRIPT }}
+          sdcard-path-or-size: 100M
+          disable-animations: true
+          script: |
+            bash .github/disable_art_metrics.sh
+            bash .github/adb_retry.sh shell settings put global hide_error_dialogs 1
+            TEST_RELEASE_BUILD=false bash .github/with_emulator_cleanup.sh ./gradlew :baselineprofile:connectedBenchmarkBenchmarkAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=com.ichi2.anki.baselineprofile.ReleaseSmokeTest -Pandroid.testInstrumentationRunnerArguments.releaseSmokeTest=true --daemon
 
       - name: Configure NDK tools PATH for alignment checking
         run: |
@@ -332,21 +373,21 @@ jobs:
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         if: always()
         with:
-          name: ${{ matrix.api-level }}-${{ matrix.arch }}-${{matrix.target}}-${{matrix.first-boot-delay}}-${{matrix.iteration}}-jacocoAndroidTestReport
+          name: ${{ matrix.api-level }}-${{ matrix.arch }}-${{matrix.target}}-${{matrix.first-boot-delay}}-${{matrix.iteration}}-${{ matrix.device }}-jacocoAndroidTestReport
           path: ~/work/Anki-Android/Anki-Android/AnkiDroid/build/reports/jacoco/
 
       - name: Upload Emulator Log
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         if: always()
         with:
-          name: ${{ matrix.api-level }}-${{ matrix.arch }}-${{matrix.target}}-${{matrix.first-boot-delay}}-${{matrix.iteration}}-adb_logs
+          name: ${{ matrix.api-level }}-${{ matrix.arch }}-${{matrix.target}}-${{matrix.first-boot-delay}}-${{matrix.iteration}}-${{ matrix.device }}-adb_logs
           path: adb-log.txt
 
       - name: Upload Emulator Screen Record
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         if: always()
         with:
-          name: ${{ matrix.api-level }}-${{ matrix.arch }}-${{matrix.target}}-${{matrix.first-boot-delay}}-${{matrix.iteration}}-adb_video
+          name: ${{ matrix.api-level }}-${{ matrix.arch }}-${{matrix.target}}-${{matrix.first-boot-delay}}-${{matrix.iteration}}-${{ matrix.device }}-adb_video
           path: video.webm
 
       - uses: codecov/codecov-action@303a32d7a59b442fa8d48b6a1cc6825c09c847a5 # v7.1.1
diff --git a/.github/workflows/tests_unit.yml b/.github/workflows/tests_unit.yml
index 13b2b4071a82..50709462a9b9 100644
--- a/.github/workflows/tests_unit.yml
+++ b/.github/workflows/tests_unit.yml
@@ -41,6 +41,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 
+env:
+  JAVA_TOOL_OPTIONS: -Dkotlin.daemon.options=autoshutdownIdleSeconds=10
+
 jobs:
   # We want to generate our matrix dynamically
   # Initial job generates the matrix as a JSON, and following job will use deserialize and use the result
@@ -115,8 +118,8 @@ jobs:
     # Do not run the scheduled jobs on forks
     if: (github.event_name == 'schedule' && github.repository == 'ankidroid/Anki-Android') || (github.event_name != 'schedule')
     needs: matrix_prep
-    # Windows takes 30-34 minutes when the Gradle cache misses (#21834)
-    timeout-minutes: 45
+    # Windows can take 40m+ on tests
+    timeout-minutes: 60
     env:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     strategy:
@@ -126,6 +129,17 @@ jobs:
     #env:
     #  CODACY_TOKEN: ${{ secrets.CODACY_TOKEN }}
     steps:
+      # Work around Ubuntu 26.04's RAM-backed /tmp until the image fix rolls out.
+      # https://github.com/actions/runner-images/pull/14814
+      - name: Keep /tmp on disk
+        if: runner.os == 'Linux'
+        run: |
+          if [ "$(findmnt -n -o FSTYPE --target /tmp)" = "tmpfs" ]; then
+            sudo systemctl mask tmp.mount
+            sudo umount -l /tmp
+          fi
+          df -hT /tmp
+
       - name: Configure Windows Pagefile
         uses: al-cheb/configure-pagefile-action@9b6da52fb72a3c6147c1aad2df22d8d905681adc # v1.5
         if: contains(matrix.os, 'windows')
@@ -134,6 +148,15 @@ jobs:
           maximum-size: 12GB
           disk-root: "C:"
 
+      - name: Configure Linux Swap
+        if: runner.os == 'Linux'
+        run: |
+          sudo fallocate -l 8G /swapfile-ci
+          sudo chmod 600 /swapfile-ci
+          sudo mkswap /swapfile-ci
+          sudo swapon /swapfile-ci
+          swapon --show
+
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           fetch-depth: 50
@@ -179,6 +202,17 @@ jobs:
         if: (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && matrix.iteration == 1 && matrix.os == 'ubuntu-latest'
         run: ./gradlew testFullDebugUnitTest -PemptyApplication --daemon
 
+      # Compile the extra release variant once per scheduled run, keeping PR checks unchanged.
+      - name: Test Parallel Content Provider (scheduled run only)
+        if: github.event_name == 'schedule' && matrix.iteration == 1 && matrix.os == 'ubuntu-latest'
+        env:
+          TEST_RELEASE_BUILD: "true"
+        run: >
+          ./gradlew :AnkiDroid:testFullReleaseUnitTest
+          -PcustomSuffix=a
+          --tests 'com.ichi2.anki.provider.CardContentProviderTest'
+          --daemon
+
       - name: Report Unit Test Results
         if: always() && hashFiles('**/build/test-results/**/TEST-*.xml') != ''
         run: python3 .github/report_test_failures.py . --pattern "build/test-results/**/TEST-*.xml" --title "Unit test failures"
diff --git a/AI_POLICY.md b/AI_POLICY.md
index f1d1b31598d8..f27967614c5e 100644
--- a/AI_POLICY.md
+++ b/AI_POLICY.md
@@ -26,10 +26,16 @@ You may be banned from the repository if this occurs a second time.
 ### Contributors
 
 * You **must** be able to explain all your contributions.
-* AI tools **should not** be used to produce GitHub comments, including filling in the pull request 
-  template.
+* When acting as a reviewer, you **may** use AI tools to produce code review comments. Prefer a
+  summary, with the exact AI-generated wording in a `<details>` block.
+* AI tools **should not** be used to produce other GitHub comments, including filling in the pull
+  request template.
 * Contributions that make nontrivial use of AI tools **must** be labelled, with the tool version.
 
+#### Exceptions
+
+AI-generated issues may be submitted at a maintainer's discretion.
+
 ### Handling Questions about AI Use
 
 If you are not sure whether a tool or workflow counts as AI usage under this policy, please ask
@@ -42,29 +48,53 @@ or trying to bypass this policy may lead to moderator action.
 
 ### Disclosure
 
-**Commit messages** **must** use the `Assisted-by:` 
- [git trailer](https://git-scm.com/docs/git-interpret-trailers#_description) with an explanation
- of the contributions in the description.
+Disclose which AI tools were used.
 
+**Commit messages** **must** use the `Assisted-by:`
+ [git trailer](https://git-scm.com/docs/git-interpret-trailers#_description).
 
 ```
 docs: example title
 
 [Optional commit description]
 
-GPT-5.2 implemented `complexMethod`
+Assisted-by: GPT-6-Astra xhigh
+Assisted-by: Claude Opus 5.5
+```
+
+**GitHub comments** **must** disclose AI tool use, typically using one of the following formats:
+
+```md
+Assisted-by: Claude Opus 5.5
+```
+
+```md
+[Summary of change]
+
+<details>
+
+<summary>Assisted-by: Claude Opus 5.5</summary>
+
+Details of change
 
-Assisted-by: GPT-5.2
-Assisted-by: Claude Opus 4.5 [Proofreading/grammar]
+</details>
 ```
+produces:
+
+[Summary of change]
 
-**GitHub comments** **must** use the `> [!NOTE]` 
- [alert](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#alerts).
+<details>
+
+<summary>Assisted-by: Claude Opus 5.5</summary>
+
+Details of change
+
+</details>
 
 ```md
 > [!NOTE]  
-> The following table was generated using Claude Opus 4.5 
+> The following table was generated using Claude Opus 5.5
 ```
 produces:
-> [!NOTE]  
-> The following table was generated using Claude Opus 4.5
\ No newline at end of file
+> [!NOTE]
+> The following table was generated using Claude Opus 5.5
\ No newline at end of file
diff --git a/AnkiDroid/build.gradle.kts b/AnkiDroid/build.gradle.kts
index ebcf51b3d8e0..2fe03b88a849 100644
--- a/AnkiDroid/build.gradle.kts
+++ b/AnkiDroid/build.gradle.kts
@@ -12,13 +12,13 @@ plugins {
     // Gradle plugin portal
     alias(libs.plugins.tripletPlay)
     id("ankidroid.android.app")
+    id("ankidroid.android.compose")
     id("ankidroid.plugins.jacoco")
     id("ankidroid.plugins.robolectric-downloader")
     alias(libs.plugins.androidx.baselineprofile)
     alias(libs.plugins.kotlin.serialization)
-    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.keeper)
-    alias(libs.plugins.roborazzi)
+    id("ankidroid.plugins.screenshots")
     id("idea")
 }
 
@@ -89,7 +89,6 @@ android {
         aidl = true
         viewBinding = true
         resValues = true
-        compose = true
     }
 
     if (testReleaseBuild) {
@@ -131,9 +130,9 @@ android {
         //
         // This ensures the correct ordering between the various types of releases (dev < alpha < beta < release) which is
         // needed for upgrades to be offered correctly.
-        versionCode = 22600104
+        versionCode = 22600109
         // If you change this to a new version, you probably also want to update .gradle/workflows/milestone.yml for the new version...
-        versionName = "2.26.0alpha4"
+        versionName = "2.26.0alpha9"
         testApplicationId = "com.ichi2.anki.tests"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner = "com.ichi2.testutils.NewCollectionPathTestRunner"
@@ -331,11 +330,11 @@ android {
         animationsDisabled = true
         unitTests {
             all { test ->
+                // Profile coverage checks must rerun when the generated profiles change.
+                test.inputs.dir("src/main/generated/baselineProfiles")
                 test.useJUnitPlatform {
                     // ./gradlew testFullDebugUnitTest -Pscreenshot
                     if (project.hasProperty("screenshot")) {
-                        includeTags("com.ichi2.anki.ScreenshotTestCategory")
-
                         // ./gradlew :AnkiDroid:recordRoborazziPlayDebug -Pscreenshot -Ptheme=black -Pdevice=tablet,foldable
                         val theme = project.findProperty("theme")?.takeIf { it.toString().isNotEmpty() } ?: "light"
                         val device = project.findProperty("device")?.takeIf { it.toString().isNotEmpty() } ?: "phone"
@@ -358,8 +357,7 @@ android {
 
                         test.systemProperty("screenshot.theme", theme)
                         test.systemProperty("screenshot.device", device)
-                    } else {
-                        excludeTags("com.ichi2.anki.ScreenshotTestCategory")
+                        test.systemProperty("screenshot.accessibilityScan", project.hasProperty("accessibilityScan"))
                     }
                     // Ensures that no EmptyApplication test relies on AnkiDroidApp
                     //  by only running EmptyApplication tests
@@ -728,9 +726,10 @@ android {
     }
 }
 
-configurations.configureEach {
+configurations.matching { it.name.endsWith("CompileClasspath") || it.name.endsWith("RuntimeClasspath") }.configureEach {
     resolutionStrategy {
-        // Timber has this as a dependency but they are not up to date. We want to force our version.
+        // Keep app dependencies such as Timber on our annotations version. Changing Kotlin's
+        // compiler classpath creates an extra compiler daemon and increases peak memory use.
         force(libs.jetbrains.annotations)
     }
 }
@@ -751,6 +750,7 @@ dependencies {
     implementation(project(":common:android"))
     implementation(project(":compat"))
     implementation(project(":libanki"))
+    implementation(project(":note-editor"))
     implementation(project(":vbpd"))
     "baselineProfile"(project(":baselineprofile"))
     implementation(project(":widgets"))
@@ -758,17 +758,9 @@ dependencies {
     implementation(libs.google.analytics.kt)
 
     implementation(libs.androidx.activity)
-    // TODO: hoist the Compose enablement (kotlin.compose plugin, buildFeatures.compose,
-    // and the dependencies below) into a convention plugin under `buildSrc/` once the
-    // Kotlin-DSL migration of this build script lands
     implementation(libs.androidx.activity.compose)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.ui)
-    implementation(libs.androidx.compose.ui.tooling.preview)
-    implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.lifecycle.runtime.compose)
-    debugImplementation(libs.androidx.compose.ui.tooling)
     implementation(libs.androidx.annotation)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.browser)
@@ -855,9 +847,6 @@ dependencies {
     // ankidroid.plugins.robolectric-downloader may need a new SDK jar entry
     // when Robolectric or targetSdk changes. See the instructions in that plugin.
     testImplementation(libs.robolectric)
-    testImplementation(libs.androidx.compose.ui.test.junit4)
-    // Needed for createComposeRule(), but not for createAndroidComposeRule<YourActivity>()
-    debugImplementation(libs.androidx.compose.ui.test.manifest)
     testImplementation(libs.androidx.test.core)
     testImplementation(libs.androidx.test.junit)
     testImplementation(libs.kotlin.reflect)
@@ -877,6 +866,7 @@ dependencies {
     }
     testImplementation(libs.androidx.work.testing)
     testImplementation(libs.roborazzi)
+    testImplementation(libs.roborazzi.accessibility.check)
     testImplementation(libs.roborazzi.rule)
     // for testing flows
     testImplementation(libs.cashapp.turbine)
@@ -908,10 +898,4 @@ dependencies {
     // Required so the ExperimentalCoroutinesApi opt-in (applied globally) doesn't cause
     // an "unresolved" warning, which is treated as an error due to allWarningsAsErrors
     testFixturesImplementation(libs.kotlinx.coroutines.core)
-    // The Kotlin Compose Compiler plugin attaches to every Kotlin compilation in the
-    // module including testFixtures, which has no @Composable code and refuses to
-    // run unless the Compose Runtime is on the classpath. compileOnly satisfies the
-    // plugin's version check without shipping the runtime in the testFixtures output.
-    testFixturesCompileOnly(platform(libs.androidx.compose.bom))
-    testFixturesCompileOnly(libs.androidx.compose.runtime)
 }
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/DeckPickerImportTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/DeckPickerImportTest.kt
new file mode 100644
index 000000000000..bfba6bbbd07a
--- /dev/null
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/DeckPickerImportTest.kt
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki
+
+import androidx.core.content.edit
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.CollectionManager.withCol
+import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.anki.dialogs.DialogHandler
+import com.ichi2.anki.tests.InstrumentedTest
+import com.ichi2.anki.testutil.GrantStoragePermission.storagePermission
+import com.ichi2.anki.testutil.disableIntroductionSlide
+import com.ichi2.anki.testutil.grantPermissions
+import com.ichi2.anki.testutil.notificationPermission
+import com.ichi2.anki.testutil.waitUntil
+import com.ichi2.utils.ImportUtils
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import org.junit.After
+import org.junit.Assume.assumeTrue
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+@RunWith(AndroidJUnit4::class)
+class DeckPickerImportTest : InstrumentedTest() {
+    @get:Rule
+    val runtimePermissionRule = grantPermissions(storagePermission, notificationPermission)
+
+    private val preferences get() = testContext.sharedPrefs()
+    private val hadBackupPromptPreference = preferences.contains("backupPromptDisabled")
+    private val backupPromptDisabled = preferences.getBoolean("backupPromptDisabled", false)
+
+    @Test
+    fun importConfirmationSurvivesDelayedTabletStartup() {
+        DialogHandler.storeMessage(ImportUtils.CollectionImportAdd("deck.apkg").toMessage())
+
+        withDelayedStartup { scenario, resumeStartup ->
+            assertImportConfirmationVisible()
+            scenario.assertStartupWaiting()
+
+            resumeStartup()
+            scenario.awaitStartup()
+
+            assertImportConfirmationVisible()
+        }
+    }
+
+    @Before
+    fun prepareTablet() {
+        // The study options side panel is selected by layout-sw600dp.
+        assumeTrue("Requires the tablet layout", testContext.resources.configuration.smallestScreenWidthDp >= 600)
+        disableIntroductionSlide()
+        InitialActivity.setUpgradedToLatestVersion(preferences)
+        preferences.edit { putBoolean("backupPromptDisabled", true) }
+        addNoteUsingBasicNoteType()
+    }
+
+    @After
+    fun restorePreferencesAndPendingDialogs() {
+        DialogHandler.storeMessage(null)
+        preferences.edit {
+            if (hadBackupPromptPreference) {
+                putBoolean("backupPromptDisabled", backupPromptDisabled)
+            } else {
+                remove("backupPromptDisabled")
+            }
+        }
+    }
+
+    private fun withDelayedStartup(test: suspend (scenario: ActivityScenario<DeckPicker>, resumeStartup: suspend () -> Unit) -> Unit) =
+        runBlocking {
+            val collectionQueueHeld = CountDownLatch(1)
+            val releaseStartup = CountDownLatch(1)
+            val pendingCollectionOperation =
+                launch(Dispatchers.IO) {
+                    withCol {
+                        collectionQueueHeld.countDown()
+                        check(releaseStartup.await(30, TimeUnit.SECONDS)) { "Startup was not released" }
+                    }
+                }
+            var scenario: ActivityScenario<DeckPicker>? = null
+            try {
+                assertTrue(collectionQueueHeld.await(10, TimeUnit.SECONDS), "The collection queue must be held before launching")
+                val activityScenario = ActivityScenario.launch(DeckPicker::class.java)
+                scenario = activityScenario
+                test(activityScenario) {
+                    releaseStartup.countDown()
+                    pendingCollectionOperation.join()
+                }
+            } finally {
+                releaseStartup.countDown()
+                withContext(NonCancellable) {
+                    pendingCollectionOperation.join()
+                    scenario?.close()
+                }
+            }
+        }
+
+    private fun ActivityScenario<DeckPicker>.assertStartupWaiting() {
+        onActivity { activity ->
+            assertTrue(activity.fragmented, "The tablet side panel must be present")
+            assertNull(activity.fragment, "Study options must not have been initialized yet")
+            assertTrue(activity.viewModel.startupJob?.isActive == true, "Startup must still be waiting")
+        }
+    }
+
+    private fun ActivityScenario<DeckPicker>.awaitStartup() {
+        waitUntil(message = { "Startup did not finish initializing study options" }) {
+            var finished = false
+            onActivity { activity ->
+                finished =
+                    activity.viewModel.startupJob?.isCompleted == true &&
+                    activity.viewModel.loadDeckCounts?.isCompleted == true &&
+                    activity.fragment != null
+            }
+            finished
+        }
+    }
+
+    private fun assertImportConfirmationVisible() {
+        onView(withText(testContext.getString(CommonString.import_dialog_message_add, "deck.apkg")))
+            .check(matches(isDisplayed()))
+        onView(withText(CommonString.import_message_add))
+            .check(matches(isDisplayed()))
+    }
+}
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/cardviewer/HtmlTypeAnswerReviewerTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/cardviewer/HtmlTypeAnswerReviewerTest.kt
index 8dd588fb39a0..23f26fae8e1f 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/cardviewer/HtmlTypeAnswerReviewerTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/cardviewer/HtmlTypeAnswerReviewerTest.kt
@@ -2,6 +2,7 @@
 
 package com.ichi2.anki.cardviewer
 
+import android.app.Activity
 import android.text.InputType
 import android.view.inputmethod.EditorInfo
 import android.webkit.WebView
@@ -17,6 +18,7 @@ import com.ichi2.anki.Reviewer
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.libanki.NoteTypeId
+import com.ichi2.anki.previewer.CardViewerActivity
 import com.ichi2.anki.tests.InstrumentedTest
 import com.ichi2.anki.tests.checkWithTimeout
 import com.ichi2.anki.testutil.AvoidDayRolloverRule
@@ -27,6 +29,7 @@ import com.ichi2.anki.testutil.ensureWebViewIsSupported
 import com.ichi2.anki.testutil.focusInput
 import com.ichi2.anki.testutil.grantPermissions
 import com.ichi2.anki.testutil.notificationPermission
+import com.ichi2.anki.ui.windows.reviewer.ReviewerFragment
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -34,13 +37,18 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 import java.util.UUID
+import kotlin.test.assertIs
 import kotlin.test.assertNotNull
 
-/** Checks the legacy reviewer's HTML, script loading, and WebView keyboard support together. */
+/** Checks the real reviewers' HTML, script loading, and WebView keyboard support together. */
 @RunWith(Parameterized::class)
 class HtmlTypeAnswerReviewerTest : InstrumentedTest() {
     @JvmField // required for Parameter
     @Parameterized.Parameter
+    var newReviewer = false
+
+    @JvmField // required for Parameter
+    @Parameterized.Parameter(1)
     var autoFocus = false
 
     @get:Rule
@@ -72,7 +80,7 @@ class HtmlTypeAnswerReviewerTest : InstrumentedTest() {
         originalPreferences =
             listOf(newReviewerKey, "useInputTag", "autoFocusTypeInAnswer", doubleTapKey).associateWith { preferences.all[it] }
         preferences.edit {
-            putBoolean(newReviewerKey, false)
+            putBoolean(newReviewerKey, newReviewer)
             putBoolean("useInputTag", true)
             putBoolean("autoFocusTypeInAnswer", autoFocus)
             // These tests intentionally grade immediately after Done.
@@ -134,6 +142,8 @@ class HtmlTypeAnswerReviewerTest : InstrumentedTest() {
     @Test
     fun onlyTheMarkedAnswerDisablesSuggestions() =
         withReviewer { webView ->
+            // Let reviewer autofocus finish before moving to another field.
+            focusAnswer(webView, noSuggest = true)
             webView.focusInput("ordinary")
             val baseline = keyboard.awaitEditor().inputType
             webView.focusInput("typeans")
@@ -165,7 +175,7 @@ class HtmlTypeAnswerReviewerTest : InstrumentedTest() {
                 keyboard.perform("done")
                 webView.awaitJavascript("document.querySelector('#typeans .typeGood')?.textContent === 'été'")
                 if (question != "Third") {
-                    onView(withId(R.id.flashcard_layout_ease3))
+                    onView(withId(if (newReviewer) R.id.good_button else R.id.flashcard_layout_ease3))
                         .also { it.checkWithTimeout(matches(isDisplayed())) }
                         .perform(click())
                 }
@@ -190,10 +200,16 @@ class HtmlTypeAnswerReviewerTest : InstrumentedTest() {
     }
 
     private fun withReviewer(block: (WebView) -> Unit) {
-        ActivityScenario.launch<Reviewer>(Reviewer.getIntent(testContext)).use { scenario ->
+        ActivityScenario.launch<Activity>(Reviewer.getIntent(testContext)).use { scenario ->
             lateinit var webView: WebView
             scenario.onActivity { activity ->
-                webView = assertNotNull(activity.webView)
+                webView =
+                    if (newReviewer) {
+                        val fragment = assertIs<ReviewerFragment>(assertIs<CardViewerActivity>(activity).fragment)
+                        assertIs<TypeAnswerWebView>(fragment.binding.webViewLayout.getChildAt(0))
+                    } else {
+                        assertNotNull(assertIs<Reviewer>(activity).webView)
+                    }
             }
             webView.awaitJavascript("document.getElementById('typeans') !== null")
             block(webView)
@@ -202,7 +218,7 @@ class HtmlTypeAnswerReviewerTest : InstrumentedTest() {
 
     companion object {
         @JvmStatic // required for Parameters
-        @Parameterized.Parameters(name = "autoFocus={0}")
-        fun focusModes() = listOf(false, true)
+        @Parameterized.Parameters(name = "newReviewer={0}, autoFocus={1}")
+        fun reviewers() = listOf(arrayOf(false, false), arrayOf(false, true), arrayOf(true, false), arrayOf(true, true))
     }
 }
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/dialogs/NoteTypeFieldEditorContextMenuTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/dialogs/NoteTypeFieldEditorContextMenuTest.kt
index 2c2cb19c783b..f22833bb5aca 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/dialogs/NoteTypeFieldEditorContextMenuTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/dialogs/NoteTypeFieldEditorContextMenuTest.kt
@@ -10,12 +10,12 @@ import androidx.test.espresso.matcher.RootMatchers.isDialog
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.R
 import com.ichi2.anki.dialogs.NoteTypeFieldEditorContextMenu.NoteTypeFieldEditorContextMenuAction
 import com.ichi2.anki.tests.InstrumentedTest
 import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
+import com.ichi2.anki.common.android.R as CommonR
 
 /** Tests [NoteTypeFieldEditorContextMenu] */
 @RunWith(AndroidJUnit4::class)
@@ -26,8 +26,8 @@ class NoteTypeFieldEditorContextMenuTest : InstrumentedTest() {
     @Ignore("flaky")
     fun showsAllOptions() {
         launchFragment(
-            fragmentArgs = Bundle().apply { putString(NoteTypeFieldEditorContextMenu.KEY_LABEL, testDialogTitle) },
-            themeResId = R.style.Theme_Light,
+            fragmentArgs = Bundle().apply { putString(NoteTypeFieldEditorContextMenu.ARG_LABEL, testDialogTitle) },
+            themeResId = CommonR.style.Theme_Light,
         ) { NoteTypeFieldEditorContextMenu() }
         onView(withText(testDialogTitle))
             .inRoot(isDialog())
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/exception/SanitizedReportCollectorIntegrationTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/exception/SanitizedReportCollectorIntegrationTest.kt
new file mode 100644
index 000000000000..3da3adad95e8
--- /dev/null
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/exception/SanitizedReportCollectorIntegrationTest.kt
@@ -0,0 +1,156 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.exception
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider.getApplicationContext
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.AnkiDroidApp
+import com.ichi2.anki.logging.ProductionCrashReportingTree
+import com.ichi2.anki.servicelayer.ThrowableFilterService
+import org.acra.ReportField
+import org.acra.builder.ReportBuilder
+import org.acra.config.CoreConfigurationBuilder
+import org.acra.data.CrashReportData
+import org.acra.data.CrashReportDataFactory
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import timber.log.Timber
+import java.util.UUID
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
+import kotlin.test.assertSame
+import kotlin.test.assertTrue
+
+/** Exercises the packaged ACRA collectors against Android's logcat and the uncaught-error filter. */
+@RunWith(AndroidJUnit4::class)
+class SanitizedReportCollectorIntegrationTest {
+    private val tree = ProductionCrashReportingTree()
+
+    @Before
+    fun setUp() {
+        Timber.plant(tree)
+    }
+
+    @After
+    fun tearDown() {
+        Timber.uproot(tree)
+    }
+
+    @Test
+    fun sanitizedReportsExcludePrivateMessagesAlreadyWrittenToLogcat() {
+        val privateMessage = "private-${UUID.randomUUID()}@example.com"
+        val exception = StorageAccessException(privateMessage)
+        Timber.w(exception)
+
+        // Prove that the real LogCatCollector can read the private message before filtering.
+        val unfiltered = collectReport(exception, parallel = false)
+        assertTrue(assertNotNull(unfiltered.getString(ReportField.LOGCAT)).contains(privateMessage))
+
+        for (parallel in listOf(false, true)) {
+            val report = collectUnhandledReport(exception, parallel)
+
+            assertEquals(
+                "Logcat filtered because it may contain personally identifiable information (PII).",
+                report.getString(ReportField.LOGCAT),
+            )
+            assertFalse(report.toJSON().contains(privateMessage))
+            assertTrue(assertNotNull(report.getString(ReportField.STACK_TRACE)).contains(exception.javaClass.name))
+            assertFalse(report.getString(ReportField.STACK_TRACE_HASH).isNullOrEmpty())
+        }
+    }
+
+    @Test
+    fun ordinaryReportsRetainTheirLogcatDiagnostics() {
+        val message = "ordinary diagnostics ${UUID.randomUUID()}"
+        val exception = IllegalStateException(message)
+        Timber.w(exception)
+
+        for (parallel in listOf(false, true)) {
+            val report = collectUnhandledReport(exception, parallel)
+
+            assertTrue(assertNotNull(report.getString(ReportField.LOGCAT)).contains(message))
+            assertTrue(assertNotNull(report.getString(ReportField.STACK_TRACE)).contains(message))
+        }
+    }
+
+    @Test
+    fun unrelatedThreadFailuresReachOriginalHandler() {
+        val backgroundFailure = IllegalStateException("unrelated background failure")
+        val worker =
+            Thread { throw backgroundFailure }.apply {
+                uncaughtExceptionHandler = ThrowableFilterService.uncaughtExceptionHandler
+            }
+        val originalHandler = ThrowableFilterService.originalUncaughtExceptionHandler
+        var delegatedThread: Thread? = null
+        var delegatedFailure: Throwable? = null
+        val delegate =
+            Thread.UncaughtExceptionHandler { thread, throwable ->
+                if (thread === worker) {
+                    delegatedThread = thread
+                    delegatedFailure = throwable
+                } else {
+                    originalHandler?.uncaughtException(thread, throwable)
+                }
+            }
+        try {
+            ThrowableFilterService.originalUncaughtExceptionHandler = delegate
+            val expectedFailure = IllegalStateException("expected report failure")
+            val report =
+                collectUnhandledReport(expectedFailure, parallel = false) {
+                    worker.start()
+                    worker.join(5000)
+                    assertFalse(worker.isAlive, "The unrelated exception handler must finish")
+                    assertSame(worker, delegatedThread)
+                    assertSame(backgroundFailure, delegatedFailure)
+                }
+
+            assertTrue(assertNotNull(report.getString(ReportField.STACK_TRACE)).contains("expected report failure"))
+            assertSame(delegate, ThrowableFilterService.originalUncaughtExceptionHandler)
+        } finally {
+            ThrowableFilterService.originalUncaughtExceptionHandler = originalHandler
+        }
+    }
+
+    private fun collectUnhandledReport(
+        exception: Throwable,
+        parallel: Boolean,
+        beforeReport: () -> Unit = {},
+    ): CrashReportData {
+        val reportingThread = Thread.currentThread()
+        val originalHandler = ThrowableFilterService.originalUncaughtExceptionHandler
+        var report: CrashReportData? = null
+        try {
+            // Capture this thread's report before ACRA's sending and process-termination stages.
+            ThrowableFilterService.originalUncaughtExceptionHandler =
+                Thread.UncaughtExceptionHandler { thread, reportable ->
+                    if (thread === reportingThread) {
+                        report = collectReport(reportable, parallel)
+                    } else {
+                        originalHandler?.uncaughtException(thread, reportable)
+                    }
+                }
+            beforeReport()
+            ThrowableFilterService.uncaughtExceptionHandler.uncaughtException(reportingThread, exception)
+        } finally {
+            ThrowableFilterService.originalUncaughtExceptionHandler = originalHandler
+        }
+        return assertNotNull(report, "The uncaught exception must reach report collection")
+    }
+
+    private fun collectReport(
+        exception: Throwable,
+        parallel: Boolean,
+    ): CrashReportData {
+        val config =
+            CoreConfigurationBuilder()
+                .withReportContent(ReportField.STACK_TRACE, ReportField.STACK_TRACE_HASH, ReportField.LOGCAT)
+                .withLogcatArguments("-t", "500", "-v", "time", "${AnkiDroidApp.TAG}:D", "*:S")
+                .withParallel(parallel)
+                .build()
+        return CrashReportDataFactory(getApplicationContext<Context>(), config).createCrashData(ReportBuilder().exception(exception))
+    }
+}
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/ContentProviderTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/ContentProviderTest.kt
index c3672a7eb83b..3dc642ec971e 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/ContentProviderTest.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/ContentProviderTest.kt
@@ -80,7 +80,7 @@ import kotlin.test.junit.JUnitAsserter.assertNotNull
  */
 class ContentProviderTest : InstrumentedTest() {
     @get:Rule
-    var runtimePermissionRule = grantPermissions(storagePermission, FlashCardsContract.READ_WRITE_PERMISSION)
+    var runtimePermissionRule = grantPermissions(storagePermission, FlashCardsContract.getPermission())
 
     // Whether tear down should be executed. I.e. if set up was not cancelled.
     private var tearDown = false
@@ -1062,7 +1062,7 @@ class ContentProviderTest : InstrumentedTest() {
         val filteredDeckId = col.decks.newFiltered("Raw due filtered deck")
         testDeckIds.add(filteredDeckId)
         val filteredDeck = checkNotNull(col.decks.getLegacy(filteredDeckId))
-        filteredDeck.getJSONArray("terms").getJSONArray(0).put(0, "cid:${card.id}")
+        filteredDeck.firstFilter.search = "cid:${card.id}"
         col.decks.save(filteredDeck)
         col.sched.rebuildFilteredDeck(filteredDeckId)
         card.load(col)
@@ -1860,7 +1860,7 @@ class ContentProviderTest : InstrumentedTest() {
                 assertNotNull("Check that the deck we received actually exists", deck)
                 assertEquals(
                     "Check that the received deck has the correct name",
-                    deck.getString("name"),
+                    deck.name,
                     deckName,
                 )
             }
@@ -1894,7 +1894,7 @@ class ContentProviderTest : InstrumentedTest() {
                 )
                 assertEquals(
                     "Check that received deck name equals real deck name",
-                    realDeck.getString("name"),
+                    realDeck.name,
                     returnedDeckName,
                 )
             }
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/testutil/DeckPicker.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/testutil/DeckPicker.kt
index 5349b53595f0..c0571ba4fb2a 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/testutil/DeckPicker.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/testutil/DeckPicker.kt
@@ -18,6 +18,7 @@ import com.ichi2.anki.R
 import com.ichi2.anki.TestUtils.clickChildViewWithId
 import com.ichi2.anki.tests.checkWithTimeout
 import com.ichi2.anki.testutil.ThreadUtils.sleep
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * This file contains utility methods to interact with the DeckPicker.
@@ -51,7 +52,7 @@ fun createDeckWithUniqueName(): String {
     val deckName = "TestDeck$testString"
     onView(withId(R.id.fab_main)).perform(click())
     onView(withId(R.id.add_deck_button)).perform(click())
-    onView(withId(R.id.dialog_text_input)).perform(typeText(deckName))
+    onView(withId(CommonR.id.dialog_text_input)).perform(typeText(deckName))
     onView(withText(CommonString.dialog_ok)).perform(click())
     return deckName
 }
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/testutil/IntroductionSlide.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/testutil/IntroductionSlide.kt
index be89daa4df15..9529ef95aca6 100644
--- a/AnkiDroid/src/androidTest/java/com/ichi2/anki/testutil/IntroductionSlide.kt
+++ b/AnkiDroid/src/androidTest/java/com/ichi2/anki/testutil/IntroductionSlide.kt
@@ -9,6 +9,6 @@ import com.ichi2.anki.IntroductionActivity
 
 fun disableIntroductionSlide() {
     AnkiDroidApp.sharedPrefs().edit {
-        putBoolean(IntroductionActivity.INTRODUCTION_SLIDES_SHOWN, true)
+        putBoolean(IntroductionActivity.PREF_INTRODUCTION_SLIDES_SHOWN, true)
     }
 }
diff --git a/AnkiDroid/src/main/AndroidManifest.xml b/AnkiDroid/src/main/AndroidManifest.xml
index f5c3dc5cc208..805c40bd7732 100644
--- a/AnkiDroid/src/main/AndroidManifest.xml
+++ b/AnkiDroid/src/main/AndroidManifest.xml
@@ -81,6 +81,10 @@
         <intent>
             <action android:name="android.media.action.IMAGE_CAPTURE" />
         </intent>
+        <intent>
+            <action android:name="android.intent.action.EDIT" />
+            <data android:mimeType="image/*" />
+        </intent>
     </queries>
 
     <!--
@@ -513,49 +517,12 @@
                 android:name="autoStoreLocales"
                 android:value="true" />
         </service>
-        <!-- Service to perform web API queries -->
-        <service android:name="com.ichi2.widget.AnkiDroidWidgetSmall$UpdateService" />
-
-
-        <!-- Don't disable/enable the widgets here until min API>=31, see issue #15747 & https://issuetracker.google.com/issues/36914010 -->
-        <!-- small widget -->
-        <receiver
-            android:name="com.ichi2.widget.AnkiDroidWidgetSmall"
-            android:label="@string/widget_small"
-            android:exported="true"
-            >
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_provider_small"
-                />
-        </receiver>
-
         <!-- Copy Sync Error Message to Clipboard -->
         <receiver
             android:name="com.ichi2.anki.receiver.CopyToClipboardReceiver"
             android:exported="false" />
 
-        <!-- A widget that displays a few decks's name and number of cards to review on the Android home screen.
-             The way to add it depends on the phone. It usually consists in a long press on the screen, followed by finding a "widget" button"-->
-        <receiver
-            android:name="com.ichi2.widget.deckpicker.DeckPickerWidget"
-            android:label="@string/deck_picker_widget_description"
-            android:exported="false"
-            >
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_provider_deck_picker" />
-        </receiver>
-
-        <!-- Configuration view for the DeckPickerWidget above.
+        <!-- Configuration view for the DeckPickerWidget.
              It is opened when adding a new deck picker widget and
              by configuration button which appears when the widget is hold or resized.-->
         <activity
@@ -566,23 +533,7 @@
             </intent-filter>
         </activity>
 
-        <!-- A widget that displays a deck name and number of cards to review on the Android home screen.
-             The way to add it depends on the phone. It usually consists in a long press on the screen, followed by finding a "widget" button"-->
-        <receiver
-            android:name="com.ichi2.widget.cardanalysis.CardAnalysisWidget"
-            android:label="@string/card_analysis_extra_widget_description"
-            android:exported="false"
-            >
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_provider_card_analysis" />
-        </receiver>
-
-        <!-- Configuration view for the CardAnalysisWidget above.
+        <!-- Configuration view for the CardAnalysisWidget.
              It is opened when adding a new widget and
              by configuration button which appears when the widget is hold or resized.-->
         <activity
@@ -593,16 +544,6 @@
             </intent-filter>
         </activity>
 
-        <!-- #14372: Handles updates after the day rollover (04:00). -->
-        <receiver android:name="com.ichi2.widget.DayRolloverAlarm"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.ichi2.widget.ACTION_ROLLOVER" />
-                <action android:name="android.intent.action.TIMEZONE_CHANGED" />
-                <action android:name="android.intent.action.TIME_SET" />
-            </intent-filter>
-        </receiver>
-
         <receiver
             android:name="com.ichi2.anki.receiver.SdCardReceiver"
             android:enabled="true"
diff --git a/AnkiDroid/src/main/assets/changelog.html b/AnkiDroid/src/main/assets/changelog.html
index 161320a39136..2bff55729158 100644
--- a/AnkiDroid/src/main/assets/changelog.html
+++ b/AnkiDroid/src/main/assets/changelog.html
@@ -464,6 +464,605 @@
 <h1>AnkiDroid Changelog</h1>
 </div>
 <div id="content">
+<div class="paragraph">
+<p><em>Version 2.26.0alpha9 is a test build. Its changelog comes with the stable release. Until then, here are the changes in the latest stable version.</em></p>
+</div>
+<div class="sect1">
+<h2 id="_version_2_25_3_20261017"><a class="anchor" href="#_version_2_25_3_20261017"></a>Version 2.25.3 (20261017)</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Hello everyone out there in AnkiDroid-land 👋</p>
+</div>
+<div class="paragraph">
+<p>We&#8217;re already moving right along on work for 2.26 but we are always listening for and
+fixing issues when we hear about them - hopefully this patch release gets rid of some
+pain points for everyone</p>
+</div>
+<div class="paragraph">
+<p>Cheers!</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Deck Picker: Fix the import confirmation disappearing on tablets during startup</p>
+</li>
+<li>
+<p>Reviewing: Re-enable HTTP(s) links - our security fixes went too far</p>
+</li>
+<li>
+<p>Note Editor: Fix filename normalization issues when pasting media</p>
+</li>
+<li>
+<p>Text-to-speech: Report network errors and timeouts</p>
+</li>
+<li>
+<p>App-wide: Fix crashes if widgets are unsupported</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Full list of <a href="https://github.com/ankidroid/Anki-Android/compare/v2.25.2&#8230;&#8203;release-2.25">2.25.3 changes</a>.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_version_2_25_2_20261013"><a class="anchor" href="#_version_2_25_2_20261013"></a>Version 2.25.2 (20261013)</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>&#8230;&#8203;aaaaand we&#8217;re back! Google has officially blessed our releases and allowed them
+out in the wild again after our donation link kerfuffle. In fact, literally millions
+of you (nearly 3 million and counting) are already on the new 2.25 release series</p>
+</div>
+<div class="paragraph">
+<p>For any of you that have opted in to crash reporting, thank you! That&#8217;s one of the main
+ways we detect new problems, and your reward is this fresh batch of fixes</p>
+</div>
+<div class="paragraph">
+<p>Enjoy!</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Deck Picker: Fix 'one way sync' disappearing on tablets</p>
+</li>
+<li>
+<p>Text-to-speech: Handle AnkiDroid crashing when accessing faulty TTS Engines</p>
+</li>
+<li>
+<p>Reviewer: Fix TTS freezes when leaving the study screen</p>
+</li>
+<li>
+<p>Performance: Fix various freezes while syncing</p>
+</li>
+<li>
+<p>Sync: Fix errors when closing the app</p>
+</li>
+<li>
+<p>App-wide: Fix some Android region settings blocking backend translations</p>
+</li>
+<li>
+<p>App-wide: Fix random freezes on some devices (Custom Tabs issue)</p>
+</li>
+<li>
+<p>App-wide: Fix crashes when closing/rotating screens</p>
+</li>
+<li>
+<p>Internationalization: Fix tablet panes resizing in the opposite direction</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Full list of <a href="https://github.com/ankidroid/Anki-Android/compare/v2.25.1&#8230;&#8203;release-2.25">2.25.2 changes</a>.</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_version_2_25_1_20261006"><a class="anchor" href="#_version_2_25_1_20261006"></a>Version 2.25.1 (20261006)</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Wait what!? What is this? A 2.25.1 and you didn&#8217;t even get 2.25.0 yet!</p>
+</div>
+<div class="paragraph">
+<p>That&#8217;s right! 2.25.0 did ship but Google wouldn&#8217;t release it because&#8230;&#8203;well, honestly
+we&#8217;re not sure, their approval / rejection process is completely opaque! All we know is that
+it originally had to do with them rejecting our donations link. And now it appears they&#8217;re
+rejecting old versions! But we do what we can. And we can keep trying. So here&#8217;s 2.25.1!</p>
+</div>
+<div class="paragraph">
+<p>With sincere wishes all of our lovely AnkiDroid users get to enjoy it  ☺️ 🫶</p>
+</div>
+<div class="paragraph">
+<p>Full <a href="#_version_2_25_0_20260927">2.25.0 changelog</a> down below 👇</p>
+</div>
+<div class="paragraph">
+<p>Here&#8217;s our 2.25.1 bugfix list:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Study screen: Preserve scroll position when flipping a card</p>
+</li>
+<li>
+<p>Study screen: Reset zoom when changing cards</p>
+</li>
+<li>
+<p>Reviewing: Fix MathJax font scaling (<strong>may change the layout of some cards</strong>)</p>
+</li>
+<li>
+<p>Reviewing: Fix crash on close after a WebView failure</p>
+</li>
+<li>
+<p>Text-to-speech: Prefer installed voices (fixes issues on Pixel devices)</p>
+</li>
+<li>
+<p>Text-to-speech: Performance improvements for legacy TTS</p>
+</li>
+<li>
+<p>Card Browser: Fix crashes while scrolling</p>
+</li>
+<li>
+<p>Card Browser: Preserve selection in more cases</p>
+</li>
+<li>
+<p>Card Browser: Fix icon tint being applied globally</p>
+</li>
+<li>
+<p>Tags: Fix parent tags remaining selected after being unchecked</p>
+</li>
+<li>
+<p>Tags: Fix checkbox states when editing multiple notes or filtering tags</p>
+</li>
+<li>
+<p>Tags: Fix ordering (partially selected tags at the top)</p>
+</li>
+<li>
+<p>Tags: Fix tags being changed on scroll</p>
+</li>
+<li>
+<p>Tags: Better performance</p>
+</li>
+<li>
+<p>Note Editor: Handle 'Restore to Default' in the template editor</p>
+</li>
+<li>
+<p>Note Editor: Match Anki Desktop when switching to a note type without an deck</p>
+</li>
+<li>
+<p>Note Types: Update state after undo/redo</p>
+</li>
+<li>
+<p>Various screens: Better edge to edge UI support</p>
+</li>
+<li>
+<p>Sync: Fix crash on long background syncs</p>
+</li>
+<li>
+<p>Sync: Fix undismissable notification sometimes appearing after a completed sync</p>
+</li>
+<li>
+<p>Deck Options: Prevent scrolling from changing Easy Days</p>
+</li>
+<li>
+<p>Deck Picker Widget: Make the whole deck row tappable</p>
+</li>
+<li>
+<p>Widgets: Improve layout with large fonts and small widget sizes</p>
+</li>
+<li>
+<p>Widgets: Hide cut-off rows and refresh the deck list when resized</p>
+</li>
+<li>
+<p>Widgets: Fix incorrect colors on load (Android 12+)</p>
+</li>
+<li>
+<p>App-wide: Reduce unnecessary data saved when moving app data to disk</p>
+</li>
+<li>
+<p>App-wide: Fix crash when <code>TMPDIR</code> is unavailable</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Full list of [2.25.1 changes](<a href="https://github.com/ankidroid/Anki-Android/compare/v2.25.0&#8230;&#8203;v2.25.1" class="bare">https://github.com/ankidroid/Anki-Android/compare/v2.25.0&#8230;&#8203;v2.25.1</a>).</p>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_version_2_25_0_20260927"><a class="anchor" href="#_version_2_25_0_20260927"></a>Version 2.25.0 (20260927)</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Hey hey hey! It&#8217;s new AnkiDroid version time 🎁👀. We&#8217;ve got a bunch of new features for you, plus the usual
+mix of security fixes, bug fixes and quality of life improvements. We hope you enjoy it.</p>
+</div>
+<div class="paragraph">
+<p><strong>Removal of donation links</strong>: Please see <a href="https://github.com/ankidroid/Anki-Android/issues/21656">GitHub Issue 21656</a> for why this has happened and how to help us with this.</p>
+</div>
+<div class="sect2">
+<h3 id="_google_summer_of_code_2026"><a class="anchor" href="#_google_summer_of_code_2026"></a>Google Summer of Code 2026</h3>
+<div class="paragraph">
+<p>We participated in Google Summer of Code 2026!</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://github.com/ShaanNarendran/GSoC-Report">Shaan Narendran&#8217;s Deck Picker Redesign Project Report</a></p>
+<div class="ulist">
+<ul>
+<li>
+<p>Available in our developer settings, will be out soon!</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Manoel Cortes Mendez is still hard at work on <a href="https://summerofcode.withgoogle.com/programs/2026/projects/XGTDRLdf">their Open LLM Flashcard Generator and Importer, using the AnkiDroid API</a></p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_security"><a class="anchor" href="#_security"></a>Security</h3>
+<div class="paragraph">
+<p>A special thank you to the following people for reporting the security issues fixed in this release:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://github.com/Kwstubbs">Kevin Stubbings</a> of the GitHub Security Lab (GHSL-2026-083, GHSL-2026-084, GHSL-2026-085)</p>
+</li>
+<li>
+<p><a href="https://github.com/kah-ja">Jan Kahmen</a> for (GHSA-qjjx-px4w-4986)</p>
+</li>
+<li>
+<p><a href="https://github.com/criticalAY">Ashish Yadav</a> (GHSA-cr2g-gf75-cm6r)</p>
+</li>
+</ul>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Reviewer: cards can no longer open dangerous links [GHSL-2026-085, GHSA-54q9-5c5p-9rxg]</p>
+</li>
+<li>
+<p>Reviewer: cards require permission to launch apps [GHSL-2026-085, GHSA-54q9-5c5p-9rxg]</p>
+<div class="ulist">
+<ul>
+<li>
+<p>May be unblocked in advanced settings, if all your cards are trustworthy.</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>JavaScript API: blocked calls which could read and modify cards (other than the currently selected card) [GHSL-2026-084, GHSA-54q9-5c5p-9rxg]</p>
+<div class="ulist">
+<ul>
+<li>
+<p>May be unblocked in advanced settings, if all your cards are trustworthy.</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Reviewer: fix path traversal when loading media [GHSL-2026-083, GHSA-qjjx-px4w-4986]</p>
+</li>
+<li>
+<p>Import: sanitize filenames to block path traversal [GHSA-q29p-h3pp-mh3v]</p>
+</li>
+<li>
+<p>Note Editor: reject untrusted files from the image picker [GHSA-cr2g-gf75-cm6r]</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_ankidroid_features"><a class="anchor" href="#_ankidroid_features"></a>AnkiDroid features</h3>
+<div class="ulist">
+<ul>
+<li>
+<p>Design: All screens now support <a href="https://developer.android.com/develop/ui/views/layout/edge-to-edge">edge to edge</a> (Android requirement)</p>
+<div class="ulist">
+<ul>
+<li>
+<p>This required extensive changes to all screens of the app. Please report any bugs.</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Themes: E-ink theme &amp; improved theme selection.</p>
+</li>
+<li>
+<p>Card Browser: Find &amp; Replace support.</p>
+</li>
+<li>
+<p>Card Browser: Improved sort screen, with new columns to sort by.</p>
+</li>
+<li>
+<p>TTS: Support all installed engines.</p>
+</li>
+<li>
+<p>Analytics: Analytics are fixed. Analytics are opt-in only, and all opt-in flags have been reset.</p>
+</li>
+<li>
+<p>Deck Picker: Better designed floating action button.</p>
+</li>
+<li>
+<p>New Study Screen: Card templates can record audio.</p>
+</li>
+<li>
+<p>Performance: Whiteboard and drawing now save 'webp' files.</p>
+</li>
+<li>
+<p>Change note type: Huge UI improvements.</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_anki_26_05_features"><a class="anchor" href="#_anki_26_05_features"></a>Anki 26.05 features</h3>
+<div class="ulist">
+<ul>
+<li>
+<p>New Cloze syntax: <code>{{c1,2,3::text}}</code> to hide text on cards 1, 2 and 3. <a href="https://docs.ankiweb.net/editing.html#cloze-deletion">(manual)</a></p>
+</li>
+<li>
+<p>Reviewing: Card content determines RTL direction (<code>dir="auto"</code>) <a href="https://github.com/ankidroid/Anki-Android/pull/19472">(source)</a></p>
+</li>
+<li>
+<p>Search: syntax for ignoring accents: <code>tag:nc:</code>.</p>
+</li>
+<li>
+<p>Image Occlusion: improved RTL layout.</p>
+</li>
+<li>
+<p>Image Occlusion: display text annotations during review.</p>
+</li>
+<li>
+<p>CSV import: supplying a note-type column allows differing field counts.</p>
+</li>
+<li>
+<p>Deck Options: UI improvements on smaller screens.</p>
+</li>
+<li>
+<p>FSRS: faster calculations and better spacing of siblings.</p>
+</li>
+<li>
+<p>FSRS: suspended cards are excluded from rescheduling.</p>
+</li>
+<li>
+<p>Media: better handling of case-sensitive filenames.</p>
+</li>
+<li>
+<p>See more in <a href="https://github.com/ankitects/anki/releases/tag/26.05">the Anki 26.05 changelog</a>.</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_fixes_and_improvements"><a class="anchor" href="#_fixes_and_improvements"></a>Fixes and improvements</h3>
+<div class="ulist">
+<ul>
+<li>
+<p>Google Play: 'Donate' links removed to comply with Play policies</p>
+</li>
+<li>
+<p>Custom study: Fix 'due cards' not working when tag selection is skipped.</p>
+</li>
+<li>
+<p>Deck Picker: A deck is selected when it is created.</p>
+</li>
+<li>
+<p>Deck Picker: Better navigation via arrow keys.</p>
+</li>
+<li>
+<p>Deck Picker: Improved 'Rename deck' dialog UX.</p>
+</li>
+<li>
+<p>Deck Picker: Fix counts when totals above 9,999.</p>
+</li>
+<li>
+<p>Shared Deck Download: Improved retry logic.</p>
+</li>
+<li>
+<p>Card Browser: UX: better selection restore and RTL design.</p>
+</li>
+<li>
+<p>Filtered Decks: UX Improvements.</p>
+</li>
+<li>
+<p>Filtered Decks: Handle state restoration after process death.</p>
+</li>
+<li>
+<p>Reviewer: Fix the shake gesture firing rapidly.</p>
+</li>
+<li>
+<p>Previewer: Fixed background in night mode.</p>
+</li>
+<li>
+<p>Study Options: Fix 'undo' opening the reviewer.</p>
+</li>
+<li>
+<p>Deck Options: Improved progress reporting.</p>
+</li>
+<li>
+<p>Note Editor: Fewer 'unsaved changes' prompts.</p>
+</li>
+<li>
+<p>Card Template Editor: Better focus handling.</p>
+</li>
+<li>
+<p>Set Due Date: Fixed crash when opening.</p>
+</li>
+<li>
+<p>WebViews: Improved outdated WebView detection.</p>
+</li>
+<li>
+<p>Deck Picker: Fixed "deck not found in limits map" error.</p>
+</li>
+<li>
+<p>API: Fixed a crash in <code>answerCard</code>.</p>
+</li>
+<li>
+<p>New Study Screen: better handling of custom scheduling and app restoration.</p>
+</li>
+<li>
+<p>Widgets: UI improvements.</p>
+</li>
+<li>
+<p>Note Editor: Fix out of memory crashes.</p>
+</li>
+<li>
+<p>Accessibility: Improvements for Card Browser and Reviewer.</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_version_2_24_1_20260831"><a class="anchor" href="#_version_2_24_1_20260831"></a>Version 2.24.1 (20260831)</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Urgent update to our 2.24.0 release: security updates, and temporarily removing donation links to
+comply with Play Store policies (more below).</p>
+</div>
+<div class="paragraph">
+<p>A special thank you to the following people for reporting the security issues fixed in this release:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://github.com/Kwstubbs">Kevin Stubbings</a> of the GitHub Security Lab (GHSL-2026-083, GHSL-2026-084, GHSL-2026-085)</p>
+</li>
+<li>
+<p><a href="https://github.com/kah-ja">Jan Kahmen</a> for (GHSA-qjjx-px4w-4986)</p>
+</li>
+<li>
+<p><a href="https://github.com/criticalAY">Ashish Yadav</a> (GHSA-cr2g-gf75-cm6r)</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p><strong>Removal of donation links</strong>: Please see <a href="https://github.com/ankidroid/Anki-Android/issues/21656">GitHub Issue 21656</a> for why this has happened and how
+to help us with this.</p>
+</div>
+<div class="paragraph">
+<p>Please see the <a href="#_version_2_24_0_20260502">2.24.0 changelog</a> below for the main 2.24 features announcement 👇</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Security</p>
+<div class="ulist">
+<ul>
+<li>
+<p>Reviewer: cards can no longer open dangerous links [GHSL-2026-085, GHSA-54q9-5c5p-9rxg]</p>
+</li>
+<li>
+<p>Reviewer: cards require permission to launch apps [GHSL-2026-085, GHSA-54q9-5c5p-9rxg]</p>
+<div class="ulist">
+<ul>
+<li>
+<p>May be unblocked in advanced settings, if all your cards are trustworthy.</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>JavaScript API: blocked calls which could read and modify cards (other than the currently selected card) [GHSL-2026-084, GHSA-54q9-5c5p-9rxg]</p>
+<div class="ulist">
+<ul>
+<li>
+<p>May be unblocked in advanced settings, if all your cards are trustworthy.</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Reviewer: fix path traversal when loading media [GHSL-2026-083, GHSA-qjjx-px4w-4986]</p>
+</li>
+<li>
+<p>Import: sanitize filenames to block path traversal [GHSA-q29p-h3pp-mh3v]</p>
+</li>
+<li>
+<p>Note Editor: reject untrusted files from the image picker [GHSA-cr2g-gf75-cm6r]</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Improvements</p>
+<div class="ulist">
+<ul>
+<li>
+<p>Privacy: removed a log entry which could hint at your timezone</p>
+</li>
+<li>
+<p>Card Browser: better 'invalid search' messages</p>
+</li>
+<li>
+<p>Google Play: 'Donate' links removed to comply with Play policies</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Fixes</p>
+<div class="ulist">
+<ul>
+<li>
+<p>Deck Picker &amp; Card Browser: Fix memory leaks</p>
+</li>
+<li>
+<p>Fix crash when sharing an image to the Note Editor</p>
+</li>
+<li>
+<p>Fix crash when exporting a large number of notes</p>
+</li>
+<li>
+<p>Fix 'Auto Advance' not following the review queue</p>
+</li>
+<li>
+<p>Improve error names in error messages</p>
+</li>
+<li>
+<p>Whiteboard: fix flickering [Samsung/OnePlus]</p>
+</li>
+<li>
+<p>Whiteboard: fix crash on rotation when 'type in the answer' is open</p>
+</li>
+<li>
+<p>Note Editor: fix 'MathJax block' syntax</p>
+</li>
+<li>
+<p>Note Types: only enable 'Save' when there are unsaved changes</p>
+</li>
+<li>
+<p>Sync: fix conflict dialog only showing its title [Samsung-only]</p>
+</li>
+<li>
+<p>Export: sharing text is now a text/plain file</p>
+</li>
+<li>
+<p>Settings: fix crash when dragging reviewer actions and switching screens</p>
+</li>
+<li>
+<p>Settings: include 'Themes' in search results</p>
+</li>
+<li>
+<p>Reviewer: fix snackbar position when answer buttons are hidden</p>
+</li>
+</ul>
+</div>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Full list of <a href="https://github.com/ankidroid/Anki-Android/milestone/78?closed=1">2.24.1 fixes</a></p>
+</div>
+</div>
+</div>
 <div class="sect1">
 <h2 id="_version_2_24_0_20260502"><a class="anchor" href="#_version_2_24_0_20260502"></a>Version 2.24.0 (20260502)</h2>
 <div class="sectionbody">
@@ -520,6 +1119,9 @@ <h2 id="_version_2_24_0_20260502"><a class="anchor" href="#_version_2_24_0_20260
 <p>Deck Picker: Compatibility with Anki Desktop deck search syntax</p>
 </li>
 <li>
+<p>Deck Picker: "Create backup" support</p>
+</li>
+<li>
 <p>Sync: Added 'Network timeout' preference</p>
 </li>
 <li>
@@ -1863,6 +2465,85 @@ <h2 id="_version_2_20_0_20241204"><a class="anchor" href="#_version_2_20_0_20241
 </div>
 </div>
 <div class="sect1">
+<h2 id="_version_2_19_6_20260831"><a class="anchor" href="#_version_2_19_6_20260831"></a>Version 2.19.6 (20260831)</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Urgent update to our 2.19.5 release: security updates, and temporarily removing donation links to
+comply with Play Store policies (more below).</p>
+</div>
+<div class="paragraph">
+<p>A special thank you to the following people for reporting the security issues fixed in this release:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://github.com/Kwstubbs">Kevin Stubbings</a> of the GitHub Security Lab (GHSL-2026-084, GHSL-2026-085)</p>
+</li>
+<li>
+<p><a href="https://github.com/kah-ja">Jan Kahmen</a> for (GHSA-qjjx-px4w-4986)</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p><strong>Removal of donation links</strong>: Please see <a href="https://github.com/ankidroid/Anki-Android/issues/21656">GitHub Issue 21656</a> for why this has happened and how
+to help us with this.</p>
+</div>
+<div class="paragraph">
+<p>Please see the <a href="#_version_2_19_1_20241031">2.19.1 changelog</a> below for the main 2.19 features announcement 👇</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Security</p>
+<div class="ulist">
+<ul>
+<li>
+<p>Reviewer: cards can no longer open dangerous links [GHSL-2026-085, GHSA-54q9-5c5p-9rxg]</p>
+</li>
+<li>
+<p>Reviewer: cards require permission to launch apps [GHSL-2026-085, GHSA-54q9-5c5p-9rxg]</p>
+<div class="ulist">
+<ul>
+<li>
+<p>May be unblocked in advanced settings, if all your cards are trustworthy.</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>JavaScript API: blocked calls which could read and modify cards (other than the currently selected card) [GHSL-2026-084, GHSA-54q9-5c5p-9rxg]</p>
+<div class="ulist">
+<ul>
+<li>
+<p>May be unblocked in advanced settings, if all your cards are trustworthy.</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Reviewer: fix path traversal when loading media [GHSA-qjjx-px4w-4986]</p>
+</li>
+<li>
+<p>Import: sanitize filenames to block path traversal [GHSA-q29p-h3pp-mh3v]</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Improvements</p>
+<div class="ulist">
+<ul>
+<li>
+<p>Google Play: 'Donate' links removed to comply with Play policies</p>
+</li>
+</ul>
+</div>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect1">
 <h2 id="_version_2_19_5_20250711"><a class="anchor" href="#_version_2_19_5_20250711"></a>Version 2.19.5 (20250711)</h2>
 <div class="sectionbody">
 <div class="ulist">
@@ -2795,6 +3476,85 @@ <h2 id="_version_2_17_0_20240223"><a class="anchor" href="#_version_2_17_0_20240
 </div>
 </div>
 <div class="sect1">
+<h2 id="_version_2_16_6_20260831"><a class="anchor" href="#_version_2_16_6_20260831"></a>Version 2.16.6 (20260831)</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>Urgent update to our 2.16.5 release: security updates, and temporarily removing donation links to
+comply with Play Store policies (more below).</p>
+</div>
+<div class="paragraph">
+<p>A special thank you to the following people for reporting the security issues fixed in this release:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://github.com/Kwstubbs">Kevin Stubbings</a> of the GitHub Security Lab (GHSL-2026-084, GHSL-2026-085)</p>
+</li>
+<li>
+<p><a href="https://github.com/kah-ja">Jan Kahmen</a> for (GHSA-qjjx-px4w-4986)</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p><strong>Removal of donation links</strong>: Please see <a href="https://github.com/ankidroid/Anki-Android/issues/21656">GitHub Issue 21656</a> for why this has happened and how
+to help us with this.</p>
+</div>
+<div class="paragraph">
+<p>Please see the <a href="#_version_2_16_2_20230726">2.16.2 changelog</a> below for the main 2.16 features announcement 👇</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Security</p>
+<div class="ulist">
+<ul>
+<li>
+<p>Reviewer: cards can no longer open dangerous links [GHSL-2026-085, GHSA-54q9-5c5p-9rxg]</p>
+</li>
+<li>
+<p>Reviewer: cards require permission to launch apps [GHSL-2026-085, GHSA-54q9-5c5p-9rxg]</p>
+<div class="ulist">
+<ul>
+<li>
+<p>May be unblocked in advanced settings, if all your cards are trustworthy.</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>JavaScript API: blocked calls which could read and modify cards (other than the currently selected card) [GHSL-2026-084, GHSA-54q9-5c5p-9rxg]</p>
+<div class="ulist">
+<ul>
+<li>
+<p>May be unblocked in advanced settings, if all your cards are trustworthy.</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Reviewer: fix path traversal when loading media [GHSA-qjjx-px4w-4986]</p>
+</li>
+<li>
+<p>Import: sanitize filenames to block path traversal [GHSA-q29p-h3pp-mh3v]</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Improvements</p>
+<div class="ulist">
+<ul>
+<li>
+<p>Google Play: 'Donate' links removed to comply with Play policies</p>
+</li>
+</ul>
+</div>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect1">
 <h2 id="_version_2_16_5_20230906"><a class="anchor" href="#_version_2_16_5_20230906"></a>Version 2.16.5 (20230906)</h2>
 <div class="sectionbody">
 <div class="ulist">
@@ -5833,8 +6593,8 @@ <h2 id="_version_0_1_to_1_1_3"><a class="anchor" href="#_version_0_1_to_1_1_3"><
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2026-05-02 22:57:50 UTC
+Last updated 2026-10-27 12:14:29 UTC
 </div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/AnkiDroid/src/main/assets/scripts/ankidroid-reviewer.js b/AnkiDroid/src/main/assets/scripts/ankidroid-reviewer.js
index eb63d63752b0..8ea05157cb15 100644
--- a/AnkiDroid/src/main/assets/scripts/ankidroid-reviewer.js
+++ b/AnkiDroid/src/main/assets/scripts/ankidroid-reviewer.js
@@ -95,55 +95,107 @@ globalThis.ankidroid.onTypeAnswerKeyDown = function (event) {
     const SCHEME = "gesture";
     const MULTI_TOUCH_TIMEOUT = 300;
     const GESTURE_TIMEOUT = 800;
+    const TOUCH_SLOP = 10;
 
-    let startX = 0,
-        startY = 0,
-        touchCount = 0,
-        touchStartTime = 0;
+    let maxTouchCount = 0,
+        touchStartTime = 0,
+        exceededSlop = false,
+        primaryStartX = 0,
+        primaryStartY = 0,
+        startTouches = new Map();
 
     document.addEventListener(
         "touchstart",
         event => {
-            touchCount = event.touches.length;
-            startX = event.touches[0].pageX;
-            startY = event.touches[0].pageY;
-            // start counting from the first finger touch
-            if (touchCount === 1) {
+            if (event.touches.length > maxTouchCount) {
+                maxTouchCount = event.touches.length;
+            }
+            if (startTouches.size === 0) {
                 touchStartTime = Date.now();
+                exceededSlop = false;
+                const firstTouch = event.changedTouches[0] || event.touches[0];
+                primaryStartX = firstTouch.pageX;
+                primaryStartY = firstTouch.pageY;
+            }
+            for (let i = 0; i < event.changedTouches.length; i++) {
+                const touch = event.changedTouches[i];
+                startTouches.set(touch.identifier, {
+                    x: touch.pageX,
+                    y: touch.pageY,
+                });
+            }
+        },
+        { passive: true },
+    );
+
+    document.addEventListener(
+        "touchmove",
+        event => {
+            if (exceededSlop) return;
+            for (let i = 0; i < event.changedTouches.length; i++) {
+                const touch = event.changedTouches[i];
+                const start = startTouches.get(touch.identifier);
+                if (start) {
+                    const dx = Math.abs(touch.pageX - start.x);
+                    const dy = Math.abs(touch.pageY - start.y);
+                    if (dx > TOUCH_SLOP || dy > TOUCH_SLOP) {
+                        exceededSlop = true;
+                        break;
+                    }
+                }
             }
         },
         { passive: true },
     );
 
+    document.addEventListener(
+        "touchcancel",
+        () => {
+            resetTouches();
+        },
+        { passive: true },
+    );
+
     document.addEventListener(
         "touchend",
         event => {
             // Only process after the final finger is lifted
-            if (
-                event.touches.length > 0 ||
-                touchCount > 4 ||
-                isTextSelected() ||
-                isInteractable(event)
-            )
-                return;
+            if (event.touches.length > 0) return;
+
+            const touchCount = maxTouchCount;
+            const elapsed = Date.now() - touchStartTime;
+            const hadMovedPastSlop = exceededSlop;
+
+            // Get primary touch start and end positions before resetting
+            const firstChangedTouch = event.changedTouches[0];
+            const startX = primaryStartX;
+            const startY = primaryStartY;
+            const endX = firstChangedTouch ? firstChangedTouch.pageX : startX;
+            const endY = firstChangedTouch ? firstChangedTouch.pageY : startY;
+
+            resetTouches();
+
+            if (touchCount > 4 || isTextSelected()) return;
 
             // Multi-finger detection
             if (touchCount > 1) {
-                if (Date.now() - touchStartTime > MULTI_TOUCH_TIMEOUT) {
+                if (elapsed > MULTI_TOUCH_TIMEOUT || hadMovedPastSlop) {
                     return;
                 }
                 window.location.href = `${SCHEME}://multiFingerTap/?touchCount=${touchCount}`;
                 return;
             }
 
+            if (isInteractable(event)) {
+                return;
+            }
+
             // Ignore gesture if it takes too long
-            if (Date.now() - touchStartTime > GESTURE_TIMEOUT) {
+            if (elapsed > GESTURE_TIMEOUT) {
                 return;
             }
 
             // Swipes and tap detection
-            const endX = event.changedTouches[0].pageX;
-            const endY = event.changedTouches[0].pageY;
             const scrollDirection = getScrollDirection(event.target);
             const params = new URLSearchParams({
                 x: Math.round(endX),
@@ -160,6 +212,15 @@ globalThis.ankidroid.onTypeAnswerKeyDown = function (event) {
         { passive: true },
     );
 
+    function resetTouches() {
+        maxTouchCount = 0;
+        touchStartTime = 0;
+        exceededSlop = false;
+        primaryStartX = 0;
+        primaryStartY = 0;
+        startTouches.clear();
+    }
+
     /**
      * Checks if the target element or its parents are interactive.
      * @param {TouchEvent} event
diff --git a/AnkiDroid/src/main/generated/baselineProfiles/baseline-prof.txt b/AnkiDroid/src/main/generated/baselineProfiles/baseline-prof.txt
index c2f91e9b2f03..bc729502fdaf 100644
--- a/AnkiDroid/src/main/generated/baselineProfiles/baseline-prof.txt
+++ b/AnkiDroid/src/main/generated/baselineProfiles/baseline-prof.txt
@@ -1,22 +1,9 @@
-La/f;
-SPLa/f;-><clinit>()V
-SPLa/f;-><init>(La/g;Landroidx/fragment/app/Fragment;)V
-SPLa/f;->onFragmentViewDestroyed(Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;)V
-La/g;
-SPLa/g;-><init>(Lkotlin/jvm/functions/Function1;)V
-SPLa/g;->clear()V
-SPLa/g;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-La/l;
-SPLa/l;-><init>(Lkotlin/jvm/functions/Function1;)V
+Landroid/net/ssl/InvalidEchDataException;
 Landroid/support/customtabs/ICustomTabsCallback;
 SPLandroid/support/customtabs/ICustomTabsCallback;-><clinit>()V
 Landroid/support/customtabs/ICustomTabsCallback$Stub;
 SPLandroid/support/customtabs/ICustomTabsCallback$Stub;-><init>()V
 SPLandroid/support/customtabs/ICustomTabsCallback$Stub;->asBinder()Landroid/os/IBinder;
-SPLandroid/support/customtabs/ICustomTabsCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z
-Landroid/support/customtabs/ICustomTabsCallback$_Parcel;
-SPLandroid/support/customtabs/ICustomTabsCallback$_Parcel;->access$000(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Ljava/lang/Object;
-SPLandroid/support/customtabs/ICustomTabsCallback$_Parcel;->readTypedObject(Landroid/os/Parcel;Landroid/os/Parcelable$Creator;)Ljava/lang/Object;
 Landroid/support/customtabs/ICustomTabsService;
 SPLandroid/support/customtabs/ICustomTabsService;-><clinit>()V
 Landroid/support/customtabs/ICustomTabsService$Stub;
@@ -29,31 +16,16 @@ Landroidx/activity/ActivityFlags;
 SPLandroidx/activity/ActivityFlags;-><clinit>()V
 SPLandroidx/activity/ActivityFlags;-><init>()V
 Landroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;
-SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m$1()V
-SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/content/pm/ShortcutInfo$Builder;Ljava/lang/CharSequence;)Landroid/content/pm/ShortcutInfo$Builder;
 SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/graphics/Insets;)I
+SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/view/Window;Z)V
 SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m$2(Landroid/graphics/Insets;)I
 SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m$3(Landroid/graphics/Insets;)I
 SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/Activity;)Landroid/window/OnBackInvokedDispatcher;
-SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/Context;Ljava/lang/String;)Landroid/content/pm/ShortcutInfo$Builder;
-SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;)Landroid/content/pm/ShortcutInfo;
-SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;I)Landroid/content/pm/ShortcutInfo$Builder;
-SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;Landroid/graphics/drawable/Icon;)Landroid/content/pm/ShortcutInfo$Builder;
-SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;Ljava/lang/CharSequence;)Landroid/content/pm/ShortcutInfo$Builder;
-SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;Z)Landroid/content/pm/ShortcutInfo$Builder;
-SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;[Landroid/content/Intent;)Landroid/content/pm/ShortcutInfo$Builder;
 SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/graphics/Insets;)I
+SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowManager$LayoutParams;I)V
 SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/window/OnBackInvokedDispatcher;ILandroid/window/OnBackInvokedCallback;)V
-SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/content/Context;[ILandroid/util/AttributeSet;Landroid/content/res/TypedArray;II)V
 SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Ljava/lang/Object;)Landroid/window/OnBackInvokedCallback;
 Landroidx/activity/ComponentActivity;
-SPLandroidx/activity/ComponentActivity;->$r8$lambda$54BeH8ZsB-ru0CXI2CCSP2syNys(Landroidx/activity/ComponentActivity;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
-SPLandroidx/activity/ComponentActivity;->$r8$lambda$7aWCLmlNPTirEoC8eOYg0rEvmus(Landroidx/activity/ComponentActivity;)Landroidx/activity/OnBackPressedDispatcher;
-SPLandroidx/activity/ComponentActivity;->$r8$lambda$G6Thfp3wAqF9QgDIJrKyBT1uzss(Landroidx/activity/ComponentActivity;)Landroidx/lifecycle/SavedStateViewModelFactory;
-SPLandroidx/activity/ComponentActivity;->$r8$lambda$XCwb6u5X87zpWrZW4Zmu6tsKQC8(Landroidx/activity/OnBackPressedDispatcher;Landroidx/activity/ComponentActivity;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
-SPLandroidx/activity/ComponentActivity;->$r8$lambda$cI7dwLT0wnPzJ9a3oRpjgUF1USM(Landroidx/activity/ComponentActivity;)V
-SPLandroidx/activity/ComponentActivity;->$r8$lambda$h6vvr6zUWA2U1fE-0KsKpOgpr28(Landroidx/activity/ComponentActivity;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
-SPLandroidx/activity/ComponentActivity;->$r8$lambda$yPQlaAoRiY-RJ3IY_TqzUUTrVH0(Landroidx/activity/ComponentActivity;Landroid/content/Context;)V
 SPLandroidx/activity/ComponentActivity;-><clinit>()V
 SPLandroidx/activity/ComponentActivity;-><init>()V
 SPLandroidx/activity/ComponentActivity;-><init>(I)V
@@ -139,6 +111,25 @@ SPLandroidx/activity/ComponentActivity$ReportFullyDrawnExecutorImpl;-><init>(Lan
 SPLandroidx/activity/ComponentActivity$ReportFullyDrawnExecutorImpl;->activityDestroyed()V
 Landroidx/activity/ComponentActivity$activityResultRegistry$1;
 SPLandroidx/activity/ComponentActivity$activityResultRegistry$1;-><init>(Landroidx/activity/ComponentActivity;)V
+Landroidx/activity/EdgeToEdge;
+SPLandroidx/activity/EdgeToEdge;-><clinit>()V
+SPLandroidx/activity/EdgeToEdge;->enable$default(Landroidx/activity/ComponentActivity;Landroidx/activity/SystemBarStyle;Landroidx/activity/SystemBarStyle;ILjava/lang/Object;)V
+SPLandroidx/activity/EdgeToEdge;->enable(Landroidx/activity/ComponentActivity;Landroidx/activity/SystemBarStyle;Landroidx/activity/SystemBarStyle;)V
+Landroidx/activity/EdgeToEdgeApi26;
+SPLandroidx/activity/EdgeToEdgeApi26;-><init>()V
+Landroidx/activity/EdgeToEdgeApi28;
+SPLandroidx/activity/EdgeToEdgeApi28;-><init>()V
+Landroidx/activity/EdgeToEdgeApi29;
+SPLandroidx/activity/EdgeToEdgeApi29;-><init>()V
+Landroidx/activity/EdgeToEdgeApi30;
+SPLandroidx/activity/EdgeToEdgeApi30;-><init>()V
+SPLandroidx/activity/EdgeToEdgeApi30;->adjustLayoutInDisplayCutoutMode(Landroid/view/Window;)V
+Landroidx/activity/EdgeToEdgeApi35;
+SPLandroidx/activity/EdgeToEdgeApi35;-><init>()V
+SPLandroidx/activity/EdgeToEdgeApi35;->setUp(Landroidx/activity/SystemBarStyle;Landroidx/activity/SystemBarStyle;Landroid/view/Window;Landroid/view/View;ZZ)V
+Landroidx/activity/EdgeToEdgeBase;
+SPLandroidx/activity/EdgeToEdgeBase;-><init>()V
+Landroidx/activity/EdgeToEdgeImpl;
 Landroidx/activity/FullyDrawnReporterOwner;
 Landroidx/activity/OnBackPressedCallback;
 SPLandroidx/activity/OnBackPressedCallback;-><init>(Z)V
@@ -154,7 +145,6 @@ SPLandroidx/activity/OnBackPressedCallback$OnBackPressedEventHandler;->setLifecy
 Landroidx/activity/OnBackPressedCallbackInfo;
 SPLandroidx/activity/OnBackPressedCallbackInfo;-><init>(Landroidx/activity/OnBackPressedCallback;Landroidx/lifecycle/LifecycleOwner;)V
 Landroidx/activity/OnBackPressedDispatcher;
-SPLandroidx/activity/OnBackPressedDispatcher;->$r8$lambda$Ce6hmwzpZeR4nJ6cSxwnPFSCXfY(Landroidx/activity/OnBackPressedDispatcher;)Landroidx/activity/OnBackPressedDispatcher$OnBackPressedEventInput;
 SPLandroidx/activity/OnBackPressedDispatcher;-><init>(Ljava/lang/Runnable;)V
 SPLandroidx/activity/OnBackPressedDispatcher;-><init>(Ljava/lang/Runnable;Landroidx/core/util/Consumer;)V
 SPLandroidx/activity/OnBackPressedDispatcher;->access$getOnHasEnabledCallbacksChanged$p(Landroidx/activity/OnBackPressedDispatcher;)Landroidx/core/util/Consumer;
@@ -179,6 +169,27 @@ SPLandroidx/activity/OnBackPressedDispatcher$addCallback$lifecycleObserver$1;->c
 SPLandroidx/activity/OnBackPressedDispatcher$addCallback$lifecycleObserver$1;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
 Landroidx/activity/OnBackPressedDispatcherOwner;
 Landroidx/activity/R$id;
+Landroidx/activity/SystemBarStyle;
+SPLandroidx/activity/SystemBarStyle;-><clinit>()V
+SPLandroidx/activity/SystemBarStyle;-><init>(IIILkotlin/jvm/functions/Function1;)V
+SPLandroidx/activity/SystemBarStyle;-><init>(IIILkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/activity/SystemBarStyle;->getDetectDarkMode$activity()Lkotlin/jvm/functions/Function1;
+SPLandroidx/activity/SystemBarStyle;->getNightMode$activity()I
+SPLandroidx/activity/SystemBarStyle;->getScrimWithEnforcedContrast$activity(Z)I
+Landroidx/activity/SystemBarStyle$Companion;
+SPLandroidx/activity/SystemBarStyle$Companion;-><init>()V
+SPLandroidx/activity/SystemBarStyle$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/activity/SystemBarStyle$Companion;->auto$default(Landroidx/activity/SystemBarStyle$Companion;IILkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroidx/activity/SystemBarStyle;
+SPLandroidx/activity/SystemBarStyle$Companion;->auto$lambda$0(Landroid/content/res/Resources;)Z
+SPLandroidx/activity/SystemBarStyle$Companion;->auto(IILkotlin/jvm/functions/Function1;)Landroidx/activity/SystemBarStyle;
+SPLandroidx/activity/SystemBarStyle$Companion;->dark$lambda$0(Landroid/content/res/Resources;)Z
+SPLandroidx/activity/SystemBarStyle$Companion;->dark(I)Landroidx/activity/SystemBarStyle;
+Landroidx/activity/SystemBarStyle$Companion$$ExternalSyntheticLambda1;
+SPLandroidx/activity/SystemBarStyle$Companion$$ExternalSyntheticLambda1;-><init>()V
+SPLandroidx/activity/SystemBarStyle$Companion$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/activity/SystemBarStyle$Companion$$ExternalSyntheticLambda2;
+SPLandroidx/activity/SystemBarStyle$Companion$$ExternalSyntheticLambda2;-><init>()V
+SPLandroidx/activity/SystemBarStyle$Companion$$ExternalSyntheticLambda2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Landroidx/activity/ViewTreeFullyDrawnReporterOwner;
 SPLandroidx/activity/ViewTreeFullyDrawnReporterOwner;->set(Landroid/view/View;Landroidx/activity/FullyDrawnReporterOwner;)V
 Landroidx/activity/ViewTreeOnBackPressedDispatcherOwner;
@@ -196,8 +207,6 @@ Landroidx/activity/result/ActivityResultCaller;
 Landroidx/activity/result/ActivityResultLauncher;
 SPLandroidx/activity/result/ActivityResultLauncher;-><init>()V
 Landroidx/activity/result/ActivityResultRegistry;
-SPLandroidx/activity/result/ActivityResultRegistry;->$r8$lambda$-f_tNvtP3uEenATo3uzHmjDoXwg()Ljava/lang/Integer;
-SPLandroidx/activity/result/ActivityResultRegistry;->$r8$lambda$TWvtyPFk-iHdx0R-btWVLevVLT0(Landroidx/activity/result/ActivityResultRegistry;Ljava/lang/String;Landroidx/activity/result/ActivityResultCallback;Landroidx/activity/result/contract/ActivityResultContract;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
 SPLandroidx/activity/result/ActivityResultRegistry;-><clinit>()V
 SPLandroidx/activity/result/ActivityResultRegistry;-><init>()V
 SPLandroidx/activity/result/ActivityResultRegistry;->bindRcKey(ILjava/lang/String;)V
@@ -320,6 +329,7 @@ SPLandroidx/appcompat/app/AppCompatDelegate$$ExternalSyntheticLambda0;->run()V
 Landroidx/appcompat/app/AppCompatDelegate$Api24Impl;
 SPLandroidx/appcompat/app/AppCompatDelegate$Api24Impl;->localeListForLanguageTags(Ljava/lang/String;)Landroid/os/LocaleList;
 Landroidx/appcompat/app/AppCompatDelegate$Api33Impl;
+SPLandroidx/appcompat/app/AppCompatDelegate$Api33Impl;->localeManagerGetApplicationLocales(Ljava/lang/Object;)Landroid/os/LocaleList;
 SPLandroidx/appcompat/app/AppCompatDelegate$Api33Impl;->localeManagerSetApplicationLocales(Ljava/lang/Object;Landroid/os/LocaleList;)V
 Landroidx/appcompat/app/AppCompatDelegate$SerialExecutor;
 SPLandroidx/appcompat/app/AppCompatDelegate$SerialExecutor;-><init>(Ljava/util/concurrent/Executor;)V
@@ -356,6 +366,7 @@ SPLandroidx/appcompat/app/AppCompatDelegateImpl;->findViewById(I)Landroid/view/V
 SPLandroidx/appcompat/app/AppCompatDelegateImpl;->getActionBarThemedContext()Landroid/content/Context;
 SPLandroidx/appcompat/app/AppCompatDelegateImpl;->getActivityHandlesConfigChangesFlags(Landroid/content/Context;)I
 SPLandroidx/appcompat/app/AppCompatDelegateImpl;->getConfigurationLocales(Landroid/content/res/Configuration;)Landroidx/core/os/LocaleListCompat;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->getContextForDelegate()Landroid/content/Context;
 SPLandroidx/appcompat/app/AppCompatDelegateImpl;->getDrawerToggleDelegate()Landroidx/appcompat/app/ActionBarDrawerToggle$Delegate;
 SPLandroidx/appcompat/app/AppCompatDelegateImpl;->getMenuInflater()Landroid/view/MenuInflater;
 SPLandroidx/appcompat/app/AppCompatDelegateImpl;->getPanelState(IZ)Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;
@@ -385,19 +396,19 @@ SPLandroidx/appcompat/app/AppCompatDelegateImpl;->setTheme(I)V
 SPLandroidx/appcompat/app/AppCompatDelegateImpl;->setTitle(Ljava/lang/CharSequence;)V
 SPLandroidx/appcompat/app/AppCompatDelegateImpl;->shouldRegisterBackInvokedCallback()Z
 SPLandroidx/appcompat/app/AppCompatDelegateImpl;->throwFeatureRequestIfSubDecorInstalled()V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->updateActionModeInsets(Landroidx/core/view/WindowInsetsCompat;Landroid/graphics/Rect;)I
 SPLandroidx/appcompat/app/AppCompatDelegateImpl;->updateAppConfiguration(ILandroidx/core/os/LocaleListCompat;Z)Z
 SPLandroidx/appcompat/app/AppCompatDelegateImpl;->updateBackInvokedCallbackState()V
-SPLandroidx/appcompat/app/AppCompatDelegateImpl;->updateStatusGuard(Landroidx/core/view/WindowInsetsCompat;Landroid/graphics/Rect;)I
+Landroidx/appcompat/app/AppCompatDelegateImpl$1;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$1;-><init>(Landroidx/appcompat/app/AppCompatDelegateImpl;)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$1;->run()V
 Landroidx/appcompat/app/AppCompatDelegateImpl$2;
 SPLandroidx/appcompat/app/AppCompatDelegateImpl$2;-><init>(Landroidx/appcompat/app/AppCompatDelegateImpl;)V
-SPLandroidx/appcompat/app/AppCompatDelegateImpl$2;->run()V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$2;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
 Landroidx/appcompat/app/AppCompatDelegateImpl$3;
 SPLandroidx/appcompat/app/AppCompatDelegateImpl$3;-><init>(Landroidx/appcompat/app/AppCompatDelegateImpl;)V
-SPLandroidx/appcompat/app/AppCompatDelegateImpl$3;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
-Landroidx/appcompat/app/AppCompatDelegateImpl$5;
-SPLandroidx/appcompat/app/AppCompatDelegateImpl$5;-><init>(Landroidx/appcompat/app/AppCompatDelegateImpl;)V
-SPLandroidx/appcompat/app/AppCompatDelegateImpl$5;->onAttachedFromWindow()V
-SPLandroidx/appcompat/app/AppCompatDelegateImpl$5;->onDetachedFromWindow()V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$3;->onAttachedFromWindow()V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$3;->onDetachedFromWindow()V
 Landroidx/appcompat/app/AppCompatDelegateImpl$ActionBarDrawableToggleImpl;
 SPLandroidx/appcompat/app/AppCompatDelegateImpl$ActionBarDrawableToggleImpl;-><init>(Landroidx/appcompat/app/AppCompatDelegateImpl;)V
 SPLandroidx/appcompat/app/AppCompatDelegateImpl$ActionBarDrawableToggleImpl;->getActionBarThemedContext()Landroid/content/Context;
@@ -424,6 +435,7 @@ SPLandroidx/appcompat/app/AppCompatViewInflater;-><init>()V
 SPLandroidx/appcompat/app/AppCompatViewInflater;->backportAccessibilityAttributes(Landroid/content/Context;Landroid/view/View;Landroid/util/AttributeSet;)V
 SPLandroidx/appcompat/app/AppCompatViewInflater;->checkOnClickListener(Landroid/view/View;Landroid/util/AttributeSet;)V
 SPLandroidx/appcompat/app/AppCompatViewInflater;->createCheckedTextView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroidx/appcompat/widget/AppCompatCheckedTextView;
+SPLandroidx/appcompat/app/AppCompatViewInflater;->createImageButton(Landroid/content/Context;Landroid/util/AttributeSet;)Landroidx/appcompat/widget/AppCompatImageButton;
 SPLandroidx/appcompat/app/AppCompatViewInflater;->createImageView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroidx/appcompat/widget/AppCompatImageView;
 SPLandroidx/appcompat/app/AppCompatViewInflater;->createSpinner(Landroid/content/Context;Landroid/util/AttributeSet;)Landroidx/appcompat/widget/AppCompatSpinner;
 SPLandroidx/appcompat/app/AppCompatViewInflater;->createView(Landroid/content/Context;Ljava/lang/String;Landroid/util/AttributeSet;)Landroid/view/View;
@@ -495,6 +507,7 @@ SPLandroidx/appcompat/view/ContextThemeWrapper;->getResources()Landroid/content/
 SPLandroidx/appcompat/view/ContextThemeWrapper;->getResourcesInternal()Landroid/content/res/Resources;
 SPLandroidx/appcompat/view/ContextThemeWrapper;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
 SPLandroidx/appcompat/view/ContextThemeWrapper;->getTheme()Landroid/content/res/Resources$Theme;
+SPLandroidx/appcompat/view/ContextThemeWrapper;->getThemeResId()I
 SPLandroidx/appcompat/view/ContextThemeWrapper;->initializeTheme()V
 SPLandroidx/appcompat/view/ContextThemeWrapper;->isEmptyConfiguration(Landroid/content/res/Configuration;)Z
 SPLandroidx/appcompat/view/ContextThemeWrapper;->onApplyThemeResource(Landroid/content/res/Resources$Theme;IZ)V
@@ -550,6 +563,7 @@ SPLandroidx/appcompat/view/menu/MenuBuilder;->findItem(I)Landroid/view/MenuItem;
 SPLandroidx/appcompat/view/menu/MenuBuilder;->flagActionItems()V
 SPLandroidx/appcompat/view/menu/MenuBuilder;->getActionItems()Ljava/util/ArrayList;
 SPLandroidx/appcompat/view/menu/MenuBuilder;->getContext()Landroid/content/Context;
+SPLandroidx/appcompat/view/menu/MenuBuilder;->getItem(I)Landroid/view/MenuItem;
 SPLandroidx/appcompat/view/menu/MenuBuilder;->getNonActionItems()Ljava/util/ArrayList;
 SPLandroidx/appcompat/view/menu/MenuBuilder;->getOrdering(I)I
 SPLandroidx/appcompat/view/menu/MenuBuilder;->getResources()Landroid/content/res/Resources;
@@ -676,14 +690,16 @@ SPLandroidx/appcompat/widget/AppCompatBackgroundHelper;-><init>(Landroid/view/Vi
 SPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->applySupportBackgroundTint()V
 SPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V
 SPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
-SPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundResource(I)V
 SPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->setInternalBackgroundTint(Landroid/content/res/ColorStateList;)V
 SPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V
 SPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->shouldApplyFrameworkTintUsingColorFilter()Z
 Landroidx/appcompat/widget/AppCompatButton;
 SPLandroidx/appcompat/widget/AppCompatButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/AppCompatButton;->access$001(Landroidx/appcompat/widget/AppCompatButton;Landroid/graphics/Typeface;)V
 SPLandroidx/appcompat/widget/AppCompatButton;->drawableStateChanged()V
 SPLandroidx/appcompat/widget/AppCompatButton;->getEmojiTextViewHelper()Landroidx/appcompat/widget/AppCompatEmojiTextHelper;
+SPLandroidx/appcompat/widget/AppCompatButton;->getFontVariationSettingsManager()Landroidx/appcompat/widget/AppCompatTextHelper$FontVariationSettingsManager;
+SPLandroidx/appcompat/widget/AppCompatButton;->lambda$getFontVariationSettingsManager$0$androidx-appcompat-widget-AppCompatButton(Landroid/graphics/Typeface;)V
 SPLandroidx/appcompat/widget/AppCompatButton;->onInitializeAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)V
 SPLandroidx/appcompat/widget/AppCompatButton;->onInitializeAccessibilityNodeInfo(Landroid/view/accessibility/AccessibilityNodeInfo;)V
 SPLandroidx/appcompat/widget/AppCompatButton;->onLayout(ZIIII)V
@@ -692,6 +708,10 @@ SPLandroidx/appcompat/widget/AppCompatButton;->setAllCaps(Z)V
 SPLandroidx/appcompat/widget/AppCompatButton;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 SPLandroidx/appcompat/widget/AppCompatButton;->setFilters([Landroid/text/InputFilter;)V
 SPLandroidx/appcompat/widget/AppCompatButton;->setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V
+SPLandroidx/appcompat/widget/AppCompatButton;->setTypeface(Landroid/graphics/Typeface;)V
+Landroidx/appcompat/widget/AppCompatButton$$ExternalSyntheticLambda0;
+SPLandroidx/appcompat/widget/AppCompatButton$$ExternalSyntheticLambda0;-><init>(Landroidx/appcompat/widget/AppCompatButton;)V
+SPLandroidx/appcompat/widget/AppCompatButton$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;)V
 Landroidx/appcompat/widget/AppCompatCheckedTextView;
 SPLandroidx/appcompat/widget/AppCompatCheckedTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 SPLandroidx/appcompat/widget/AppCompatCheckedTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
@@ -706,9 +726,9 @@ SPLandroidx/appcompat/widget/AppCompatCheckedTextViewHelper;-><init>(Landroid/wi
 SPLandroidx/appcompat/widget/AppCompatCheckedTextViewHelper;->applyCheckMarkTint()V
 SPLandroidx/appcompat/widget/AppCompatCheckedTextViewHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V
 Landroidx/appcompat/widget/AppCompatDrawableManager;
+SPLandroidx/appcompat/widget/AppCompatDrawableManager;->-$$Nest$sfgetDEFAULT_MODE()Landroid/graphics/PorterDuff$Mode;
 SPLandroidx/appcompat/widget/AppCompatDrawableManager;-><clinit>()V
 SPLandroidx/appcompat/widget/AppCompatDrawableManager;-><init>()V
-SPLandroidx/appcompat/widget/AppCompatDrawableManager;->access$000()Landroid/graphics/PorterDuff$Mode;
 SPLandroidx/appcompat/widget/AppCompatDrawableManager;->get()Landroidx/appcompat/widget/AppCompatDrawableManager;
 SPLandroidx/appcompat/widget/AppCompatDrawableManager;->getDrawable(Landroid/content/Context;IZ)Landroid/graphics/drawable/Drawable;
 SPLandroidx/appcompat/widget/AppCompatDrawableManager;->getTintList(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
@@ -748,7 +768,6 @@ SPLandroidx/appcompat/widget/AppCompatImageHelper;->applySupportImageTint()V
 SPLandroidx/appcompat/widget/AppCompatImageHelper;->hasOverlappingRendering()Z
 SPLandroidx/appcompat/widget/AppCompatImageHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V
 SPLandroidx/appcompat/widget/AppCompatImageHelper;->obtainLevelFromDrawable(Landroid/graphics/drawable/Drawable;)V
-SPLandroidx/appcompat/widget/AppCompatImageHelper;->setImageResource(I)V
 SPLandroidx/appcompat/widget/AppCompatImageHelper;->shouldApplyFrameworkTintUsingColorFilter()Z
 Landroidx/appcompat/widget/AppCompatImageView;
 SPLandroidx/appcompat/widget/AppCompatImageView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
@@ -756,10 +775,8 @@ SPLandroidx/appcompat/widget/AppCompatImageView;-><init>(Landroid/content/Contex
 SPLandroidx/appcompat/widget/AppCompatImageView;->drawableStateChanged()V
 SPLandroidx/appcompat/widget/AppCompatImageView;->hasOverlappingRendering()Z
 SPLandroidx/appcompat/widget/AppCompatImageView;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
-SPLandroidx/appcompat/widget/AppCompatImageView;->setBackgroundResource(I)V
 SPLandroidx/appcompat/widget/AppCompatImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
 Landroidx/appcompat/widget/AppCompatPopupWindow;
-SPLandroidx/appcompat/widget/AppCompatPopupWindow;-><clinit>()V
 SPLandroidx/appcompat/widget/AppCompatPopupWindow;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
 SPLandroidx/appcompat/widget/AppCompatPopupWindow;->init(Landroid/content/Context;Landroid/util/AttributeSet;II)V
 Landroidx/appcompat/widget/AppCompatSpinner;
@@ -783,24 +800,35 @@ SPLandroidx/appcompat/widget/AppCompatTextClassifierHelper;-><init>(Landroid/wid
 Landroidx/appcompat/widget/AppCompatTextHelper;
 SPLandroidx/appcompat/widget/AppCompatTextHelper;-><init>(Landroid/widget/TextView;)V
 SPLandroidx/appcompat/widget/AppCompatTextHelper;->applyCompoundDrawablesTints()V
+SPLandroidx/appcompat/widget/AppCompatTextHelper;->applyFontAndVariationSettings(Z)V
 SPLandroidx/appcompat/widget/AppCompatTextHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/AppCompatTextHelper;->makeFontCallback(II)Landroidx/core/content/res/ResourcesCompat$FontCallback;
 SPLandroidx/appcompat/widget/AppCompatTextHelper;->onLayout(ZIIII)V
 SPLandroidx/appcompat/widget/AppCompatTextHelper;->onSetCompoundDrawables()V
 SPLandroidx/appcompat/widget/AppCompatTextHelper;->onSetTextAppearance(Landroid/content/Context;I)V
 SPLandroidx/appcompat/widget/AppCompatTextHelper;->setAllCaps(Z)V
 SPLandroidx/appcompat/widget/AppCompatTextHelper;->setCompoundDrawables(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
-SPLandroidx/appcompat/widget/AppCompatTextHelper;->updateTypefaceAndStyle(Landroid/content/Context;Landroidx/appcompat/widget/TintTypedArray;)V
+SPLandroidx/appcompat/widget/AppCompatTextHelper;->updateTypefaceAndStyle(Landroid/content/Context;Landroidx/appcompat/widget/TintTypedArray;)Z
 Landroidx/appcompat/widget/AppCompatTextHelper$1;
 SPLandroidx/appcompat/widget/AppCompatTextHelper$1;-><init>(Landroidx/appcompat/widget/AppCompatTextHelper;IILjava/lang/ref/WeakReference;)V
 SPLandroidx/appcompat/widget/AppCompatTextHelper$1;->onFontRetrievalFailed(I)V
+Landroidx/appcompat/widget/AppCompatTextHelper$FontVariationSettingsManager;
+SPLandroidx/appcompat/widget/AppCompatTextHelper$FontVariationSettingsManager;-><init>(Landroid/widget/TextView;Landroidx/core/util/Consumer;)V
+SPLandroidx/appcompat/widget/AppCompatTextHelper$FontVariationSettingsManager;->getTypeface()Landroid/graphics/Typeface;
+SPLandroidx/appcompat/widget/AppCompatTextHelper$FontVariationSettingsManager;->setTypeface(Landroid/graphics/Typeface;)V
+SPLandroidx/appcompat/widget/AppCompatTextHelper$FontVariationSettingsManager;->setTypefaceInternal(Landroid/graphics/Typeface;)V
 Landroidx/appcompat/widget/AppCompatTextView;
 SPLandroidx/appcompat/widget/AppCompatTextView;-><init>(Landroid/content/Context;)V
 SPLandroidx/appcompat/widget/AppCompatTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 SPLandroidx/appcompat/widget/AppCompatTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->access$1301(Landroidx/appcompat/widget/AppCompatTextView;Landroid/graphics/Typeface;)V
 SPLandroidx/appcompat/widget/AppCompatTextView;->consumeTextFutureAndSetBlocking()V
 SPLandroidx/appcompat/widget/AppCompatTextView;->drawableStateChanged()V
 SPLandroidx/appcompat/widget/AppCompatTextView;->getEmojiTextViewHelper()Landroidx/appcompat/widget/AppCompatEmojiTextHelper;
+SPLandroidx/appcompat/widget/AppCompatTextView;->getFontVariationSettingsManager()Landroidx/appcompat/widget/AppCompatTextHelper$FontVariationSettingsManager;
 SPLandroidx/appcompat/widget/AppCompatTextView;->getText()Ljava/lang/CharSequence;
+SPLandroidx/appcompat/widget/AppCompatTextView;->getTypeface()Landroid/graphics/Typeface;
+SPLandroidx/appcompat/widget/AppCompatTextView;->lambda$getFontVariationSettingsManager$0$androidx-appcompat-widget-AppCompatTextView(Landroid/graphics/Typeface;)V
 SPLandroidx/appcompat/widget/AppCompatTextView;->onDetachedFromWindow()V
 SPLandroidx/appcompat/widget/AppCompatTextView;->onLayout(ZIIII)V
 SPLandroidx/appcompat/widget/AppCompatTextView;->onMeasure(II)V
@@ -810,8 +838,15 @@ SPLandroidx/appcompat/widget/AppCompatTextView;->setBackgroundDrawable(Landroid/
 SPLandroidx/appcompat/widget/AppCompatTextView;->setCompoundDrawables(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
 SPLandroidx/appcompat/widget/AppCompatTextView;->setCompoundDrawablesWithIntrinsicBounds(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
 SPLandroidx/appcompat/widget/AppCompatTextView;->setFilters([Landroid/text/InputFilter;)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->setLineHeight(I)V
 SPLandroidx/appcompat/widget/AppCompatTextView;->setTextAppearance(Landroid/content/Context;I)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->setTextSize(IF)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->setTypeface(Landroid/graphics/Typeface;)V
 SPLandroidx/appcompat/widget/AppCompatTextView;->setTypeface(Landroid/graphics/Typeface;I)V
+Landroidx/appcompat/widget/AppCompatTextView$$ExternalSyntheticLambda0;
+SPLandroidx/appcompat/widget/AppCompatTextView$$ExternalSyntheticLambda0;-><init>(Landroidx/appcompat/widget/AppCompatTextView;)V
+SPLandroidx/appcompat/widget/AppCompatTextView$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;)V
+Landroidx/appcompat/widget/AppCompatTextView$SuperCaller;
 Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;
 SPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;-><clinit>()V
 SPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;-><init>(Landroid/widget/TextView;)V
@@ -820,8 +855,6 @@ SPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->loadFromAttribute
 SPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->supportsAutoSizeText()Z
 Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper$Impl;
 SPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper$Impl;-><init>()V
-Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper$Impl23;
-SPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper$Impl23;-><init>()V
 Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper$Impl29;
 SPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper$Impl29;-><init>()V
 Landroidx/appcompat/widget/ContentFrameLayout;
@@ -917,7 +950,6 @@ SPLandroidx/appcompat/widget/ResourceManagerInternal$ColorFilterLruCache;->gener
 SPLandroidx/appcompat/widget/ResourceManagerInternal$ColorFilterLruCache;->get(ILandroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuffColorFilter;
 SPLandroidx/appcompat/widget/ResourceManagerInternal$ColorFilterLruCache;->put(ILandroid/graphics/PorterDuff$Mode;Landroid/graphics/PorterDuffColorFilter;)Landroid/graphics/PorterDuffColorFilter;
 Landroidx/appcompat/widget/ResourceManagerInternal$ResourceManagerHooks;
-Landroidx/appcompat/widget/ResourcesWrapper;
 Landroidx/appcompat/widget/RtlSpacingHelper;
 SPLandroidx/appcompat/widget/RtlSpacingHelper;-><init>()V
 SPLandroidx/appcompat/widget/RtlSpacingHelper;->getEnd()I
@@ -964,6 +996,7 @@ SPLandroidx/appcompat/widget/SearchView$8;-><init>(Landroidx/appcompat/widget/Se
 Landroidx/appcompat/widget/SearchView$9;
 SPLandroidx/appcompat/widget/SearchView$9;-><init>(Landroidx/appcompat/widget/SearchView;)V
 Landroidx/appcompat/widget/SearchView$OnQueryTextListener;
+Landroidx/appcompat/widget/SearchView$PreQAutoCompleteTextViewReflector;
 Landroidx/appcompat/widget/SearchView$SearchAutoComplete;
 SPLandroidx/appcompat/widget/SearchView$SearchAutoComplete;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 SPLandroidx/appcompat/widget/SearchView$SearchAutoComplete;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
@@ -976,16 +1009,13 @@ SPLandroidx/appcompat/widget/SearchView$SearchAutoComplete$1;-><init>(Landroidx/
 Landroidx/appcompat/widget/ThemeUtils;
 SPLandroidx/appcompat/widget/ThemeUtils;-><clinit>()V
 SPLandroidx/appcompat/widget/ThemeUtils;->checkAppCompatTheme(Landroid/view/View;Landroid/content/Context;)V
-Landroidx/appcompat/widget/TintContextWrapper;
-SPLandroidx/appcompat/widget/TintContextWrapper;-><clinit>()V
-SPLandroidx/appcompat/widget/TintContextWrapper;->shouldWrap(Landroid/content/Context;)Z
-SPLandroidx/appcompat/widget/TintContextWrapper;->wrap(Landroid/content/Context;)Landroid/content/Context;
+SPLandroidx/appcompat/widget/ThemeUtils;->getThemeAttrColor(Landroid/content/Context;I)I
 Landroidx/appcompat/widget/TintInfo;
 SPLandroidx/appcompat/widget/TintInfo;-><init>()V
-Landroidx/appcompat/widget/TintResources;
 Landroidx/appcompat/widget/TintTypedArray;
 SPLandroidx/appcompat/widget/TintTypedArray;-><init>(Landroid/content/Context;Landroid/content/res/TypedArray;)V
 SPLandroidx/appcompat/widget/TintTypedArray;->getBoolean(IZ)Z
+SPLandroidx/appcompat/widget/TintTypedArray;->getColor(II)I
 SPLandroidx/appcompat/widget/TintTypedArray;->getColorStateList(I)Landroid/content/res/ColorStateList;
 SPLandroidx/appcompat/widget/TintTypedArray;->getDimensionPixelOffset(II)I
 SPLandroidx/appcompat/widget/TintTypedArray;->getDimensionPixelSize(II)I
@@ -1104,10 +1134,6 @@ Landroidx/appcompat/widget/TooltipCompat;
 SPLandroidx/appcompat/widget/TooltipCompat;->setTooltipText(Landroid/view/View;Ljava/lang/CharSequence;)V
 Landroidx/appcompat/widget/TooltipCompat$Api26Impl;
 SPLandroidx/appcompat/widget/TooltipCompat$Api26Impl;->setTooltipText(Landroid/view/View;Ljava/lang/CharSequence;)V
-Landroidx/appcompat/widget/VectorEnabledTintResources;
-SPLandroidx/appcompat/widget/VectorEnabledTintResources;-><clinit>()V
-SPLandroidx/appcompat/widget/VectorEnabledTintResources;->isCompatVectorFromResourcesEnabled()Z
-SPLandroidx/appcompat/widget/VectorEnabledTintResources;->shouldBeUsed()Z
 Landroidx/appcompat/widget/ViewStubCompat;
 SPLandroidx/appcompat/widget/ViewStubCompat;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 SPLandroidx/appcompat/widget/ViewStubCompat;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
@@ -1137,47 +1163,20 @@ Landroidx/arch/core/executor/DefaultTaskExecutor$Api28Impl;
 SPLandroidx/arch/core/executor/DefaultTaskExecutor$Api28Impl;->createAsync(Landroid/os/Looper;)Landroid/os/Handler;
 Landroidx/arch/core/executor/TaskExecutor;
 SPLandroidx/arch/core/executor/TaskExecutor;-><init>()V
-Landroidx/arch/core/internal/FastSafeIterableMap;
-SPLandroidx/arch/core/internal/FastSafeIterableMap;-><init>()V
-SPLandroidx/arch/core/internal/FastSafeIterableMap;->ceil(Ljava/lang/Object;)Ljava/util/Map$Entry;
-SPLandroidx/arch/core/internal/FastSafeIterableMap;->contains(Ljava/lang/Object;)Z
-SPLandroidx/arch/core/internal/FastSafeIterableMap;->get(Ljava/lang/Object;)Landroidx/arch/core/internal/SafeIterableMap$Entry;
-SPLandroidx/arch/core/internal/FastSafeIterableMap;->putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-SPLandroidx/arch/core/internal/FastSafeIterableMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 Landroidx/arch/core/internal/SafeIterableMap;
 SPLandroidx/arch/core/internal/SafeIterableMap;-><init>()V
-SPLandroidx/arch/core/internal/SafeIterableMap;->descendingIterator()Ljava/util/Iterator;
-SPLandroidx/arch/core/internal/SafeIterableMap;->eldest()Ljava/util/Map$Entry;
 SPLandroidx/arch/core/internal/SafeIterableMap;->get(Ljava/lang/Object;)Landroidx/arch/core/internal/SafeIterableMap$Entry;
 SPLandroidx/arch/core/internal/SafeIterableMap;->iteratorWithAdditions()Landroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;
-SPLandroidx/arch/core/internal/SafeIterableMap;->newest()Ljava/util/Map$Entry;
 SPLandroidx/arch/core/internal/SafeIterableMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Landroidx/arch/core/internal/SafeIterableMap$Entry;
 SPLandroidx/arch/core/internal/SafeIterableMap;->putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-SPLandroidx/arch/core/internal/SafeIterableMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-SPLandroidx/arch/core/internal/SafeIterableMap;->size()I
-Landroidx/arch/core/internal/SafeIterableMap$DescendingIterator;
-SPLandroidx/arch/core/internal/SafeIterableMap$DescendingIterator;-><init>(Landroidx/arch/core/internal/SafeIterableMap$Entry;Landroidx/arch/core/internal/SafeIterableMap$Entry;)V
-SPLandroidx/arch/core/internal/SafeIterableMap$DescendingIterator;->backward(Landroidx/arch/core/internal/SafeIterableMap$Entry;)Landroidx/arch/core/internal/SafeIterableMap$Entry;
-SPLandroidx/arch/core/internal/SafeIterableMap$DescendingIterator;->forward(Landroidx/arch/core/internal/SafeIterableMap$Entry;)Landroidx/arch/core/internal/SafeIterableMap$Entry;
 Landroidx/arch/core/internal/SafeIterableMap$Entry;
 SPLandroidx/arch/core/internal/SafeIterableMap$Entry;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
-SPLandroidx/arch/core/internal/SafeIterableMap$Entry;->getKey()Ljava/lang/Object;
-SPLandroidx/arch/core/internal/SafeIterableMap$Entry;->getValue()Ljava/lang/Object;
 Landroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;
 SPLandroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;-><init>(Landroidx/arch/core/internal/SafeIterableMap;)V
 SPLandroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;->hasNext()Z
-SPLandroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;->next()Ljava/lang/Object;
-SPLandroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;->next()Ljava/util/Map$Entry;
-SPLandroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;->supportRemove(Landroidx/arch/core/internal/SafeIterableMap$Entry;)V
-Landroidx/arch/core/internal/SafeIterableMap$ListIterator;
-SPLandroidx/arch/core/internal/SafeIterableMap$ListIterator;-><init>(Landroidx/arch/core/internal/SafeIterableMap$Entry;Landroidx/arch/core/internal/SafeIterableMap$Entry;)V
-SPLandroidx/arch/core/internal/SafeIterableMap$ListIterator;->hasNext()Z
-SPLandroidx/arch/core/internal/SafeIterableMap$ListIterator;->next()Ljava/lang/Object;
-SPLandroidx/arch/core/internal/SafeIterableMap$ListIterator;->next()Ljava/util/Map$Entry;
-SPLandroidx/arch/core/internal/SafeIterableMap$ListIterator;->nextNode()Landroidx/arch/core/internal/SafeIterableMap$Entry;
-SPLandroidx/arch/core/internal/SafeIterableMap$ListIterator;->supportRemove(Landroidx/arch/core/internal/SafeIterableMap$Entry;)V
 Landroidx/arch/core/internal/SafeIterableMap$SupportRemove;
 SPLandroidx/arch/core/internal/SafeIterableMap$SupportRemove;-><init>()V
+Landroidx/browser/customtabs/CustomTabsCallback;
 Landroidx/browser/customtabs/CustomTabsClient;
 SPLandroidx/browser/customtabs/CustomTabsClient;-><init>(Landroid/support/customtabs/ICustomTabsService;Landroid/content/ComponentName;Landroid/content/Context;)V
 SPLandroidx/browser/customtabs/CustomTabsClient;->bindCustomTabsService(Landroid/content/Context;Ljava/lang/String;Landroidx/browser/customtabs/CustomTabsServiceConnection;)Z
@@ -1187,8 +1186,6 @@ SPLandroidx/browser/customtabs/CustomTabsClient;->newSessionInternal(Landroidx/b
 SPLandroidx/browser/customtabs/CustomTabsClient;->warmup(J)Z
 Landroidx/browser/customtabs/CustomTabsClient$3;
 SPLandroidx/browser/customtabs/CustomTabsClient$3;-><init>(Landroidx/browser/customtabs/CustomTabsClient;Landroidx/browser/customtabs/CustomTabsCallback;)V
-SPLandroidx/browser/customtabs/CustomTabsClient$3;->extraCallback(Ljava/lang/String;Landroid/os/Bundle;)V
-SPLandroidx/browser/customtabs/CustomTabsClient$3;->onWarmupCompleted(Landroid/os/Bundle;)V
 Landroidx/browser/customtabs/CustomTabsServiceConnection;
 SPLandroidx/browser/customtabs/CustomTabsServiceConnection;-><init>()V
 SPLandroidx/browser/customtabs/CustomTabsServiceConnection;->onServiceConnected(Landroid/content/ComponentName;Landroid/os/IBinder;)V
@@ -1232,11 +1229,26 @@ SPLandroidx/collection/IndexBasedArrayIterator;-><init>(I)V
 SPLandroidx/collection/IndexBasedArrayIterator;->hasNext()Z
 SPLandroidx/collection/IndexBasedArrayIterator;->next()Ljava/lang/Object;
 SPLandroidx/collection/IndexBasedArrayIterator;->remove()V
+Landroidx/collection/LongObjectMap;
+SPLandroidx/collection/LongObjectMap;-><init>()V
+SPLandroidx/collection/LongObjectMap;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/collection/LongObjectMap;->getCapacity()I
+Landroidx/collection/LongObjectMapKt;
+SPLandroidx/collection/LongObjectMapKt;-><clinit>()V
+SPLandroidx/collection/LongObjectMapKt;->mutableLongObjectMapOf()Landroidx/collection/MutableLongObjectMap;
+Landroidx/collection/LongSet;
+SPLandroidx/collection/LongSet;-><init>()V
+SPLandroidx/collection/LongSet;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/collection/LongSet;->getCapacity()I
+Landroidx/collection/LongSetKt;
+SPLandroidx/collection/LongSetKt;-><clinit>()V
+SPLandroidx/collection/LongSetKt;->getEmptyLongArray()[J
 Landroidx/collection/LongSparseArray;
 SPLandroidx/collection/LongSparseArray;-><init>()V
 SPLandroidx/collection/LongSparseArray;-><init>(I)V
 SPLandroidx/collection/LongSparseArray;-><init>(IILkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLandroidx/collection/LongSparseArray;->clear()V
+SPLandroidx/collection/LongSparseArray;->get(J)Ljava/lang/Object;
 Landroidx/collection/LruCache;
 SPLandroidx/collection/LruCache;-><init>(I)V
 SPLandroidx/collection/LruCache;->create(Ljava/lang/Object;)Ljava/lang/Object;
@@ -1245,6 +1257,44 @@ SPLandroidx/collection/LruCache;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava
 SPLandroidx/collection/LruCache;->safeSizeOf(Ljava/lang/Object;Ljava/lang/Object;)I
 SPLandroidx/collection/LruCache;->sizeOf(Ljava/lang/Object;Ljava/lang/Object;)I
 SPLandroidx/collection/LruCache;->trimToSize(I)V
+Landroidx/collection/MutableLongObjectMap;
+SPLandroidx/collection/MutableLongObjectMap;-><init>(I)V
+SPLandroidx/collection/MutableLongObjectMap;-><init>(IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/collection/MutableLongObjectMap;->initializeGrowth()V
+SPLandroidx/collection/MutableLongObjectMap;->initializeMetadata(I)V
+SPLandroidx/collection/MutableLongObjectMap;->initializeStorage(I)V
+Landroidx/collection/MutableLongSet;
+SPLandroidx/collection/MutableLongSet;-><init>(I)V
+SPLandroidx/collection/MutableLongSet;->initializeGrowth()V
+SPLandroidx/collection/MutableLongSet;->initializeMetadata(I)V
+SPLandroidx/collection/MutableLongSet;->initializeStorage(I)V
+Landroidx/collection/MutableScatterMap;
+SPLandroidx/collection/MutableScatterMap;-><init>(I)V
+SPLandroidx/collection/MutableScatterMap;-><init>(IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/collection/MutableScatterMap;->adjustStorage$collection()V
+SPLandroidx/collection/MutableScatterMap;->findFirstAvailableSlot(I)I
+SPLandroidx/collection/MutableScatterMap;->findInsertIndex(Ljava/lang/Object;)I
+SPLandroidx/collection/MutableScatterMap;->initializeGrowth()V
+SPLandroidx/collection/MutableScatterMap;->initializeMetadata(I)V
+SPLandroidx/collection/MutableScatterMap;->initializeStorage(I)V
+SPLandroidx/collection/MutableScatterMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/collection/MutableScatterMap;->removeValueAt(I)Ljava/lang/Object;
+SPLandroidx/collection/MutableScatterMap;->resizeStorage$collection(I)V
+SPLandroidx/collection/MutableScatterMap;->set(Ljava/lang/Object;Ljava/lang/Object;)V
+Landroidx/collection/ScatterMap;
+SPLandroidx/collection/ScatterMap;-><init>()V
+SPLandroidx/collection/ScatterMap;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/collection/ScatterMap;->containsKey(Ljava/lang/Object;)Z
+SPLandroidx/collection/ScatterMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/collection/ScatterMap;->getCapacity()I
+SPLandroidx/collection/ScatterMap;->getSize()I
+Landroidx/collection/ScatterMapKt;
+SPLandroidx/collection/ScatterMapKt;-><clinit>()V
+SPLandroidx/collection/ScatterMapKt;->loadedCapacity(I)I
+SPLandroidx/collection/ScatterMapKt;->mutableScatterMapOf()Landroidx/collection/MutableScatterMap;
+SPLandroidx/collection/ScatterMapKt;->nextCapacity(I)I
+SPLandroidx/collection/ScatterMapKt;->normalizeCapacity(I)I
+SPLandroidx/collection/ScatterMapKt;->unloadedCapacity(I)I
 Landroidx/collection/SimpleArrayMap;
 SPLandroidx/collection/SimpleArrayMap;-><init>()V
 SPLandroidx/collection/SimpleArrayMap;-><init>(I)V
@@ -1258,6 +1308,7 @@ SPLandroidx/collection/SimpleArrayMap;->isEmpty()Z
 SPLandroidx/collection/SimpleArrayMap;->keyAt(I)Ljava/lang/Object;
 SPLandroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 SPLandroidx/collection/SimpleArrayMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/collection/SimpleArrayMap;->removeAt(I)Ljava/lang/Object;
 SPLandroidx/collection/SimpleArrayMap;->size()I
 SPLandroidx/collection/SimpleArrayMap;->valueAt(I)Ljava/lang/Object;
 Landroidx/collection/SparseArrayCompat;
@@ -1269,6 +1320,7 @@ SPLandroidx/collection/SparseArrayCompat;->size()I
 Landroidx/collection/internal/ContainerHelpersKt;
 SPLandroidx/collection/internal/ContainerHelpersKt;-><clinit>()V
 SPLandroidx/collection/internal/ContainerHelpersKt;->binarySearch([III)I
+SPLandroidx/collection/internal/ContainerHelpersKt;->binarySearch([JIJ)I
 SPLandroidx/collection/internal/ContainerHelpersKt;->idealByteArraySize(I)I
 SPLandroidx/collection/internal/ContainerHelpersKt;->idealIntArraySize(I)I
 SPLandroidx/collection/internal/ContainerHelpersKt;->idealLongArraySize(I)I
@@ -1279,6 +1331,10 @@ SPLandroidx/collection/internal/LruHashMap;-><init>(IF)V
 SPLandroidx/collection/internal/LruHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 SPLandroidx/collection/internal/LruHashMap;->isEmpty()Z
 SPLandroidx/collection/internal/LruHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/compose/animation/core/MutatorMutex$$ExternalSyntheticBackportWithForwarding0;
+SPLandroidx/compose/animation/core/MutatorMutex$$ExternalSyntheticBackportWithForwarding0;->m(Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/Object;Ljava/lang/Object;)Z
+Landroidx/compose/ui/platform/HapticDefaults$$ExternalSyntheticApiModelOutline0;
+SPLandroidx/compose/ui/platform/HapticDefaults$$ExternalSyntheticApiModelOutline0;->m(Landroid/graphics/Outline;Landroid/graphics/Path;)V
 Landroidx/concurrent/futures/AbstractResolvableFuture;
 SPLandroidx/concurrent/futures/AbstractResolvableFuture;-><clinit>()V
 SPLandroidx/concurrent/futures/AbstractResolvableFuture;-><init>()V
@@ -1307,6 +1363,7 @@ Landroidx/concurrent/futures/CallbackToFutureAdapter;
 SPLandroidx/concurrent/futures/CallbackToFutureAdapter;->getFuture(Landroidx/concurrent/futures/CallbackToFutureAdapter$Resolver;)Lcom/google/common/util/concurrent/ListenableFuture;
 Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;
 SPLandroidx/concurrent/futures/CallbackToFutureAdapter$Completer;-><init>()V
+PLandroidx/concurrent/futures/CallbackToFutureAdapter$Completer;->finalize()V
 SPLandroidx/concurrent/futures/CallbackToFutureAdapter$Completer;->set(Ljava/lang/Object;)Z
 SPLandroidx/concurrent/futures/CallbackToFutureAdapter$Completer;->setCompletedNormally()V
 Landroidx/concurrent/futures/CallbackToFutureAdapter$Resolver;
@@ -1341,6 +1398,7 @@ SPLandroidx/constraintlayout/core/LinearSystem;->minimize()V
 SPLandroidx/constraintlayout/core/LinearSystem;->releaseRows()V
 SPLandroidx/constraintlayout/core/LinearSystem;->reset()V
 Landroidx/constraintlayout/core/LinearSystem$Row;
+Landroidx/constraintlayout/core/Metrics;
 Landroidx/constraintlayout/core/Pools$Pool;
 Landroidx/constraintlayout/core/Pools$SimplePool;
 SPLandroidx/constraintlayout/core/Pools$SimplePool;-><init>(I)V
@@ -1529,6 +1587,8 @@ SPLandroidx/constraintlayout/core/widgets/analyzer/Direct;->solveHorizontalCente
 SPLandroidx/constraintlayout/core/widgets/analyzer/Direct;->solveVerticalMatchConstraint(ILandroidx/constraintlayout/core/widgets/ConstraintWidget;Landroidx/constraintlayout/core/widgets/analyzer/BasicMeasure$Measurer;Landroidx/constraintlayout/core/widgets/ConstraintWidget;)V
 SPLandroidx/constraintlayout/core/widgets/analyzer/Direct;->solvingPass(Landroidx/constraintlayout/core/widgets/ConstraintWidgetContainer;Landroidx/constraintlayout/core/widgets/analyzer/BasicMeasure$Measurer;)V
 SPLandroidx/constraintlayout/core/widgets/analyzer/Direct;->verticalSolvingPass(ILandroidx/constraintlayout/core/widgets/ConstraintWidget;Landroidx/constraintlayout/core/widgets/analyzer/BasicMeasure$Measurer;)V
+Landroidx/constraintlayout/core/widgets/analyzer/HorizontalWidgetRun;
+Landroidx/constraintlayout/core/widgets/analyzer/VerticalWidgetRun;
 Landroidx/constraintlayout/core/widgets/analyzer/WidgetRun;
 Landroidx/constraintlayout/widget/Barrier;
 Landroidx/constraintlayout/widget/ConstraintHelper;
@@ -1572,6 +1632,8 @@ SPLandroidx/constraintlayout/widget/ConstraintLayout$Measurer;-><init>(Landroidx
 SPLandroidx/constraintlayout/widget/ConstraintLayout$Measurer;->captureLayoutInfo(IIIIII)V
 SPLandroidx/constraintlayout/widget/ConstraintLayout$Measurer;->didMeasures()V
 SPLandroidx/constraintlayout/widget/ConstraintLayout$Measurer;->measure(Landroidx/constraintlayout/core/widgets/ConstraintWidget;Landroidx/constraintlayout/core/widgets/analyzer/BasicMeasure$Measure;)V
+Landroidx/constraintlayout/widget/ConstraintLayoutStates;
+Landroidx/constraintlayout/widget/ConstraintSet;
 Landroidx/constraintlayout/widget/Guideline;
 Landroidx/constraintlayout/widget/Placeholder;
 Landroidx/constraintlayout/widget/R$styleable;
@@ -1604,6 +1666,7 @@ SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->onLayout(ZIIII)V
 SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->onLayoutChild(Landroid/view/View;I)V
 SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->onMeasure(II)V
 SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->onMeasureChild(Landroid/view/View;IIII)V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->parseBehavior(Landroid/content/Context;Landroid/util/AttributeSet;Ljava/lang/String;)Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
 SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->performIntercept(Landroid/view/MotionEvent;I)Z
 SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->prepareChildren()V
 SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->releaseTempRect(Landroid/graphics/Rect;)V
@@ -1611,6 +1674,11 @@ SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->resetTouchBehaviors(Z)V
 SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->resolveGravity(I)I
 SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->setupForInsets()V
 Landroidx/coordinatorlayout/widget/CoordinatorLayout$AttachedBehavior;
+Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;->layoutDependsOn(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;)Z
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;->onAttachedToLayoutParams(Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;)V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;->onTouchEvent(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/MotionEvent;)Z
 Landroidx/coordinatorlayout/widget/CoordinatorLayout$DefaultBehavior;
 Landroidx/coordinatorlayout/widget/CoordinatorLayout$HierarchyChangeListener;
 SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$HierarchyChangeListener;-><init>(Landroidx/coordinatorlayout/widget/CoordinatorLayout;)V
@@ -1690,21 +1758,36 @@ Landroidx/core/app/OnMultiWindowModeChangedProvider;
 Landroidx/core/app/OnNewIntentProvider;
 Landroidx/core/app/OnPictureInPictureModeChangedProvider;
 Landroidx/core/app/OnUserLeaveHintProvider;
+Landroidx/core/app/PendingIntentCompat;
+SPLandroidx/core/app/PendingIntentCompat;->addMutabilityFlags(ZI)I
+SPLandroidx/core/app/PendingIntentCompat;->getActivity(Landroid/content/Context;ILandroid/content/Intent;IZ)Landroid/app/PendingIntent;
+SPLandroidx/core/app/PendingIntentCompat;->getBroadcast(Landroid/content/Context;ILandroid/content/Intent;IZ)Landroid/app/PendingIntent;
+Landroidx/core/app/SharedElementCallback;
 Landroidx/core/app/TaskStackBuilder$SupportParentable;
 Landroidx/core/content/ContextCompat;
-SPLandroidx/core/content/ContextCompat;-><clinit>()V
 SPLandroidx/core/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I
 SPLandroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
 SPLandroidx/core/content/ContextCompat;->getColorStateList(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
+SPLandroidx/core/content/ContextCompat;->getDataDir(Landroid/content/Context;)Ljava/io/File;
 SPLandroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 SPLandroidx/core/content/ContextCompat;->getSystemService(Landroid/content/Context;Ljava/lang/Class;)Ljava/lang/Object;
 SPLandroidx/core/content/ContextCompat;->registerReceiver(Landroid/content/Context;Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent;
 SPLandroidx/core/content/ContextCompat;->registerReceiver(Landroid/content/Context;Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;Ljava/lang/String;Landroid/os/Handler;I)Landroid/content/Intent;
-Landroidx/core/content/ContextCompat$Api21Impl;
-SPLandroidx/core/content/ContextCompat$Api21Impl;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
-Landroidx/core/content/ContextCompat$Api23Impl;
-SPLandroidx/core/content/ContextCompat$Api23Impl;->getColor(Landroid/content/Context;I)I
-SPLandroidx/core/content/ContextCompat$Api23Impl;->getSystemService(Landroid/content/Context;Ljava/lang/Class;)Ljava/lang/Object;
+Landroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/content/pm/ShortcutInfo$Builder;Ljava/lang/CharSequence;)Landroid/content/pm/ShortcutInfo$Builder;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m$3()V
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/Context;Ljava/lang/String;)Landroid/content/pm/ShortcutInfo$Builder;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;)Landroid/content/pm/ShortcutInfo;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;I)Landroid/content/pm/ShortcutInfo$Builder;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;Landroid/graphics/drawable/Icon;)Landroid/content/pm/ShortcutInfo$Builder;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;Ljava/lang/CharSequence;)Landroid/content/pm/ShortcutInfo$Builder;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;Z)Landroid/content/pm/ShortcutInfo$Builder;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;[Landroid/content/Intent;)Landroid/content/pm/ShortcutInfo$Builder;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowManager;)Landroid/view/WindowMetrics;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowMetrics;)Landroid/graphics/Rect;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/content/Context;[ILandroid/util/AttributeSet;Landroid/content/res/TypedArray;II)V
+Landroidx/core/content/ContextCompat$Api24Impl;
+SPLandroidx/core/content/ContextCompat$Api24Impl;->getDataDir(Landroid/content/Context;)Ljava/io/File;
 Landroidx/core/content/ContextCompat$Api33Impl;
 SPLandroidx/core/content/ContextCompat$Api33Impl;->registerReceiver(Landroid/content/Context;Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;Ljava/lang/String;Landroid/os/Handler;I)Landroid/content/Intent;
 Landroidx/core/content/FileProvider;
@@ -1767,8 +1850,6 @@ SPLandroidx/core/content/res/ResourcesCompat;->inflateColorStateList(Landroid/co
 SPLandroidx/core/content/res/ResourcesCompat;->isColorInt(Landroid/content/res/Resources;I)Z
 SPLandroidx/core/content/res/ResourcesCompat;->loadFont(Landroid/content/Context;ILandroid/util/TypedValue;ILandroidx/core/content/res/ResourcesCompat$FontCallback;Landroid/os/Handler;ZZ)Landroid/graphics/Typeface;
 SPLandroidx/core/content/res/ResourcesCompat;->loadFont(Landroid/content/Context;Landroid/content/res/Resources;Landroid/util/TypedValue;IILandroidx/core/content/res/ResourcesCompat$FontCallback;Landroid/os/Handler;ZZ)Landroid/graphics/Typeface;
-Landroidx/core/content/res/ResourcesCompat$Api23Impl;
-SPLandroidx/core/content/res/ResourcesCompat$Api23Impl;->getColorStateList(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)Landroid/content/res/ColorStateList;
 Landroidx/core/content/res/ResourcesCompat$ColorStateListCacheEntry;
 SPLandroidx/core/content/res/ResourcesCompat$ColorStateListCacheEntry;-><init>(Landroid/content/res/ColorStateList;Landroid/content/res/Configuration;Landroid/content/res/Resources$Theme;)V
 Landroidx/core/content/res/ResourcesCompat$ColorStateListCacheKey;
@@ -1796,6 +1877,8 @@ Landroidx/core/graphics/Insets;
 SPLandroidx/core/graphics/Insets;-><clinit>()V
 SPLandroidx/core/graphics/Insets;-><init>(IIII)V
 SPLandroidx/core/graphics/Insets;->equals(Ljava/lang/Object;)Z
+SPLandroidx/core/graphics/Insets;->max(Landroidx/core/graphics/Insets;Landroidx/core/graphics/Insets;)Landroidx/core/graphics/Insets;
+SPLandroidx/core/graphics/Insets;->min(Landroidx/core/graphics/Insets;Landroidx/core/graphics/Insets;)Landroidx/core/graphics/Insets;
 SPLandroidx/core/graphics/Insets;->of(IIII)Landroidx/core/graphics/Insets;
 SPLandroidx/core/graphics/Insets;->toCompatInsets(Landroid/graphics/Insets;)Landroidx/core/graphics/Insets;
 Landroidx/core/graphics/TypefaceCompat;
@@ -1818,14 +1901,9 @@ SPLandroidx/core/graphics/TypefaceCompatBaseImpl;-><init>()V
 Landroidx/core/graphics/TypefaceCompatUtil;
 SPLandroidx/core/graphics/TypefaceCompatUtil;->mmap(Landroid/content/Context;Landroid/os/CancellationSignal;Landroid/net/Uri;)Ljava/nio/ByteBuffer;
 Landroidx/core/graphics/drawable/DrawableCompat;
-SPLandroidx/core/graphics/drawable/DrawableCompat;->clearColorFilter(Landroid/graphics/drawable/Drawable;)V
 SPLandroidx/core/graphics/drawable/DrawableCompat;->getLayoutDirection(Landroid/graphics/drawable/Drawable;)I
 SPLandroidx/core/graphics/drawable/DrawableCompat;->setHotspotBounds(Landroid/graphics/drawable/Drawable;IIII)V
 SPLandroidx/core/graphics/drawable/DrawableCompat;->wrap(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
-Landroidx/core/graphics/drawable/DrawableCompat$Api21Impl;
-SPLandroidx/core/graphics/drawable/DrawableCompat$Api21Impl;->setHotspotBounds(Landroid/graphics/drawable/Drawable;IIII)V
-Landroidx/core/graphics/drawable/DrawableCompat$Api23Impl;
-SPLandroidx/core/graphics/drawable/DrawableCompat$Api23Impl;->getLayoutDirection(Landroid/graphics/drawable/Drawable;)I
 Landroidx/core/graphics/drawable/IconCompat;
 SPLandroidx/core/graphics/drawable/IconCompat;-><clinit>()V
 SPLandroidx/core/graphics/drawable/IconCompat;-><init>(I)V
@@ -1840,6 +1918,14 @@ Landroidx/core/internal/view/SupportMenu;
 Landroidx/core/internal/view/SupportMenuItem;
 Landroidx/core/math/MathUtils;
 SPLandroidx/core/math/MathUtils;->clamp(III)I
+Landroidx/core/os/BuildCompat;
+SPLandroidx/core/os/BuildCompat;-><clinit>()V
+SPLandroidx/core/os/BuildCompat;-><init>()V
+SPLandroidx/core/os/BuildCompat;->isAtLeastB_1()Z
+Landroidx/core/os/BuildCompat$Api30Impl;
+SPLandroidx/core/os/BuildCompat$Api30Impl;-><clinit>()V
+SPLandroidx/core/os/BuildCompat$Api30Impl;-><init>()V
+SPLandroidx/core/os/BuildCompat$Api30Impl;->getExtensionVersion(I)I
 Landroidx/core/os/BundleCompat;
 SPLandroidx/core/os/BundleCompat;->getParcelable(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object;
 Landroidx/core/os/BundleCompat$Api33Impl;
@@ -1862,10 +1948,8 @@ SPLandroidx/core/os/LocaleListCompat;->forLanguageTags(Ljava/lang/String;)Landro
 SPLandroidx/core/os/LocaleListCompat;->get(I)Ljava/util/Locale;
 SPLandroidx/core/os/LocaleListCompat;->getEmptyLocaleList()Landroidx/core/os/LocaleListCompat;
 SPLandroidx/core/os/LocaleListCompat;->isEmpty()Z
+SPLandroidx/core/os/LocaleListCompat;->toLanguageTags()Ljava/lang/String;
 SPLandroidx/core/os/LocaleListCompat;->wrap(Landroid/os/LocaleList;)Landroidx/core/os/LocaleListCompat;
-Landroidx/core/os/LocaleListCompat$Api21Impl;
-SPLandroidx/core/os/LocaleListCompat$Api21Impl;-><clinit>()V
-SPLandroidx/core/os/LocaleListCompat$Api21Impl;->forLanguageTag(Ljava/lang/String;)Ljava/util/Locale;
 Landroidx/core/os/LocaleListCompat$Api24Impl;
 SPLandroidx/core/os/LocaleListCompat$Api24Impl;->createLocaleList([Ljava/util/Locale;)Landroid/os/LocaleList;
 Landroidx/core/os/LocaleListInterface;
@@ -1873,6 +1957,7 @@ Landroidx/core/os/LocaleListPlatformWrapper;
 SPLandroidx/core/os/LocaleListPlatformWrapper;-><init>(Ljava/lang/Object;)V
 SPLandroidx/core/os/LocaleListPlatformWrapper;->get(I)Ljava/util/Locale;
 SPLandroidx/core/os/LocaleListPlatformWrapper;->isEmpty()Z
+SPLandroidx/core/os/LocaleListPlatformWrapper;->toLanguageTags()Ljava/lang/String;
 Landroidx/core/os/Profiling$$ExternalSyntheticApiModelOutline0;
 SPLandroidx/core/os/Profiling$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/content/pm/ShortcutManager;Ljava/util/List;)Z
 SPLandroidx/core/os/Profiling$$ExternalSyntheticApiModelOutline0;->m()Ljava/lang/Class;
@@ -1884,6 +1969,10 @@ SPLandroidx/core/os/TraceCompat;->endSection()V
 SPLandroidx/core/os/TraceCompat;->isEnabled()Z
 Landroidx/core/os/TraceCompat$Api29Impl;
 SPLandroidx/core/os/TraceCompat$Api29Impl;->isEnabled()Z
+Landroidx/core/os/UserManagerCompat;
+SPLandroidx/core/os/UserManagerCompat;->isUserUnlocked(Landroid/content/Context;)Z
+Landroidx/core/os/UserManagerCompat$Api24Impl;
+SPLandroidx/core/os/UserManagerCompat$Api24Impl;->isUserUnlocked(Landroid/content/Context;)Z
 Landroidx/core/provider/FontProvider;
 SPLandroidx/core/provider/FontProvider;-><clinit>()V
 SPLandroidx/core/provider/FontProvider;->convertToByteArrayList([Landroid/content/pm/Signature;)Ljava/util/List;
@@ -1891,6 +1980,7 @@ SPLandroidx/core/provider/FontProvider;->equalsByteArrayList(Ljava/util/List;Lja
 SPLandroidx/core/provider/FontProvider;->getCertificates(Landroidx/core/provider/FontRequest;Landroid/content/res/Resources;)Ljava/util/List;
 SPLandroidx/core/provider/FontProvider;->getFontFamilyResult(Landroid/content/Context;Ljava/util/List;Landroid/os/CancellationSignal;)Landroidx/core/provider/FontsContractCompat$FontFamilyResult;
 SPLandroidx/core/provider/FontProvider;->getProvider(Landroid/content/pm/PackageManager;Landroidx/core/provider/FontRequest;Landroid/content/res/Resources;)Landroid/content/pm/ProviderInfo;
+SPLandroidx/core/provider/FontProvider;->getSelectionArgs(Landroidx/core/provider/FontRequest;)[Ljava/lang/String;
 SPLandroidx/core/provider/FontProvider;->query(Landroid/content/Context;Landroidx/core/provider/FontRequest;Ljava/lang/String;Landroid/os/CancellationSignal;)[Landroidx/core/provider/FontsContractCompat$FontInfo;
 Landroidx/core/provider/FontProvider$$ExternalSyntheticLambda0;
 SPLandroidx/core/provider/FontProvider$$ExternalSyntheticLambda0;-><init>()V
@@ -1912,6 +2002,7 @@ SPLandroidx/core/provider/FontRequest;->getProviderAuthority()Ljava/lang/String;
 SPLandroidx/core/provider/FontRequest;->getProviderPackage()Ljava/lang/String;
 SPLandroidx/core/provider/FontRequest;->getQuery()Ljava/lang/String;
 SPLandroidx/core/provider/FontRequest;->getSystemFont()Ljava/lang/String;
+SPLandroidx/core/provider/FontRequest;->getVariationSettings()Ljava/lang/String;
 Landroidx/core/provider/FontsContractCompat;
 SPLandroidx/core/provider/FontsContractCompat;->buildTypeface(Landroid/content/Context;Landroid/os/CancellationSignal;[Landroidx/core/provider/FontsContractCompat$FontInfo;)Landroid/graphics/Typeface;
 SPLandroidx/core/provider/FontsContractCompat;->fetchFonts(Landroid/content/Context;Landroid/os/CancellationSignal;Landroidx/core/provider/FontRequest;)Landroidx/core/provider/FontsContractCompat$FontFamilyResult;
@@ -1921,9 +2012,7 @@ SPLandroidx/core/provider/FontsContractCompat$FontFamilyResult;->create(ILjava/u
 SPLandroidx/core/provider/FontsContractCompat$FontFamilyResult;->getFonts()[Landroidx/core/provider/FontsContractCompat$FontInfo;
 SPLandroidx/core/provider/FontsContractCompat$FontFamilyResult;->getStatusCode()I
 Landroidx/core/provider/FontsContractCompat$FontInfo;
-SPLandroidx/core/provider/FontsContractCompat$FontInfo;-><init>(Landroid/net/Uri;IIZI)V
 SPLandroidx/core/provider/FontsContractCompat$FontInfo;-><init>(Landroid/net/Uri;IIZLjava/lang/String;I)V
-SPLandroidx/core/provider/FontsContractCompat$FontInfo;->create(Landroid/net/Uri;IIZI)Landroidx/core/provider/FontsContractCompat$FontInfo;
 SPLandroidx/core/provider/FontsContractCompat$FontInfo;->getResultCode()I
 SPLandroidx/core/provider/FontsContractCompat$FontInfo;->getTtcIndex()I
 SPLandroidx/core/provider/FontsContractCompat$FontInfo;->getUri()Landroid/net/Uri;
@@ -1933,11 +2022,19 @@ SPLandroidx/core/provider/FontsContractCompat$FontInfo;->isItalic()Z
 SPLandroidx/core/provider/FontsContractCompat$FontInfo;->isSystemFont()Z
 Landroidx/core/util/Consumer;
 Landroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m$1()I
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/view/WindowInsets;I)Landroid/graphics/Insets;
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m$2()I
 SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m$2(Landroid/view/WindowInsets;)Landroid/graphics/Insets;
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m$3()I
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m()I
 SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m()Landroid/view/WindowInsets$Builder;
 SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m()Landroid/view/WindowInsets;
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/View;Landroid/view/WindowInsetsAnimation$Callback;)V
 SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowInsets$Builder;)Landroid/view/WindowInsets;
 SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowInsets;)Landroid/view/WindowInsets;
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowInsets;I)Landroid/graphics/Insets;
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowInsets;I)Landroid/view/RoundedCorner;
 Landroidx/core/util/ObjectsCompat;
 SPLandroidx/core/util/ObjectsCompat;->equals(Ljava/lang/Object;Ljava/lang/Object;)Z
 SPLandroidx/core/util/ObjectsCompat;->hash([Ljava/lang/Object;)I
@@ -1955,6 +2052,7 @@ SPLandroidx/core/util/Pools$SynchronizedPool;->acquire()Ljava/lang/Object;
 SPLandroidx/core/util/Pools$SynchronizedPool;->release(Ljava/lang/Object;)Z
 Landroidx/core/util/Preconditions;
 SPLandroidx/core/util/Preconditions;->checkArgument(ZLjava/lang/Object;)V
+SPLandroidx/core/util/Preconditions;->checkArgumentNonnegative(I)I
 SPLandroidx/core/util/Preconditions;->checkArgumentNonnegative(ILjava/lang/String;)I
 SPLandroidx/core/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 SPLandroidx/core/util/Preconditions;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -1998,6 +2096,7 @@ SPLandroidx/core/view/DifferentialMotionFlingController$$ExternalSyntheticLambda
 Landroidx/core/view/DifferentialMotionFlingController$DifferentialVelocityProvider;
 Landroidx/core/view/DifferentialMotionFlingController$FlingVelocityThresholdCalculator;
 Landroidx/core/view/DifferentialMotionFlingTarget;
+Landroidx/core/view/DisplayShapeCompat;
 Landroidx/core/view/GravityCompat;
 SPLandroidx/core/view/GravityCompat;->apply(IIILandroid/graphics/Rect;Landroid/graphics/Rect;I)V
 SPLandroidx/core/view/GravityCompat;->getAbsoluteGravity(II)I
@@ -2034,7 +2133,17 @@ SPLandroidx/core/view/NestedScrollingParentHelper;-><init>(Landroid/view/ViewGro
 Landroidx/core/view/OnApplyWindowInsetsListener;
 Landroidx/core/view/OnReceiveContentListener;
 Landroidx/core/view/OnReceiveContentViewBehavior;
+Landroidx/core/view/RoundedCornerCompat;
+SPLandroidx/core/view/RoundedCornerCompat;->toRoundedCornerCompat(Landroid/view/RoundedCorner;)Landroidx/core/view/RoundedCornerCompat;
 Landroidx/core/view/ScrollingView;
+Landroidx/core/view/SoftwareKeyboardControllerCompat;
+SPLandroidx/core/view/SoftwareKeyboardControllerCompat;-><init>(Landroid/view/View;)V
+Landroidx/core/view/SoftwareKeyboardControllerCompat$Impl;
+SPLandroidx/core/view/SoftwareKeyboardControllerCompat$Impl;-><init>()V
+Landroidx/core/view/SoftwareKeyboardControllerCompat$Impl20;
+SPLandroidx/core/view/SoftwareKeyboardControllerCompat$Impl20;-><init>(Landroid/view/View;)V
+Landroidx/core/view/SoftwareKeyboardControllerCompat$Impl30;
+SPLandroidx/core/view/SoftwareKeyboardControllerCompat$Impl30;-><init>(Landroid/view/View;)V
 Landroidx/core/view/TintableBackgroundView;
 Landroidx/core/view/ViewCompat;
 SPLandroidx/core/view/ViewCompat;-><clinit>()V
@@ -2072,6 +2181,7 @@ SPLandroidx/core/view/ViewCompat;->setImportantForAccessibilityIfNeeded(Landroid
 SPLandroidx/core/view/ViewCompat;->setImportantForAutofill(Landroid/view/View;I)V
 SPLandroidx/core/view/ViewCompat;->setOnApplyWindowInsetsListener(Landroid/view/View;Landroidx/core/view/OnApplyWindowInsetsListener;)V
 SPLandroidx/core/view/ViewCompat;->setOnReceiveContentListener(Landroid/view/View;[Ljava/lang/String;Landroidx/core/view/OnReceiveContentListener;)V
+SPLandroidx/core/view/ViewCompat;->setWindowInsetsAnimationCallback(Landroid/view/View;Landroidx/core/view/WindowInsetsAnimationCompat$Callback;)V
 SPLandroidx/core/view/ViewCompat;->stateDescriptionProperty()Landroidx/core/view/ViewCompat$AccessibilityViewProperty;
 Landroidx/core/view/ViewCompat$$ExternalSyntheticLambda0;
 SPLandroidx/core/view/ViewCompat$$ExternalSyntheticLambda0;-><init>()V
@@ -2105,13 +2215,7 @@ SPLandroidx/core/view/ViewCompat$AccessibilityViewProperty;-><init>(ILjava/lang/
 SPLandroidx/core/view/ViewCompat$AccessibilityViewProperty;->frameworkAvailable()Z
 SPLandroidx/core/view/ViewCompat$AccessibilityViewProperty;->get(Landroid/view/View;)Ljava/lang/Object;
 SPLandroidx/core/view/ViewCompat$AccessibilityViewProperty;->set(Landroid/view/View;Ljava/lang/Object;)V
-Landroidx/core/view/ViewCompat$Api20Impl;
-SPLandroidx/core/view/ViewCompat$Api20Impl;->onApplyWindowInsets(Landroid/view/View;Landroid/view/WindowInsets;)Landroid/view/WindowInsets;
-SPLandroidx/core/view/ViewCompat$Api20Impl;->requestApplyInsets(Landroid/view/View;)V
 Landroidx/core/view/ViewCompat$Api21Impl;
-SPLandroidx/core/view/ViewCompat$Api21Impl;->getElevation(Landroid/view/View;)F
-SPLandroidx/core/view/ViewCompat$Api21Impl;->setBackgroundTintList(Landroid/view/View;Landroid/content/res/ColorStateList;)V
-SPLandroidx/core/view/ViewCompat$Api21Impl;->setElevation(Landroid/view/View;F)V
 SPLandroidx/core/view/ViewCompat$Api21Impl;->setOnApplyWindowInsetsListener(Landroid/view/View;Landroidx/core/view/OnApplyWindowInsetsListener;)V
 Landroidx/core/view/ViewCompat$Api21Impl$1;
 SPLandroidx/core/view/ViewCompat$Api21Impl$1;-><init>(Landroid/view/View;Landroidx/core/view/OnApplyWindowInsetsListener;)V
@@ -2140,9 +2244,27 @@ Landroidx/core/view/ViewConfigurationCompat;
 SPLandroidx/core/view/ViewConfigurationCompat;-><clinit>()V
 SPLandroidx/core/view/ViewConfigurationCompat;->getScaledHorizontalScrollFactor(Landroid/view/ViewConfiguration;Landroid/content/Context;)F
 SPLandroidx/core/view/ViewConfigurationCompat;->getScaledVerticalScrollFactor(Landroid/view/ViewConfiguration;Landroid/content/Context;)F
+SPLandroidx/core/view/ViewConfigurationCompat;->shouldShowMenuShortcutsWhenKeyboardPresent(Landroid/view/ViewConfiguration;Landroid/content/Context;)Z
 Landroidx/core/view/ViewConfigurationCompat$Api26Impl;
 SPLandroidx/core/view/ViewConfigurationCompat$Api26Impl;->getScaledHorizontalScrollFactor(Landroid/view/ViewConfiguration;)F
 SPLandroidx/core/view/ViewConfigurationCompat$Api26Impl;->getScaledVerticalScrollFactor(Landroid/view/ViewConfiguration;)F
+Landroidx/core/view/ViewConfigurationCompat$Api28Impl;
+SPLandroidx/core/view/ViewConfigurationCompat$Api28Impl;->shouldShowMenuShortcutsWhenKeyboardPresent(Landroid/view/ViewConfiguration;)Z
+Landroidx/core/view/ViewPropertyAnimatorCompat;
+Landroidx/core/view/WindowCompat;
+SPLandroidx/core/view/WindowCompat;->setDecorFitsSystemWindows(Landroid/view/Window;Z)V
+Landroidx/core/view/WindowCompat$Api35Impl;
+SPLandroidx/core/view/WindowCompat$Api35Impl;->setDecorFitsSystemWindows(Landroid/view/Window;Z)V
+Landroidx/core/view/WindowInsetsAnimationCompat;
+SPLandroidx/core/view/WindowInsetsAnimationCompat;->setCallback(Landroid/view/View;Landroidx/core/view/WindowInsetsAnimationCompat$Callback;)V
+Landroidx/core/view/WindowInsetsAnimationCompat$Callback;
+SPLandroidx/core/view/WindowInsetsAnimationCompat$Callback;-><init>(I)V
+SPLandroidx/core/view/WindowInsetsAnimationCompat$Callback;->getDispatchMode()I
+Landroidx/core/view/WindowInsetsAnimationCompat$Impl;
+Landroidx/core/view/WindowInsetsAnimationCompat$Impl30;
+SPLandroidx/core/view/WindowInsetsAnimationCompat$Impl30;->setCallback(Landroid/view/View;Landroidx/core/view/WindowInsetsAnimationCompat$Callback;)V
+Landroidx/core/view/WindowInsetsAnimationCompat$Impl30$ProxyCallback;
+SPLandroidx/core/view/WindowInsetsAnimationCompat$Impl30$ProxyCallback;-><init>(Landroidx/core/view/WindowInsetsAnimationCompat$Callback;)V
 Landroidx/core/view/WindowInsetsCompat;
 SPLandroidx/core/view/WindowInsetsCompat;-><clinit>()V
 SPLandroidx/core/view/WindowInsetsCompat;-><init>(Landroid/view/WindowInsets;)V
@@ -2150,16 +2272,22 @@ SPLandroidx/core/view/WindowInsetsCompat;-><init>(Landroidx/core/view/WindowInse
 SPLandroidx/core/view/WindowInsetsCompat;->consumeDisplayCutout()Landroidx/core/view/WindowInsetsCompat;
 SPLandroidx/core/view/WindowInsetsCompat;->consumeStableInsets()Landroidx/core/view/WindowInsetsCompat;
 SPLandroidx/core/view/WindowInsetsCompat;->consumeSystemWindowInsets()Landroidx/core/view/WindowInsetsCompat;
-SPLandroidx/core/view/WindowInsetsCompat;->copyRootViewBounds(Landroid/view/View;)V
+SPLandroidx/core/view/WindowInsetsCompat;->getInsets(I)Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/WindowInsetsCompat;->getInsetsIgnoringVisibility(I)Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/WindowInsetsCompat;->getRoundedCorner(I)Landroidx/core/view/RoundedCornerCompat;
 SPLandroidx/core/view/WindowInsetsCompat;->getSystemGestureInsets()Landroidx/core/graphics/Insets;
 SPLandroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetBottom()I
 SPLandroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetLeft()I
 SPLandroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetRight()I
 SPLandroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetTop()I
-SPLandroidx/core/view/WindowInsetsCompat;->hasSystemWindowInsets()Z
+SPLandroidx/core/view/WindowInsetsCompat;->init(Landroid/view/View;)V
+SPLandroidx/core/view/WindowInsetsCompat;->isConsumed()Z
+SPLandroidx/core/view/WindowInsetsCompat;->setDisplayShape(Landroidx/core/view/DisplayShapeCompat;)V
 SPLandroidx/core/view/WindowInsetsCompat;->setOverriddenInsets([Landroidx/core/graphics/Insets;)V
 SPLandroidx/core/view/WindowInsetsCompat;->setRootWindowInsets(Landroidx/core/view/WindowInsetsCompat;)V
 SPLandroidx/core/view/WindowInsetsCompat;->setSystemUiVisibility(I)V
+SPLandroidx/core/view/WindowInsetsCompat;->setTypeBoundingRectsMap([[Landroid/graphics/Rect;)V
+SPLandroidx/core/view/WindowInsetsCompat;->setTypeMaxBoundingRectsMap([[Landroid/graphics/Rect;)V
 SPLandroidx/core/view/WindowInsetsCompat;->toWindowInsets()Landroid/view/WindowInsets;
 SPLandroidx/core/view/WindowInsetsCompat;->toWindowInsetsCompat(Landroid/view/WindowInsets;)Landroidx/core/view/WindowInsetsCompat;
 SPLandroidx/core/view/WindowInsetsCompat;->toWindowInsetsCompat(Landroid/view/WindowInsets;Landroid/view/View;)Landroidx/core/view/WindowInsetsCompat;
@@ -2179,6 +2307,9 @@ Landroidx/core/view/WindowInsetsCompat$BuilderImpl31;
 SPLandroidx/core/view/WindowInsetsCompat$BuilderImpl31;-><init>()V
 Landroidx/core/view/WindowInsetsCompat$BuilderImpl34;
 SPLandroidx/core/view/WindowInsetsCompat$BuilderImpl34;-><init>()V
+Landroidx/core/view/WindowInsetsCompat$BuilderImpl35;
+SPLandroidx/core/view/WindowInsetsCompat$BuilderImpl35;-><init>()V
+SPLandroidx/core/view/WindowInsetsCompat$BuilderImpl35;->initTypeBoundingRects(Landroidx/core/view/WindowInsetsCompat;)V
 Landroidx/core/view/WindowInsetsCompat$Impl;
 SPLandroidx/core/view/WindowInsetsCompat$Impl;-><clinit>()V
 SPLandroidx/core/view/WindowInsetsCompat$Impl;-><init>(Landroidx/core/view/WindowInsetsCompat;)V
@@ -2186,13 +2317,17 @@ Landroidx/core/view/WindowInsetsCompat$Impl20;
 SPLandroidx/core/view/WindowInsetsCompat$Impl20;-><clinit>()V
 SPLandroidx/core/view/WindowInsetsCompat$Impl20;-><init>(Landroidx/core/view/WindowInsetsCompat;Landroid/view/WindowInsets;)V
 SPLandroidx/core/view/WindowInsetsCompat$Impl20;->getSystemWindowInsets()Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/WindowInsetsCompat$Impl20;->setDisplayShape(Landroidx/core/view/DisplayShapeCompat;)V
 SPLandroidx/core/view/WindowInsetsCompat$Impl20;->setOverriddenInsets([Landroidx/core/graphics/Insets;)V
 SPLandroidx/core/view/WindowInsetsCompat$Impl20;->setRootWindowInsets(Landroidx/core/view/WindowInsetsCompat;)V
 SPLandroidx/core/view/WindowInsetsCompat$Impl20;->setSystemUiVisibility(I)V
+SPLandroidx/core/view/WindowInsetsCompat$Impl20;->setTypeBoundingRectsMap([[Landroid/graphics/Rect;)V
+SPLandroidx/core/view/WindowInsetsCompat$Impl20;->setTypeMaxBoundingRectsMap([[Landroid/graphics/Rect;)V
 Landroidx/core/view/WindowInsetsCompat$Impl21;
 SPLandroidx/core/view/WindowInsetsCompat$Impl21;-><init>(Landroidx/core/view/WindowInsetsCompat;Landroid/view/WindowInsets;)V
 SPLandroidx/core/view/WindowInsetsCompat$Impl21;->consumeStableInsets()Landroidx/core/view/WindowInsetsCompat;
 SPLandroidx/core/view/WindowInsetsCompat$Impl21;->consumeSystemWindowInsets()Landroidx/core/view/WindowInsetsCompat;
+SPLandroidx/core/view/WindowInsetsCompat$Impl21;->isConsumed()Z
 Landroidx/core/view/WindowInsetsCompat$Impl28;
 SPLandroidx/core/view/WindowInsetsCompat$Impl28;-><init>(Landroidx/core/view/WindowInsetsCompat;Landroid/view/WindowInsets;)V
 SPLandroidx/core/view/WindowInsetsCompat$Impl28;->consumeDisplayCutout()Landroidx/core/view/WindowInsetsCompat;
@@ -2205,15 +2340,48 @@ SPLandroidx/core/view/WindowInsetsCompat$Impl30;-><init>(Landroidx/core/view/Win
 SPLandroidx/core/view/WindowInsetsCompat$Impl30;->copyRootViewBounds(Landroid/view/View;)V
 Landroidx/core/view/WindowInsetsCompat$Impl31;
 SPLandroidx/core/view/WindowInsetsCompat$Impl31;-><init>(Landroidx/core/view/WindowInsetsCompat;Landroid/view/WindowInsets;)V
+SPLandroidx/core/view/WindowInsetsCompat$Impl31;->getRoundedCorner(I)Landroidx/core/view/RoundedCornerCompat;
 Landroidx/core/view/WindowInsetsCompat$Impl34;
 SPLandroidx/core/view/WindowInsetsCompat$Impl34;-><clinit>()V
 SPLandroidx/core/view/WindowInsetsCompat$Impl34;-><init>(Landroidx/core/view/WindowInsetsCompat;Landroid/view/WindowInsets;)V
+SPLandroidx/core/view/WindowInsetsCompat$Impl34;->getInsets(I)Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/WindowInsetsCompat$Impl34;->getInsetsIgnoringVisibility(I)Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/WindowInsetsCompat$Impl34;->initDisplayShape(Landroid/view/View;)V
+Landroidx/core/view/WindowInsetsCompat$Impl35;
+SPLandroidx/core/view/WindowInsetsCompat$Impl35;-><init>(Landroidx/core/view/WindowInsetsCompat;Landroid/view/WindowInsets;)V
+SPLandroidx/core/view/WindowInsetsCompat$Impl35;->initTypeBoundingRectsMaps()V
+Landroidx/core/view/WindowInsetsCompat$Type;
+SPLandroidx/core/view/WindowInsetsCompat$Type;->displayCutout()I
+SPLandroidx/core/view/WindowInsetsCompat$Type;->ime()I
+SPLandroidx/core/view/WindowInsetsCompat$Type;->navigationBars()I
+SPLandroidx/core/view/WindowInsetsCompat$Type;->systemBars()I
+SPLandroidx/core/view/WindowInsetsCompat$Type;->tappableElement()I
+Landroidx/core/view/WindowInsetsCompat$TypeImpl34;
+SPLandroidx/core/view/WindowInsetsCompat$TypeImpl34;->toPlatformType(I)I
+Landroidx/core/view/WindowInsetsControllerCompat;
+SPLandroidx/core/view/WindowInsetsControllerCompat;-><init>(Landroid/view/Window;Landroid/view/View;)V
+SPLandroidx/core/view/WindowInsetsControllerCompat;->setAppearanceLightNavigationBars(Z)V
+SPLandroidx/core/view/WindowInsetsControllerCompat;->setAppearanceLightStatusBars(Z)V
+Landroidx/core/view/WindowInsetsControllerCompat$Impl;
+SPLandroidx/core/view/WindowInsetsControllerCompat$Impl;-><init>()V
+Landroidx/core/view/WindowInsetsControllerCompat$Impl30;
+SPLandroidx/core/view/WindowInsetsControllerCompat$Impl30;-><init>(Landroid/view/Window;Landroidx/core/view/WindowInsetsControllerCompat;Landroidx/core/view/SoftwareKeyboardControllerCompat;)V
+SPLandroidx/core/view/WindowInsetsControllerCompat$Impl30;-><init>(Landroid/view/WindowInsetsController;Landroidx/core/view/WindowInsetsControllerCompat;Landroidx/core/view/SoftwareKeyboardControllerCompat;)V
+Landroidx/core/view/WindowInsetsControllerCompat$Impl31;
+SPLandroidx/core/view/WindowInsetsControllerCompat$Impl31;-><init>(Landroid/view/Window;Landroidx/core/view/WindowInsetsControllerCompat;Landroidx/core/view/SoftwareKeyboardControllerCompat;)V
+Landroidx/core/view/WindowInsetsControllerCompat$Impl35;
+SPLandroidx/core/view/WindowInsetsControllerCompat$Impl35;-><init>(Landroid/view/Window;Landroidx/core/view/WindowInsetsControllerCompat;Landroidx/core/view/SoftwareKeyboardControllerCompat;)V
+SPLandroidx/core/view/WindowInsetsControllerCompat$Impl35;->setAppearanceLightNavigationBars(Z)V
+SPLandroidx/core/view/WindowInsetsControllerCompat$Impl35;->setAppearanceLightStatusBars(Z)V
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;
 SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;-><clinit>()V
 SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;-><init>(Landroid/view/accessibility/AccessibilityNodeInfo;)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->addAction(Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;)V
 SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->addSpansToExtras(Ljava/lang/CharSequence;Landroid/view/View;)V
 SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->removeAction(Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;)Z
 SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setClassName(Ljava/lang/CharSequence;)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setCollectionInfo(Ljava/lang/Object;)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setCollectionItemInfo(Ljava/lang/Object;)V
 SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setFocusable(Z)V
 SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setFocused(Z)V
 SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setHeading(Z)V
@@ -2231,6 +2399,12 @@ Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$Api30Impl;
 SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$Api30Impl;->setStateDescription(Landroid/view/accessibility/AccessibilityNodeInfo;Ljava/lang/CharSequence;)V
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$Api34Impl;
 SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$Api34Impl;->getActionScrollInDirection()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat;
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat;-><init>(Ljava/lang/Object;)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat;->obtain(IIZI)Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat;
+Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat;
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat;-><init>(Ljava/lang/Object;)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat;->obtain(IIIIZZ)Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat;
 Landroidx/core/view/accessibility/AccessibilityViewCommand;
 Landroidx/core/view/accessibility/AccessibilityViewCommand$CommandArguments;
 Landroidx/core/view/accessibility/AccessibilityViewCommand$MoveAtGranularityArguments;
@@ -2240,14 +2414,107 @@ Landroidx/core/view/accessibility/AccessibilityViewCommand$ScrollToPositionArgum
 Landroidx/core/view/accessibility/AccessibilityViewCommand$SetProgressArguments;
 Landroidx/core/view/accessibility/AccessibilityViewCommand$SetSelectionArguments;
 Landroidx/core/view/accessibility/AccessibilityViewCommand$SetTextArguments;
+Landroidx/core/view/insets/ColorProtection;
+SPLandroidx/core/view/insets/ColorProtection;-><init>(I)V
+SPLandroidx/core/view/insets/ColorProtection;-><init>(II)V
+SPLandroidx/core/view/insets/ColorProtection;->dispatchColorHint(I)V
+SPLandroidx/core/view/insets/ColorProtection;->occupiesCorners()Z
+SPLandroidx/core/view/insets/ColorProtection;->setColor(I)V
+SPLandroidx/core/view/insets/ColorProtection;->setColorInner(I)V
+Landroidx/core/view/insets/Protection;
+SPLandroidx/core/view/insets/Protection;-><clinit>()V
+SPLandroidx/core/view/insets/Protection;-><init>(I)V
+SPLandroidx/core/view/insets/Protection;->dispatchInsets(Landroidx/core/graphics/Insets;Landroidx/core/graphics/Insets;Landroidx/core/graphics/Insets;)Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/insets/Protection;->getAttributes()Landroidx/core/view/insets/Protection$Attributes;
+SPLandroidx/core/view/insets/Protection;->getController()Ljava/lang/Object;
+SPLandroidx/core/view/insets/Protection;->getSide()I
+SPLandroidx/core/view/insets/Protection;->getThickness(I)I
+SPLandroidx/core/view/insets/Protection;->setController(Ljava/lang/Object;)V
+SPLandroidx/core/view/insets/Protection;->setSystemAlpha(F)V
+SPLandroidx/core/view/insets/Protection;->setSystemInsetAmount(F)V
+SPLandroidx/core/view/insets/Protection;->setSystemVisible(Z)V
+SPLandroidx/core/view/insets/Protection;->updateAlpha()V
+SPLandroidx/core/view/insets/Protection;->updateInsetAmount()V
+SPLandroidx/core/view/insets/Protection;->updateLayout()Landroidx/core/graphics/Insets;
+Landroidx/core/view/insets/Protection$Attributes;
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$fgetmHeight(Landroidx/core/view/insets/Protection$Attributes;)I
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$fgetmWidth(Landroidx/core/view/insets/Protection$Attributes;)I
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$msetAlpha(Landroidx/core/view/insets/Protection$Attributes;F)V
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$msetHeight(Landroidx/core/view/insets/Protection$Attributes;I)V
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$msetMargin(Landroidx/core/view/insets/Protection$Attributes;Landroidx/core/graphics/Insets;)V
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$msetTranslationX(Landroidx/core/view/insets/Protection$Attributes;F)V
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$msetTranslationY(Landroidx/core/view/insets/Protection$Attributes;F)V
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$msetVisible(Landroidx/core/view/insets/Protection$Attributes;Z)V
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$msetWidth(Landroidx/core/view/insets/Protection$Attributes;I)V
+SPLandroidx/core/view/insets/Protection$Attributes;-><init>()V
+SPLandroidx/core/view/insets/Protection$Attributes;->getAlpha()F
+SPLandroidx/core/view/insets/Protection$Attributes;->getDrawable()Landroid/graphics/drawable/Drawable;
+SPLandroidx/core/view/insets/Protection$Attributes;->getHeight()I
+SPLandroidx/core/view/insets/Protection$Attributes;->getMargin()Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/insets/Protection$Attributes;->getTranslationX()F
+SPLandroidx/core/view/insets/Protection$Attributes;->getTranslationY()F
+SPLandroidx/core/view/insets/Protection$Attributes;->getWidth()I
+SPLandroidx/core/view/insets/Protection$Attributes;->isVisible()Z
+SPLandroidx/core/view/insets/Protection$Attributes;->setAlpha(F)V
+SPLandroidx/core/view/insets/Protection$Attributes;->setCallback(Landroidx/core/view/insets/Protection$Attributes$Callback;)V
+SPLandroidx/core/view/insets/Protection$Attributes;->setHeight(I)V
+SPLandroidx/core/view/insets/Protection$Attributes;->setMargin(Landroidx/core/graphics/Insets;)V
+SPLandroidx/core/view/insets/Protection$Attributes;->setTranslationX(F)V
+SPLandroidx/core/view/insets/Protection$Attributes;->setTranslationY(F)V
+SPLandroidx/core/view/insets/Protection$Attributes;->setVisible(Z)V
+SPLandroidx/core/view/insets/Protection$Attributes;->setWidth(I)V
+Landroidx/core/view/insets/Protection$Attributes$Callback;
+Landroidx/core/view/insets/ProtectionGroup;
+SPLandroidx/core/view/insets/ProtectionGroup;-><init>(Landroidx/core/view/insets/SystemBarStateMonitor;Ljava/util/List;)V
+SPLandroidx/core/view/insets/ProtectionGroup;->addProtections(Ljava/util/List;Z)V
+SPLandroidx/core/view/insets/ProtectionGroup;->dispose()V
+SPLandroidx/core/view/insets/ProtectionGroup;->getProtection(I)Landroidx/core/view/insets/Protection;
+SPLandroidx/core/view/insets/ProtectionGroup;->onColorHintChanged(I)V
+SPLandroidx/core/view/insets/ProtectionGroup;->onInsetsChanged(Landroidx/core/graphics/Insets;Landroidx/core/graphics/Insets;)V
+SPLandroidx/core/view/insets/ProtectionGroup;->size()I
+SPLandroidx/core/view/insets/ProtectionGroup;->updateInsets()V
+Landroidx/core/view/insets/ProtectionLayout;
+SPLandroidx/core/view/insets/ProtectionLayout;-><clinit>()V
+SPLandroidx/core/view/insets/ProtectionLayout;-><init>(Landroid/content/Context;Ljava/util/List;)V
+SPLandroidx/core/view/insets/ProtectionLayout;->addProtectionView(Landroid/content/Context;ILandroidx/core/view/insets/Protection;)V
+SPLandroidx/core/view/insets/ProtectionLayout;->addProtectionViews()V
+SPLandroidx/core/view/insets/ProtectionLayout;->addView(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V
+SPLandroidx/core/view/insets/ProtectionLayout;->getOrInstallSystemBarStateMonitor()Landroidx/core/view/insets/SystemBarStateMonitor;
+SPLandroidx/core/view/insets/ProtectionLayout;->maybeUninstallSystemBarStateMonitor()V
+SPLandroidx/core/view/insets/ProtectionLayout;->onAttachedToWindow()V
+SPLandroidx/core/view/insets/ProtectionLayout;->onDetachedFromWindow()V
+SPLandroidx/core/view/insets/ProtectionLayout;->removeProtectionViews()V
+SPLandroidx/core/view/insets/ProtectionLayout;->setProtections(Ljava/util/List;)V
+Landroidx/core/view/insets/ProtectionLayout$1;
+SPLandroidx/core/view/insets/ProtectionLayout$1;-><init>(Landroidx/core/view/insets/ProtectionLayout;Landroid/widget/FrameLayout$LayoutParams;Landroid/view/View;)V
+SPLandroidx/core/view/insets/ProtectionLayout$1;->onAlphaChanged(F)V
+SPLandroidx/core/view/insets/ProtectionLayout$1;->onHeightChanged(I)V
+SPLandroidx/core/view/insets/ProtectionLayout$1;->onVisibilityChanged(Z)V
+Landroidx/core/view/insets/SystemBarStateMonitor;
+SPLandroidx/core/view/insets/SystemBarStateMonitor;-><init>(Landroid/view/ViewGroup;)V
+SPLandroidx/core/view/insets/SystemBarStateMonitor;->addCallback(Landroidx/core/view/insets/SystemBarStateMonitor$Callback;)V
+SPLandroidx/core/view/insets/SystemBarStateMonitor;->addViewWhenReady(Landroid/view/ViewGroup;Landroid/view/View;I)V
+SPLandroidx/core/view/insets/SystemBarStateMonitor;->detachFromWindow()V
+SPLandroidx/core/view/insets/SystemBarStateMonitor;->getInsets(Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/insets/SystemBarStateMonitor;->getInsetsIgnoringVisibility(Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/insets/SystemBarStateMonitor;->hasCallback()Z
+SPLandroidx/core/view/insets/SystemBarStateMonitor;->lambda$new$0$androidx-core-view-insets-SystemBarStateMonitor(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+SPLandroidx/core/view/insets/SystemBarStateMonitor;->removeCallback(Landroidx/core/view/insets/SystemBarStateMonitor$Callback;)V
+Landroidx/core/view/insets/SystemBarStateMonitor$$ExternalSyntheticLambda0;
+SPLandroidx/core/view/insets/SystemBarStateMonitor$$ExternalSyntheticLambda0;-><init>(Landroidx/core/view/insets/SystemBarStateMonitor;)V
+SPLandroidx/core/view/insets/SystemBarStateMonitor$$ExternalSyntheticLambda0;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+Landroidx/core/view/insets/SystemBarStateMonitor$$ExternalSyntheticLambda1;
+SPLandroidx/core/view/insets/SystemBarStateMonitor$$ExternalSyntheticLambda1;-><init>(Landroidx/core/view/insets/SystemBarStateMonitor;)V
+Landroidx/core/view/insets/SystemBarStateMonitor$1;
+SPLandroidx/core/view/insets/SystemBarStateMonitor$1;-><init>(Landroidx/core/view/insets/SystemBarStateMonitor;Landroid/content/Context;Landroid/view/ViewGroup;)V
+Landroidx/core/view/insets/SystemBarStateMonitor$2;
+SPLandroidx/core/view/insets/SystemBarStateMonitor$2;-><init>(Landroidx/core/view/insets/SystemBarStateMonitor;I)V
+Landroidx/core/view/insets/SystemBarStateMonitor$Callback;
 Landroidx/core/widget/AutoSizeableTextView;
 Landroidx/core/widget/CheckedTextViewCompat;
 SPLandroidx/core/widget/CheckedTextViewCompat;->getCheckMarkDrawable(Landroid/widget/CheckedTextView;)Landroid/graphics/drawable/Drawable;
-Landroidx/core/widget/ImageViewCompat;
-SPLandroidx/core/widget/ImageViewCompat;->setImageTintList(Landroid/widget/ImageView;Landroid/content/res/ColorStateList;)V
-Landroidx/core/widget/ImageViewCompat$Api21Impl;
-SPLandroidx/core/widget/ImageViewCompat$Api21Impl;->setImageTintList(Landroid/widget/ImageView;Landroid/content/res/ColorStateList;)V
 Landroidx/core/widget/TextViewCompat;
+SPLandroidx/core/widget/TextViewCompat;->setLineHeight(Landroid/widget/TextView;I)V
 SPLandroidx/core/widget/TextViewCompat;->setTextAppearance(Landroid/widget/TextView;I)V
 Landroidx/core/widget/TintableCheckedTextView;
 Landroidx/core/widget/TintableCompoundDrawablesView;
@@ -2273,6 +2540,7 @@ SPLandroidx/customview/widget/ViewDragHelper;->continueSettling(Z)Z
 SPLandroidx/customview/widget/ViewDragHelper;->create(Landroid/view/ViewGroup;FLandroidx/customview/widget/ViewDragHelper$Callback;)Landroidx/customview/widget/ViewDragHelper;
 SPLandroidx/customview/widget/ViewDragHelper;->create(Landroid/view/ViewGroup;Landroidx/customview/widget/ViewDragHelper$Callback;)Landroidx/customview/widget/ViewDragHelper;
 SPLandroidx/customview/widget/ViewDragHelper;->getDefaultEdgeSize()I
+SPLandroidx/customview/widget/ViewDragHelper;->requireNonNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 SPLandroidx/customview/widget/ViewDragHelper;->setEdgeSize(I)V
 SPLandroidx/customview/widget/ViewDragHelper;->setEdgeTrackingEnabled(I)V
 SPLandroidx/customview/widget/ViewDragHelper;->setMinVelocity(F)V
@@ -2280,6 +2548,8 @@ Landroidx/customview/widget/ViewDragHelper$1;
 SPLandroidx/customview/widget/ViewDragHelper$1;-><init>()V
 Landroidx/customview/widget/ViewDragHelper$2;
 SPLandroidx/customview/widget/ViewDragHelper$2;-><init>(Landroidx/customview/widget/ViewDragHelper;)V
+Landroidx/customview/widget/ViewDragHelper$3;
+SPLandroidx/customview/widget/ViewDragHelper$3;-><init>(Landroidx/customview/widget/ViewDragHelper;)V
 Landroidx/customview/widget/ViewDragHelper$Callback;
 SPLandroidx/customview/widget/ViewDragHelper$Callback;-><init>()V
 Landroidx/draganddrop/DropAffordanceHighlighter;
@@ -2320,6 +2590,7 @@ Landroidx/drawerlayout/R$attr;
 Landroidx/drawerlayout/R$styleable;
 SPLandroidx/drawerlayout/R$styleable;-><clinit>()V
 Landroidx/drawerlayout/widget/ClosableDrawerLayout;
+SPLandroidx/drawerlayout/widget/ClosableDrawerLayout;-><clinit>()V
 SPLandroidx/drawerlayout/widget/ClosableDrawerLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 SPLandroidx/drawerlayout/widget/ClosableDrawerLayout;->setAnimationEnabled(Z)V
 Landroidx/drawerlayout/widget/DrawerLayout;
@@ -2342,22 +2613,15 @@ SPLandroidx/drawerlayout/widget/DrawerLayout;->isDrawerOpen(I)Z
 SPLandroidx/drawerlayout/widget/DrawerLayout;->isDrawerOpen(Landroid/view/View;)Z
 SPLandroidx/drawerlayout/widget/DrawerLayout;->isDrawerView(Landroid/view/View;)Z
 SPLandroidx/drawerlayout/widget/DrawerLayout;->onAttachedToWindow()V
-SPLandroidx/drawerlayout/widget/DrawerLayout;->onDraw(Landroid/graphics/Canvas;)V
 SPLandroidx/drawerlayout/widget/DrawerLayout;->onLayout(ZIIII)V
 SPLandroidx/drawerlayout/widget/DrawerLayout;->onMeasure(II)V
 SPLandroidx/drawerlayout/widget/DrawerLayout;->onRtlPropertiesChanged(I)V
 SPLandroidx/drawerlayout/widget/DrawerLayout;->removeDrawerListener(Landroidx/drawerlayout/widget/DrawerLayout$DrawerListener;)V
 SPLandroidx/drawerlayout/widget/DrawerLayout;->requestLayout()V
 SPLandroidx/drawerlayout/widget/DrawerLayout;->resolveShadowDrawables()V
-SPLandroidx/drawerlayout/widget/DrawerLayout;->setChildInsets(Ljava/lang/Object;Z)V
-SPLandroidx/drawerlayout/widget/DrawerLayout;->setDrawerShadow(II)V
-SPLandroidx/drawerlayout/widget/DrawerLayout;->setDrawerShadow(Landroid/graphics/drawable/Drawable;I)V
 SPLandroidx/drawerlayout/widget/DrawerLayout;->setStatusBarBackgroundColor(I)V
 Landroidx/drawerlayout/widget/DrawerLayout$1;
 SPLandroidx/drawerlayout/widget/DrawerLayout$1;-><init>(Landroidx/drawerlayout/widget/DrawerLayout;)V
-Landroidx/drawerlayout/widget/DrawerLayout$2;
-SPLandroidx/drawerlayout/widget/DrawerLayout$2;-><init>(Landroidx/drawerlayout/widget/DrawerLayout;)V
-SPLandroidx/drawerlayout/widget/DrawerLayout$2;->onApplyWindowInsets(Landroid/view/View;Landroid/view/WindowInsets;)Landroid/view/WindowInsets;
 Landroidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate;
 SPLandroidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate;-><init>(Landroidx/drawerlayout/widget/DrawerLayout;)V
 SPLandroidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
@@ -2423,6 +2687,7 @@ Landroidx/dynamicanimation/animation/DynamicAnimation$9;
 SPLandroidx/dynamicanimation/animation/DynamicAnimation$9;-><init>(Ljava/lang/String;)V
 Landroidx/dynamicanimation/animation/DynamicAnimation$MassState;
 SPLandroidx/dynamicanimation/animation/DynamicAnimation$MassState;-><init>()V
+Landroidx/dynamicanimation/animation/DynamicAnimation$OnAnimationEndListener;
 Landroidx/dynamicanimation/animation/DynamicAnimation$ViewProperty;
 SPLandroidx/dynamicanimation/animation/DynamicAnimation$ViewProperty;-><init>(Ljava/lang/String;)V
 SPLandroidx/dynamicanimation/animation/DynamicAnimation$ViewProperty;-><init>(Ljava/lang/String;Landroidx/dynamicanimation/animation/DynamicAnimation$1;)V
@@ -2433,6 +2698,7 @@ Landroidx/dynamicanimation/animation/FrameCallbackScheduler;
 Landroidx/dynamicanimation/animation/SpringAnimation;
 SPLandroidx/dynamicanimation/animation/SpringAnimation;-><init>(Ljava/lang/Object;Landroidx/dynamicanimation/animation/FloatPropertyCompat;)V
 SPLandroidx/dynamicanimation/animation/SpringAnimation;->canSkipToEnd()Z
+SPLandroidx/dynamicanimation/animation/SpringAnimation;->getSpring()Landroidx/dynamicanimation/animation/SpringForce;
 SPLandroidx/dynamicanimation/animation/SpringAnimation;->setSpring(Landroidx/dynamicanimation/animation/SpringForce;)Landroidx/dynamicanimation/animation/SpringAnimation;
 SPLandroidx/dynamicanimation/animation/SpringAnimation;->skipToEnd()V
 Landroidx/dynamicanimation/animation/SpringForce;
@@ -2612,8 +2878,8 @@ SPLandroidx/emoji2/text/MetadataRepo;->getRootNode()Landroidx/emoji2/text/Metada
 SPLandroidx/emoji2/text/MetadataRepo;->put(Landroidx/emoji2/text/TypefaceEmojiRasterizer;)V
 Landroidx/emoji2/text/MetadataRepo$Node;
 SPLandroidx/emoji2/text/MetadataRepo$Node;-><init>()V
-HSPLandroidx/emoji2/text/MetadataRepo$Node;-><init>(I)V
-HSPLandroidx/emoji2/text/MetadataRepo$Node;->get(I)Landroidx/emoji2/text/MetadataRepo$Node;
+SPLandroidx/emoji2/text/MetadataRepo$Node;-><init>(I)V
+SPLandroidx/emoji2/text/MetadataRepo$Node;->get(I)Landroidx/emoji2/text/MetadataRepo$Node;
 SPLandroidx/emoji2/text/MetadataRepo$Node;->getData()Landroidx/emoji2/text/TypefaceEmojiRasterizer;
 SPLandroidx/emoji2/text/MetadataRepo$Node;->put(Landroidx/emoji2/text/TypefaceEmojiRasterizer;II)V
 Landroidx/emoji2/text/SpannableBuilder;
@@ -2628,17 +2894,17 @@ SPLandroidx/emoji2/text/SpannableBuilder;->removeSpan(Ljava/lang/Object;)V
 SPLandroidx/emoji2/text/SpannableBuilder;->setSpan(Ljava/lang/Object;III)V
 Landroidx/emoji2/text/TypefaceEmojiRasterizer;
 SPLandroidx/emoji2/text/TypefaceEmojiRasterizer;-><clinit>()V
-SPLandroidx/emoji2/text/TypefaceEmojiRasterizer;-><init>(Landroidx/emoji2/text/MetadataRepo;I)V
-HSPLandroidx/emoji2/text/TypefaceEmojiRasterizer;->getCodepointAt(I)I
+HSPLandroidx/emoji2/text/TypefaceEmojiRasterizer;-><init>(Landroidx/emoji2/text/MetadataRepo;I)V
+SPLandroidx/emoji2/text/TypefaceEmojiRasterizer;->getCodepointAt(I)I
 SPLandroidx/emoji2/text/TypefaceEmojiRasterizer;->getCodepointsLength()I
 SPLandroidx/emoji2/text/TypefaceEmojiRasterizer;->getId()I
-SPLandroidx/emoji2/text/TypefaceEmojiRasterizer;->getMetadataItem()Landroidx/emoji2/text/flatbuffer/MetadataItem;
+HSPLandroidx/emoji2/text/TypefaceEmojiRasterizer;->getMetadataItem()Landroidx/emoji2/text/flatbuffer/MetadataItem;
 SPLandroidx/emoji2/text/TypefaceEmojiRasterizer;->isDefaultEmoji()Z
 Landroidx/emoji2/text/UnprecomputeTextOnModificationSpannable;
 Landroidx/emoji2/text/flatbuffer/MetadataItem;
 SPLandroidx/emoji2/text/flatbuffer/MetadataItem;-><init>()V
-SPLandroidx/emoji2/text/flatbuffer/MetadataItem;->__assign(ILjava/nio/ByteBuffer;)Landroidx/emoji2/text/flatbuffer/MetadataItem;
-SPLandroidx/emoji2/text/flatbuffer/MetadataItem;->__init(ILjava/nio/ByteBuffer;)V
+HSPLandroidx/emoji2/text/flatbuffer/MetadataItem;->__assign(ILjava/nio/ByteBuffer;)Landroidx/emoji2/text/flatbuffer/MetadataItem;
+HSPLandroidx/emoji2/text/flatbuffer/MetadataItem;->__init(ILjava/nio/ByteBuffer;)V
 SPLandroidx/emoji2/text/flatbuffer/MetadataItem;->codepoints(I)I
 SPLandroidx/emoji2/text/flatbuffer/MetadataItem;->codepointsLength()I
 SPLandroidx/emoji2/text/flatbuffer/MetadataItem;->emojiStyle()Z
@@ -2654,7 +2920,7 @@ SPLandroidx/emoji2/text/flatbuffer/MetadataList;->listLength()I
 Landroidx/emoji2/text/flatbuffer/Table;
 SPLandroidx/emoji2/text/flatbuffer/Table;-><init>()V
 HSPLandroidx/emoji2/text/flatbuffer/Table;->__indirect(I)I
-SPLandroidx/emoji2/text/flatbuffer/Table;->__offset(I)I
+HSPLandroidx/emoji2/text/flatbuffer/Table;->__offset(I)I
 SPLandroidx/emoji2/text/flatbuffer/Table;->__reset(ILjava/nio/ByteBuffer;)V
 HSPLandroidx/emoji2/text/flatbuffer/Table;->__vector(I)I
 SPLandroidx/emoji2/text/flatbuffer/Table;->__vector_len(I)I
@@ -2686,6 +2952,7 @@ Landroidx/emoji2/viewsintegration/EmojiInputFilter$InitCallbackImpl;
 SPLandroidx/emoji2/viewsintegration/EmojiInputFilter$InitCallbackImpl;-><init>(Landroid/widget/TextView;Landroidx/emoji2/viewsintegration/EmojiInputFilter;)V
 SPLandroidx/emoji2/viewsintegration/EmojiInputFilter$InitCallbackImpl;->isInputFilterCurrentlyRegisteredOnTextView(Landroid/widget/TextView;Landroid/text/InputFilter;)Z
 SPLandroidx/emoji2/viewsintegration/EmojiInputFilter$InitCallbackImpl;->onInitialized()V
+SPLandroidx/emoji2/viewsintegration/EmojiInputFilter$InitCallbackImpl;->run()V
 Landroidx/emoji2/viewsintegration/EmojiKeyListener;
 SPLandroidx/emoji2/viewsintegration/EmojiKeyListener;-><init>(Landroid/text/method/KeyListener;)V
 SPLandroidx/emoji2/viewsintegration/EmojiKeyListener;-><init>(Landroid/text/method/KeyListener;Landroidx/emoji2/viewsintegration/EmojiKeyListener$EmojiCompatHandleKeyDownHelper;)V
@@ -2719,11 +2986,12 @@ Landroidx/emoji2/viewsintegration/EmojiTextWatcher;
 SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher;-><init>(Landroid/widget/EditText;Z)V
 SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher;->afterTextChanged(Landroid/text/Editable;)V
 SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher;->beforeTextChanged(Ljava/lang/CharSequence;III)V
+SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher;->getInitCallback()Landroidx/emoji2/text/EmojiCompat$InitCallback;
 SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher;->onTextChanged(Ljava/lang/CharSequence;III)V
-SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher;->processTextOnEnablingEvent(Landroid/widget/EditText;I)V
 SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher;->setEnabled(Z)V
 SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher;->shouldSkipForDisabledOrNotConfigured()Z
 Landroidx/emoji2/viewsintegration/EmojiTextWatcher$InitCallbackImpl;
+SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher$InitCallbackImpl;-><init>(Landroid/widget/EditText;)V
 SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher$InitCallbackImpl;->onInitialized()V
 Landroidx/emoji2/viewsintegration/EmojiTransformationMethod;
 SPLandroidx/emoji2/viewsintegration/EmojiTransformationMethod;-><init>(Landroid/text/method/TransformationMethod;)V
@@ -2742,6 +3010,7 @@ SPLandroidx/fragment/app/BackStackRecord;->generateOps(Ljava/util/ArrayList;Ljav
 SPLandroidx/fragment/app/BackStackRecord;->runOnCommitRunnables()V
 Landroidx/fragment/app/DefaultSpecialEffectsController;
 SPLandroidx/fragment/app/DefaultSpecialEffectsController;-><init>(Landroid/view/ViewGroup;)V
+Landroidx/fragment/app/DialogFragment;
 Landroidx/fragment/app/Fragment;
 SPLandroidx/fragment/app/Fragment;-><clinit>()V
 SPLandroidx/fragment/app/Fragment;-><init>()V
@@ -2767,7 +3036,25 @@ SPLandroidx/fragment/app/Fragment;->getViewModelStore()Landroidx/lifecycle/ViewM
 SPLandroidx/fragment/app/Fragment;->initLifecycle()V
 SPLandroidx/fragment/app/Fragment;->initState()V
 SPLandroidx/fragment/app/Fragment;->instantiate(Landroid/content/Context;Ljava/lang/String;Landroid/os/Bundle;)Landroidx/fragment/app/Fragment;
-SPLandroidx/fragment/app/Fragment;->lambda$performCreateView$0$androidx-fragment-app-Fragment()V
+SPLandroidx/fragment/app/Fragment;->lambda$performActivityCreated$8$androidx-fragment-app-Fragment(Landroid/os/Bundle;)V
+SPLandroidx/fragment/app/Fragment;->lambda$performAttach$2$androidx-fragment-app-Fragment()V
+SPLandroidx/fragment/app/Fragment;->lambda$performCreate$3$androidx-fragment-app-Fragment(Landroid/os/Bundle;)V
+SPLandroidx/fragment/app/Fragment;->lambda$performCreate$4$androidx-fragment-app-Fragment()V
+SPLandroidx/fragment/app/Fragment;->lambda$performCreateView$5$androidx-fragment-app-Fragment()V
+SPLandroidx/fragment/app/Fragment;->lambda$performCreateView$6$androidx-fragment-app-Fragment(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)V
+SPLandroidx/fragment/app/Fragment;->lambda$performDestroy$19$androidx-fragment-app-Fragment()V
+SPLandroidx/fragment/app/Fragment;->lambda$performDestroyView$18$androidx-fragment-app-Fragment()V
+SPLandroidx/fragment/app/Fragment;->lambda$performPause$14$androidx-fragment-app-Fragment()V
+SPLandroidx/fragment/app/Fragment;->lambda$performPause$15$androidx-fragment-app-Fragment()V
+SPLandroidx/fragment/app/Fragment;->lambda$performResume$11$androidx-fragment-app-Fragment()V
+SPLandroidx/fragment/app/Fragment;->lambda$performResume$12$androidx-fragment-app-Fragment()V
+SPLandroidx/fragment/app/Fragment;->lambda$performStart$10$androidx-fragment-app-Fragment()V
+SPLandroidx/fragment/app/Fragment;->lambda$performStart$9$androidx-fragment-app-Fragment()V
+SPLandroidx/fragment/app/Fragment;->lambda$performStop$16$androidx-fragment-app-Fragment()V
+SPLandroidx/fragment/app/Fragment;->lambda$performStop$17$androidx-fragment-app-Fragment()V
+SPLandroidx/fragment/app/Fragment;->lambda$performViewCreated$7$androidx-fragment-app-Fragment(Landroid/os/Bundle;)V
+SPLandroidx/fragment/app/Fragment;->lambda$restoreViewState$0$androidx-fragment-app-Fragment(Landroid/os/Bundle;)V
+SPLandroidx/fragment/app/Fragment;->lambda$restoreViewState$1$androidx-fragment-app-Fragment()V
 SPLandroidx/fragment/app/Fragment;->noteStateNotSaved()V
 SPLandroidx/fragment/app/Fragment;->onActivityCreated(Landroid/os/Bundle;)V
 SPLandroidx/fragment/app/Fragment;->onAttach(Landroid/app/Activity;)V
@@ -2814,21 +3101,99 @@ SPLandroidx/fragment/app/Fragment;->setSharedElementNames(Ljava/util/ArrayList;L
 Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda0;
 SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda0;-><init>(Landroidx/fragment/app/Fragment;)V
 SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda0;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda1;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda1;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda1;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda10;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda10;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda10;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda11;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda11;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda11;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda12;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda12;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda12;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda13;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda13;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda13;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda14;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda14;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda14;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda15;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda15;-><init>(Landroidx/fragment/app/Fragment;Landroid/os/Bundle;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda15;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda16;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda16;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda16;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda17;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda17;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda17;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda18;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda18;-><init>(Landroidx/fragment/app/Fragment;Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda18;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda19;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda19;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda19;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda2;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda2;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda2;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda20;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda20;-><init>(Landroidx/fragment/app/Fragment;Landroid/os/Bundle;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda20;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda21;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda21;-><init>(Landroidx/fragment/app/Fragment;Landroid/os/Bundle;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda21;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda22;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda22;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda22;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda23;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda23;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda23;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda24;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda24;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda24;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda25;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda25;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda25;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda26;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda26;-><init>(Landroidx/fragment/app/Fragment;Landroid/os/Bundle;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda26;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda3;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda3;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda3;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda4;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda4;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda4;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda6;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda6;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda6;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda7;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda7;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda7;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda8;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda8;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda8;->run()V
+Landroidx/fragment/app/Fragment$$ExternalSyntheticLambda9;
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda9;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$$ExternalSyntheticLambda9;->run()V
 Landroidx/fragment/app/Fragment$1;
 SPLandroidx/fragment/app/Fragment$1;-><init>(Landroidx/fragment/app/Fragment;)V
 Landroidx/fragment/app/Fragment$2;
 SPLandroidx/fragment/app/Fragment$2;-><init>(Landroidx/fragment/app/Fragment;)V
 SPLandroidx/fragment/app/Fragment$2;->onPreAttached()V
-Landroidx/fragment/app/Fragment$5;
-SPLandroidx/fragment/app/Fragment$5;-><init>(Landroidx/fragment/app/Fragment;)V
+Landroidx/fragment/app/Fragment$3;
+SPLandroidx/fragment/app/Fragment$3;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$3;->onPreAttached()V
 Landroidx/fragment/app/Fragment$6;
 SPLandroidx/fragment/app/Fragment$6;-><init>(Landroidx/fragment/app/Fragment;)V
-SPLandroidx/fragment/app/Fragment$6;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+Landroidx/fragment/app/Fragment$7;
+SPLandroidx/fragment/app/Fragment$7;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/Fragment$7;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
 Landroidx/fragment/app/Fragment$AnimationInfo;
 SPLandroidx/fragment/app/Fragment$AnimationInfo;-><init>()V
 Landroidx/fragment/app/Fragment$OnPreAttachedListener;
 SPLandroidx/fragment/app/Fragment$OnPreAttachedListener;-><init>()V
-SPLandroidx/fragment/app/Fragment$OnPreAttachedListener;-><init>(Landroidx/fragment/app/Fragment$1;)V
+SPLandroidx/fragment/app/Fragment$OnPreAttachedListener;-><init>(Landroidx/fragment/app/Fragment-IA;)V
 Landroidx/fragment/app/FragmentActivity;
 SPLandroidx/fragment/app/FragmentActivity;-><init>(I)V
 SPLandroidx/fragment/app/FragmentActivity;->dispatchFragmentsOnCreateView(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;
@@ -2886,8 +3251,10 @@ Landroidx/fragment/app/FragmentContainerView;
 SPLandroidx/fragment/app/FragmentContainerView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;Landroidx/fragment/app/FragmentManager;)V
 SPLandroidx/fragment/app/FragmentContainerView;->addDisappearingFragmentView(Landroid/view/View;)V
 SPLandroidx/fragment/app/FragmentContainerView;->addView(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V
+SPLandroidx/fragment/app/FragmentContainerView;->dispatchApplyWindowInsets(Landroid/view/WindowInsets;)Landroid/view/WindowInsets;
 SPLandroidx/fragment/app/FragmentContainerView;->dispatchDraw(Landroid/graphics/Canvas;)V
 SPLandroidx/fragment/app/FragmentContainerView;->drawChild(Landroid/graphics/Canvas;Landroid/view/View;J)Z
+SPLandroidx/fragment/app/FragmentContainerView;->onApplyWindowInsets(Landroid/view/WindowInsets;)Landroid/view/WindowInsets;
 SPLandroidx/fragment/app/FragmentContainerView;->removeView(Landroid/view/View;)V
 SPLandroidx/fragment/app/FragmentContainerView;->setDrawDisappearingViewsLast(Z)V
 Landroidx/fragment/app/FragmentController;
@@ -2943,10 +3310,10 @@ Landroidx/fragment/app/FragmentLifecycleCallbacksDispatcher$FragmentLifecycleCal
 SPLandroidx/fragment/app/FragmentLifecycleCallbacksDispatcher$FragmentLifecycleCallbacksHolder;-><init>(Landroidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks;Z)V
 SPLandroidx/fragment/app/FragmentLifecycleCallbacksDispatcher$FragmentLifecycleCallbacksHolder;->getCallback()Landroidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks;
 Landroidx/fragment/app/FragmentManager;
+SPLandroidx/fragment/app/FragmentManager;->-$$Nest$fgetmResultListeners(Landroidx/fragment/app/FragmentManager;)Ljava/util/Map;
+SPLandroidx/fragment/app/FragmentManager;->-$$Nest$fgetmResults(Landroidx/fragment/app/FragmentManager;)Ljava/util/Map;
 SPLandroidx/fragment/app/FragmentManager;-><clinit>()V
 SPLandroidx/fragment/app/FragmentManager;-><init>()V
-SPLandroidx/fragment/app/FragmentManager;->access$100(Landroidx/fragment/app/FragmentManager;)Ljava/util/Map;
-SPLandroidx/fragment/app/FragmentManager;->access$200(Landroidx/fragment/app/FragmentManager;)Ljava/util/Map;
 SPLandroidx/fragment/app/FragmentManager;->addFragment(Landroidx/fragment/app/Fragment;)Landroidx/fragment/app/FragmentStateManager;
 SPLandroidx/fragment/app/FragmentManager;->addFragmentOnAttachListener(Landroidx/fragment/app/FragmentOnAttachListener;)V
 SPLandroidx/fragment/app/FragmentManager;->attachController(Landroidx/fragment/app/FragmentHostCallback;Landroidx/fragment/app/FragmentContainer;Landroidx/fragment/app/Fragment;)V
@@ -2979,6 +3346,7 @@ SPLandroidx/fragment/app/FragmentManager;->execSingleAction(Landroidx/fragment/a
 SPLandroidx/fragment/app/FragmentManager;->executeOps(Ljava/util/ArrayList;Ljava/util/ArrayList;II)V
 SPLandroidx/fragment/app/FragmentManager;->executeOpsTogether(Ljava/util/ArrayList;Ljava/util/ArrayList;II)V
 SPLandroidx/fragment/app/FragmentManager;->findFragmentById(I)Landroidx/fragment/app/Fragment;
+SPLandroidx/fragment/app/FragmentManager;->findFragmentByTag(Ljava/lang/String;)Landroidx/fragment/app/Fragment;
 SPLandroidx/fragment/app/FragmentManager;->findViewFragment(Landroid/view/View;)Landroidx/fragment/app/Fragment;
 SPLandroidx/fragment/app/FragmentManager;->generateOpsForPendingActions(Ljava/util/ArrayList;Ljava/util/ArrayList;)Z
 SPLandroidx/fragment/app/FragmentManager;->getBackStackEntryCount()I
@@ -3116,6 +3484,7 @@ SPLandroidx/fragment/app/FragmentStore;->burpActive()V
 SPLandroidx/fragment/app/FragmentStore;->containsActiveFragment(Ljava/lang/String;)Z
 SPLandroidx/fragment/app/FragmentStore;->dispatchStateChange(I)V
 SPLandroidx/fragment/app/FragmentStore;->findFragmentById(I)Landroidx/fragment/app/Fragment;
+SPLandroidx/fragment/app/FragmentStore;->findFragmentByTag(Ljava/lang/String;)Landroidx/fragment/app/Fragment;
 SPLandroidx/fragment/app/FragmentStore;->findFragmentIndexInContainer(Landroidx/fragment/app/Fragment;)I
 SPLandroidx/fragment/app/FragmentStore;->getActiveFragmentStateManagers()Ljava/util/List;
 SPLandroidx/fragment/app/FragmentStore;->getActiveFragments()Ljava/util/List;
@@ -3127,6 +3496,9 @@ SPLandroidx/fragment/app/FragmentStore;->makeInactive(Landroidx/fragment/app/Fra
 SPLandroidx/fragment/app/FragmentStore;->moveToExpectedState()V
 SPLandroidx/fragment/app/FragmentStore;->setNonConfig(Landroidx/fragment/app/FragmentManagerViewModel;)V
 SPLandroidx/fragment/app/FragmentStore;->setSavedState(Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
+Landroidx/fragment/app/FragmentTracer;
+SPLandroidx/fragment/app/FragmentTracer;-><init>(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/FragmentTracer;->trace(Ljava/lang/String;Ljava/lang/Runnable;)V
 Landroidx/fragment/app/FragmentTransaction;
 SPLandroidx/fragment/app/FragmentTransaction;-><init>(Landroidx/fragment/app/FragmentFactory;Ljava/lang/ClassLoader;)V
 SPLandroidx/fragment/app/FragmentTransaction;->add(ILandroidx/fragment/app/Fragment;Ljava/lang/String;)Landroidx/fragment/app/FragmentTransaction;
@@ -3147,12 +3519,12 @@ SPLandroidx/fragment/app/FragmentViewLifecycleOwner;->performRestore(Landroid/os
 SPLandroidx/fragment/app/FragmentViewLifecycleOwner;->performSave(Landroid/os/Bundle;)V
 SPLandroidx/fragment/app/FragmentViewLifecycleOwner;->setCurrentState(Landroidx/lifecycle/Lifecycle$State;)V
 Landroidx/fragment/app/SpecialEffectsController;
-SPLandroidx/fragment/app/SpecialEffectsController;->$r8$lambda$TeCmoVW0hctjg0BNHLP6mPbAs5U(Landroidx/fragment/app/SpecialEffectsController;Landroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;)V
-SPLandroidx/fragment/app/SpecialEffectsController;->$r8$lambda$ahdwWRJghvCwX2xG1GsepYfILrY(Landroidx/fragment/app/SpecialEffectsController;Landroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;)V
+SPLandroidx/fragment/app/SpecialEffectsController;->$r8$lambda$1mA-Pl_YYgabeWyXepVIg50-pdw(Landroidx/fragment/app/SpecialEffectsController;Landroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;)V
+SPLandroidx/fragment/app/SpecialEffectsController;->$r8$lambda$WWs1PUTSh7Jll0tICvJh6oZeEfQ(Landroidx/fragment/app/SpecialEffectsController;Landroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;)V
 SPLandroidx/fragment/app/SpecialEffectsController;-><clinit>()V
 SPLandroidx/fragment/app/SpecialEffectsController;-><init>(Landroid/view/ViewGroup;)V
-SPLandroidx/fragment/app/SpecialEffectsController;->enqueue$lambda$4$lambda$2(Landroidx/fragment/app/SpecialEffectsController;Landroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;)V
-SPLandroidx/fragment/app/SpecialEffectsController;->enqueue$lambda$4$lambda$3(Landroidx/fragment/app/SpecialEffectsController;Landroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;)V
+SPLandroidx/fragment/app/SpecialEffectsController;->enqueue$lambda$0$0(Landroidx/fragment/app/SpecialEffectsController;Landroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;)V
+SPLandroidx/fragment/app/SpecialEffectsController;->enqueue$lambda$0$1(Landroidx/fragment/app/SpecialEffectsController;Landroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;)V
 SPLandroidx/fragment/app/SpecialEffectsController;->enqueue(Landroidx/fragment/app/SpecialEffectsController$Operation$State;Landroidx/fragment/app/SpecialEffectsController$Operation$LifecycleImpact;Landroidx/fragment/app/FragmentStateManager;)V
 SPLandroidx/fragment/app/SpecialEffectsController;->enqueueAdd(Landroidx/fragment/app/SpecialEffectsController$Operation$State;Landroidx/fragment/app/FragmentStateManager;)V
 SPLandroidx/fragment/app/SpecialEffectsController;->enqueueRemove(Landroidx/fragment/app/FragmentStateManager;)V
@@ -3180,14 +3552,14 @@ SPLandroidx/fragment/app/SpecialEffectsController$Companion;->getOrCreateControl
 SPLandroidx/fragment/app/SpecialEffectsController$Companion;->getOrCreateController(Landroid/view/ViewGroup;Landroidx/fragment/app/SpecialEffectsControllerFactory;)Landroidx/fragment/app/SpecialEffectsController;
 Landroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;
 SPLandroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;-><init>(Landroidx/fragment/app/SpecialEffectsController$Operation$State;Landroidx/fragment/app/SpecialEffectsController$Operation$LifecycleImpact;Landroidx/fragment/app/FragmentStateManager;)V
-SPLandroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;->complete$fragment_release()V
+SPLandroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;->complete$fragment()V
 SPLandroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;->onStart()V
 Landroidx/fragment/app/SpecialEffectsController$Operation;
 SPLandroidx/fragment/app/SpecialEffectsController$Operation;-><init>(Landroidx/fragment/app/SpecialEffectsController$Operation$State;Landroidx/fragment/app/SpecialEffectsController$Operation$LifecycleImpact;Landroidx/fragment/app/Fragment;)V
 SPLandroidx/fragment/app/SpecialEffectsController$Operation;->addCompletionListener(Ljava/lang/Runnable;)V
 SPLandroidx/fragment/app/SpecialEffectsController$Operation;->cancel(Landroid/view/ViewGroup;)V
-SPLandroidx/fragment/app/SpecialEffectsController$Operation;->complete$fragment_release()V
-SPLandroidx/fragment/app/SpecialEffectsController$Operation;->getEffects$fragment_release()Ljava/util/List;
+SPLandroidx/fragment/app/SpecialEffectsController$Operation;->complete$fragment()V
+SPLandroidx/fragment/app/SpecialEffectsController$Operation;->getEffects$fragment()Ljava/util/List;
 SPLandroidx/fragment/app/SpecialEffectsController$Operation;->getFinalState()Landroidx/fragment/app/SpecialEffectsController$Operation$State;
 SPLandroidx/fragment/app/SpecialEffectsController$Operation;->getFragment()Landroidx/fragment/app/Fragment;
 SPLandroidx/fragment/app/SpecialEffectsController$Operation;->getLifecycleImpact()Landroidx/fragment/app/SpecialEffectsController$Operation$LifecycleImpact;
@@ -3195,7 +3567,7 @@ SPLandroidx/fragment/app/SpecialEffectsController$Operation;->isCanceled()Z
 SPLandroidx/fragment/app/SpecialEffectsController$Operation;->isStarted()Z
 SPLandroidx/fragment/app/SpecialEffectsController$Operation;->mergeWith(Landroidx/fragment/app/SpecialEffectsController$Operation$State;Landroidx/fragment/app/SpecialEffectsController$Operation$LifecycleImpact;)V
 SPLandroidx/fragment/app/SpecialEffectsController$Operation;->onStart()V
-SPLandroidx/fragment/app/SpecialEffectsController$Operation;->setSeeking$fragment_release(Z)V
+SPLandroidx/fragment/app/SpecialEffectsController$Operation;->setSeeking$fragment(Z)V
 Landroidx/fragment/app/SpecialEffectsController$Operation$LifecycleImpact;
 SPLandroidx/fragment/app/SpecialEffectsController$Operation$LifecycleImpact;->$values()[Landroidx/fragment/app/SpecialEffectsController$Operation$LifecycleImpact;
 SPLandroidx/fragment/app/SpecialEffectsController$Operation$LifecycleImpact;-><clinit>()V
@@ -3237,8 +3609,6 @@ Landroidx/lifecycle/AtomicReference;
 SPLandroidx/lifecycle/AtomicReference;-><init>(Ljava/lang/Object;)V
 SPLandroidx/lifecycle/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 SPLandroidx/lifecycle/AtomicReference;->get()Ljava/lang/Object;
-Landroidx/lifecycle/AtomicReference$$ExternalSyntheticBackportWithForwarding0;
-SPLandroidx/lifecycle/AtomicReference$$ExternalSyntheticBackportWithForwarding0;->m(Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/Object;Ljava/lang/Object;)Z
 Landroidx/lifecycle/DefaultLifecycleObserver;
 SPLandroidx/lifecycle/DefaultLifecycleObserver;->onCreate(Landroidx/lifecycle/LifecycleOwner;)V
 SPLandroidx/lifecycle/DefaultLifecycleObserver;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
@@ -3256,6 +3626,28 @@ SPLandroidx/lifecycle/EmptyActivityLifecycleCallbacks;->onActivityPaused(Landroi
 SPLandroidx/lifecycle/EmptyActivityLifecycleCallbacks;->onActivityResumed(Landroid/app/Activity;)V
 SPLandroidx/lifecycle/EmptyActivityLifecycleCallbacks;->onActivityStarted(Landroid/app/Activity;)V
 SPLandroidx/lifecycle/EmptyActivityLifecycleCallbacks;->onActivityStopped(Landroid/app/Activity;)V
+Landroidx/lifecycle/FastSafeIterableMap;
+SPLandroidx/lifecycle/FastSafeIterableMap;-><init>()V
+SPLandroidx/lifecycle/FastSafeIterableMap;->ceil(Ljava/lang/Object;)Ljava/util/Map$Entry;
+SPLandroidx/lifecycle/FastSafeIterableMap;->contains(Ljava/lang/Object;)Z
+SPLandroidx/lifecycle/FastSafeIterableMap;->first()Ljava/util/Map$Entry;
+SPLandroidx/lifecycle/FastSafeIterableMap;->forEachReversed(Lkotlin/jvm/functions/Function1;)V
+SPLandroidx/lifecycle/FastSafeIterableMap;->forEachWithAdditions(Lkotlin/jvm/functions/Function1;)V
+SPLandroidx/lifecycle/FastSafeIterableMap;->last()Ljava/util/Map$Entry;
+SPLandroidx/lifecycle/FastSafeIterableMap;->lastOrNull()Ljava/util/Map$Entry;
+SPLandroidx/lifecycle/FastSafeIterableMap;->putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/lifecycle/FastSafeIterableMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/lifecycle/FastSafeIterableMap;->size()I
+Landroidx/lifecycle/FastSafeIterableMap$Entry;
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;->getKey()Ljava/lang/Object;
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;->getNext()Landroidx/lifecycle/FastSafeIterableMap$Entry;
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;->getPrev()Landroidx/lifecycle/FastSafeIterableMap$Entry;
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;->getValue()Ljava/lang/Object;
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;->isRemoved()Z
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;->markRemoved()V
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;->setNext(Landroidx/lifecycle/FastSafeIterableMap$Entry;)V
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;->setPrev(Landroidx/lifecycle/FastSafeIterableMap$Entry;)V
 Landroidx/lifecycle/FlowExtKt;
 SPLandroidx/lifecycle/FlowExtKt;->flowWithLifecycle$default(Lkotlinx/coroutines/flow/Flow;Landroidx/lifecycle/Lifecycle;Landroidx/lifecycle/Lifecycle$State;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
 SPLandroidx/lifecycle/FlowExtKt;->flowWithLifecycle(Lkotlinx/coroutines/flow/Flow;Landroidx/lifecycle/Lifecycle;Landroidx/lifecycle/Lifecycle$State;)Lkotlinx/coroutines/flow/Flow;
@@ -3331,29 +3723,37 @@ SPLandroidx/lifecycle/LifecycleRegistry;-><clinit>()V
 SPLandroidx/lifecycle/LifecycleRegistry;-><init>(Landroidx/lifecycle/LifecycleOwner;)V
 SPLandroidx/lifecycle/LifecycleRegistry;-><init>(Landroidx/lifecycle/LifecycleOwner;Z)V
 SPLandroidx/lifecycle/LifecycleRegistry;->addObserver(Landroidx/lifecycle/LifecycleObserver;)V
+SPLandroidx/lifecycle/LifecycleRegistry;->backwardPass$lambda$0(Landroidx/lifecycle/LifecycleRegistry;Landroidx/lifecycle/LifecycleOwner;Ljava/util/Map$Entry;)Lkotlin/Unit;
 SPLandroidx/lifecycle/LifecycleRegistry;->backwardPass(Landroidx/lifecycle/LifecycleOwner;)V
 SPLandroidx/lifecycle/LifecycleRegistry;->calculateTargetState(Landroidx/lifecycle/LifecycleObserver;)Landroidx/lifecycle/Lifecycle$State;
 SPLandroidx/lifecycle/LifecycleRegistry;->enforceMainThreadIfNeeded(Ljava/lang/String;)V
+SPLandroidx/lifecycle/LifecycleRegistry;->forwardPass$lambda$0(Landroidx/lifecycle/LifecycleRegistry;Landroidx/lifecycle/LifecycleOwner;Ljava/util/Map$Entry;)Lkotlin/Unit;
 SPLandroidx/lifecycle/LifecycleRegistry;->forwardPass(Landroidx/lifecycle/LifecycleOwner;)V
 SPLandroidx/lifecycle/LifecycleRegistry;->getCurrentState()Landroidx/lifecycle/Lifecycle$State;
 SPLandroidx/lifecycle/LifecycleRegistry;->handleLifecycleEvent(Landroidx/lifecycle/Lifecycle$Event;)V
 SPLandroidx/lifecycle/LifecycleRegistry;->isSynced()Z
 SPLandroidx/lifecycle/LifecycleRegistry;->moveToState(Landroidx/lifecycle/Lifecycle$State;)V
-SPLandroidx/lifecycle/LifecycleRegistry;->popParentState()V
-SPLandroidx/lifecycle/LifecycleRegistry;->pushParentState(Landroidx/lifecycle/Lifecycle$State;)V
 SPLandroidx/lifecycle/LifecycleRegistry;->removeObserver(Landroidx/lifecycle/LifecycleObserver;)V
 SPLandroidx/lifecycle/LifecycleRegistry;->setCurrentState(Landroidx/lifecycle/Lifecycle$State;)V
 SPLandroidx/lifecycle/LifecycleRegistry;->sync()V
+Landroidx/lifecycle/LifecycleRegistry$$ExternalSyntheticLambda0;
+SPLandroidx/lifecycle/LifecycleRegistry$$ExternalSyntheticLambda0;-><init>(Landroidx/lifecycle/LifecycleRegistry;Landroidx/lifecycle/LifecycleOwner;)V
+SPLandroidx/lifecycle/LifecycleRegistry$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/lifecycle/LifecycleRegistry$$ExternalSyntheticLambda1;
+SPLandroidx/lifecycle/LifecycleRegistry$$ExternalSyntheticLambda1;-><init>(Landroidx/lifecycle/LifecycleRegistry;Landroidx/lifecycle/LifecycleOwner;)V
+SPLandroidx/lifecycle/LifecycleRegistry$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Landroidx/lifecycle/LifecycleRegistry$Companion;
 SPLandroidx/lifecycle/LifecycleRegistry$Companion;-><init>()V
 SPLandroidx/lifecycle/LifecycleRegistry$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-SPLandroidx/lifecycle/LifecycleRegistry$Companion;->min$lifecycle_runtime(Landroidx/lifecycle/Lifecycle$State;Landroidx/lifecycle/Lifecycle$State;)Landroidx/lifecycle/Lifecycle$State;
 Landroidx/lifecycle/LifecycleRegistry$ObserverWithState;
 SPLandroidx/lifecycle/LifecycleRegistry$ObserverWithState;-><init>(Landroidx/lifecycle/LifecycleObserver;Landroidx/lifecycle/Lifecycle$State;)V
 SPLandroidx/lifecycle/LifecycleRegistry$ObserverWithState;->dispatchEvent(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
 SPLandroidx/lifecycle/LifecycleRegistry$ObserverWithState;->getState()Landroidx/lifecycle/Lifecycle$State;
 Landroidx/lifecycle/LifecycleRegistryKt;
+SPLandroidx/lifecycle/LifecycleRegistryKt;->access$checkLifecycleStateTransition(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$State;Landroidx/lifecycle/Lifecycle$State;)V
+SPLandroidx/lifecycle/LifecycleRegistryKt;->access$min(Landroidx/lifecycle/Lifecycle$State;Landroidx/lifecycle/Lifecycle$State;)Landroidx/lifecycle/Lifecycle$State;
 SPLandroidx/lifecycle/LifecycleRegistryKt;->checkLifecycleStateTransition(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$State;Landroidx/lifecycle/Lifecycle$State;)V
+SPLandroidx/lifecycle/LifecycleRegistryKt;->min(Landroidx/lifecycle/Lifecycle$State;Landroidx/lifecycle/Lifecycle$State;)Landroidx/lifecycle/Lifecycle$State;
 Landroidx/lifecycle/LifecycleRegistryOwner;
 Landroidx/lifecycle/LifecycleRegistry_androidKt;
 SPLandroidx/lifecycle/LifecycleRegistry_androidKt;->isMainThread()Z
@@ -3430,6 +3830,7 @@ Landroidx/lifecycle/ProcessLifecycleOwner$initializationListener$1;
 SPLandroidx/lifecycle/ProcessLifecycleOwner$initializationListener$1;-><init>(Landroidx/lifecycle/ProcessLifecycleOwner;)V
 Landroidx/lifecycle/RepeatOnLifecycleKt;
 SPLandroidx/lifecycle/RepeatOnLifecycleKt;->repeatOnLifecycle(Landroidx/lifecycle/Lifecycle;Landroidx/lifecycle/Lifecycle$State;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt;->repeatOnLifecycle(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$State;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Landroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3;
 SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3;-><init>(Landroidx/lifecycle/Lifecycle;Landroidx/lifecycle/Lifecycle$State;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
 SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
@@ -3494,12 +3895,22 @@ SPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks$Companion;-><init>()V
 SPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks$Companion;->registerIn(Landroid/app/Activity;)V
 Landroidx/lifecycle/SavedStateHandle;
+SPLandroidx/lifecycle/SavedStateHandle;-><clinit>()V
+SPLandroidx/lifecycle/SavedStateHandle;-><init>(Ljava/util/Map;)V
+SPLandroidx/lifecycle/SavedStateHandle;->getMutableStateFlow(Ljava/lang/String;Ljava/lang/Object;)Lkotlinx/coroutines/flow/MutableStateFlow;
+Landroidx/lifecycle/SavedStateHandle$Companion;
+SPLandroidx/lifecycle/SavedStateHandle$Companion;-><init>()V
+SPLandroidx/lifecycle/SavedStateHandle$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/lifecycle/SavedStateHandle$Companion;->createHandle(Landroid/os/Bundle;Landroid/os/Bundle;)Landroidx/lifecycle/SavedStateHandle;
 Landroidx/lifecycle/SavedStateHandleAttacher;
 SPLandroidx/lifecycle/SavedStateHandleAttacher;-><init>(Landroidx/lifecycle/SavedStateHandlesProvider;)V
 SPLandroidx/lifecycle/SavedStateHandleAttacher;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
 Landroidx/lifecycle/SavedStateHandleSupport;
 SPLandroidx/lifecycle/SavedStateHandleSupport;-><clinit>()V
+SPLandroidx/lifecycle/SavedStateHandleSupport;->createSavedStateHandle(Landroidx/lifecycle/viewmodel/CreationExtras;)Landroidx/lifecycle/SavedStateHandle;
+SPLandroidx/lifecycle/SavedStateHandleSupport;->createSavedStateHandle(Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Ljava/lang/String;Landroid/os/Bundle;)Landroidx/lifecycle/SavedStateHandle;
 SPLandroidx/lifecycle/SavedStateHandleSupport;->enableSavedStateHandles(Landroidx/savedstate/SavedStateRegistryOwner;)V
+SPLandroidx/lifecycle/SavedStateHandleSupport;->getSavedStateHandlesProvider(Landroidx/savedstate/SavedStateRegistryOwner;)Landroidx/lifecycle/SavedStateHandlesProvider;
 SPLandroidx/lifecycle/SavedStateHandleSupport;->getSavedStateHandlesVM(Landroidx/lifecycle/ViewModelStoreOwner;)Landroidx/lifecycle/SavedStateHandlesVM;
 Landroidx/lifecycle/SavedStateHandleSupport$savedStateHandlesVM$1;
 SPLandroidx/lifecycle/SavedStateHandleSupport$savedStateHandlesVM$1;-><init>()V
@@ -3511,8 +3922,8 @@ SPLandroidx/lifecycle/SavedStateHandleSupport$special$$inlined$Key$2;-><init>()V
 Landroidx/lifecycle/SavedStateHandleSupport$special$$inlined$Key$3;
 SPLandroidx/lifecycle/SavedStateHandleSupport$special$$inlined$Key$3;-><init>()V
 Landroidx/lifecycle/SavedStateHandlesProvider;
-SPLandroidx/lifecycle/SavedStateHandlesProvider;->$r8$lambda$BWYiFNbmaxFqlGaoxfo2jDYwXi4(Landroidx/lifecycle/ViewModelStoreOwner;)Landroidx/lifecycle/SavedStateHandlesVM;
 SPLandroidx/lifecycle/SavedStateHandlesProvider;-><init>(Landroidx/savedstate/SavedStateRegistry;Landroidx/lifecycle/ViewModelStoreOwner;)V
+SPLandroidx/lifecycle/SavedStateHandlesProvider;->consumeRestoredStateForKey(Ljava/lang/String;)Landroid/os/Bundle;
 SPLandroidx/lifecycle/SavedStateHandlesProvider;->getViewModel()Landroidx/lifecycle/SavedStateHandlesVM;
 SPLandroidx/lifecycle/SavedStateHandlesProvider;->performRestore()V
 SPLandroidx/lifecycle/SavedStateHandlesProvider;->viewModel_delegate$lambda$0(Landroidx/lifecycle/ViewModelStoreOwner;)Landroidx/lifecycle/SavedStateHandlesVM;
@@ -3521,6 +3932,7 @@ SPLandroidx/lifecycle/SavedStateHandlesProvider$$ExternalSyntheticLambda0;-><ini
 SPLandroidx/lifecycle/SavedStateHandlesProvider$$ExternalSyntheticLambda0;->invoke()Ljava/lang/Object;
 Landroidx/lifecycle/SavedStateHandlesVM;
 SPLandroidx/lifecycle/SavedStateHandlesVM;-><init>()V
+SPLandroidx/lifecycle/SavedStateHandlesVM;->getHandles()Ljava/util/Map;
 Landroidx/lifecycle/SavedStateViewModelFactory;
 SPLandroidx/lifecycle/SavedStateViewModelFactory;-><init>(Landroid/app/Application;Landroidx/savedstate/SavedStateRegistryOwner;Landroid/os/Bundle;)V
 SPLandroidx/lifecycle/SavedStateViewModelFactory;->create(Ljava/lang/Class;Landroidx/lifecycle/viewmodel/CreationExtras;)Landroidx/lifecycle/ViewModel;
@@ -3593,13 +4005,23 @@ SPLandroidx/lifecycle/ViewModelProvider$special$$inlined$Key$1;-><init>()V
 Landroidx/lifecycle/ViewModelStore;
 SPLandroidx/lifecycle/ViewModelStore;-><init>()V
 SPLandroidx/lifecycle/ViewModelStore;->clear()V
-SPLandroidx/lifecycle/ViewModelStore;->get(Ljava/lang/String;)Landroidx/lifecycle/ViewModel;
-SPLandroidx/lifecycle/ViewModelStore;->put(Ljava/lang/String;Landroidx/lifecycle/ViewModel;)V
+SPLandroidx/lifecycle/ViewModelStore;->get(Ljava/lang/Object;)Landroidx/lifecycle/ViewModel;
+SPLandroidx/lifecycle/ViewModelStore;->put(Ljava/lang/Object;Landroidx/lifecycle/ViewModel;)V
 Landroidx/lifecycle/ViewModelStoreOwner;
+Landroidx/lifecycle/ViewModelStoreOwnerDefaults;
+SPLandroidx/lifecycle/ViewModelStoreOwnerDefaults;->getViewModelCreationExtras(Landroidx/lifecycle/ViewModelStoreOwner;)Landroidx/lifecycle/viewmodel/CreationExtras;
 Landroidx/lifecycle/ViewTreeLifecycleOwner;
 SPLandroidx/lifecycle/ViewTreeLifecycleOwner;->set(Landroid/view/View;Landroidx/lifecycle/LifecycleOwner;)V
 Landroidx/lifecycle/ViewTreeViewModelStoreOwner;
 SPLandroidx/lifecycle/ViewTreeViewModelStoreOwner;->set(Landroid/view/View;Landroidx/lifecycle/ViewModelStoreOwner;)V
+Landroidx/lifecycle/WeakReference;
+SPLandroidx/lifecycle/WeakReference;-><init>(Ljava/lang/Object;)V
+SPLandroidx/lifecycle/WeakReference;->get()Ljava/lang/Object;
+Landroidx/lifecycle/internal/SavedStateHandleImpl;
+SPLandroidx/lifecycle/internal/SavedStateHandleImpl;-><init>(Ljava/util/Map;)V
+SPLandroidx/lifecycle/internal/SavedStateHandleImpl;->getMutableStateFlow(Ljava/lang/String;Ljava/lang/Object;)Lkotlinx/coroutines/flow/MutableStateFlow;
+Landroidx/lifecycle/internal/SavedStateHandleImpl$$ExternalSyntheticLambda0;
+SPLandroidx/lifecycle/internal/SavedStateHandleImpl$$ExternalSyntheticLambda0;-><init>(Landroidx/lifecycle/internal/SavedStateHandleImpl;)V
 Landroidx/lifecycle/runtime/R$id;
 Landroidx/lifecycle/viewmodel/CreationExtras;
 SPLandroidx/lifecycle/viewmodel/CreationExtras;-><clinit>()V
@@ -3612,6 +4034,13 @@ Landroidx/lifecycle/viewmodel/CreationExtras$Empty;
 SPLandroidx/lifecycle/viewmodel/CreationExtras$Empty;-><clinit>()V
 SPLandroidx/lifecycle/viewmodel/CreationExtras$Empty;-><init>()V
 Landroidx/lifecycle/viewmodel/CreationExtras$Key;
+Landroidx/lifecycle/viewmodel/InitializerViewModelFactory;
+SPLandroidx/lifecycle/viewmodel/InitializerViewModelFactory;-><init>([Landroidx/lifecycle/viewmodel/ViewModelInitializer;)V
+SPLandroidx/lifecycle/viewmodel/InitializerViewModelFactory;->create(Ljava/lang/Class;Landroidx/lifecycle/viewmodel/CreationExtras;)Landroidx/lifecycle/ViewModel;
+Landroidx/lifecycle/viewmodel/InitializerViewModelFactoryBuilder;
+SPLandroidx/lifecycle/viewmodel/InitializerViewModelFactoryBuilder;-><init>()V
+SPLandroidx/lifecycle/viewmodel/InitializerViewModelFactoryBuilder;->addInitializer(Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function1;)V
+SPLandroidx/lifecycle/viewmodel/InitializerViewModelFactoryBuilder;->build()Landroidx/lifecycle/ViewModelProvider$Factory;
 Landroidx/lifecycle/viewmodel/MutableCreationExtras;
 SPLandroidx/lifecycle/viewmodel/MutableCreationExtras;-><init>()V
 SPLandroidx/lifecycle/viewmodel/MutableCreationExtras;-><init>(Landroidx/lifecycle/viewmodel/CreationExtras;)V
@@ -3620,6 +4049,10 @@ SPLandroidx/lifecycle/viewmodel/MutableCreationExtras;-><init>(Ljava/util/Map;)V
 SPLandroidx/lifecycle/viewmodel/MutableCreationExtras;->get(Landroidx/lifecycle/viewmodel/CreationExtras$Key;)Ljava/lang/Object;
 SPLandroidx/lifecycle/viewmodel/MutableCreationExtras;->set(Landroidx/lifecycle/viewmodel/CreationExtras$Key;Ljava/lang/Object;)V
 Landroidx/lifecycle/viewmodel/R$id;
+Landroidx/lifecycle/viewmodel/ViewModelInitializer;
+SPLandroidx/lifecycle/viewmodel/ViewModelInitializer;-><init>(Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function1;)V
+SPLandroidx/lifecycle/viewmodel/ViewModelInitializer;->getClazz$lifecycle_viewmodel()Lkotlin/reflect/KClass;
+SPLandroidx/lifecycle/viewmodel/ViewModelInitializer;->getInitializer$lifecycle_viewmodel()Lkotlin/jvm/functions/Function1;
 Landroidx/lifecycle/viewmodel/internal/CanonicalName_jvmKt;
 SPLandroidx/lifecycle/viewmodel/internal/CanonicalName_jvmKt;->getCanonicalName(Lkotlin/reflect/KClass;)Ljava/lang/String;
 Landroidx/lifecycle/viewmodel/internal/CloseableCoroutineScope;
@@ -3653,7 +4086,8 @@ SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviderImpl_androidKt;->creat
 Landroidx/lifecycle/viewmodel/internal/ViewModelProviders;
 SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviders;-><clinit>()V
 SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviders;-><init>()V
-SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviders;->getDefaultCreationExtras$lifecycle_viewmodel(Landroidx/lifecycle/ViewModelStoreOwner;)Landroidx/lifecycle/viewmodel/CreationExtras;
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviders;->createInitializerFactory$lifecycle_viewmodel(Ljava/util/Collection;)Landroidx/lifecycle/ViewModelProvider$Factory;
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviders;->createViewModelFromInitializers$lifecycle_viewmodel(Lkotlin/reflect/KClass;Landroidx/lifecycle/viewmodel/CreationExtras;[Landroidx/lifecycle/viewmodel/ViewModelInitializer;)Landroidx/lifecycle/ViewModel;
 SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviders;->getDefaultKey$lifecycle_viewmodel(Lkotlin/reflect/KClass;)Ljava/lang/String;
 Landroidx/loader/app/LoaderManager;
 SPLandroidx/loader/app/LoaderManager;-><init>()V
@@ -3671,25 +4105,30 @@ SPLandroidx/loader/app/LoaderManagerImpl$LoaderViewModel;->onCleared()V
 Landroidx/loader/app/LoaderManagerImpl$LoaderViewModel$1;
 SPLandroidx/loader/app/LoaderManagerImpl$LoaderViewModel$1;-><init>()V
 SPLandroidx/loader/app/LoaderManagerImpl$LoaderViewModel$1;->create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-Landroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m$1()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/view/accessibility/AccessibilityNodeInfo;Ljava/lang/CharSequence;)V
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/view/accessibility/AccessibilityNodeInfo;Z)V
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m$10()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m$11()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m$12()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m$2()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m$3()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m$4()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m$5()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m$6()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m$7()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m$8()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m$9()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/Activity;Landroid/app/Application$ActivityLifecycleCallbacks;)V
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m(Landroid/os/Looper;)Landroid/os/Handler;
-SPLandroidx/media3/common/util/Util$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/accessibility/AccessibilityNodeInfo;Z)V
+Landroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$1()I
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$1()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/view/accessibility/AccessibilityNodeInfo;Ljava/lang/CharSequence;)V
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/view/accessibility/AccessibilityNodeInfo;Z)V
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$10()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$11()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$12()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$2()I
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$2()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$2(Landroid/view/accessibility/AccessibilityNodeInfo;Z)V
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$3()I
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$3()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$4()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$5()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$6()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$7()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$8()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$9()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/Activity;Landroid/app/Application$ActivityLifecycleCallbacks;)V
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m(Landroid/os/Looper;)Landroid/os/Handler;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/Window;)Landroid/view/WindowInsetsController;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowInsetsController;II)V
 PLandroidx/media3/exoplayer/dash/offline/DashDownloader$$ExternalSyntheticLambda1;-><init>()V
 Landroidx/navigationevent/NavigationEventDispatcher;
 SPLandroidx/navigationevent/NavigationEventDispatcher;-><clinit>()V
@@ -3829,6 +4268,7 @@ SPLandroidx/recyclerview/R$styleable;-><clinit>()V
 Landroidx/recyclerview/widget/AdapterHelper;
 SPLandroidx/recyclerview/widget/AdapterHelper;-><init>(Landroidx/recyclerview/widget/AdapterHelper$Callback;)V
 SPLandroidx/recyclerview/widget/AdapterHelper;-><init>(Landroidx/recyclerview/widget/AdapterHelper$Callback;Z)V
+SPLandroidx/recyclerview/widget/AdapterHelper;->applyAdd(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
 SPLandroidx/recyclerview/widget/AdapterHelper;->consumePostponedUpdates()V
 SPLandroidx/recyclerview/widget/AdapterHelper;->consumeUpdatesInOnePass()V
 SPLandroidx/recyclerview/widget/AdapterHelper;->findPositionOffset(I)I
@@ -3837,6 +4277,7 @@ SPLandroidx/recyclerview/widget/AdapterHelper;->hasPendingUpdates()Z
 SPLandroidx/recyclerview/widget/AdapterHelper;->obtainUpdateOp(IIILjava/lang/Object;)Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;
 SPLandroidx/recyclerview/widget/AdapterHelper;->onItemRangeChanged(IILjava/lang/Object;)Z
 SPLandroidx/recyclerview/widget/AdapterHelper;->onItemRangeInserted(II)Z
+SPLandroidx/recyclerview/widget/AdapterHelper;->postponeAndUpdateViewHolders(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
 SPLandroidx/recyclerview/widget/AdapterHelper;->preProcess()V
 SPLandroidx/recyclerview/widget/AdapterHelper;->recycleUpdateOp(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
 SPLandroidx/recyclerview/widget/AdapterHelper;->recycleUpdateOpsAndClearList(Ljava/util/List;)V
@@ -3859,6 +4300,7 @@ Landroidx/recyclerview/widget/AsyncListDiffer;
 SPLandroidx/recyclerview/widget/AsyncListDiffer;-><clinit>()V
 SPLandroidx/recyclerview/widget/AsyncListDiffer;-><init>(Landroidx/recyclerview/widget/ListUpdateCallback;Landroidx/recyclerview/widget/AsyncDifferConfig;)V
 SPLandroidx/recyclerview/widget/AsyncListDiffer;->addListListener(Landroidx/recyclerview/widget/AsyncListDiffer$ListListener;)V
+SPLandroidx/recyclerview/widget/AsyncListDiffer;->getCurrentList()Ljava/util/List;
 SPLandroidx/recyclerview/widget/AsyncListDiffer;->latchList(Ljava/util/List;Landroidx/recyclerview/widget/DiffUtil$DiffResult;Ljava/lang/Runnable;)V
 SPLandroidx/recyclerview/widget/AsyncListDiffer;->onCurrentListChanged(Ljava/util/List;Ljava/lang/Runnable;)V
 SPLandroidx/recyclerview/widget/AsyncListDiffer;->submitList(Ljava/util/List;)V
@@ -3884,24 +4326,44 @@ SPLandroidx/recyclerview/widget/BatchingListUpdateCallback;->onInserted(II)V
 Landroidx/recyclerview/widget/ChildHelper;
 SPLandroidx/recyclerview/widget/ChildHelper;-><init>(Landroidx/recyclerview/widget/ChildHelper$Callback;)V
 SPLandroidx/recyclerview/widget/ChildHelper;->addView(Landroid/view/View;IZ)V
+SPLandroidx/recyclerview/widget/ChildHelper;->attachViewToParent(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;Z)V
+SPLandroidx/recyclerview/widget/ChildHelper;->detachViewFromParent(I)V
 SPLandroidx/recyclerview/widget/ChildHelper;->findHiddenNonRemovedView(I)Landroid/view/View;
 SPLandroidx/recyclerview/widget/ChildHelper;->getChildAt(I)Landroid/view/View;
 SPLandroidx/recyclerview/widget/ChildHelper;->getChildCount()I
 SPLandroidx/recyclerview/widget/ChildHelper;->getOffset(I)I
+SPLandroidx/recyclerview/widget/ChildHelper;->getUnfilteredChildAt(I)Landroid/view/View;
 SPLandroidx/recyclerview/widget/ChildHelper;->getUnfilteredChildCount()I
+SPLandroidx/recyclerview/widget/ChildHelper;->isHidden(Landroid/view/View;)Z
 SPLandroidx/recyclerview/widget/ChildHelper;->removeAllViewsUnfiltered()V
+SPLandroidx/recyclerview/widget/ChildHelper;->removeViewIfHidden(Landroid/view/View;)Z
 Landroidx/recyclerview/widget/ChildHelper$Bucket;
 SPLandroidx/recyclerview/widget/ChildHelper$Bucket;-><init>()V
 SPLandroidx/recyclerview/widget/ChildHelper$Bucket;->clear(I)V
 SPLandroidx/recyclerview/widget/ChildHelper$Bucket;->countOnesBefore(I)I
 SPLandroidx/recyclerview/widget/ChildHelper$Bucket;->get(I)Z
 SPLandroidx/recyclerview/widget/ChildHelper$Bucket;->insert(IZ)V
+SPLandroidx/recyclerview/widget/ChildHelper$Bucket;->remove(I)Z
 SPLandroidx/recyclerview/widget/ChildHelper$Bucket;->reset()V
 Landroidx/recyclerview/widget/ChildHelper$Callback;
 Landroidx/recyclerview/widget/DefaultItemAnimator;
 SPLandroidx/recyclerview/widget/DefaultItemAnimator;-><init>()V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator;->animateAdd(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Z
+SPLandroidx/recyclerview/widget/DefaultItemAnimator;->animateAddImpl(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator;->dispatchFinishedWhenDone()V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator;->endAnimation(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 SPLandroidx/recyclerview/widget/DefaultItemAnimator;->endAnimations()V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator;->endChangeAnimation(Ljava/util/List;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 SPLandroidx/recyclerview/widget/DefaultItemAnimator;->isRunning()Z
+SPLandroidx/recyclerview/widget/DefaultItemAnimator;->resetAnimation(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator;->runPendingAnimations()V
+Landroidx/recyclerview/widget/DefaultItemAnimator$3;
+SPLandroidx/recyclerview/widget/DefaultItemAnimator$3;-><init>(Landroidx/recyclerview/widget/DefaultItemAnimator;Ljava/util/ArrayList;)V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator$3;->run()V
+Landroidx/recyclerview/widget/DefaultItemAnimator$5;
+SPLandroidx/recyclerview/widget/DefaultItemAnimator$5;-><init>(Landroidx/recyclerview/widget/DefaultItemAnimator;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroid/view/View;Landroid/view/ViewPropertyAnimator;)V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator$5;->onAnimationEnd(Landroid/animation/Animator;)V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator$5;->onAnimationStart(Landroid/animation/Animator;)V
 Landroidx/recyclerview/widget/DiffUtil;
 SPLandroidx/recyclerview/widget/DiffUtil;-><clinit>()V
 SPLandroidx/recyclerview/widget/DiffUtil;->calculateDiff(Landroidx/recyclerview/widget/DiffUtil$Callback;)Landroidx/recyclerview/widget/DiffUtil$DiffResult;
@@ -3946,15 +4408,25 @@ SPLandroidx/recyclerview/widget/LinearLayoutManager;->assertNotInLayoutOrScroll(
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->calculateExtraLayoutSpace(Landroidx/recyclerview/widget/RecyclerView$State;[I)V
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->canScrollHorizontally()Z
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->canScrollVertically()Z
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->computeScrollExtent(Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->computeScrollOffset(Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->computeScrollRange(Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->computeVerticalScrollExtent(Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->computeVerticalScrollOffset(Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->computeVerticalScrollRange(Landroidx/recyclerview/widget/RecyclerView$State;)I
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->createLayoutState()Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->ensureLayoutState()V
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->fill(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->findFirstCompletelyVisibleItemPosition()I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->findFirstVisibleChildClosestToEnd(ZZ)Landroid/view/View;
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->findFirstVisibleChildClosestToStart(ZZ)Landroid/view/View;
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->findFirstVisibleItemPosition()I
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->findLastVisibleItemPosition()I
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->findOneVisibleChild(IIZZ)Landroid/view/View;
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->findReferenceChild(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;ZZ)Landroid/view/View;
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->fixLayoutEndGap(ILandroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->fixLayoutStartGap(ILandroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->getChildClosestToEnd()Landroid/view/View;
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->getChildClosestToStart()Landroid/view/View;
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->getExtraLayoutSpace(Landroidx/recyclerview/widget/RecyclerView$State;)I
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->isAutoMeasureEnabled()Z
@@ -3962,11 +4434,14 @@ SPLandroidx/recyclerview/widget/LinearLayoutManager;->isLayoutRTL()Z
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->layoutChunk(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutChunkResult;)V
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->layoutForPredictiveAnimations(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;II)V
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->onAnchorReady(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;I)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->onInitializeAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->onInitializeAccessibilityNodeInfo(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->onLayoutChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)V
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->onLayoutCompleted(Landroidx/recyclerview/widget/RecyclerView$State;)V
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->recycleByLayoutState(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;)V
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->recycleChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;II)V
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->recycleViewsFromEnd(Landroidx/recyclerview/widget/RecyclerView$Recycler;II)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->recycleViewsFromStart(Landroidx/recyclerview/widget/RecyclerView$Recycler;II)V
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->resolveIsInfinite()Z
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->resolveShouldLayoutReverse()V
 SPLandroidx/recyclerview/widget/LinearLayoutManager;->scrollBy(ILandroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)I
@@ -3985,6 +4460,7 @@ SPLandroidx/recyclerview/widget/LinearLayoutManager;->updateLayoutStateToFillSta
 Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;
 SPLandroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;-><init>()V
 SPLandroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->assignCoordinateFromPadding()V
+SPLandroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->assignFromView(Landroid/view/View;I)V
 SPLandroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->reset()V
 Landroidx/recyclerview/widget/LinearLayoutManager$LayoutChunkResult;
 SPLandroidx/recyclerview/widget/LinearLayoutManager$LayoutChunkResult;-><init>()V
@@ -3993,8 +4469,11 @@ Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
 SPLandroidx/recyclerview/widget/LinearLayoutManager$LayoutState;-><init>()V
 SPLandroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->hasMore(Landroidx/recyclerview/widget/RecyclerView$State;)Z
 SPLandroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->next(Landroidx/recyclerview/widget/RecyclerView$Recycler;)Landroid/view/View;
+Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;
 Landroidx/recyclerview/widget/ListAdapter;
 SPLandroidx/recyclerview/widget/ListAdapter;-><init>(Landroidx/recyclerview/widget/DiffUtil$ItemCallback;)V
+SPLandroidx/recyclerview/widget/ListAdapter;->getItem(I)Ljava/lang/Object;
+SPLandroidx/recyclerview/widget/ListAdapter;->getItemCount()I
 SPLandroidx/recyclerview/widget/ListAdapter;->onCurrentListChanged(Ljava/util/List;Ljava/util/List;)V
 SPLandroidx/recyclerview/widget/ListAdapter;->submitList(Ljava/util/List;)V
 Landroidx/recyclerview/widget/ListAdapter$1;
@@ -4014,6 +4493,7 @@ SPLandroidx/recyclerview/widget/OrientationHelper;->createVerticalHelper(Landroi
 SPLandroidx/recyclerview/widget/OrientationHelper;->onLayoutComplete()V
 Landroidx/recyclerview/widget/OrientationHelper$2;
 SPLandroidx/recyclerview/widget/OrientationHelper$2;-><init>(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
+SPLandroidx/recyclerview/widget/OrientationHelper$2;->getDecoratedEnd(Landroid/view/View;)I
 SPLandroidx/recyclerview/widget/OrientationHelper$2;->getDecoratedMeasurement(Landroid/view/View;)I
 SPLandroidx/recyclerview/widget/OrientationHelper$2;->getDecoratedMeasurementInOther(Landroid/view/View;)I
 SPLandroidx/recyclerview/widget/OrientationHelper$2;->getDecoratedStart(Landroid/view/View;)I
@@ -4028,9 +4508,19 @@ Landroidx/recyclerview/widget/RecyclerView;
 SPLandroidx/recyclerview/widget/RecyclerView;-><clinit>()V
 SPLandroidx/recyclerview/widget/RecyclerView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 SPLandroidx/recyclerview/widget/RecyclerView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/recyclerview/widget/RecyclerView;->access$000(Landroidx/recyclerview/widget/RecyclerView;Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V
+SPLandroidx/recyclerview/widget/RecyclerView;->access$100(Landroidx/recyclerview/widget/RecyclerView;I)V
+SPLandroidx/recyclerview/widget/RecyclerView;->addOnScrollListener(Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;)V
+SPLandroidx/recyclerview/widget/RecyclerView;->animateAppearance(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)V
 SPLandroidx/recyclerview/widget/RecyclerView;->assertNotInLayoutOrScroll(Ljava/lang/String;)V
 SPLandroidx/recyclerview/widget/RecyclerView;->checkLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Z
 SPLandroidx/recyclerview/widget/RecyclerView;->clearOldPositions()V
+SPLandroidx/recyclerview/widget/RecyclerView;->computeHorizontalScrollExtent()I
+SPLandroidx/recyclerview/widget/RecyclerView;->computeHorizontalScrollOffset()I
+SPLandroidx/recyclerview/widget/RecyclerView;->computeHorizontalScrollRange()I
+SPLandroidx/recyclerview/widget/RecyclerView;->computeVerticalScrollExtent()I
+SPLandroidx/recyclerview/widget/RecyclerView;->computeVerticalScrollOffset()I
+SPLandroidx/recyclerview/widget/RecyclerView;->computeVerticalScrollRange()I
 SPLandroidx/recyclerview/widget/RecyclerView;->createLayoutManager(Landroid/content/Context;Ljava/lang/String;Landroid/util/AttributeSet;II)V
 SPLandroidx/recyclerview/widget/RecyclerView;->defaultOnMeasure(II)V
 SPLandroidx/recyclerview/widget/RecyclerView;->didChildRangeChange(II)Z
@@ -4042,13 +4532,17 @@ SPLandroidx/recyclerview/widget/RecyclerView;->dispatchLayoutStep2()V
 SPLandroidx/recyclerview/widget/RecyclerView;->dispatchLayoutStep3()V
 SPLandroidx/recyclerview/widget/RecyclerView;->dispatchOnScrolled(II)V
 SPLandroidx/recyclerview/widget/RecyclerView;->dispatchPendingImportantForAccessibilityChanges()V
+SPLandroidx/recyclerview/widget/RecyclerView;->draw(Landroid/graphics/Canvas;)V
+SPLandroidx/recyclerview/widget/RecyclerView;->drawChild(Landroid/graphics/Canvas;Landroid/view/View;J)Z
 SPLandroidx/recyclerview/widget/RecyclerView;->fillRemainingScrollValues(Landroidx/recyclerview/widget/RecyclerView$State;)V
 SPLandroidx/recyclerview/widget/RecyclerView;->findMinMaxChildLayoutPositions([I)V
 SPLandroidx/recyclerview/widget/RecyclerView;->findNestedRecyclerView(Landroid/view/View;)Landroidx/recyclerview/widget/RecyclerView;
 SPLandroidx/recyclerview/widget/RecyclerView;->generateLayoutParams(Landroid/util/AttributeSet;)Landroid/view/ViewGroup$LayoutParams;
 SPLandroidx/recyclerview/widget/RecyclerView;->getAccessibilityClassName()Ljava/lang/CharSequence;
+SPLandroidx/recyclerview/widget/RecyclerView;->getChangedHolderKey(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)J
 SPLandroidx/recyclerview/widget/RecyclerView;->getChildViewHolderInt(Landroid/view/View;)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 SPLandroidx/recyclerview/widget/RecyclerView;->getItemDecorInsetsForChild(Landroid/view/View;)Landroid/graphics/Rect;
+SPLandroidx/recyclerview/widget/RecyclerView;->getLayoutManager()Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 SPLandroidx/recyclerview/widget/RecyclerView;->getNanoTime()J
 SPLandroidx/recyclerview/widget/RecyclerView;->getScrollState()I
 SPLandroidx/recyclerview/widget/RecyclerView;->getScrollingChildHelper()Landroidx/core/view/NestedScrollingChildHelper;
@@ -4063,8 +4557,10 @@ SPLandroidx/recyclerview/widget/RecyclerView;->isComputingLayout()Z
 SPLandroidx/recyclerview/widget/RecyclerView;->markItemDecorInsetsDirty()V
 SPLandroidx/recyclerview/widget/RecyclerView;->markKnownViewsInvalid()V
 SPLandroidx/recyclerview/widget/RecyclerView;->offsetChildrenVertical(I)V
+SPLandroidx/recyclerview/widget/RecyclerView;->offsetPositionRecordsForInsert(II)V
 SPLandroidx/recyclerview/widget/RecyclerView;->onAttachedToWindow()V
 SPLandroidx/recyclerview/widget/RecyclerView;->onChildAttachedToWindow(Landroid/view/View;)V
+SPLandroidx/recyclerview/widget/RecyclerView;->onDraw(Landroid/graphics/Canvas;)V
 SPLandroidx/recyclerview/widget/RecyclerView;->onEnterLayoutOrScroll()V
 SPLandroidx/recyclerview/widget/RecyclerView;->onExitLayoutOrScroll()V
 SPLandroidx/recyclerview/widget/RecyclerView;->onExitLayoutOrScroll(Z)V
@@ -4072,14 +4568,17 @@ SPLandroidx/recyclerview/widget/RecyclerView;->onLayout(ZIIII)V
 SPLandroidx/recyclerview/widget/RecyclerView;->onMeasure(II)V
 SPLandroidx/recyclerview/widget/RecyclerView;->onScrolled(II)V
 SPLandroidx/recyclerview/widget/RecyclerView;->onSizeChanged(IIII)V
+SPLandroidx/recyclerview/widget/RecyclerView;->postAnimationRunner()V
 SPLandroidx/recyclerview/widget/RecyclerView;->predictiveItemAnimationsEnabled()Z
 SPLandroidx/recyclerview/widget/RecyclerView;->processAdapterUpdatesAndSetAnimationFlags()V
 SPLandroidx/recyclerview/widget/RecyclerView;->processDataSetCompletelyChanged(Z)V
 SPLandroidx/recyclerview/widget/RecyclerView;->recoverFocusFromState()V
 SPLandroidx/recyclerview/widget/RecyclerView;->removeAndRecycleViews()V
+SPLandroidx/recyclerview/widget/RecyclerView;->removeAnimatingView(Landroid/view/View;)Z
 SPLandroidx/recyclerview/widget/RecyclerView;->requestLayout()V
 SPLandroidx/recyclerview/widget/RecyclerView;->resetFocusInfo()V
 SPLandroidx/recyclerview/widget/RecyclerView;->saveFocusInfo()V
+SPLandroidx/recyclerview/widget/RecyclerView;->saveOldPositions()V
 SPLandroidx/recyclerview/widget/RecyclerView;->sendAccessibilityEventUnchecked(Landroid/view/accessibility/AccessibilityEvent;)V
 SPLandroidx/recyclerview/widget/RecyclerView;->setAccessibilityDelegateCompat(Landroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate;)V
 SPLandroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
@@ -4099,27 +4598,37 @@ Landroidx/recyclerview/widget/RecyclerView$1;
 SPLandroidx/recyclerview/widget/RecyclerView$1;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 Landroidx/recyclerview/widget/RecyclerView$2;
 SPLandroidx/recyclerview/widget/RecyclerView$2;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$2;->run()V
 Landroidx/recyclerview/widget/RecyclerView$3;
 SPLandroidx/recyclerview/widget/RecyclerView$3;-><init>()V
 Landroidx/recyclerview/widget/RecyclerView$4;
 SPLandroidx/recyclerview/widget/RecyclerView$4;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$4;->processAppeared(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)V
 Landroidx/recyclerview/widget/RecyclerView$5;
 SPLandroidx/recyclerview/widget/RecyclerView$5;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 Landroidx/recyclerview/widget/RecyclerView$6;
 SPLandroidx/recyclerview/widget/RecyclerView$6;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 SPLandroidx/recyclerview/widget/RecyclerView$6;->addView(Landroid/view/View;I)V
+SPLandroidx/recyclerview/widget/RecyclerView$6;->attachViewToParent(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V
+SPLandroidx/recyclerview/widget/RecyclerView$6;->detachViewFromParent(I)V
 SPLandroidx/recyclerview/widget/RecyclerView$6;->getChildAt(I)Landroid/view/View;
 SPLandroidx/recyclerview/widget/RecyclerView$6;->getChildCount()I
+SPLandroidx/recyclerview/widget/RecyclerView$6;->indexOfChild(Landroid/view/View;)I
 SPLandroidx/recyclerview/widget/RecyclerView$6;->removeAllViews()V
 Landroidx/recyclerview/widget/RecyclerView$7;
 SPLandroidx/recyclerview/widget/RecyclerView$7;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$7;->dispatchUpdate(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
+SPLandroidx/recyclerview/widget/RecyclerView$7;->offsetPositionsForAdd(II)V
+SPLandroidx/recyclerview/widget/RecyclerView$7;->onDispatchSecondPass(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
 Landroidx/recyclerview/widget/RecyclerView$Adapter;
 SPLandroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->bindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
 SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->createViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->getItemViewType(I)I
 SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->hasObservers()Z
 SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->hasStableIds()Z
 SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->notifyDataSetChanged()V
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->notifyItemChanged(I)V
 SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->notifyItemRangeChanged(II)V
 SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->notifyItemRangeInserted(II)V
 SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->onAttachedToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
@@ -4144,10 +4653,21 @@ Landroidx/recyclerview/widget/RecyclerView$EdgeEffectFactory;
 SPLandroidx/recyclerview/widget/RecyclerView$EdgeEffectFactory;-><init>()V
 Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;
 SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;-><init>()V
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->dispatchAnimationFinished(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->dispatchAnimationsFinished()V
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->getAddDuration()J
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->obtainHolderInfo()Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->onAnimationFinished(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->recordPostLayoutInformation(Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
 SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->setListener(Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorListener;)V
 Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorListener;
+Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;-><init>()V
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;->setFrom(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;->setFrom(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
 Landroidx/recyclerview/widget/RecyclerView$ItemAnimatorRestoreListener;
 SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimatorRestoreListener;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimatorRestoreListener;->onAnimationFinished(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;-><init>()V
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->addView(Landroid/view/View;)V
@@ -4157,11 +4677,16 @@ SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->assertNotInLayoutOr
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->checkLayoutParams(Landroidx/recyclerview/widget/RecyclerView$LayoutParams;)Z
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->chooseSize(III)I
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->detachAndScrapAttachedViews(Landroidx/recyclerview/widget/RecyclerView$Recycler;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->detachViewAt(I)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->detachViewInternal(ILandroid/view/View;)V
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->dispatchAttachedToWindow(Landroidx/recyclerview/widget/RecyclerView;)V
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->generateLayoutParams(Landroid/content/Context;Landroid/util/AttributeSet;)Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getBottomDecorationHeight(Landroid/view/View;)I
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildAt(I)Landroid/view/View;
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildCount()I
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildMeasureSpec(IIIIZ)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getColumnCountForAccessibility(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getDecoratedBottom(Landroid/view/View;)I
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getDecoratedMeasuredHeight(Landroid/view/View;)I
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getDecoratedMeasuredWidth(Landroid/view/View;)I
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getDecoratedTop(Landroid/view/View;)I
@@ -4174,20 +4699,32 @@ SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPaddingLeft()I
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPaddingRight()I
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPaddingTop()I
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPosition(Landroid/view/View;)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getRowCountForAccessibility(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getSelectionModeForAccessibility(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)I
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getTopDecorationHeight(Landroid/view/View;)I
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getWidth()I
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getWidthMode()I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->isLayoutHierarchical(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)Z
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->isMeasurementUpToDate(III)Z
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->layoutDecoratedWithMargins(Landroid/view/View;IIII)V
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->measureChildWithMargins(Landroid/view/View;II)V
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->offsetChildrenVertical(I)V
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onAdapterChanged(Landroidx/recyclerview/widget/RecyclerView$Adapter;Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onAttachedToWindow(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onInitializeAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onInitializeAccessibilityEvent(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroid/view/accessibility/AccessibilityEvent;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onInitializeAccessibilityNodeInfo(Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onInitializeAccessibilityNodeInfo(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onInitializeAccessibilityNodeInfoForItem(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onInitializeAccessibilityNodeInfoForItem(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onItemsAdded(Landroidx/recyclerview/widget/RecyclerView;II)V
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onItemsChanged(Landroidx/recyclerview/widget/RecyclerView;)V
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onLayoutCompleted(Landroidx/recyclerview/widget/RecyclerView$State;)V
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onMeasure(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;II)V
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->removeAndRecycleAllViews(Landroidx/recyclerview/widget/RecyclerView$Recycler;)V
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->removeAndRecycleScrapInt(Landroidx/recyclerview/widget/RecyclerView$Recycler;)V
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->requestLayout()V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->scrapOrRecycleView(Landroidx/recyclerview/widget/RecyclerView$Recycler;ILandroid/view/View;)V
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->setExactMeasureSpecsFrom(Landroidx/recyclerview/widget/RecyclerView;)V
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->setMeasureSpecs(II)V
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->setRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
@@ -4196,6 +4733,9 @@ Landroidx/recyclerview/widget/RecyclerView$LayoutManager$1;
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$1;-><init>(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
 Landroidx/recyclerview/widget/RecyclerView$LayoutManager$2;
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$2;-><init>(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$2;->getChildAt(I)Landroid/view/View;
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$2;->getChildEnd(Landroid/view/View;)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$2;->getChildStart(Landroid/view/View;)I
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$2;->getParentEnd()I
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$2;->getParentStart()I
 Landroidx/recyclerview/widget/RecyclerView$LayoutManager$LayoutPrefetchRegistry;
@@ -4204,6 +4744,8 @@ SPLandroidx/recyclerview/widget/RecyclerView$LayoutParams;-><init>(Landroid/cont
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutParams;->getViewLayoutPosition()I
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutParams;->isItemChanged()Z
 SPLandroidx/recyclerview/widget/RecyclerView$LayoutParams;->isItemRemoved()Z
+Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;
+SPLandroidx/recyclerview/widget/RecyclerView$OnScrollListener;-><init>()V
 Landroidx/recyclerview/widget/RecyclerView$RecycledViewPool;
 SPLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool;-><init>()V
 SPLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool;->attach()V
@@ -4225,6 +4767,7 @@ SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->clearOldPositions()V
 SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->clearScrap()V
 SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getRecycledViewPool()Landroidx/recyclerview/widget/RecyclerView$RecycledViewPool;
 SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getScrapCount()I
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getScrapList()Ljava/util/List;
 SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getScrapOrCachedViewForId(JIZ)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getScrapOrHiddenOrCachedHolderForPosition(IZ)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getViewForPosition(I)Landroid/view/View;
@@ -4232,13 +4775,17 @@ SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getViewForPosition(IZ)La
 SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->markItemDecorInsetsDirty()V
 SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->markKnownViewsInvalid()V
 SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->maybeSendPoolingContainerAttach()V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->offsetPositionRecordsForInsert(II)V
 SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->onAdapterChanged(Landroidx/recyclerview/widget/RecyclerView$Adapter;Landroidx/recyclerview/widget/RecyclerView$Adapter;Z)V
 SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->onAttachedToWindow()V
 SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->poolingContainerDetach(Landroidx/recyclerview/widget/RecyclerView$Adapter;Z)V
 SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->recycleAndClearCachedViews()V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->scrapView(Landroid/view/View;)V
 SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->tryBindViewHolderByDeadline(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;IIJ)Z
 SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->tryGetViewHolderForPositionByDeadline(IZJ)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->unscrapView(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->updateViewCacheSize()V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->validateViewHolderForOffsetPosition(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Z
 Landroidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver;
 SPLandroidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 SPLandroidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver;->onChanged()V
@@ -4261,40 +4808,75 @@ SPLandroidx/recyclerview/widget/RecyclerView$ViewFlinger;->stop()V
 Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;-><clinit>()V
 SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->addFlags(I)V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->clearOldPosition()V
 SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->clearPayload()V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->clearReturnedFromScrapFlag()V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->clearTmpDetachFlag()V
 SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->getItemViewType()I
 SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->getLayoutPosition()I
 SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->getUnmodifiedPayloads()Ljava/util/List;
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->hasAnyOfTheFlags(I)Z
 SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->isBound()Z
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->isInvalid()Z
 SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->isRemoved()Z
 SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->isScrap()Z
 SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->isTmpDetached()Z
 SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->isUpdated()Z
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->needsUpdate()Z
 SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->setFlags(II)V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->setIsRecyclable(Z)V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->setScrapContainer(Landroidx/recyclerview/widget/RecyclerView$Recycler;Z)V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->shouldBeKeptAsChild()Z
 SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->shouldIgnore()Z
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->unScrap()V
 SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->wasReturnedFromScrap()Z
 Landroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate;
 SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate;->getItemDelegate()Landroidx/core/view/AccessibilityDelegateCompat;
 SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate;->onInitializeAccessibilityEvent(Landroid/view/View;Landroid/view/accessibility/AccessibilityEvent;)V
+SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
 SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate;->shouldIgnore()Z
 Landroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate$ItemDelegate;
 SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate$ItemDelegate;-><init>(Landroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate;)V
 SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate$ItemDelegate;->getAccessibilityNodeProvider(Landroid/view/View;)Landroidx/core/view/accessibility/AccessibilityNodeProviderCompat;
+SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate$ItemDelegate;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
 SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate$ItemDelegate;->saveOriginalDelegate(Landroid/view/View;)V
+Landroidx/recyclerview/widget/ScrollbarHelper;
+SPLandroidx/recyclerview/widget/ScrollbarHelper;->computeScrollExtent(Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/OrientationHelper;Landroid/view/View;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView$LayoutManager;Z)I
+SPLandroidx/recyclerview/widget/ScrollbarHelper;->computeScrollOffset(Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/OrientationHelper;Landroid/view/View;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView$LayoutManager;ZZ)I
+SPLandroidx/recyclerview/widget/ScrollbarHelper;->computeScrollRange(Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/OrientationHelper;Landroid/view/View;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView$LayoutManager;Z)I
 Landroidx/recyclerview/widget/SimpleItemAnimator;
 SPLandroidx/recyclerview/widget/SimpleItemAnimator;-><init>()V
+SPLandroidx/recyclerview/widget/SimpleItemAnimator;->animateAppearance(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)Z
+SPLandroidx/recyclerview/widget/SimpleItemAnimator;->dispatchAddFinished(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/SimpleItemAnimator;->dispatchAddStarting(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/SimpleItemAnimator;->onAddFinished(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/SimpleItemAnimator;->onAddStarting(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 Landroidx/recyclerview/widget/ViewBoundsCheck;
 SPLandroidx/recyclerview/widget/ViewBoundsCheck;-><init>(Landroidx/recyclerview/widget/ViewBoundsCheck$Callback;)V
 SPLandroidx/recyclerview/widget/ViewBoundsCheck;->findOneViewWithinBoundFlags(IIII)Landroid/view/View;
 Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;
 SPLandroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;-><init>()V
+SPLandroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->addFlags(I)V
+SPLandroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->boundsMatch()Z
+SPLandroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->compare(II)I
+SPLandroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->resetFlags()V
+SPLandroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->setBounds(IIII)V
 Landroidx/recyclerview/widget/ViewBoundsCheck$Callback;
 Landroidx/recyclerview/widget/ViewInfoStore;
 SPLandroidx/recyclerview/widget/ViewInfoStore;-><init>()V
+SPLandroidx/recyclerview/widget/ViewInfoStore;->addToPostLayout(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)V
 SPLandroidx/recyclerview/widget/ViewInfoStore;->clear()V
+SPLandroidx/recyclerview/widget/ViewInfoStore;->getFromOldChangeHolders(J)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+SPLandroidx/recyclerview/widget/ViewInfoStore;->onViewDetached(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/ViewInfoStore;->process(Landroidx/recyclerview/widget/ViewInfoStore$ProcessCallback;)V
 SPLandroidx/recyclerview/widget/ViewInfoStore;->removeFromDisappearedInLayout(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;
+SPLandroidx/recyclerview/widget/ViewInfoStore$InfoRecord;-><clinit>()V
+SPLandroidx/recyclerview/widget/ViewInfoStore$InfoRecord;-><init>()V
+SPLandroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->obtain()Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;
+SPLandroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->recycle(Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;)V
 Landroidx/recyclerview/widget/ViewInfoStore$ProcessCallback;
 Landroidx/room/BaseRoomConnectionManager;
 SPLandroidx/room/BaseRoomConnectionManager;-><clinit>()V
@@ -4319,9 +4901,6 @@ SPLandroidx/room/EntityInsertAdapter;->insert(Landroidx/sqlite/SQLiteConnection;
 Landroidx/room/InvalidationLiveDataContainer;
 SPLandroidx/room/InvalidationLiveDataContainer;-><init>(Landroidx/room/RoomDatabase;)V
 Landroidx/room/InvalidationTracker;
-SPLandroidx/room/InvalidationTracker;->$r8$lambda$S0GAeZVlYzHdkENrWO-BCuj8x5g(Landroidx/room/InvalidationTracker;)Lkotlin/Unit;
-SPLandroidx/room/InvalidationTracker;->$r8$lambda$rV938R3HpEbbZMJ5mxkZVyQwHqY(Landroidx/room/InvalidationTracker;)Z
-SPLandroidx/room/InvalidationTracker;->$r8$lambda$z_vz9Tqx65AifWN0It6OfeI4bTk(Landroidx/room/InvalidationTracker;)Lkotlin/Unit;
 SPLandroidx/room/InvalidationTracker;-><clinit>()V
 SPLandroidx/room/InvalidationTracker;-><init>(Landroidx/room/RoomDatabase;Ljava/util/Map;Ljava/util/Map;[Ljava/lang/String;)V
 SPLandroidx/room/InvalidationTracker;->_init_$lambda$2(Landroidx/room/InvalidationTracker;)Z
@@ -4441,6 +5020,7 @@ SPLandroidx/room/RoomDatabase$MigrationContainer;->addMigration(Landroidx/room/m
 SPLandroidx/room/RoomDatabase$MigrationContainer;->addMigrations([Landroidx/room/migration/Migration;)V
 SPLandroidx/room/RoomDatabase$MigrationContainer;->contains(II)Z
 SPLandroidx/room/RoomDatabase$MigrationContainer;->getMigrations()Ljava/util/Map;
+Landroidx/room/RoomDatabase$PrepackagedDatabaseCallback;
 Landroidx/room/RoomDatabase$closeBarrier$1;
 SPLandroidx/room/RoomDatabase$closeBarrier$1;-><init>(Ljava/lang/Object;)V
 Landroidx/room/RoomDatabaseKt;
@@ -4462,7 +5042,6 @@ Landroidx/room/TransactionElement$Key;
 SPLandroidx/room/TransactionElement$Key;-><init>()V
 SPLandroidx/room/TransactionElement$Key;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 Landroidx/room/TransactionExecutor;
-SPLandroidx/room/TransactionExecutor;->$r8$lambda$FZWr2PGmP3sgXLCiri-DCcePXSs(Ljava/lang/Runnable;Landroidx/room/TransactionExecutor;)V
 SPLandroidx/room/TransactionExecutor;-><init>(Ljava/util/concurrent/Executor;)V
 SPLandroidx/room/TransactionExecutor;->execute$lambda$1$lambda$0(Ljava/lang/Runnable;Landroidx/room/TransactionExecutor;)V
 SPLandroidx/room/TransactionExecutor;->execute(Ljava/lang/Runnable;)V
@@ -4478,14 +5057,12 @@ SPLandroidx/room/Transactor$SQLiteTransactionType;-><clinit>()V
 SPLandroidx/room/Transactor$SQLiteTransactionType;-><init>(Ljava/lang/String;I)V
 SPLandroidx/room/Transactor$SQLiteTransactionType;->values()[Landroidx/room/Transactor$SQLiteTransactionType;
 Landroidx/room/TransactorKt;
-SPLandroidx/room/TransactorKt;->$r8$lambda$VVj_enrVNhrquoXbSKTrpTfnIsI(Landroidx/sqlite/SQLiteStatement;)Z
 SPLandroidx/room/TransactorKt;->execSQL$lambda$0(Landroidx/sqlite/SQLiteStatement;)Z
 SPLandroidx/room/TransactorKt;->execSQL(Landroidx/room/PooledConnection;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Landroidx/room/TransactorKt$$ExternalSyntheticLambda0;
 SPLandroidx/room/TransactorKt$$ExternalSyntheticLambda0;-><init>()V
 SPLandroidx/room/TransactorKt$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Landroidx/room/TriggerBasedInvalidationTracker;
-SPLandroidx/room/TriggerBasedInvalidationTracker;->$r8$lambda$NRZHa3RQXpIcgcxW1BMkNDbO3A8(Landroidx/sqlite/SQLiteStatement;)Ljava/util/Set;
 SPLandroidx/room/TriggerBasedInvalidationTracker;-><clinit>()V
 SPLandroidx/room/TriggerBasedInvalidationTracker;-><init>(Landroidx/room/RoomDatabase;Ljava/util/Map;Ljava/util/Map;[Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)V
 SPLandroidx/room/TriggerBasedInvalidationTracker;->access$checkInvalidatedTables(Landroidx/room/TriggerBasedInvalidationTracker;Landroidx/room/PooledConnection;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -4758,7 +5335,9 @@ SPLandroidx/savedstate/Recreator$Companion;-><init>()V
 SPLandroidx/savedstate/Recreator$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 Landroidx/savedstate/SavedStateReader;
 SPLandroidx/savedstate/SavedStateReader;->constructor-impl(Landroid/os/Bundle;)Landroid/os/Bundle;
+SPLandroidx/savedstate/SavedStateReader;->contains-impl(Landroid/os/Bundle;Ljava/lang/String;)Z
 SPLandroidx/savedstate/SavedStateReader;->isEmpty-impl(Landroid/os/Bundle;)Z
+SPLandroidx/savedstate/SavedStateReader;->toMap-impl(Landroid/os/Bundle;)Ljava/util/Map;
 Landroidx/savedstate/SavedStateRegistry;
 SPLandroidx/savedstate/SavedStateRegistry;-><init>(Landroidx/savedstate/internal/SavedStateRegistryImpl;)V
 SPLandroidx/savedstate/SavedStateRegistry;->consumeRestoredStateForKey(Ljava/lang/String;)Landroid/os/Bundle;
@@ -4775,7 +5354,6 @@ SPLandroidx/savedstate/SavedStateRegistryController;->performAttach()V
 SPLandroidx/savedstate/SavedStateRegistryController;->performRestore(Landroid/os/Bundle;)V
 SPLandroidx/savedstate/SavedStateRegistryController;->performSave(Landroid/os/Bundle;)V
 Landroidx/savedstate/SavedStateRegistryController$Companion;
-SPLandroidx/savedstate/SavedStateRegistryController$Companion;->$r8$lambda$mYKAg7nh_JcP4XSEzfHJKM82YOw(Landroidx/savedstate/SavedStateRegistryOwner;)Lkotlin/Unit;
 SPLandroidx/savedstate/SavedStateRegistryController$Companion;-><init>()V
 SPLandroidx/savedstate/SavedStateRegistryController$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLandroidx/savedstate/SavedStateRegistryController$Companion;->create$lambda$0(Landroidx/savedstate/SavedStateRegistryOwner;)Lkotlin/Unit;
@@ -4789,7 +5367,6 @@ SPLandroidx/savedstate/SavedStateWriter;->constructor-impl(Landroid/os/Bundle;)L
 Landroidx/savedstate/ViewTreeSavedStateRegistryOwner;
 SPLandroidx/savedstate/ViewTreeSavedStateRegistryOwner;->set(Landroid/view/View;Landroidx/savedstate/SavedStateRegistryOwner;)V
 Landroidx/savedstate/internal/SavedStateRegistryImpl;
-SPLandroidx/savedstate/internal/SavedStateRegistryImpl;->$r8$lambda$6xnOyEL_uTccN7fW0CY8JkIx-HI(Landroidx/savedstate/internal/SavedStateRegistryImpl;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
 SPLandroidx/savedstate/internal/SavedStateRegistryImpl;-><clinit>()V
 SPLandroidx/savedstate/internal/SavedStateRegistryImpl;-><init>(Landroidx/savedstate/SavedStateRegistryOwner;Lkotlin/jvm/functions/Function0;)V
 SPLandroidx/savedstate/internal/SavedStateRegistryImpl;->access$getKeyToProviders$p(Landroidx/savedstate/internal/SavedStateRegistryImpl;)Ljava/util/Map;
@@ -4814,10 +5391,8 @@ Landroidx/sqlite/SQLiteConnection;
 Landroidx/sqlite/SQLiteDriver;
 Landroidx/sqlite/SQLiteStatement;
 SPLandroidx/sqlite/SQLiteStatement;->getBoolean(I)Z
-Landroidx/sqlite/db/SupportSQLiteCompat$Api21Impl;
-SPLandroidx/sqlite/db/SupportSQLiteCompat$Api21Impl;-><clinit>()V
-SPLandroidx/sqlite/db/SupportSQLiteCompat$Api21Impl;-><init>()V
-SPLandroidx/sqlite/db/SupportSQLiteCompat$Api21Impl;->getNoBackupFilesDir(Landroid/content/Context;)Ljava/io/File;
+Landroidx/sqlite/SQLite__SQLite_nonWebKt;
+SPLandroidx/sqlite/SQLite__SQLite_nonWebKt;->execSQL(Landroidx/sqlite/SQLiteConnection;Ljava/lang/String;)V
 Landroidx/sqlite/db/SupportSQLiteDatabase;
 Landroidx/sqlite/db/SupportSQLiteOpenHelper;
 Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;
@@ -4846,22 +5421,18 @@ Landroidx/sqlite/db/SupportSQLiteProgram;
 Landroidx/sqlite/db/SupportSQLiteQuery;
 Landroidx/sqlite/db/SupportSQLiteStatement;
 Landroidx/sqlite/db/framework/FrameworkSQLiteDatabase;
-SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->$r8$lambda$4rXSxUDV5Jwg_myyvvGbHMZMbGM()Ljava/lang/reflect/Method;
-SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->$r8$lambda$TcD1j6gYKY4LbAnrkC-XD1zFcJk(Lkotlin/jvm/functions/Function4;Landroid/database/sqlite/SQLiteDatabase;Landroid/database/sqlite/SQLiteCursorDriver;Ljava/lang/String;Landroid/database/sqlite/SQLiteQuery;)Landroid/database/Cursor;
-SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->$r8$lambda$dKqImjZeKtSaT9NYGZ8XQAtPq7s()Ljava/lang/reflect/Method;
-SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->$r8$lambda$lJwI5rfEgbbousRT0mbuHaL1K3E(Landroidx/sqlite/db/SupportSQLiteQuery;Landroid/database/sqlite/SQLiteDatabase;Landroid/database/sqlite/SQLiteCursorDriver;Ljava/lang/String;Landroid/database/sqlite/SQLiteQuery;)Landroid/database/sqlite/SQLiteCursor;
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;-><clinit>()V
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;-><init>(Landroid/database/sqlite/SQLiteDatabase;)V
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->access$getBeginTransactionMethod$delegate$cp()Lkotlin/Lazy;
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->access$getGetThreadSessionMethod$delegate$cp()Lkotlin/Lazy;
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->beginTransaction()V
-SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->beginTransactionMethod_delegate$lambda$8()Ljava/lang/reflect/Method;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->beginTransactionMethod_delegate$lambda$0()Ljava/lang/reflect/Method;
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->beginTransactionNonExclusive()V
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->beginTransactionReadOnly()V
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->compileStatement(Ljava/lang/String;)Landroidx/sqlite/db/SupportSQLiteStatement;
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->endTransaction()V
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->execSQL(Ljava/lang/String;)V
-SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->getThreadSessionMethod_delegate$lambda$7()Ljava/lang/reflect/Method;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->getThreadSessionMethod_delegate$lambda$0()Ljava/lang/reflect/Method;
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->inTransaction()Z
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->internalBeginTransactionWithListenerReadOnly(Landroid/database/sqlite/SQLiteTransactionListener;)V
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->isDelegate$sqlite_framework(Landroid/database/sqlite/SQLiteDatabase;)Z
@@ -4891,7 +5462,6 @@ SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase$Companion;->access$getGe
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase$Companion;->getBeginTransactionMethod()Ljava/lang/reflect/Method;
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase$Companion;->getGetThreadSessionMethod()Ljava/lang/reflect/Method;
 Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper;
-SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper;->$r8$lambda$bMXVQYZgPq9YSTqMFpOzwjrmmJ8(Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper;)Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper;
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper;-><clinit>()V
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper;-><init>(Landroid/content/Context;Ljava/lang/String;Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;ZZ)V
 SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper;->getDatabaseName()Ljava/lang/String;
@@ -4972,29 +5542,20 @@ Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;
 SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable;-><clinit>()V
 SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable;-><init>(Landroid/content/Context;)V
 SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable;->getOpacity()I
-SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable;->setAlpha(I)V
-SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable;->setRotation(F)V
 SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable;->setSizeParameters(FFFF)V
 SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable;->setStrokeWidth(F)V
 SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable;->setStyle(I)V
 SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable;->setupAnimators()V
-SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable;->stop()V
 Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$1;
 SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$1;-><init>(Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;)V
 Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$2;
 SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$2;-><init>(Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;)V
 Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;
 SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;-><init>()V
-SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->resetOriginals()V
-SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->setAlpha(I)V
 SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->setArrowDimensions(FF)V
 SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->setCenterRadius(F)V
 SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->setColorIndex(I)V
 SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->setColors([I)V
-SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->setEndTrim(F)V
-SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->setRotation(F)V
-SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->setShowArrow(Z)V
-SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->setStartTrim(F)V
 SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->setStrokeWidth(F)V
 Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;
 SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;-><clinit>()V
@@ -5005,8 +5566,6 @@ SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->getChildDrawingOrder(
 SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->moveToStart(F)V
 SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->onLayout(ZIIII)V
 SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->onMeasure(II)V
-SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->reset()V
-SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setColorViewAlpha(I)V
 SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setDistanceToTriggerSync(I)V
 SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setEnabled(Z)V
 SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setNestedScrollingEnabled(Z)V
@@ -5019,16 +5578,143 @@ SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6;-><init>(Landroidx/sw
 Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$7;
 SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout$7;-><init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V
 Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnRefreshListener;
+Landroidx/tracing/AbstractTraceSink;
+SPLandroidx/tracing/AbstractTraceSink;-><init>()V
+Landroidx/tracing/CommonKt;
+SPLandroidx/tracing/CommonKt;-><clinit>()V
+SPLandroidx/tracing/CommonKt;->monotonicId()J
+Landroidx/tracing/Counter;
+Landroidx/tracing/CounterTrack;
+SPLandroidx/tracing/CounterTrack;-><init>(Ljava/lang/String;Landroidx/tracing/Track;)V
+Landroidx/tracing/EmptyCloseable;
+SPLandroidx/tracing/EmptyCloseable;-><clinit>()V
+SPLandroidx/tracing/EmptyCloseable;-><init>()V
+SPLandroidx/tracing/EmptyCloseable;->close()V
+Landroidx/tracing/EmptyCounterTrack;
+SPLandroidx/tracing/EmptyCounterTrack;-><init>(Landroidx/tracing/EmptyProcessTrack;)V
+Landroidx/tracing/EmptyEventMetadata;
+SPLandroidx/tracing/EmptyEventMetadata;-><clinit>()V
+SPLandroidx/tracing/EmptyEventMetadata;-><init>()V
+Landroidx/tracing/EmptyProcessTrack;
+SPLandroidx/tracing/EmptyProcessTrack;-><init>(Landroidx/tracing/EmptyTraceContext;)V
+Landroidx/tracing/EmptyThreadTrack;
+SPLandroidx/tracing/EmptyThreadTrack;-><init>(Landroidx/tracing/EmptyProcessTrack;)V
+Landroidx/tracing/EmptyTraceContext;
+SPLandroidx/tracing/EmptyTraceContext;-><clinit>()V
+SPLandroidx/tracing/EmptyTraceContext;-><init>()V
+SPLandroidx/tracing/EmptyTraceContext;->getProcess()Landroidx/tracing/ProcessTrack;
+SPLandroidx/tracing/EmptyTraceContext;->setProcess(Landroidx/tracing/ProcessTrack;)V
+Landroidx/tracing/EmptyTraceContext$$ExternalSyntheticLambda0;
+SPLandroidx/tracing/EmptyTraceContext$$ExternalSyntheticLambda0;-><init>()V
+Landroidx/tracing/EmptyTraceSink;
+SPLandroidx/tracing/EmptyTraceSink;-><clinit>()V
+SPLandroidx/tracing/EmptyTraceSink;-><init>()V
+Landroidx/tracing/EventMetadata;
+SPLandroidx/tracing/EventMetadata;-><init>()V
+Landroidx/tracing/EventMetadataCloseable;
+SPLandroidx/tracing/EventMetadataCloseable;-><init>(Landroidx/tracing/EventMetadata;Ljava/lang/AutoCloseable;Landroidx/tracing/PropagationToken;)V
+SPLandroidx/tracing/EventMetadataCloseable;-><init>(Landroidx/tracing/EventMetadata;Ljava/lang/AutoCloseable;Landroidx/tracing/PropagationToken;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/tracing/PerfettoTracer;
+SPLandroidx/tracing/PerfettoTracer;-><init>(Landroidx/tracing/TraceContext;Lkotlin/jvm/functions/Function1;)V
+SPLandroidx/tracing/PerfettoTracer;->isCategoryEnabled(Ljava/lang/String;)Z
+Landroidx/tracing/PerfettoTracer$$ExternalSyntheticApiModelOutline0;
+SPLandroidx/tracing/PerfettoTracer$$ExternalSyntheticApiModelOutline0;->m()Landroid/content/pm/PackageInfo;
+SPLandroidx/tracing/PerfettoTracer$$ExternalSyntheticApiModelOutline0;->m()Ljava/lang/String;
+Landroidx/tracing/ProcessTrack;
+SPLandroidx/tracing/ProcessTrack;-><init>(Landroidx/tracing/TraceContext;ILjava/lang/String;)V
+Landroidx/tracing/PropagationToken;
+Landroidx/tracing/PropagationUnsupportedToken;
+SPLandroidx/tracing/PropagationUnsupportedToken;-><clinit>()V
+SPLandroidx/tracing/PropagationUnsupportedToken;-><init>()V
+Landroidx/tracing/SliceTrack;
+SPLandroidx/tracing/SliceTrack;-><init>(Landroidx/tracing/TraceContext;J)V
+Landroidx/tracing/ThreadTrack;
+SPLandroidx/tracing/ThreadTrack;-><init>(JJLjava/lang/String;Landroidx/tracing/ProcessTrack;)V
 Landroidx/tracing/Trace;
+SPLandroidx/tracing/Trace;-><clinit>()V
+SPLandroidx/tracing/Trace;-><init>()V
 SPLandroidx/tracing/Trace;->beginSection(Ljava/lang/String;)V
 SPLandroidx/tracing/Trace;->endSection()V
 SPLandroidx/tracing/Trace;->isEnabled()Z
 SPLandroidx/tracing/Trace;->truncatedTraceSectionLabel(Ljava/lang/String;)Ljava/lang/String;
-Landroidx/tracing/TraceApi18Impl;
-SPLandroidx/tracing/TraceApi18Impl;->beginSection(Ljava/lang/String;)V
-SPLandroidx/tracing/TraceApi18Impl;->endSection()V
 Landroidx/tracing/TraceApi29Impl;
+SPLandroidx/tracing/TraceApi29Impl;-><clinit>()V
+SPLandroidx/tracing/TraceApi29Impl;-><init>()V
 SPLandroidx/tracing/TraceApi29Impl;->isEnabled()Z
+Landroidx/tracing/TraceAttributes;
+SPLandroidx/tracing/TraceAttributes;-><init>()V
+Landroidx/tracing/TraceAttributesImpl;
+SPLandroidx/tracing/TraceAttributesImpl;-><init>()V
+Landroidx/tracing/TraceContext;
+SPLandroidx/tracing/TraceContext;-><init>(Landroidx/tracing/AbstractTraceSink;ZLkotlin/jvm/functions/Function1;Z)V
+SPLandroidx/tracing/TraceContext;->createProcessTrack(ILjava/lang/String;)V
+Landroidx/tracing/TraceEventScope;
+SPLandroidx/tracing/TraceEventScope;-><init>()V
+Landroidx/tracing/Tracer;
+SPLandroidx/tracing/Tracer;-><clinit>()V
+SPLandroidx/tracing/Tracer;-><init>()V
+SPLandroidx/tracing/Tracer;->access$getTracer$cp()Landroidx/tracing/Tracer;
+SPLandroidx/tracing/Tracer;->stubTracer$lambda$0(Ljava/lang/String;)Z
+Landroidx/tracing/Tracer$$ExternalSyntheticLambda0;
+SPLandroidx/tracing/Tracer$$ExternalSyntheticLambda0;-><init>()V
+SPLandroidx/tracing/Tracer$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/tracing/Tracer$Companion;
+SPLandroidx/tracing/Tracer$Companion;-><init>()V
+SPLandroidx/tracing/Tracer$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/tracing/Tracer$Companion;->getGlobal()Landroidx/tracing/Tracer;
+Landroidx/tracing/Track;
+SPLandroidx/tracing/Track;-><init>(Landroidx/tracing/TraceContext;J)V
+Landroidx/transition/AutoTransition;
+SPLandroidx/transition/AutoTransition;-><init>()V
+SPLandroidx/transition/AutoTransition;->init()V
+Landroidx/transition/ChangeBounds;
+SPLandroidx/transition/ChangeBounds;-><clinit>()V
+SPLandroidx/transition/ChangeBounds;-><init>()V
+Landroidx/transition/ChangeBounds$1;
+SPLandroidx/transition/ChangeBounds$1;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Landroidx/transition/ChangeBounds$2;
+SPLandroidx/transition/ChangeBounds$2;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Landroidx/transition/ChangeBounds$3;
+SPLandroidx/transition/ChangeBounds$3;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Landroidx/transition/ChangeBounds$4;
+SPLandroidx/transition/ChangeBounds$4;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Landroidx/transition/ChangeBounds$5;
+SPLandroidx/transition/ChangeBounds$5;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Landroidx/transition/Fade;
+SPLandroidx/transition/Fade;-><init>(I)V
+Landroidx/transition/PathMotion;
+SPLandroidx/transition/PathMotion;-><init>()V
+Landroidx/transition/RectEvaluator;
+SPLandroidx/transition/RectEvaluator;-><init>()V
+Landroidx/transition/Transition;
+SPLandroidx/transition/Transition;-><clinit>()V
+SPLandroidx/transition/Transition;-><init>()V
+SPLandroidx/transition/Transition;->excludeTarget(Ljava/lang/Class;Z)Landroidx/transition/Transition;
+SPLandroidx/transition/Transition;->excludeType(Ljava/util/ArrayList;Ljava/lang/Class;Z)Ljava/util/ArrayList;
+SPLandroidx/transition/Transition;->getInterpolator()Landroid/animation/TimeInterpolator;
+SPLandroidx/transition/Transition;->setDuration(J)Landroidx/transition/Transition;
+SPLandroidx/transition/Transition;->setInterpolator(Landroid/animation/TimeInterpolator;)Landroidx/transition/Transition;
+Landroidx/transition/Transition$1;
+SPLandroidx/transition/Transition$1;-><init>()V
+Landroidx/transition/Transition$ArrayListManager;
+SPLandroidx/transition/Transition$ArrayListManager;->add(Ljava/util/ArrayList;Ljava/lang/Object;)Ljava/util/ArrayList;
+Landroidx/transition/TransitionManager;
+SPLandroidx/transition/TransitionManager;-><clinit>()V
+SPLandroidx/transition/TransitionManager;->beginDelayedTransition(Landroid/view/ViewGroup;Landroidx/transition/Transition;)V
+Landroidx/transition/TransitionSet;
+SPLandroidx/transition/TransitionSet;-><init>()V
+SPLandroidx/transition/TransitionSet;->addTransition(Landroidx/transition/Transition;)Landroidx/transition/TransitionSet;
+SPLandroidx/transition/TransitionSet;->addTransitionInternal(Landroidx/transition/Transition;)V
+SPLandroidx/transition/TransitionSet;->excludeTarget(Ljava/lang/Class;Z)Landroidx/transition/Transition;
+SPLandroidx/transition/TransitionSet;->setDuration(J)Landroidx/transition/TransitionSet;
+SPLandroidx/transition/TransitionSet;->setInterpolator(Landroid/animation/TimeInterpolator;)Landroidx/transition/TransitionSet;
+SPLandroidx/transition/TransitionSet;->setOrdering(I)Landroidx/transition/TransitionSet;
+Landroidx/transition/TransitionValuesMaps;
+SPLandroidx/transition/TransitionValuesMaps;-><init>()V
+Landroidx/transition/Visibility;
+SPLandroidx/transition/Visibility;-><clinit>()V
+SPLandroidx/transition/Visibility;-><init>()V
+SPLandroidx/transition/Visibility;->setMode(I)V
 Landroidx/vectordrawable/graphics/drawable/Animatable2Compat;
 Landroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback;
 SPLandroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback;-><init>()V
@@ -5061,41 +5747,44 @@ SPLandroidx/work/Configuration;->getMinimumLoggingLevel()I
 SPLandroidx/work/Configuration;->getRunnableScheduler()Landroidx/work/RunnableScheduler;
 SPLandroidx/work/Configuration;->getTaskExecutor()Ljava/util/concurrent/Executor;
 SPLandroidx/work/Configuration;->getTracer()Landroidx/work/Tracer;
+SPLandroidx/work/Configuration;->isGreedySchedulerEnabled()Z
 SPLandroidx/work/Configuration;->isMarkingJobsAsImportantWhileForeground()Z
+SPLandroidx/work/Configuration;->isRepresentativeJobsEnabled()Z
 Landroidx/work/Configuration$Builder;
 SPLandroidx/work/Configuration$Builder;-><init>()V
 SPLandroidx/work/Configuration$Builder;->build()Landroidx/work/Configuration;
-SPLandroidx/work/Configuration$Builder;->getClock$work_runtime_release()Landroidx/work/Clock;
-SPLandroidx/work/Configuration$Builder;->getContentUriTriggerWorkersLimit$work_runtime_release()I
-SPLandroidx/work/Configuration$Builder;->getDefaultProcessName$work_runtime_release()Ljava/lang/String;
-SPLandroidx/work/Configuration$Builder;->getExecutor$work_runtime_release()Ljava/util/concurrent/Executor;
-SPLandroidx/work/Configuration$Builder;->getInitializationExceptionHandler$work_runtime_release()Landroidx/core/util/Consumer;
-SPLandroidx/work/Configuration$Builder;->getInputMergerFactory$work_runtime_release()Landroidx/work/InputMergerFactory;
-SPLandroidx/work/Configuration$Builder;->getLoggingLevel$work_runtime_release()I
-SPLandroidx/work/Configuration$Builder;->getMarkJobsAsImportantWhileForeground$work_runtime_release()Z
-SPLandroidx/work/Configuration$Builder;->getMaxJobSchedulerId$work_runtime_release()I
-SPLandroidx/work/Configuration$Builder;->getMaxSchedulerLimit$work_runtime_release()I
-SPLandroidx/work/Configuration$Builder;->getMinJobSchedulerId$work_runtime_release()I
-SPLandroidx/work/Configuration$Builder;->getRemoteSessionTimeoutMillis$work_runtime_release()J
-SPLandroidx/work/Configuration$Builder;->getRunnableScheduler$work_runtime_release()Landroidx/work/RunnableScheduler;
-SPLandroidx/work/Configuration$Builder;->getSchedulingExceptionHandler$work_runtime_release()Landroidx/core/util/Consumer;
-SPLandroidx/work/Configuration$Builder;->getTaskExecutor$work_runtime_release()Ljava/util/concurrent/Executor;
-SPLandroidx/work/Configuration$Builder;->getTracer$work_runtime_release()Landroidx/work/Tracer;
-SPLandroidx/work/Configuration$Builder;->getWorkerContext$work_runtime_release()Lkotlin/coroutines/CoroutineContext;
-SPLandroidx/work/Configuration$Builder;->getWorkerExecutionExceptionHandler$work_runtime_release()Landroidx/core/util/Consumer;
-SPLandroidx/work/Configuration$Builder;->getWorkerFactory$work_runtime_release()Landroidx/work/WorkerFactory;
-SPLandroidx/work/Configuration$Builder;->getWorkerInitializationExceptionHandler$work_runtime_release()Landroidx/core/util/Consumer;
+SPLandroidx/work/Configuration$Builder;->getClock$work_runtime()Landroidx/work/Clock;
+SPLandroidx/work/Configuration$Builder;->getContentUriTriggerWorkersLimit$work_runtime()I
+SPLandroidx/work/Configuration$Builder;->getDefaultProcessName$work_runtime()Ljava/lang/String;
+SPLandroidx/work/Configuration$Builder;->getEnableGreedyScheduler$work_runtime()Z
+SPLandroidx/work/Configuration$Builder;->getEnableRepresentativeJobs$work_runtime()Z
+SPLandroidx/work/Configuration$Builder;->getExecutionEventListener$work_runtime()Landroidx/work/ExecutionEventListener;
+SPLandroidx/work/Configuration$Builder;->getExecutor$work_runtime()Ljava/util/concurrent/Executor;
+SPLandroidx/work/Configuration$Builder;->getInitializationExceptionHandler$work_runtime()Landroidx/core/util/Consumer;
+SPLandroidx/work/Configuration$Builder;->getInputMergerFactory$work_runtime()Landroidx/work/InputMergerFactory;
+SPLandroidx/work/Configuration$Builder;->getLoggingLevel$work_runtime()I
+SPLandroidx/work/Configuration$Builder;->getMarkJobsAsImportantWhileForeground$work_runtime()Z
+SPLandroidx/work/Configuration$Builder;->getMaxJobSchedulerId$work_runtime()I
+SPLandroidx/work/Configuration$Builder;->getMaxSchedulerLimit$work_runtime()I
+SPLandroidx/work/Configuration$Builder;->getMinJobSchedulerId$work_runtime()I
+SPLandroidx/work/Configuration$Builder;->getRemoteCancellationPropagationFixEnabled$work_runtime()Z
+SPLandroidx/work/Configuration$Builder;->getRemoteSessionTimeoutMillis$work_runtime()J
+SPLandroidx/work/Configuration$Builder;->getRunnableScheduler$work_runtime()Landroidx/work/RunnableScheduler;
+SPLandroidx/work/Configuration$Builder;->getScheduleEventListener$work_runtime()Landroidx/work/ScheduleEventListener;
+SPLandroidx/work/Configuration$Builder;->getSchedulingExceptionHandler$work_runtime()Landroidx/core/util/Consumer;
+SPLandroidx/work/Configuration$Builder;->getTaskExecutor$work_runtime()Ljava/util/concurrent/Executor;
+SPLandroidx/work/Configuration$Builder;->getTracer$work_runtime()Landroidx/work/Tracer;
+SPLandroidx/work/Configuration$Builder;->getWorkerContext$work_runtime()Lkotlin/coroutines/CoroutineContext;
+SPLandroidx/work/Configuration$Builder;->getWorkerExecutionExceptionHandler$work_runtime()Landroidx/core/util/Consumer;
+SPLandroidx/work/Configuration$Builder;->getWorkerFactory$work_runtime()Landroidx/work/WorkerFactory;
+SPLandroidx/work/Configuration$Builder;->getWorkerInitializationExceptionHandler$work_runtime()Landroidx/core/util/Consumer;
 Landroidx/work/Configuration$Companion;
 SPLandroidx/work/Configuration$Companion;-><init>()V
 SPLandroidx/work/Configuration$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/work/Configuration$Companion;->calculateExecutorParallelismLimit()I
 Landroidx/work/ConfigurationKt;
-SPLandroidx/work/ConfigurationKt;->access$createDefaultExecutor(Z)Ljava/util/concurrent/Executor;
 SPLandroidx/work/ConfigurationKt;->access$createDefaultTracer()Landroidx/work/Tracer;
-SPLandroidx/work/ConfigurationKt;->createDefaultExecutor(Z)Ljava/util/concurrent/Executor;
 SPLandroidx/work/ConfigurationKt;->createDefaultTracer()Landroidx/work/Tracer;
-Landroidx/work/ConfigurationKt$createDefaultExecutor$factory$1;
-SPLandroidx/work/ConfigurationKt$createDefaultExecutor$factory$1;-><init>(Z)V
-SPLandroidx/work/ConfigurationKt$createDefaultExecutor$factory$1;->newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
 Landroidx/work/ConfigurationKt$createDefaultTracer$tracer$1;
 SPLandroidx/work/ConfigurationKt$createDefaultTracer$tracer$1;-><init>()V
 SPLandroidx/work/ConfigurationKt$createDefaultTracer$tracer$1;->isEnabled()Z
@@ -5105,6 +5794,7 @@ Landroidx/work/Data$Builder;
 Landroidx/work/DefaultWorkerFactory;
 SPLandroidx/work/DefaultWorkerFactory;-><clinit>()V
 SPLandroidx/work/DefaultWorkerFactory;-><init>()V
+Landroidx/work/ExecutionEventListener;
 Landroidx/work/InputMergerFactory;
 SPLandroidx/work/InputMergerFactory;-><init>()V
 Landroidx/work/ListenableWorker;
@@ -5117,6 +5807,10 @@ SPLandroidx/work/Logger;->tagWithPrefix(Ljava/lang/String;)Ljava/lang/String;
 Landroidx/work/Logger$LogcatLogger;
 SPLandroidx/work/Logger$LogcatLogger;-><init>(I)V
 SPLandroidx/work/Logger$LogcatLogger;->debug(Ljava/lang/String;Ljava/lang/String;)V
+Landroidx/work/NetworkType;
+SPLandroidx/work/NetworkType;->$values()[Landroidx/work/NetworkType;
+SPLandroidx/work/NetworkType;-><clinit>()V
+SPLandroidx/work/NetworkType;-><init>(Ljava/lang/String;I)V
 Landroidx/work/NoOpInputMergerFactory;
 SPLandroidx/work/NoOpInputMergerFactory;-><clinit>()V
 SPLandroidx/work/NoOpInputMergerFactory;-><init>()V
@@ -5126,17 +5820,16 @@ Landroidx/work/Operation$State;
 SPLandroidx/work/Operation$State;-><init>()V
 Landroidx/work/Operation$State$IN_PROGRESS;
 SPLandroidx/work/Operation$State$IN_PROGRESS;-><init>()V
-SPLandroidx/work/Operation$State$IN_PROGRESS;-><init>(Landroidx/work/Operation$1;)V
+SPLandroidx/work/Operation$State$IN_PROGRESS;-><init>(Landroidx/work/Operation-IA;)V
 Landroidx/work/Operation$State$SUCCESS;
 SPLandroidx/work/Operation$State$SUCCESS;-><init>()V
-SPLandroidx/work/Operation$State$SUCCESS;-><init>(Landroidx/work/Operation$1;)V
+SPLandroidx/work/Operation$State$SUCCESS;-><init>(Landroidx/work/Operation-IA;)V
 Landroidx/work/OperationImpl;
 SPLandroidx/work/OperationImpl;-><init>(Landroidx/lifecycle/LiveData;Lcom/google/common/util/concurrent/ListenableFuture;)V
 Landroidx/work/OperationKt;
-SPLandroidx/work/OperationKt;->$r8$lambda$4AmAQmnwY87AwH_dAIVR-wuDub0(Ljava/util/concurrent/Executor;Landroidx/work/Tracer;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/lifecycle/MutableLiveData;Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;)Lkotlin/Unit;
-SPLandroidx/work/OperationKt;->$r8$lambda$XKAkIiEN7OgIvwuLUZRQpJhjmyE(Landroidx/work/Tracer;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/lifecycle/MutableLiveData;Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;)V
-SPLandroidx/work/OperationKt;->launchOperation$lambda$2$lambda$1(Landroidx/work/Tracer;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/lifecycle/MutableLiveData;Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;)V
-SPLandroidx/work/OperationKt;->launchOperation$lambda$2(Ljava/util/concurrent/Executor;Landroidx/work/Tracer;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/lifecycle/MutableLiveData;Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;)Lkotlin/Unit;
+SPLandroidx/work/OperationKt;->$r8$lambda$HpXEiU5zZrnWi4iuCKdgd7dMYGk(Landroidx/work/Tracer;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/lifecycle/MutableLiveData;Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;)V
+SPLandroidx/work/OperationKt;->launchOperation$lambda$0$0(Landroidx/work/Tracer;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/lifecycle/MutableLiveData;Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;)V
+SPLandroidx/work/OperationKt;->launchOperation$lambda$0(Ljava/util/concurrent/Executor;Landroidx/work/Tracer;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/lifecycle/MutableLiveData;Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;)Lkotlin/Unit;
 SPLandroidx/work/OperationKt;->launchOperation(Landroidx/work/Tracer;Ljava/lang/String;Ljava/util/concurrent/Executor;Lkotlin/jvm/functions/Function0;)Landroidx/work/Operation;
 Landroidx/work/OperationKt$$ExternalSyntheticLambda0;
 SPLandroidx/work/OperationKt$$ExternalSyntheticLambda0;-><init>(Ljava/util/concurrent/Executor;Landroidx/work/Tracer;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/lifecycle/MutableLiveData;)V
@@ -5146,6 +5839,7 @@ SPLandroidx/work/OperationKt$$ExternalSyntheticLambda1;-><init>(Landroidx/work/T
 SPLandroidx/work/OperationKt$$ExternalSyntheticLambda1;->run()V
 Landroidx/work/R$bool;
 Landroidx/work/RunnableScheduler;
+Landroidx/work/ScheduleEventListener;
 Landroidx/work/SystemClock;
 SPLandroidx/work/SystemClock;-><init>()V
 SPLandroidx/work/SystemClock;->currentTimeMillis()J
@@ -5231,8 +5925,9 @@ SPLandroidx/work/impl/Schedulers;->createBestAvailableBackgroundScheduler(Landro
 SPLandroidx/work/impl/Schedulers;->markScheduled(Landroidx/work/impl/model/WorkSpecDao;Landroidx/work/Clock;Ljava/util/List;)V
 SPLandroidx/work/impl/Schedulers;->registerRescheduling(Ljava/util/List;Landroidx/work/impl/Processor;Ljava/util/concurrent/Executor;Landroidx/work/impl/WorkDatabase;Landroidx/work/Configuration;)V
 SPLandroidx/work/impl/Schedulers;->schedule(Landroidx/work/Configuration;Landroidx/work/impl/WorkDatabase;Ljava/util/List;)V
-Landroidx/work/impl/Schedulers$$ExternalSyntheticLambda0;
-SPLandroidx/work/impl/Schedulers$$ExternalSyntheticLambda0;-><init>(Ljava/util/concurrent/Executor;Ljava/util/List;Landroidx/work/Configuration;Landroidx/work/impl/WorkDatabase;)V
+SPLandroidx/work/impl/Schedulers;->scheduleWorkSpecs(Ljava/util/List;Ljava/util/List;Z)V
+Landroidx/work/impl/Schedulers$$ExternalSyntheticLambda1;
+SPLandroidx/work/impl/Schedulers$$ExternalSyntheticLambda1;-><init>(Ljava/util/concurrent/Executor;Landroidx/work/impl/WorkDatabase;Ljava/util/List;Landroidx/work/Configuration;)V
 Landroidx/work/impl/StartStopTokens;
 SPLandroidx/work/impl/StartStopTokens;-><clinit>()V
 SPLandroidx/work/impl/StartStopTokens;->create()Landroidx/work/impl/StartStopTokens;
@@ -5261,7 +5956,6 @@ Landroidx/work/impl/WorkDatabase;
 SPLandroidx/work/impl/WorkDatabase;-><clinit>()V
 SPLandroidx/work/impl/WorkDatabase;-><init>()V
 Landroidx/work/impl/WorkDatabase$Companion;
-SPLandroidx/work/impl/WorkDatabase$Companion;->$r8$lambda$d9uKx9JAMiDvrmcMenix4D379lU(Landroid/content/Context;Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration;)Landroidx/sqlite/db/SupportSQLiteOpenHelper;
 SPLandroidx/work/impl/WorkDatabase$Companion;-><init>()V
 SPLandroidx/work/impl/WorkDatabase$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLandroidx/work/impl/WorkDatabase$Companion;->create$lambda$0(Landroid/content/Context;Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration;)Landroidx/sqlite/db/SupportSQLiteOpenHelper;
@@ -5295,14 +5989,10 @@ SPLandroidx/work/impl/WorkDatabase_AutoMigration_22_23_Impl;-><init>()V
 Landroidx/work/impl/WorkDatabase_AutoMigration_23_24_Impl;
 SPLandroidx/work/impl/WorkDatabase_AutoMigration_23_24_Impl;-><init>()V
 Landroidx/work/impl/WorkDatabase_Impl;
-SPLandroidx/work/impl/WorkDatabase_Impl;->$r8$lambda$EBCBMQRVkN1sQSZgY0tCFd1jjgA(Landroidx/work/impl/WorkDatabase_Impl;)Landroidx/work/impl/model/WorkSpecDao_Impl;
-SPLandroidx/work/impl/WorkDatabase_Impl;->$r8$lambda$Q4e7dMsbchyXlG7si6nJ2S-X0Hg(Landroidx/work/impl/WorkDatabase_Impl;)Landroidx/work/impl/model/PreferenceDao_Impl;
-SPLandroidx/work/impl/WorkDatabase_Impl;->$r8$lambda$VD7PkCdHr0pD6cL8vVPjuCZZsCo(Landroidx/work/impl/WorkDatabase_Impl;)Landroidx/work/impl/model/SystemIdInfoDao_Impl;
-SPLandroidx/work/impl/WorkDatabase_Impl;->$r8$lambda$YXFG2V7GSqY1Fh14uyLBpxHvsJg(Landroidx/work/impl/WorkDatabase_Impl;)Landroidx/work/impl/model/WorkProgressDao_Impl;
 SPLandroidx/work/impl/WorkDatabase_Impl;-><init>()V
-SPLandroidx/work/impl/WorkDatabase_Impl;->_preferenceDao$lambda$6(Landroidx/work/impl/WorkDatabase_Impl;)Landroidx/work/impl/model/PreferenceDao_Impl;
-SPLandroidx/work/impl/WorkDatabase_Impl;->_systemIdInfoDao$lambda$3(Landroidx/work/impl/WorkDatabase_Impl;)Landroidx/work/impl/model/SystemIdInfoDao_Impl;
-SPLandroidx/work/impl/WorkDatabase_Impl;->_workProgressDao$lambda$5(Landroidx/work/impl/WorkDatabase_Impl;)Landroidx/work/impl/model/WorkProgressDao_Impl;
+SPLandroidx/work/impl/WorkDatabase_Impl;->_preferenceDao$lambda$0(Landroidx/work/impl/WorkDatabase_Impl;)Landroidx/work/impl/model/PreferenceDao_Impl;
+SPLandroidx/work/impl/WorkDatabase_Impl;->_systemIdInfoDao$lambda$0(Landroidx/work/impl/WorkDatabase_Impl;)Landroidx/work/impl/model/SystemIdInfoDao_Impl;
+SPLandroidx/work/impl/WorkDatabase_Impl;->_workProgressDao$lambda$0(Landroidx/work/impl/WorkDatabase_Impl;)Landroidx/work/impl/model/WorkProgressDao_Impl;
 SPLandroidx/work/impl/WorkDatabase_Impl;->_workSpecDao$lambda$0(Landroidx/work/impl/WorkDatabase_Impl;)Landroidx/work/impl/model/WorkSpecDao_Impl;
 SPLandroidx/work/impl/WorkDatabase_Impl;->access$internalInitInvalidationTracker(Landroidx/work/impl/WorkDatabase_Impl;Landroidx/sqlite/SQLiteConnection;)V
 SPLandroidx/work/impl/WorkDatabase_Impl;->createAutoMigrations(Ljava/util/Map;)Ljava/util/List;
@@ -5370,7 +6060,6 @@ SPLandroidx/work/impl/WorkManagerImplExtKt;->createSchedulers(Landroid/content/C
 SPLandroidx/work/impl/WorkManagerImplExtKt;->createWorkManager$default(Landroid/content/Context;Landroidx/work/Configuration;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;Landroidx/work/impl/WorkDatabase;Landroidx/work/impl/constraints/trackers/Trackers;Landroidx/work/impl/Processor;Lkotlin/jvm/functions/Function6;ILjava/lang/Object;)Landroidx/work/impl/WorkManagerImpl;
 SPLandroidx/work/impl/WorkManagerImplExtKt;->createWorkManager(Landroid/content/Context;Landroidx/work/Configuration;)Landroidx/work/impl/WorkManagerImpl;
 SPLandroidx/work/impl/WorkManagerImplExtKt;->createWorkManager(Landroid/content/Context;Landroidx/work/Configuration;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;Landroidx/work/impl/WorkDatabase;Landroidx/work/impl/constraints/trackers/Trackers;Landroidx/work/impl/Processor;Lkotlin/jvm/functions/Function6;)Landroidx/work/impl/WorkManagerImpl;
-SPLandroidx/work/impl/WorkManagerImplExtKt;->createWorkManagerScope(Landroidx/work/impl/utils/taskexecutor/TaskExecutor;)Lkotlinx/coroutines/CoroutineScope;
 Landroidx/work/impl/WorkManagerImplExtKt$WorkManagerImpl$1;
 SPLandroidx/work/impl/WorkManagerImplExtKt$WorkManagerImpl$1;-><clinit>()V
 SPLandroidx/work/impl/WorkManagerImplExtKt$WorkManagerImpl$1;-><init>()V
@@ -5422,6 +6111,8 @@ SPLandroidx/work/impl/constraints/WorkConstraintsTracker;-><init>(Ljava/util/Lis
 Landroidx/work/impl/constraints/WorkConstraintsTrackerKt;
 SPLandroidx/work/impl/constraints/WorkConstraintsTrackerKt;-><clinit>()V
 SPLandroidx/work/impl/constraints/WorkConstraintsTrackerKt;->NetworkRequestConstraintController(Landroid/content/Context;)Landroidx/work/impl/constraints/NetworkRequestConstraintController;
+SPLandroidx/work/impl/constraints/WorkConstraintsTrackerKt;->access$createControllers(Landroidx/work/impl/constraints/trackers/Trackers;)Ljava/util/List;
+SPLandroidx/work/impl/constraints/WorkConstraintsTrackerKt;->createControllers(Landroidx/work/impl/constraints/trackers/Trackers;)Ljava/util/List;
 Landroidx/work/impl/constraints/controllers/BaseConstraintController;
 SPLandroidx/work/impl/constraints/controllers/BaseConstraintController;-><init>(Landroidx/work/impl/constraints/trackers/ConstraintTracker;)V
 Landroidx/work/impl/constraints/controllers/BatteryChargingController;
@@ -5429,22 +6120,6 @@ SPLandroidx/work/impl/constraints/controllers/BatteryChargingController;-><init>
 Landroidx/work/impl/constraints/controllers/BatteryNotLowController;
 SPLandroidx/work/impl/constraints/controllers/BatteryNotLowController;-><init>(Landroidx/work/impl/constraints/trackers/BatteryNotLowTracker;)V
 Landroidx/work/impl/constraints/controllers/ConstraintController;
-Landroidx/work/impl/constraints/controllers/NetworkConnectedController;
-SPLandroidx/work/impl/constraints/controllers/NetworkConnectedController;-><init>(Landroidx/work/impl/constraints/trackers/ConstraintTracker;)V
-Landroidx/work/impl/constraints/controllers/NetworkMeteredController;
-SPLandroidx/work/impl/constraints/controllers/NetworkMeteredController;-><clinit>()V
-SPLandroidx/work/impl/constraints/controllers/NetworkMeteredController;-><init>(Landroidx/work/impl/constraints/trackers/ConstraintTracker;)V
-Landroidx/work/impl/constraints/controllers/NetworkMeteredController$Companion;
-SPLandroidx/work/impl/constraints/controllers/NetworkMeteredController$Companion;-><init>()V
-SPLandroidx/work/impl/constraints/controllers/NetworkMeteredController$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-Landroidx/work/impl/constraints/controllers/NetworkNotRoamingController;
-SPLandroidx/work/impl/constraints/controllers/NetworkNotRoamingController;-><clinit>()V
-SPLandroidx/work/impl/constraints/controllers/NetworkNotRoamingController;-><init>(Landroidx/work/impl/constraints/trackers/ConstraintTracker;)V
-Landroidx/work/impl/constraints/controllers/NetworkNotRoamingController$Companion;
-SPLandroidx/work/impl/constraints/controllers/NetworkNotRoamingController$Companion;-><init>()V
-SPLandroidx/work/impl/constraints/controllers/NetworkNotRoamingController$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-Landroidx/work/impl/constraints/controllers/NetworkUnmeteredController;
-SPLandroidx/work/impl/constraints/controllers/NetworkUnmeteredController;-><init>(Landroidx/work/impl/constraints/trackers/ConstraintTracker;)V
 Landroidx/work/impl/constraints/controllers/StorageNotLowController;
 SPLandroidx/work/impl/constraints/controllers/StorageNotLowController;-><init>(Landroidx/work/impl/constraints/trackers/ConstraintTracker;)V
 Landroidx/work/impl/constraints/trackers/BatteryChargingTracker;
@@ -5457,14 +6132,6 @@ Landroidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker$broa
 SPLandroidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker$broadcastReceiver$1;-><init>(Landroidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker;)V
 Landroidx/work/impl/constraints/trackers/ConstraintTracker;
 SPLandroidx/work/impl/constraints/trackers/ConstraintTracker;-><init>(Landroid/content/Context;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;)V
-SPLandroidx/work/impl/constraints/trackers/ConstraintTracker;->getAppContext()Landroid/content/Context;
-Landroidx/work/impl/constraints/trackers/NetworkStateTracker24;
-SPLandroidx/work/impl/constraints/trackers/NetworkStateTracker24;-><init>(Landroid/content/Context;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;)V
-Landroidx/work/impl/constraints/trackers/NetworkStateTracker24$networkCallback$1;
-SPLandroidx/work/impl/constraints/trackers/NetworkStateTracker24$networkCallback$1;-><init>(Landroidx/work/impl/constraints/trackers/NetworkStateTracker24;)V
-Landroidx/work/impl/constraints/trackers/NetworkStateTrackerKt;
-SPLandroidx/work/impl/constraints/trackers/NetworkStateTrackerKt;-><clinit>()V
-SPLandroidx/work/impl/constraints/trackers/NetworkStateTrackerKt;->NetworkStateTracker(Landroid/content/Context;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;)Landroidx/work/impl/constraints/trackers/ConstraintTracker;
 Landroidx/work/impl/constraints/trackers/StorageNotLowTracker;
 SPLandroidx/work/impl/constraints/trackers/StorageNotLowTracker;-><init>(Landroid/content/Context;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;)V
 Landroidx/work/impl/constraints/trackers/Trackers;
@@ -5473,7 +6140,6 @@ SPLandroidx/work/impl/constraints/trackers/Trackers;-><init>(Landroid/content/Co
 SPLandroidx/work/impl/constraints/trackers/Trackers;->getBatteryChargingTracker()Landroidx/work/impl/constraints/trackers/ConstraintTracker;
 SPLandroidx/work/impl/constraints/trackers/Trackers;->getBatteryNotLowTracker()Landroidx/work/impl/constraints/trackers/BatteryNotLowTracker;
 SPLandroidx/work/impl/constraints/trackers/Trackers;->getContext()Landroid/content/Context;
-SPLandroidx/work/impl/constraints/trackers/Trackers;->getNetworkStateTracker()Landroidx/work/impl/constraints/trackers/ConstraintTracker;
 SPLandroidx/work/impl/constraints/trackers/Trackers;->getStorageNotLowTracker()Landroidx/work/impl/constraints/trackers/ConstraintTracker;
 Landroidx/work/impl/foreground/ForegroundProcessor;
 Landroidx/work/impl/model/DependencyDao;
@@ -5489,11 +6155,9 @@ SPLandroidx/work/impl/model/Preference;->getKey()Ljava/lang/String;
 SPLandroidx/work/impl/model/Preference;->getValue()Ljava/lang/Long;
 Landroidx/work/impl/model/PreferenceDao;
 Landroidx/work/impl/model/PreferenceDao_Impl;
-SPLandroidx/work/impl/model/PreferenceDao_Impl;->$r8$lambda$WOdbRCbcU9bF-o_A_B2dKOhXNig(Ljava/lang/String;Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/lang/Long;
-SPLandroidx/work/impl/model/PreferenceDao_Impl;->$r8$lambda$pV7ZAv1ABN_GLbYRS_jnXDCXzyk(Landroidx/work/impl/model/PreferenceDao_Impl;Landroidx/work/impl/model/Preference;Landroidx/sqlite/SQLiteConnection;)Lkotlin/Unit;
 SPLandroidx/work/impl/model/PreferenceDao_Impl;-><clinit>()V
 SPLandroidx/work/impl/model/PreferenceDao_Impl;-><init>(Landroidx/room/RoomDatabase;)V
-SPLandroidx/work/impl/model/PreferenceDao_Impl;->getLongValue$lambda$1(Ljava/lang/String;Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/lang/Long;
+SPLandroidx/work/impl/model/PreferenceDao_Impl;->getLongValue$lambda$0(Ljava/lang/String;Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/lang/Long;
 SPLandroidx/work/impl/model/PreferenceDao_Impl;->getLongValue(Ljava/lang/String;)Ljava/lang/Long;
 SPLandroidx/work/impl/model/PreferenceDao_Impl;->insertPreference$lambda$0(Landroidx/work/impl/model/PreferenceDao_Impl;Landroidx/work/impl/model/Preference;Landroidx/sqlite/SQLiteConnection;)Lkotlin/Unit;
 SPLandroidx/work/impl/model/PreferenceDao_Impl;->insertPreference(Landroidx/work/impl/model/Preference;)V
@@ -5521,10 +6185,9 @@ SPLandroidx/work/impl/model/RawWorkInfoDao_Impl$Companion;-><init>(Lkotlin/jvm/i
 SPLandroidx/work/impl/model/RawWorkInfoDao_Impl$Companion;->getRequiredConverters()Ljava/util/List;
 Landroidx/work/impl/model/SystemIdInfoDao;
 Landroidx/work/impl/model/SystemIdInfoDao_Impl;
-SPLandroidx/work/impl/model/SystemIdInfoDao_Impl;->$r8$lambda$NU7j-t1lTm0KFasmFmR5rCrby_s(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
 SPLandroidx/work/impl/model/SystemIdInfoDao_Impl;-><clinit>()V
 SPLandroidx/work/impl/model/SystemIdInfoDao_Impl;-><init>(Landroidx/room/RoomDatabase;)V
-SPLandroidx/work/impl/model/SystemIdInfoDao_Impl;->getWorkSpecIds$lambda$2(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
+SPLandroidx/work/impl/model/SystemIdInfoDao_Impl;->getWorkSpecIds$lambda$0(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
 SPLandroidx/work/impl/model/SystemIdInfoDao_Impl;->getWorkSpecIds()Ljava/util/List;
 Landroidx/work/impl/model/SystemIdInfoDao_Impl$$ExternalSyntheticLambda1;
 SPLandroidx/work/impl/model/SystemIdInfoDao_Impl$$ExternalSyntheticLambda1;-><init>(Ljava/lang/String;)V
@@ -5544,10 +6207,9 @@ SPLandroidx/work/impl/model/WorkNameDao_Impl$Companion;-><init>(Lkotlin/jvm/inte
 SPLandroidx/work/impl/model/WorkNameDao_Impl$Companion;->getRequiredConverters()Ljava/util/List;
 Landroidx/work/impl/model/WorkProgressDao;
 Landroidx/work/impl/model/WorkProgressDao_Impl;
-SPLandroidx/work/impl/model/WorkProgressDao_Impl;->$r8$lambda$HxEzdbtI1meBd-aXYgHdDeKTIRA(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Lkotlin/Unit;
 SPLandroidx/work/impl/model/WorkProgressDao_Impl;-><clinit>()V
 SPLandroidx/work/impl/model/WorkProgressDao_Impl;-><init>(Landroidx/room/RoomDatabase;)V
-SPLandroidx/work/impl/model/WorkProgressDao_Impl;->deleteAll$lambda$3(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Lkotlin/Unit;
+SPLandroidx/work/impl/model/WorkProgressDao_Impl;->deleteAll$lambda$0(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Lkotlin/Unit;
 SPLandroidx/work/impl/model/WorkProgressDao_Impl;->deleteAll()V
 Landroidx/work/impl/model/WorkProgressDao_Impl$$ExternalSyntheticLambda1;
 SPLandroidx/work/impl/model/WorkProgressDao_Impl$$ExternalSyntheticLambda1;-><init>(Ljava/lang/String;)V
@@ -5571,58 +6233,50 @@ SPLandroidx/work/impl/model/WorkSpecDaoKt$dedup$$inlined$map$1$2;->emit(Ljava/la
 Landroidx/work/impl/model/WorkSpecDaoKt$dedup$$inlined$map$1$2$1;
 SPLandroidx/work/impl/model/WorkSpecDaoKt$dedup$$inlined$map$1$2$1;-><init>(Landroidx/work/impl/model/WorkSpecDaoKt$dedup$$inlined$map$1$2;Lkotlin/coroutines/Continuation;)V
 Landroidx/work/impl/model/WorkSpecDao_Impl;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl;->$r8$lambda$1X8u9KRHqPGLidWnCmxbXa2nlSk(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)I
-SPLandroidx/work/impl/model/WorkSpecDao_Impl;->$r8$lambda$5E9Q3WxcAEUU2AazRaO6GyVPULI(Ljava/lang/String;Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl;->$r8$lambda$7xU4rcngjQY9wTrzM2HFSRzKlTE(Ljava/lang/String;ILandroidx/sqlite/SQLiteConnection;)Ljava/util/List;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl;->$r8$lambda$Bmk0Wb4PqGceYkMRz22vPjZLj7s(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl;->$r8$lambda$WmdU6OWFKOewjux-UcOkDAId0fg(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl;->$r8$lambda$fnITpoR1PO1p7_VkaDg0ZRzSZ9U(Ljava/lang/String;ILandroidx/sqlite/SQLiteConnection;)Ljava/util/List;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl;->$r8$lambda$hFo_x_SZZBoNGDTckdtCQRnSGyo(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Z
-SPLandroidx/work/impl/model/WorkSpecDao_Impl;->$r8$lambda$l7G77qMRDypSz_zq-MZ252vex3M(Ljava/lang/String;Ljava/lang/String;Landroidx/work/impl/model/WorkSpecDao_Impl;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
 SPLandroidx/work/impl/model/WorkSpecDao_Impl;-><clinit>()V
 SPLandroidx/work/impl/model/WorkSpecDao_Impl;-><init>(Landroidx/room/RoomDatabase;)V
 SPLandroidx/work/impl/model/WorkSpecDao_Impl;->__fetchRelationshipWorkProgressAsandroidxWorkData(Landroidx/sqlite/SQLiteConnection;Landroidx/collection/ArrayMap;)V
 SPLandroidx/work/impl/model/WorkSpecDao_Impl;->__fetchRelationshipWorkTagAsjavaLangString(Landroidx/sqlite/SQLiteConnection;Landroidx/collection/ArrayMap;)V
-SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getAllEligibleWorkSpecsForScheduling$lambda$29(Ljava/lang/String;ILandroidx/sqlite/SQLiteConnection;)Ljava/util/List;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getAllEligibleWorkSpecsForScheduling$lambda$0(Ljava/lang/String;ILandroidx/sqlite/SQLiteConnection;)Ljava/util/List;
 SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getAllEligibleWorkSpecsForScheduling(I)Ljava/util/List;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getEligibleWorkForScheduling$lambda$25(Ljava/lang/String;ILandroidx/sqlite/SQLiteConnection;)Ljava/util/List;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getEligibleWorkForScheduling$lambda$0(Ljava/lang/String;ILandroidx/sqlite/SQLiteConnection;)Ljava/util/List;
 SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getEligibleWorkForScheduling(I)Ljava/util/List;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getEligibleWorkForSchedulingWithContentUris$lambda$27(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getEligibleWorkForSchedulingWithContentUris$lambda$0(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
 SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getEligibleWorkForSchedulingWithContentUris()Ljava/util/List;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getRunningWork$lambda$33(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getRunningWork$lambda$0(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
 SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getRunningWork()Ljava/util/List;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getUnfinishedWorkWithName$lambda$20(Ljava/lang/String;Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getUnfinishedWorkWithName$lambda$0(Ljava/lang/String;Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
 SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getUnfinishedWorkWithName(Ljava/lang/String;)Ljava/util/List;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getWorkStatusPojoFlowForName$lambda$17(Ljava/lang/String;Ljava/lang/String;Landroidx/work/impl/model/WorkSpecDao_Impl;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getWorkStatusPojoFlowForName$lambda$0(Ljava/lang/String;Ljava/lang/String;Landroidx/work/impl/model/WorkSpecDao_Impl;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
 SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getWorkStatusPojoFlowForName(Ljava/lang/String;)Lkotlinx/coroutines/flow/Flow;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl;->hasUnfinishedWorkFlow$lambda$22(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Z
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->hasUnfinishedWorkFlow$lambda$0(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Z
 SPLandroidx/work/impl/model/WorkSpecDao_Impl;->hasUnfinishedWorkFlow()Lkotlinx/coroutines/flow/Flow;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl;->resetScheduledState$lambda$48(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)I
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->resetScheduledState$lambda$0(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)I
 SPLandroidx/work/impl/model/WorkSpecDao_Impl;->resetScheduledState()I
-Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda12;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda12;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda12;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda20;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda20;-><init>(Ljava/lang/String;I)V
-SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda20;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda34;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda34;-><init>(Ljava/lang/String;)V
-SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda34;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda13;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda13;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda13;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda23;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda23;-><init>(Ljava/lang/String;I)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda23;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda37;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda37;-><init>(Ljava/lang/String;Ljava/lang/String;Landroidx/work/impl/model/WorkSpecDao_Impl;)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda37;-><init>(Ljava/lang/String;)V
 SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda37;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda45;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda45;-><init>(Ljava/lang/String;)V
-SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda45;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda6;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda6;-><init>(Ljava/lang/String;)V
-SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda6;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda40;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda40;-><init>(Ljava/lang/String;Ljava/lang/String;Landroidx/work/impl/model/WorkSpecDao_Impl;)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda40;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda48;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda48;-><init>(Ljava/lang/String;)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda48;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda7;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda7;-><init>(Ljava/lang/String;I)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda7;-><init>(Ljava/lang/String;)V
 SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda7;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda8;
-SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda8;-><init>(Ljava/lang/String;)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda8;-><init>(Ljava/lang/String;I)V
 SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda8;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda9;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda9;-><init>(Ljava/lang/String;)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda9;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Landroidx/work/impl/model/WorkSpecDao_Impl$1;
 SPLandroidx/work/impl/model/WorkSpecDao_Impl$1;-><init>()V
 Landroidx/work/impl/model/WorkSpecDao_Impl$2;
@@ -5643,11 +6297,9 @@ SPLandroidx/work/impl/utils/Api28Impl;-><clinit>()V
 SPLandroidx/work/impl/utils/Api28Impl;-><init>()V
 SPLandroidx/work/impl/utils/Api28Impl;->getProcessName()Ljava/lang/String;
 Landroidx/work/impl/utils/CancelWorkRunnable;
-SPLandroidx/work/impl/utils/CancelWorkRunnable;->$r8$lambda$4QqdN7ggcyUEiyMiYfM9Uxq5r7Q(Ljava/lang/String;Landroidx/work/impl/WorkManagerImpl;)Lkotlin/Unit;
-SPLandroidx/work/impl/utils/CancelWorkRunnable;->$r8$lambda$7CMxqlNCknD_Q1NSUJ5-L0sWGBQ(Landroidx/work/impl/WorkDatabase;Ljava/lang/String;Landroidx/work/impl/WorkManagerImpl;)V
-SPLandroidx/work/impl/utils/CancelWorkRunnable;->forName$lambda$4(Ljava/lang/String;Landroidx/work/impl/WorkManagerImpl;)Lkotlin/Unit;
+SPLandroidx/work/impl/utils/CancelWorkRunnable;->forName$lambda$0(Ljava/lang/String;Landroidx/work/impl/WorkManagerImpl;)Lkotlin/Unit;
 SPLandroidx/work/impl/utils/CancelWorkRunnable;->forName(Ljava/lang/String;Landroidx/work/impl/WorkManagerImpl;)Landroidx/work/Operation;
-SPLandroidx/work/impl/utils/CancelWorkRunnable;->forNameInline$lambda$5(Landroidx/work/impl/WorkDatabase;Ljava/lang/String;Landroidx/work/impl/WorkManagerImpl;)V
+SPLandroidx/work/impl/utils/CancelWorkRunnable;->forNameInline$lambda$0(Landroidx/work/impl/WorkDatabase;Ljava/lang/String;Landroidx/work/impl/WorkManagerImpl;)V
 SPLandroidx/work/impl/utils/CancelWorkRunnable;->forNameInline(Ljava/lang/String;Landroidx/work/impl/WorkManagerImpl;)V
 SPLandroidx/work/impl/utils/CancelWorkRunnable;->reschedulePendingWorkers(Landroidx/work/impl/WorkManagerImpl;)V
 Landroidx/work/impl/utils/CancelWorkRunnable$$ExternalSyntheticLambda0;
@@ -5670,9 +6322,23 @@ SPLandroidx/work/impl/utils/ForceStopRunnable;->shouldRescheduleWorkers()Z
 Landroidx/work/impl/utils/ForceStopRunnable$BroadcastReceiver;
 Landroidx/work/impl/utils/PackageManagerHelper;
 SPLandroidx/work/impl/utils/PackageManagerHelper;-><clinit>()V
-SPLandroidx/work/impl/utils/PackageManagerHelper;->getComponentEnabledSetting(Landroid/content/Context;Ljava/lang/String;)I
-SPLandroidx/work/impl/utils/PackageManagerHelper;->isComponentEnabled(IZ)Z
-SPLandroidx/work/impl/utils/PackageManagerHelper;->setComponentEnabled(Landroid/content/Context;Ljava/lang/Class;Z)V
+SPLandroidx/work/impl/utils/PackageManagerHelper;->access$isReceiverEnabled(Landroid/content/pm/PackageManager;Landroid/content/ComponentName;)Z
+SPLandroidx/work/impl/utils/PackageManagerHelper;->access$isServiceEnabled(Landroid/content/pm/PackageManager;Landroid/content/ComponentName;)Z
+SPLandroidx/work/impl/utils/PackageManagerHelper;->isReceiverEnabled(Landroid/content/pm/PackageManager;Landroid/content/ComponentName;)Z
+SPLandroidx/work/impl/utils/PackageManagerHelper;->isServiceEnabled(Landroid/content/pm/PackageManager;Landroid/content/ComponentName;)Z
+SPLandroidx/work/impl/utils/PackageManagerHelper;->setComponentEnabled(Landroid/content/pm/PackageManager;Landroid/content/ComponentName;ZLkotlin/jvm/functions/Function2;)V
+SPLandroidx/work/impl/utils/PackageManagerHelper;->setReceiverEnabled(Landroid/content/Context;Ljava/lang/Class;Z)V
+SPLandroidx/work/impl/utils/PackageManagerHelper;->setServiceEnabled(Landroid/content/Context;Ljava/lang/Class;Z)V
+Landroidx/work/impl/utils/PackageManagerHelper$setReceiverEnabled$1;
+SPLandroidx/work/impl/utils/PackageManagerHelper$setReceiverEnabled$1;-><clinit>()V
+SPLandroidx/work/impl/utils/PackageManagerHelper$setReceiverEnabled$1;-><init>()V
+SPLandroidx/work/impl/utils/PackageManagerHelper$setReceiverEnabled$1;->invoke(Landroid/content/pm/PackageManager;Landroid/content/ComponentName;)Ljava/lang/Boolean;
+SPLandroidx/work/impl/utils/PackageManagerHelper$setReceiverEnabled$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/utils/PackageManagerHelper$setServiceEnabled$1;
+SPLandroidx/work/impl/utils/PackageManagerHelper$setServiceEnabled$1;-><clinit>()V
+SPLandroidx/work/impl/utils/PackageManagerHelper$setServiceEnabled$1;-><init>()V
+SPLandroidx/work/impl/utils/PackageManagerHelper$setServiceEnabled$1;->invoke(Landroid/content/pm/PackageManager;Landroid/content/ComponentName;)Ljava/lang/Boolean;
+SPLandroidx/work/impl/utils/PackageManagerHelper$setServiceEnabled$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 Landroidx/work/impl/utils/PreferenceUtils;
 SPLandroidx/work/impl/utils/PreferenceUtils;-><init>(Landroidx/work/impl/WorkDatabase;)V
 SPLandroidx/work/impl/utils/PreferenceUtils;->getLastForceStopEventMillis()J
@@ -5683,6 +6349,7 @@ SPLandroidx/work/impl/utils/ProcessUtils;-><clinit>()V
 SPLandroidx/work/impl/utils/ProcessUtils;->getProcessName(Landroid/content/Context;)Ljava/lang/String;
 SPLandroidx/work/impl/utils/ProcessUtils;->isDefaultProcess(Landroid/content/Context;Landroidx/work/Configuration;)Z
 Landroidx/work/impl/utils/SerialExecutorImpl;
+SPLandroidx/work/impl/utils/SerialExecutorImpl;-><clinit>()V
 SPLandroidx/work/impl/utils/SerialExecutorImpl;-><init>(Ljava/util/concurrent/Executor;)V
 SPLandroidx/work/impl/utils/SerialExecutorImpl;->execute(Ljava/lang/Runnable;)V
 SPLandroidx/work/impl/utils/SerialExecutorImpl;->scheduleNext()V
@@ -5694,6 +6361,7 @@ Landroidx/work/impl/utils/taskexecutor/TaskExecutor;
 SPLandroidx/work/impl/utils/taskexecutor/TaskExecutor;->executeOnTaskThread(Ljava/lang/Runnable;)V
 Landroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor;
 SPLandroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor;-><init>(Ljava/util/concurrent/Executor;)V
+SPLandroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor;->getCoroutineScope()Lkotlinx/coroutines/CoroutineScope;
 SPLandroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor;->getSerialTaskExecutor()Landroidx/work/impl/utils/SerialExecutorImpl;
 SPLandroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor;->getSerialTaskExecutor()Landroidx/work/impl/utils/taskexecutor/SerialExecutor;
 SPLandroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor;->getTaskCoroutineDispatcher()Lkotlinx/coroutines/CoroutineDispatcher;
@@ -5799,12 +6467,14 @@ SPLanki/backend/GeneratedBackend;->getDeckNames(ZZ)Ljava/util/List;
 SPLanki/backend/GeneratedBackend;->getDeckNamesRaw([B)[B
 SPLanki/backend/GeneratedBackend;->getUndoStatus()Lanki/collection/UndoStatus;
 SPLanki/backend/GeneratedBackend;->getUndoStatusRaw([B)[B
+SPLanki/backend/GeneratedBackend;->i18nResources(Ljava/lang/Iterable;)Lcom/google/protobuf/ByteString;
+SPLanki/backend/GeneratedBackend;->i18nResourcesRaw([B)[B
 SPLanki/backend/GeneratedBackend;->openCollection(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 SPLanki/backend/GeneratedBackend;->openCollectionRaw([B)[B
 SPLanki/backend/GeneratedBackend;->runDbCommandProto(Lcom/google/protobuf/ByteString;)Lanki/ankidroid/DbResponse;
 SPLanki/backend/GeneratedBackend;->runDbCommandProtoRaw([B)[B
-SPLanki/backend/GeneratedBackend;->setConfigJson(Ljava/lang/String;Lcom/google/protobuf/ByteString;Z)Lanki/collection/OpChanges;
-SPLanki/backend/GeneratedBackend;->setConfigJsonRaw([B)[B
+SPLanki/backend/GeneratedBackend;->schedTimingToday()Lanki/scheduler/SchedTimingTodayResponse;
+SPLanki/backend/GeneratedBackend;->schedTimingTodayRaw([B)[B
 SPLanki/backend/GeneratedBackend;->studiedToday()Ljava/lang/String;
 SPLanki/backend/GeneratedBackend;->studiedTodayRaw([B)[B
 SPLanki/backend/GeneratedBackend;->translateStringRaw([B)[B
@@ -5847,7 +6517,6 @@ SPLanki/collection/OpChanges;-><clinit>()V
 SPLanki/collection/OpChanges;-><init>()V
 SPLanki/collection/OpChanges;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 SPLanki/collection/OpChanges;->newBuilder()Lanki/collection/OpChanges$Builder;
-SPLanki/collection/OpChanges;->parseFrom([B)Lanki/collection/OpChanges;
 SPLanki/collection/OpChanges;->setBrowserSidebar(Z)V
 SPLanki/collection/OpChanges;->setBrowserTable(Z)V
 SPLanki/collection/OpChanges;->setCard(Z)V
@@ -5938,6 +6607,12 @@ SPLanki/config/ConfigKey$Bool;-><init>(Ljava/lang/String;II)V
 SPLanki/config/ConfigKey$Bool;->getNumber()I
 Lanki/config/ConfigKey$Bool$1;
 SPLanki/config/ConfigKey$Bool$1;-><init>()V
+Lanki/config/ConfigKey$String;
+SPLanki/config/ConfigKey$String;->$values()[Lanki/config/ConfigKey$String;
+SPLanki/config/ConfigKey$String;-><clinit>()V
+SPLanki/config/ConfigKey$String;-><init>(Ljava/lang/String;II)V
+Lanki/config/ConfigKey$String$1;
+SPLanki/config/ConfigKey$String$1;-><init>()V
 Lanki/config/GetConfigBoolRequest;
 SPLanki/config/GetConfigBoolRequest;->-$$Nest$msetKey(Lanki/config/GetConfigBoolRequest;Lanki/config/ConfigKey$Bool;)V
 SPLanki/config/GetConfigBoolRequest;->-$$Nest$sfgetDEFAULT_INSTANCE()Lanki/config/GetConfigBoolRequest;
@@ -5953,27 +6628,6 @@ SPLanki/config/GetConfigBoolRequest$Builder;-><init>()V
 SPLanki/config/GetConfigBoolRequest$Builder;-><init>(Lanki/config/GetConfigBoolRequest-IA;)V
 SPLanki/config/GetConfigBoolRequest$Builder;->setKey(Lanki/config/ConfigKey$Bool;)Lanki/config/GetConfigBoolRequest$Builder;
 Lanki/config/GetConfigBoolRequestOrBuilder;
-Lanki/config/SetConfigJsonRequest;
-SPLanki/config/SetConfigJsonRequest;->-$$Nest$msetKey(Lanki/config/SetConfigJsonRequest;Ljava/lang/String;)V
-SPLanki/config/SetConfigJsonRequest;->-$$Nest$msetUndoable(Lanki/config/SetConfigJsonRequest;Z)V
-SPLanki/config/SetConfigJsonRequest;->-$$Nest$msetValueJson(Lanki/config/SetConfigJsonRequest;Lcom/google/protobuf/ByteString;)V
-SPLanki/config/SetConfigJsonRequest;->-$$Nest$sfgetDEFAULT_INSTANCE()Lanki/config/SetConfigJsonRequest;
-SPLanki/config/SetConfigJsonRequest;-><clinit>()V
-SPLanki/config/SetConfigJsonRequest;-><init>()V
-SPLanki/config/SetConfigJsonRequest;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-SPLanki/config/SetConfigJsonRequest;->newBuilder()Lanki/config/SetConfigJsonRequest$Builder;
-SPLanki/config/SetConfigJsonRequest;->setKey(Ljava/lang/String;)V
-SPLanki/config/SetConfigJsonRequest;->setUndoable(Z)V
-SPLanki/config/SetConfigJsonRequest;->setValueJson(Lcom/google/protobuf/ByteString;)V
-Lanki/config/SetConfigJsonRequest$1;
-SPLanki/config/SetConfigJsonRequest$1;-><clinit>()V
-Lanki/config/SetConfigJsonRequest$Builder;
-SPLanki/config/SetConfigJsonRequest$Builder;-><init>()V
-SPLanki/config/SetConfigJsonRequest$Builder;-><init>(Lanki/config/SetConfigJsonRequest-IA;)V
-SPLanki/config/SetConfigJsonRequest$Builder;->setKey(Ljava/lang/String;)Lanki/config/SetConfigJsonRequest$Builder;
-SPLanki/config/SetConfigJsonRequest$Builder;->setUndoable(Z)Lanki/config/SetConfigJsonRequest$Builder;
-SPLanki/config/SetConfigJsonRequest$Builder;->setValueJson(Lcom/google/protobuf/ByteString;)Lanki/config/SetConfigJsonRequest$Builder;
-Lanki/config/SetConfigJsonRequestOrBuilder;
 Lanki/decks/Deck;
 SPLanki/decks/Deck;-><clinit>()V
 SPLanki/decks/Deck;-><init>()V
@@ -6161,9 +6815,30 @@ SPLanki/generic/String$Builder;-><init>(Lanki/generic/String-IA;)V
 SPLanki/generic/String$Builder;->setVal(Ljava/lang/String;)Lanki/generic/String$Builder;
 Lanki/generic/StringOrBuilder;
 Lanki/i18n/GeneratedTranslations;
+SPLanki/i18n/GeneratedTranslations;->actionsDecks()Ljava/lang/String;
+SPLanki/i18n/GeneratedTranslations;->actionsEmptyCards()Ljava/lang/String;
 SPLanki/i18n/GeneratedTranslations;->actionsExport()Ljava/lang/String;
+SPLanki/i18n/GeneratedTranslations;->actionsImport()Ljava/lang/String;
 SPLanki/i18n/GeneratedTranslations;->databaseCheckTitle()Ljava/lang/String;
+SPLanki/i18n/GeneratedTranslations;->decksCreateDeck()Ljava/lang/String;
 SPLanki/i18n/GeneratedTranslations;->mediaCheckCheckMediaAction()Ljava/lang/String;
+SPLanki/i18n/GeneratedTranslations;->statisticsTitle()Ljava/lang/String;
+Lanki/i18n/I18nResourcesRequest;
+SPLanki/i18n/I18nResourcesRequest;->-$$Nest$maddAllModules(Lanki/i18n/I18nResourcesRequest;Ljava/lang/Iterable;)V
+SPLanki/i18n/I18nResourcesRequest;->-$$Nest$sfgetDEFAULT_INSTANCE()Lanki/i18n/I18nResourcesRequest;
+SPLanki/i18n/I18nResourcesRequest;-><clinit>()V
+SPLanki/i18n/I18nResourcesRequest;-><init>()V
+SPLanki/i18n/I18nResourcesRequest;->addAllModules(Ljava/lang/Iterable;)V
+SPLanki/i18n/I18nResourcesRequest;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/i18n/I18nResourcesRequest;->ensureModulesIsMutable()V
+SPLanki/i18n/I18nResourcesRequest;->newBuilder()Lanki/i18n/I18nResourcesRequest$Builder;
+Lanki/i18n/I18nResourcesRequest$1;
+SPLanki/i18n/I18nResourcesRequest$1;-><clinit>()V
+Lanki/i18n/I18nResourcesRequest$Builder;
+SPLanki/i18n/I18nResourcesRequest$Builder;-><init>()V
+SPLanki/i18n/I18nResourcesRequest$Builder;-><init>(Lanki/i18n/I18nResourcesRequest-IA;)V
+SPLanki/i18n/I18nResourcesRequest$Builder;->addAllModules(Ljava/lang/Iterable;)Lanki/i18n/I18nResourcesRequest$Builder;
+Lanki/i18n/I18nResourcesRequestOrBuilder;
 Lanki/i18n/TranslateArgValue;
 SPLanki/i18n/TranslateArgValue;-><clinit>()V
 SPLanki/i18n/TranslateArgValue;-><init>()V
@@ -6193,6 +6868,15 @@ SPLanki/i18n/TranslateStringRequest$Builder;->putAllArgs(Ljava/util/Map;)Lanki/i
 SPLanki/i18n/TranslateStringRequest$Builder;->setMessageIndex(I)Lanki/i18n/TranslateStringRequest$Builder;
 SPLanki/i18n/TranslateStringRequest$Builder;->setModuleIndex(I)Lanki/i18n/TranslateStringRequest$Builder;
 Lanki/i18n/TranslateStringRequestOrBuilder;
+Lanki/scheduler/SchedTimingTodayResponse;
+SPLanki/scheduler/SchedTimingTodayResponse;-><clinit>()V
+SPLanki/scheduler/SchedTimingTodayResponse;-><init>()V
+SPLanki/scheduler/SchedTimingTodayResponse;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/scheduler/SchedTimingTodayResponse;->getNextDayAt()J
+SPLanki/scheduler/SchedTimingTodayResponse;->parseFrom([B)Lanki/scheduler/SchedTimingTodayResponse;
+Lanki/scheduler/SchedTimingTodayResponse$1;
+SPLanki/scheduler/SchedTimingTodayResponse$1;-><clinit>()V
+Lanki/scheduler/SchedTimingTodayResponseOrBuilder;
 Lanki/sync/SyncStatusResponse$Required;
 SPLanki/sync/SyncStatusResponse$Required;->$values()[Lanki/sync/SyncStatusResponse$Required;
 SPLanki/sync/SyncStatusResponse$Required;-><clinit>()V
@@ -6200,144 +6884,121 @@ SPLanki/sync/SyncStatusResponse$Required;-><init>(Ljava/lang/String;II)V
 SPLanki/sync/SyncStatusResponse$Required;->values()[Lanki/sync/SyncStatusResponse$Required;
 Lanki/sync/SyncStatusResponse$Required$1;
 SPLanki/sync/SyncStatusResponse$Required$1;-><init>()V
-Lb/a;
-SPLb/a;-><init>(Ljava/lang/Object;)V
-SPLb/a;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-Lcom/arcao/slf4j/timber/TimberLoggerAdapter;
-SPLcom/arcao/slf4j/timber/TimberLoggerAdapter;-><init>(Ljava/lang/String;)V
-SPLcom/arcao/slf4j/timber/TimberLoggerAdapter;->info(Ljava/lang/String;)V
-SPLcom/arcao/slf4j/timber/TimberLoggerAdapter;->log(Lcom/arcao/slf4j/timber/TimberLoggerAdapter$LogType;Ljava/lang/String;Ljava/lang/Throwable;)V
-Lcom/arcao/slf4j/timber/TimberLoggerAdapter$1;
-SPLcom/arcao/slf4j/timber/TimberLoggerAdapter$1;-><clinit>()V
-Lcom/arcao/slf4j/timber/TimberLoggerAdapter$LogType;
-SPLcom/arcao/slf4j/timber/TimberLoggerAdapter$LogType;-><clinit>()V
-SPLcom/arcao/slf4j/timber/TimberLoggerAdapter$LogType;-><init>(Ljava/lang/String;I)V
-SPLcom/arcao/slf4j/timber/TimberLoggerAdapter$LogType;->values()[Lcom/arcao/slf4j/timber/TimberLoggerAdapter$LogType;
-Lcom/arcao/slf4j/timber/TimberLoggerFactory;
-SPLcom/arcao/slf4j/timber/TimberLoggerFactory;-><clinit>()V
-SPLcom/arcao/slf4j/timber/TimberLoggerFactory;-><init>()V
-SPLcom/arcao/slf4j/timber/TimberLoggerFactory;->createTag(Ljava/lang/String;)Ljava/lang/String;
-SPLcom/arcao/slf4j/timber/TimberLoggerFactory;->getLogger(Ljava/lang/String;)Lorg/slf4j/Logger;
-Lcom/brsanthu/googleanalytics/GoogleAnalytics;
-SPLcom/brsanthu/googleanalytics/GoogleAnalytics;->builder()Lcom/brsanthu/googleanalytics/GoogleAnalyticsBuilder;
-Lcom/brsanthu/googleanalytics/GoogleAnalyticsBuilder;
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsBuilder;-><init>()V
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsBuilder;->build()Lcom/brsanthu/googleanalytics/GoogleAnalytics;
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsBuilder;->createHttpClient()Lcom/brsanthu/googleanalytics/httpclient/HttpClient;
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsBuilder;->withConfig(Lcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;)Lcom/brsanthu/googleanalytics/GoogleAnalyticsBuilder;
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsBuilder;->withDefaultRequest(Lcom/brsanthu/googleanalytics/request/DefaultRequest;)Lcom/brsanthu/googleanalytics/GoogleAnalyticsBuilder;
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsBuilder;->withHttpClient(Lcom/brsanthu/googleanalytics/httpclient/HttpClient;)Lcom/brsanthu/googleanalytics/GoogleAnalyticsBuilder;
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsBuilder;->withTrackingId(Ljava/lang/String;)Lcom/brsanthu/googleanalytics/GoogleAnalyticsBuilder;
-Lcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;-><init>()V
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;->getMaxHttpConnectionsPerRoute()I
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;->getProxyHost()Ljava/lang/String;
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;->getRequestParameterDiscoverer()Lcom/brsanthu/googleanalytics/discovery/RequestParameterDiscoverer;
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;->getSamplePercentage()I
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;->getUserAgent()Ljava/lang/String;
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;->isDiscoverRequestParameters()Z
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;->isEnabled()Z
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;->setBatchSize(I)Lcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;->setBatchingEnabled(Z)Lcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;->setEnabled(Z)Lcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;->setSamplePercentage(I)Lcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;
-SPLcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;->setUserAgent(Ljava/lang/String;)Lcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;
-Lcom/brsanthu/googleanalytics/GoogleAnalyticsExecutor;
-Lcom/brsanthu/googleanalytics/GoogleAnalyticsStats;
-Lcom/brsanthu/googleanalytics/discovery/DefaultRequestParameterDiscoverer;
-SPLcom/brsanthu/googleanalytics/discovery/DefaultRequestParameterDiscoverer;-><clinit>()V
-SPLcom/brsanthu/googleanalytics/discovery/DefaultRequestParameterDiscoverer;-><init>()V
-SPLcom/brsanthu/googleanalytics/discovery/DefaultRequestParameterDiscoverer;->discoverParameters(Lcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;Lcom/brsanthu/googleanalytics/request/DefaultRequest;)Lcom/brsanthu/googleanalytics/request/DefaultRequest;
-SPLcom/brsanthu/googleanalytics/discovery/DefaultRequestParameterDiscoverer;->getUserAgentString()Ljava/lang/String;
-Lcom/brsanthu/googleanalytics/discovery/RequestParameterDiscoverer;
-Lcom/brsanthu/googleanalytics/httpclient/HttpClient;
-Lcom/brsanthu/googleanalytics/httpclient/OkHttpClientImpl;
-SPLcom/brsanthu/googleanalytics/httpclient/OkHttpClientImpl;-><clinit>()V
-SPLcom/brsanthu/googleanalytics/httpclient/OkHttpClientImpl;-><init>(Lcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;)V
-SPLcom/brsanthu/googleanalytics/httpclient/OkHttpClientImpl;->checkConfigForUnsupportedConfiguration(Lcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;)V
-SPLcom/brsanthu/googleanalytics/httpclient/OkHttpClientImpl;->createHttpClient(Lcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;)Lokhttp3/OkHttpClient;
-Lcom/brsanthu/googleanalytics/internal/GaUtils;
-SPLcom/brsanthu/googleanalytics/internal/GaUtils;->appendSystemProperty(Ljava/lang/StringBuilder;Ljava/lang/String;)Ljava/lang/StringBuilder;
-SPLcom/brsanthu/googleanalytics/internal/GaUtils;->firstNotNull([Ljava/lang/Object;)Ljava/lang/Object;
-SPLcom/brsanthu/googleanalytics/internal/GaUtils;->isBlank(Ljava/lang/String;)Z
-SPLcom/brsanthu/googleanalytics/internal/GaUtils;->isEmpty(Ljava/lang/String;)Z
-SPLcom/brsanthu/googleanalytics/internal/GaUtils;->isNotEmpty(Ljava/lang/String;)Z
-Lcom/brsanthu/googleanalytics/internal/GoogleAnalyticsImpl;
-SPLcom/brsanthu/googleanalytics/internal/GoogleAnalyticsImpl;-><clinit>()V
-SPLcom/brsanthu/googleanalytics/internal/GoogleAnalyticsImpl;-><init>(Lcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;Lcom/brsanthu/googleanalytics/request/DefaultRequest;Lcom/brsanthu/googleanalytics/httpclient/HttpClient;)V
-SPLcom/brsanthu/googleanalytics/internal/GoogleAnalyticsImpl;->flush()V
-SPLcom/brsanthu/googleanalytics/internal/GoogleAnalyticsImpl;->getConfig()Lcom/brsanthu/googleanalytics/GoogleAnalyticsConfig;
-SPLcom/brsanthu/googleanalytics/internal/GoogleAnalyticsImpl;->inSample()Z
-SPLcom/brsanthu/googleanalytics/internal/GoogleAnalyticsImpl;->performSamplingElection()Z
-SPLcom/brsanthu/googleanalytics/internal/GoogleAnalyticsImpl;->submitBatch(Z)V
-Lcom/brsanthu/googleanalytics/internal/GoogleAnalyticsStatsImpl;
-SPLcom/brsanthu/googleanalytics/internal/GoogleAnalyticsStatsImpl;-><init>()V
-Lcom/brsanthu/googleanalytics/request/DefaultRequest;
-SPLcom/brsanthu/googleanalytics/request/DefaultRequest;-><clinit>()V
-SPLcom/brsanthu/googleanalytics/request/DefaultRequest;-><init>()V
-SPLcom/brsanthu/googleanalytics/request/DefaultRequest;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-Lcom/brsanthu/googleanalytics/request/GoogleAnalyticsParameter;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsParameter;-><clinit>()V
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsParameter;-><init>(Ljava/lang/String;ILjava/lang/String;)V
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsParameter;-><init>(Ljava/lang/String;ILjava/lang/String;I)V
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsParameter;-><init>(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsParameter;-><init>(Ljava/lang/String;ILjava/lang/String;Z)V
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsParameter;-><init>(Ljava/lang/String;ILjava/lang/String;ZLjava/lang/String;[Ljava/lang/String;)V
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsParameter;-><init>(Ljava/lang/String;ILjava/lang/String;ZLjava/lang/String;[Ljava/lang/String;I)V
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsParameter;-><init>(Ljava/lang/String;ILjava/lang/String;[Ljava/lang/String;I)V
-Lcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;-><init>()V
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->anonymizeIp(Ljava/lang/Boolean;)Ljava/lang/Object;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->applicationId(Ljava/lang/String;)Ljava/lang/Object;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->applicationName(Ljava/lang/String;)Ljava/lang/Object;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->applicationVersion(Ljava/lang/String;)Ljava/lang/Object;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->clientId(Ljava/lang/String;)Ljava/lang/Object;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->customDimension(ILjava/lang/String;)Ljava/lang/Object;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->documentEncoding()Ljava/lang/String;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->documentEncoding(Ljava/lang/String;)Ljava/lang/Object;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->fromBoolean(Ljava/lang/Boolean;)Ljava/lang/String;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->getString(Lcom/brsanthu/googleanalytics/request/GoogleAnalyticsParameter;)Ljava/lang/String;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->hitType(Ljava/lang/String;)Ljava/lang/Object;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->protocolVersion(Ljava/lang/String;)Ljava/lang/Object;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->screenResolution(Ljava/lang/String;)Ljava/lang/Object;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->setBoolean(Lcom/brsanthu/googleanalytics/request/GoogleAnalyticsParameter;Ljava/lang/Boolean;)Ljava/lang/Object;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->setString(Lcom/brsanthu/googleanalytics/request/GoogleAnalyticsParameter;Ljava/lang/String;)Ljava/lang/Object;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->trackingId(Ljava/lang/String;)Ljava/lang/Object;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->userAgent(Ljava/lang/String;)Ljava/lang/Object;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->userLanguage()Ljava/lang/String;
-SPLcom/brsanthu/googleanalytics/request/GoogleAnalyticsRequest;->userLanguage(Ljava/lang/String;)Ljava/lang/Object;
-Lcom/canhub/cropper/BitmapUtils$$ExternalSyntheticApiModelOutline0;
-SPLcom/canhub/cropper/BitmapUtils$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/view/WindowManager;)Landroid/view/WindowMetrics;
-SPLcom/canhub/cropper/BitmapUtils$$ExternalSyntheticApiModelOutline0;->m()Landroid/content/pm/PackageInfo;
-SPLcom/canhub/cropper/BitmapUtils$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/ActivityManager;Ljava/lang/String;II)Ljava/util/List;
-SPLcom/canhub/cropper/BitmapUtils$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/ApplicationExitInfo;)I
-SPLcom/canhub/cropper/BitmapUtils$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/ApplicationExitInfo;)J
-SPLcom/canhub/cropper/BitmapUtils$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/job/JobScheduler;Ljava/lang/String;)Landroid/app/job/JobScheduler;
-SPLcom/canhub/cropper/BitmapUtils$$ExternalSyntheticApiModelOutline0;->m(Landroid/graphics/Outline;Landroid/graphics/Path;)V
-SPLcom/canhub/cropper/BitmapUtils$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowMetrics;)Landroid/graphics/Rect;
-SPLcom/canhub/cropper/BitmapUtils$$ExternalSyntheticApiModelOutline0;->m(Ljava/lang/Object;)Landroid/app/ApplicationExitInfo;
 Lcom/canhub/cropper/CropFileProvider;
 SPLcom/canhub/cropper/CropFileProvider;-><init>()V
 Lcom/canhub/cropper/R$xml;
+Lcom/criticalay/GoogleAnalytics;
+SPLcom/criticalay/GoogleAnalytics;-><clinit>()V
+Lcom/criticalay/GoogleAnalytics$Companion;
+SPLcom/criticalay/GoogleAnalytics$Companion;-><clinit>()V
+SPLcom/criticalay/GoogleAnalytics$Companion;-><init>()V
+SPLcom/criticalay/GoogleAnalytics$Companion;->builder(Lkotlin/jvm/functions/Function1;)Lcom/criticalay/GoogleAnalytics;
+Lcom/criticalay/GoogleAnalyticsBuilder;
+SPLcom/criticalay/GoogleAnalyticsBuilder;-><init>()V
+SPLcom/criticalay/GoogleAnalyticsBuilder;->build()Lcom/criticalay/GoogleAnalytics;
+SPLcom/criticalay/GoogleAnalyticsBuilder;->setApiSecret(Ljava/lang/String;)V
+SPLcom/criticalay/GoogleAnalyticsBuilder;->setAppName(Ljava/lang/String;)V
+SPLcom/criticalay/GoogleAnalyticsBuilder;->setAppVersion(Ljava/lang/String;)V
+SPLcom/criticalay/GoogleAnalyticsBuilder;->setDebug(Z)V
+SPLcom/criticalay/GoogleAnalyticsBuilder;->setEnabled(Z)V
+SPLcom/criticalay/GoogleAnalyticsBuilder;->setMeasurementId(Ljava/lang/String;)V
+SPLcom/criticalay/GoogleAnalyticsBuilder;->setSamplePercentage(I)V
+Lcom/criticalay/GoogleAnalyticsConfig;
+SPLcom/criticalay/GoogleAnalyticsConfig;-><clinit>()V
+SPLcom/criticalay/GoogleAnalyticsConfig;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZIZILjava/lang/String;Ljava/lang/String;IJJ)V
+SPLcom/criticalay/GoogleAnalyticsConfig;->getConnectTimeoutMs()J
+SPLcom/criticalay/GoogleAnalyticsConfig;->getProxyHost()Ljava/lang/String;
+SPLcom/criticalay/GoogleAnalyticsConfig;->getReadTimeoutMs()J
+SPLcom/criticalay/GoogleAnalyticsConfig;->getSamplePercentage()I
+Lcom/criticalay/GoogleAnalyticsConfig$Companion;
+SPLcom/criticalay/GoogleAnalyticsConfig$Companion;-><init>()V
+SPLcom/criticalay/GoogleAnalyticsConfig$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/criticalay/httpclient/OkHttpClientImpl;
+SPLcom/criticalay/httpclient/OkHttpClientImpl;-><init>(Lcom/criticalay/GoogleAnalyticsConfig;)V
+SPLcom/criticalay/httpclient/OkHttpClientImpl;->buildClient()Lokhttp3/OkHttpClient;
+SPLcom/criticalay/httpclient/OkHttpClientImpl;->json$lambda$0(Lkotlinx/serialization/json/JsonBuilder;)Lkotlin/Unit;
+Lcom/criticalay/httpclient/OkHttpClientImpl$$ExternalSyntheticLambda1;
+SPLcom/criticalay/httpclient/OkHttpClientImpl$$ExternalSyntheticLambda1;-><init>()V
+SPLcom/criticalay/httpclient/OkHttpClientImpl$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/criticalay/internal/GaImpl;
+SPLcom/criticalay/internal/GaImpl;-><init>(Lcom/criticalay/GoogleAnalyticsConfig;Lcom/criticalay/httpclient/OkHttpClientImpl;)V
+SPLcom/criticalay/internal/GaImpl;->getConfig()Lcom/criticalay/GoogleAnalyticsConfig;
+SPLcom/criticalay/internal/GaImpl;->getInSample()Z
+SPLcom/criticalay/internal/GaImpl;->performSamplingElection$lambda$0(ILcom/criticalay/internal/GaImpl;)Ljava/lang/Object;
+SPLcom/criticalay/internal/GaImpl;->performSamplingElection$lambda$1(ILcom/criticalay/internal/GaImpl;)Ljava/lang/Object;
+SPLcom/criticalay/internal/GaImpl;->performSamplingElection()Z
+Lcom/criticalay/internal/GaImpl$$ExternalSyntheticLambda4;
+SPLcom/criticalay/internal/GaImpl$$ExternalSyntheticLambda4;-><init>(ILcom/criticalay/internal/GaImpl;)V
+SPLcom/criticalay/internal/GaImpl$$ExternalSyntheticLambda4;->invoke()Ljava/lang/Object;
+Lcom/criticalay/internal/GaImpl$$ExternalSyntheticLambda5;
+SPLcom/criticalay/internal/GaImpl$$ExternalSyntheticLambda5;-><init>(ILcom/criticalay/internal/GaImpl;)V
+SPLcom/criticalay/internal/GaImpl$$ExternalSyntheticLambda5;->invoke()Ljava/lang/Object;
+Lcom/criticalay/internal/GaImplKt;
+SPLcom/criticalay/internal/GaImplKt;-><clinit>()V
+SPLcom/criticalay/internal/GaImplKt;->access$getLogger$p()Lio/github/oshai/kotlinlogging/KLogger;
+Lcom/criticalay/internal/GaImplKt$$ExternalSyntheticLambda0;
+SPLcom/criticalay/internal/GaImplKt$$ExternalSyntheticLambda0;-><init>()V
 Lcom/google/android/material/R$anim;
 Lcom/google/android/material/R$attr;
 Lcom/google/android/material/R$dimen;
+Lcom/google/android/material/R$drawable;
 Lcom/google/android/material/R$id;
+Lcom/google/android/material/R$integer;
 Lcom/google/android/material/R$layout;
 Lcom/google/android/material/R$style;
 Lcom/google/android/material/R$styleable;
 SPLcom/google/android/material/R$styleable;-><clinit>()V
 Lcom/google/android/material/animation/AnimationUtils;
 SPLcom/google/android/material/animation/AnimationUtils;-><clinit>()V
+SPLcom/google/android/material/animation/AnimationUtils;->lerp(FFF)F
+SPLcom/google/android/material/animation/AnimationUtils;->lerp(FFFFF)F
 Lcom/google/android/material/animation/MotionSpec;
+SPLcom/google/android/material/animation/MotionSpec;-><init>()V
+SPLcom/google/android/material/animation/MotionSpec;->addInfoFromAnimator(Lcom/google/android/material/animation/MotionSpec;Landroid/animation/Animator;)V
 SPLcom/google/android/material/animation/MotionSpec;->createFromAttribute(Landroid/content/Context;Landroid/content/res/TypedArray;I)Lcom/google/android/material/animation/MotionSpec;
+SPLcom/google/android/material/animation/MotionSpec;->createFromResource(Landroid/content/Context;I)Lcom/google/android/material/animation/MotionSpec;
+SPLcom/google/android/material/animation/MotionSpec;->createSpecFromAnimators(Ljava/util/List;)Lcom/google/android/material/animation/MotionSpec;
+SPLcom/google/android/material/animation/MotionSpec;->setPropertyValues(Ljava/lang/String;[Landroid/animation/PropertyValuesHolder;)V
+SPLcom/google/android/material/animation/MotionSpec;->setTiming(Ljava/lang/String;Lcom/google/android/material/animation/MotionTiming;)V
+Lcom/google/android/material/animation/MotionTiming;
+SPLcom/google/android/material/animation/MotionTiming;-><init>(JJLandroid/animation/TimeInterpolator;)V
+SPLcom/google/android/material/animation/MotionTiming;->createFromAnimator(Landroid/animation/ValueAnimator;)Lcom/google/android/material/animation/MotionTiming;
+Lcom/google/android/material/badge/BadgeDrawable;
+Lcom/google/android/material/behavior/HideViewOnScrollBehavior;
+SPLcom/google/android/material/behavior/HideViewOnScrollBehavior;-><clinit>()V
+SPLcom/google/android/material/behavior/HideViewOnScrollBehavior;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;
+SPLcom/google/android/material/bottomnavigation/BottomNavigationItemView;-><init>(Landroid/content/Context;)V
+SPLcom/google/android/material/bottomnavigation/BottomNavigationItemView;->getItemDefaultMarginResId()I
+SPLcom/google/android/material/bottomnavigation/BottomNavigationItemView;->getItemLayoutResId()I
+Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
+SPLcom/google/android/material/bottomnavigation/BottomNavigationMenuView;-><init>(Landroid/content/Context;)V
+SPLcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->createNavigationBarItemView(Landroid/content/Context;)Lcom/google/android/material/navigation/NavigationBarItemView;
+SPLcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->isItemHorizontalTranslationEnabled()Z
+Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView;->applyWindowInsets()V
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView;->createNavigationBarMenuView(Landroid/content/Context;)Lcom/google/android/material/navigation/NavigationBarMenuView;
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView;->getMaxItemCount()I
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView;->setItemHorizontalTranslationEnabled(Z)V
+Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView$1;-><init>(Lcom/google/android/material/bottomnavigation/BottomNavigationView;)V
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView$1;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;Lcom/google/android/material/internal/ViewUtils$RelativePadding;)Landroidx/core/view/WindowInsetsCompat;
 Lcom/google/android/material/button/MaterialButton;
 SPLcom/google/android/material/button/MaterialButton;-><clinit>()V
 SPLcom/google/android/material/button/MaterialButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 SPLcom/google/android/material/button/MaterialButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLcom/google/android/material/button/MaterialButton;->canUpdateWithoutTextAlignment(I)Z
 SPLcom/google/android/material/button/MaterialButton;->getA11yClassName()Ljava/lang/String;
+SPLcom/google/android/material/button/MaterialButton;->getActualTextAlignment()Landroid/text/Layout$Alignment;
+SPLcom/google/android/material/button/MaterialButton;->getGravityTextAlignment()Landroid/text/Layout$Alignment;
+SPLcom/google/android/material/button/MaterialButton;->getIcon()Landroid/graphics/drawable/Drawable;
+SPLcom/google/android/material/button/MaterialButton;->getIconPadding()I
+SPLcom/google/android/material/button/MaterialButton;->getIconSize()I
 SPLcom/google/android/material/button/MaterialButton;->getTextLayoutWidth()I
+SPLcom/google/android/material/button/MaterialButton;->getUpdatedIconFor(I)Landroid/graphics/drawable/Drawable;
 SPLcom/google/android/material/button/MaterialButton;->isCheckable()Z
 SPLcom/google/android/material/button/MaterialButton;->isChecked()Z
 SPLcom/google/android/material/button/MaterialButton;->isIconEnd()Z
@@ -6358,14 +7019,21 @@ SPLcom/google/android/material/button/MaterialButton;->refreshDrawableState()V
 SPLcom/google/android/material/button/MaterialButton;->setBackgroundTintList(Landroid/content/res/ColorStateList;)V
 SPLcom/google/android/material/button/MaterialButton;->setChecked(Z)V
 SPLcom/google/android/material/button/MaterialButton;->setCheckedInternal(Z)V
+SPLcom/google/android/material/button/MaterialButton;->setCompoundDrawablePadding(I)V
 SPLcom/google/android/material/button/MaterialButton;->setElevation(F)V
 SPLcom/google/android/material/button/MaterialButton;->setInternalBackground(Landroid/graphics/drawable/Drawable;)V
 SPLcom/google/android/material/button/MaterialButton;->setOpticalCenterEnabled(Z)V
 SPLcom/google/android/material/button/MaterialButton;->setPressed(Z)V
+SPLcom/google/android/material/button/MaterialButton;->setShapeAppearanceModel(Lcom/google/android/material/shape/ShapeAppearanceModel;)V
 SPLcom/google/android/material/button/MaterialButton;->setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/button/MaterialButton;->setText(Ljava/lang/CharSequence;Landroid/widget/TextView$BufferType;)V
 SPLcom/google/android/material/button/MaterialButton;->toggle()V
 SPLcom/google/android/material/button/MaterialButton;->updateIcon(Z)V
 SPLcom/google/android/material/button/MaterialButton;->updateIconPosition(II)V
+SPLcom/google/android/material/button/MaterialButton;->updateSecondaryIcon(Z)V
+SPLcom/google/android/material/button/MaterialButton;->updateSecondaryIconPosition(II)V
+SPLcom/google/android/material/button/MaterialButton;->validateIconGravity()V
+SPLcom/google/android/material/button/MaterialButton;->validateSecondaryIconGravity()V
 Lcom/google/android/material/button/MaterialButton$1;
 SPLcom/google/android/material/button/MaterialButton$1;-><init>(Ljava/lang/String;)V
 Lcom/google/android/material/button/MaterialButton$SavedState;
@@ -6373,17 +7041,25 @@ SPLcom/google/android/material/button/MaterialButton$SavedState;-><clinit>()V
 SPLcom/google/android/material/button/MaterialButton$SavedState;-><init>(Landroid/os/Parcelable;)V
 Lcom/google/android/material/button/MaterialButton$SavedState$1;
 SPLcom/google/android/material/button/MaterialButton$SavedState$1;-><init>()V
+Lcom/google/android/material/button/MaterialButton$WidthChangeDirection;
+SPLcom/google/android/material/button/MaterialButton$WidthChangeDirection;->$values()[Lcom/google/android/material/button/MaterialButton$WidthChangeDirection;
+SPLcom/google/android/material/button/MaterialButton$WidthChangeDirection;-><clinit>()V
+SPLcom/google/android/material/button/MaterialButton$WidthChangeDirection;-><init>(Ljava/lang/String;I)V
 Lcom/google/android/material/button/MaterialButtonGroup;
 Lcom/google/android/material/button/MaterialButtonHelper;
-SPLcom/google/android/material/button/MaterialButtonHelper;-><init>(Lcom/google/android/material/button/MaterialButton;Lcom/google/android/material/shape/ShapeAppearanceModel;)V
+SPLcom/google/android/material/button/MaterialButtonHelper;-><init>(Lcom/google/android/material/button/MaterialButton;Lcom/google/android/material/shape/ShapeAppearance;)V
 SPLcom/google/android/material/button/MaterialButtonHelper;->createBackground()Landroid/graphics/drawable/Drawable;
+SPLcom/google/android/material/button/MaterialButtonHelper;->getMaskDrawable()Lcom/google/android/material/shape/Shapeable;
 SPLcom/google/android/material/button/MaterialButtonHelper;->getMaterialShapeDrawable()Lcom/google/android/material/shape/MaterialShapeDrawable;
 SPLcom/google/android/material/button/MaterialButtonHelper;->getMaterialShapeDrawable(Z)Lcom/google/android/material/shape/MaterialShapeDrawable;
+SPLcom/google/android/material/button/MaterialButtonHelper;->getSurfaceColorStrokeDrawable()Lcom/google/android/material/shape/MaterialShapeDrawable;
 SPLcom/google/android/material/button/MaterialButtonHelper;->isBackgroundOverwritten()Z
 SPLcom/google/android/material/button/MaterialButtonHelper;->isCheckable()Z
 SPLcom/google/android/material/button/MaterialButtonHelper;->isToggleCheckedStateOnClick()Z
 SPLcom/google/android/material/button/MaterialButtonHelper;->loadFromAttributes(Landroid/content/res/TypedArray;)V
+SPLcom/google/android/material/button/MaterialButtonHelper;->setShapeAppearance(Lcom/google/android/material/shape/ShapeAppearance;)V
 SPLcom/google/android/material/button/MaterialButtonHelper;->updateBackground()V
+SPLcom/google/android/material/button/MaterialButtonHelper;->updateButtonShape()V
 SPLcom/google/android/material/button/MaterialButtonHelper;->wrapDrawableWithInset(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/InsetDrawable;
 Lcom/google/android/material/color/MaterialColors;
 SPLcom/google/android/material/color/MaterialColors;->getColor(Landroid/content/Context;II)I
@@ -6403,67 +7079,83 @@ SPLcom/google/android/material/elevation/ElevationOverlayProvider;->compositeOve
 SPLcom/google/android/material/elevation/ElevationOverlayProvider;->compositeOverlayIfNeeded(IF)I
 SPLcom/google/android/material/elevation/ElevationOverlayProvider;->isThemeElevationOverlayEnabled()Z
 SPLcom/google/android/material/elevation/ElevationOverlayProvider;->isThemeSurfaceColor(I)Z
-Lcom/google/android/material/expandable/ExpandableTransformationWidget;
-Lcom/google/android/material/expandable/ExpandableWidget;
-Lcom/google/android/material/expandable/ExpandableWidgetHelper;
-SPLcom/google/android/material/expandable/ExpandableWidgetHelper;-><init>(Lcom/google/android/material/expandable/ExpandableWidget;)V
-Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;-><clinit>()V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;->access$000(Lcom/google/android/material/floatingactionbutton/FloatingActionButton;)I
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;->access$101(Lcom/google/android/material/floatingactionbutton/FloatingActionButton;Landroid/graphics/drawable/Drawable;)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;->drawableStateChanged()V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;->getAccessibilityClassName()Ljava/lang/CharSequence;
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;->getImpl()Lcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;->getSizeDimension()I
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;->getSizeDimension(I)I
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;->jumpDrawablesToCurrentState()V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;->onApplySupportImageTint()V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;->onAttachedToWindow()V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;->onMeasure(II)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;->setBackgroundTintList(Landroid/content/res/ColorStateList;)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;->setElevation(F)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;->setImageResource(I)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;->setMaxImageSize(I)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton;->setTranslationZ(F)V
-Lcom/google/android/material/floatingactionbutton/FloatingActionButton$ShadowDelegateImpl;
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton$ShadowDelegateImpl;-><init>(Lcom/google/android/material/floatingactionbutton/FloatingActionButton;)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton$ShadowDelegateImpl;->isCompatPaddingEnabled()Z
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton$ShadowDelegateImpl;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButton$ShadowDelegateImpl;->setShadowPadding(IIII)V
-Lcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;-><clinit>()V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;-><init>(Lcom/google/android/material/floatingactionbutton/FloatingActionButton;Lcom/google/android/material/shadow/ShadowViewDelegate;)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->calculateImageMatrixFromScale(FLandroid/graphics/Matrix;)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->createShapeDrawable()Lcom/google/android/material/shape/MaterialShapeDrawable;
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->getPadding(Landroid/graphics/Rect;)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->ignoreExpandBoundsForA11y()Z
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->initializeBackgroundDrawable(Landroid/content/res/ColorStateList;Landroid/graphics/PorterDuff$Mode;Landroid/content/res/ColorStateList;I)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->onAttachedToWindow()V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->onElevationsChanged(FFF)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->onPaddingUpdated(Landroid/graphics/Rect;)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->onTranslationChanged()V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->setElevation(F)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->setEnsureMinTouchTargetSize(Z)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->setHideMotionSpec(Lcom/google/android/material/animation/MotionSpec;)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->setHoveredFocusedTranslationZ(F)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->setImageMatrixScale(F)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->setMaxImageSize(I)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->setMinTouchTargetSize(I)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->setPressedTranslationZ(F)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->setShapeAppearance(Lcom/google/android/material/shape/ShapeAppearanceModel;)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->setShowMotionSpec(Lcom/google/android/material/animation/MotionSpec;)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->shouldAddPadding()Z
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->updateImageMatrixScale()V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->updatePadding()V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->updateShapeElevation(F)V
-Lcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl$AlwaysStatefulMaterialShapeDrawable;
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl$AlwaysStatefulMaterialShapeDrawable;-><init>(Lcom/google/android/material/shape/ShapeAppearanceModel;)V
-SPLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl$AlwaysStatefulMaterialShapeDrawable;->isStateful()Z
+Lcom/google/android/material/floatingactionbutton/AnimatorTracker;
+SPLcom/google/android/material/floatingactionbutton/AnimatorTracker;-><init>()V
+Lcom/google/android/material/floatingactionbutton/BaseMotionStrategy;
+SPLcom/google/android/material/floatingactionbutton/BaseMotionStrategy;-><init>(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Lcom/google/android/material/floatingactionbutton/AnimatorTracker;)V
+SPLcom/google/android/material/floatingactionbutton/BaseMotionStrategy;->setMotionSpec(Lcom/google/android/material/animation/MotionSpec;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;-><clinit>()V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->access$202(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;I)I
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->access$302(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;I)I
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->access$500(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;)Z
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->access$502(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Z)Z
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->access$600(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->getAccessibilityClassName()Ljava/lang/CharSequence;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->getCollapsedPadding()I
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->getCollapsedSize()I
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->getSizeFromExtendStrategyType(I)Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$Size;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->onAttachedToWindow()V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->saveOriginalTextCsl()V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->setClickable(Z)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->setContentDescription(Ljava/lang/CharSequence;)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->setExtended(Z)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->setPaddingRelative(IIII)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->setText(Ljava/lang/CharSequence;Landroid/widget/TextView$BufferType;)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->setTextColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->silentlyUpdateTextColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->updateTooltip()V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$1;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$1;-><init>(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$1;->getHeight()I
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$1;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$1;->getPaddingEnd()I
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$1;->getPaddingStart()I
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$1;->getWidth()I
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$2;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$2;-><init>(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$3;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$3;-><init>(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$Size;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$4;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$4;-><init>(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$Size;Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$Size;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$6;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$6;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$7;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$7;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$8;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$8;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$9;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$9;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$ChangeSizeStrategy;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$ChangeSizeStrategy;-><init>(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Lcom/google/android/material/floatingactionbutton/AnimatorTracker;Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$Size;Z)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$ChangeSizeStrategy;->performNow()V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$ChangeSizeStrategy;->shouldCancel()Z
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$ExtendedFloatingActionButtonBehavior;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$ExtendedFloatingActionButtonBehavior;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$HideStrategy;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$HideStrategy;-><init>(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Lcom/google/android/material/floatingactionbutton/AnimatorTracker;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$ShowStrategy;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$ShowStrategy;-><init>(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Lcom/google/android/material/floatingactionbutton/AnimatorTracker;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$Size;
+Lcom/google/android/material/floatingactionbutton/MotionStrategy;
+Lcom/google/android/material/focus/FocusRingDrawable;
+SPLcom/google/android/material/focus/FocusRingDrawable;-><clinit>()V
+SPLcom/google/android/material/focus/FocusRingDrawable;->find(Landroid/graphics/drawable/Drawable;)Lcom/google/android/material/focus/FocusRingDrawable;
+SPLcom/google/android/material/focus/FocusRingDrawable;->layer(Landroid/content/Context;Landroid/graphics/drawable/LayerDrawable;)Lcom/google/android/material/focus/FocusRingDrawable;
+SPLcom/google/android/material/focus/FocusRingDrawable;->layer(Landroid/content/Context;Landroid/graphics/drawable/LayerDrawable;Lcom/google/android/material/shape/MaterialShapeDrawable;)Lcom/google/android/material/focus/FocusRingDrawable;
+SPLcom/google/android/material/focus/FocusRingDrawable;->shouldUseFocusRing(Landroid/content/Context;)Z
+Lcom/google/android/material/focus/FocusRingDrawable$1;
+SPLcom/google/android/material/focus/FocusRingDrawable$1;-><init>(Ljava/lang/String;)V
+Lcom/google/android/material/internal/BaselineLayout;
+SPLcom/google/android/material/internal/BaselineLayout;-><init>(Landroid/content/Context;)V
+SPLcom/google/android/material/internal/BaselineLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLcom/google/android/material/internal/BaselineLayout;->setMeasurePaddingFromBaseline(Z)V
 Lcom/google/android/material/internal/ContextUtils;
 SPLcom/google/android/material/internal/ContextUtils;->getActivity(Landroid/content/Context;)Landroid/app/Activity;
+Lcom/google/android/material/internal/EdgeToEdgeUtils;
+SPLcom/google/android/material/internal/EdgeToEdgeUtils;->getNavigationBarColor(Landroid/view/Window;)I
 Lcom/google/android/material/internal/ForegroundLinearLayout;
 SPLcom/google/android/material/internal/ForegroundLinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 SPLcom/google/android/material/internal/ForegroundLinearLayout;->drawableStateChanged()V
@@ -6501,10 +7193,9 @@ Lcom/google/android/material/internal/NavigationMenuPresenter;
 SPLcom/google/android/material/internal/NavigationMenuPresenter;-><init>()V
 SPLcom/google/android/material/internal/NavigationMenuPresenter;->access$300(Lcom/google/android/material/internal/NavigationMenuPresenter;)I
 SPLcom/google/android/material/internal/NavigationMenuPresenter;->addHeaderView(Landroid/view/View;)V
-SPLcom/google/android/material/internal/NavigationMenuPresenter;->dispatchApplyWindowInsets(Landroidx/core/view/WindowInsetsCompat;)V
-SPLcom/google/android/material/internal/NavigationMenuPresenter;->getHeaderCount()I
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->getDividerInsetStart()I
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->getItemHorizontalPadding()I
 SPLcom/google/android/material/internal/NavigationMenuPresenter;->getMenuView(Landroid/view/ViewGroup;)Landroidx/appcompat/view/menu/MenuView;
-SPLcom/google/android/material/internal/NavigationMenuPresenter;->hasHeader()Z
 SPLcom/google/android/material/internal/NavigationMenuPresenter;->inflateHeaderView(I)Landroid/view/View;
 SPLcom/google/android/material/internal/NavigationMenuPresenter;->initForMenu(Landroid/content/Context;Landroidx/appcompat/view/menu/MenuBuilder;)V
 SPLcom/google/android/material/internal/NavigationMenuPresenter;->setBehindStatusBar(Z)V
@@ -6531,13 +7222,14 @@ SPLcom/google/android/material/internal/NavigationMenuPresenter;->updateAllDivid
 SPLcom/google/android/material/internal/NavigationMenuPresenter;->updateAllSubHeaderMenuItems()V
 SPLcom/google/android/material/internal/NavigationMenuPresenter;->updateAllTextMenuItems()V
 SPLcom/google/android/material/internal/NavigationMenuPresenter;->updateMenuView(Z)V
-SPLcom/google/android/material/internal/NavigationMenuPresenter;->updateTopPadding()V
 Lcom/google/android/material/internal/NavigationMenuPresenter$1;
 SPLcom/google/android/material/internal/NavigationMenuPresenter$1;-><init>(Lcom/google/android/material/internal/NavigationMenuPresenter;)V
 Lcom/google/android/material/internal/NavigationMenuPresenter$HeaderViewHolder;
 SPLcom/google/android/material/internal/NavigationMenuPresenter$HeaderViewHolder;-><init>(Landroid/view/View;)V
 Lcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;
 SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;-><init>(Lcom/google/android/material/internal/NavigationMenuPresenter;)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->access$000(Lcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->access$200(Lcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;)V
 SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->getItemCount()I
 SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->getItemId(I)J
 SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->getItemViewType(I)I
@@ -6550,6 +7242,8 @@ SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAd
 SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->setCheckedItem(Landroidx/appcompat/view/menu/MenuItemImpl;)V
 SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->setUpdateSuspended(Z)V
 SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->update()V
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->updateAllDividerMenuItems()V
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->updateAllTextMenuItems()V
 Lcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter$1;
 SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter$1;-><init>(Lcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;IZ)V
 Lcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuHeaderItem;
@@ -6582,21 +7276,35 @@ SPLcom/google/android/material/internal/ScrimInsetsFrameLayout;->setDrawRightIns
 SPLcom/google/android/material/internal/ScrimInsetsFrameLayout;->setDrawTopInsetForeground(Z)V
 Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;
 SPLcom/google/android/material/internal/ScrimInsetsFrameLayout$1;-><init>(Lcom/google/android/material/internal/ScrimInsetsFrameLayout;)V
-SPLcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+Lcom/google/android/material/internal/TextDrawableHelper$TextDrawableDelegate;
+Lcom/google/android/material/internal/TextScale;
+SPLcom/google/android/material/internal/TextScale;-><init>()V
 Lcom/google/android/material/internal/ThemeEnforcement;
 SPLcom/google/android/material/internal/ThemeEnforcement;-><clinit>()V
 SPLcom/google/android/material/internal/ThemeEnforcement;->checkAppCompatTheme(Landroid/content/Context;)V
 SPLcom/google/android/material/internal/ThemeEnforcement;->checkCompatibleTheme(Landroid/content/Context;Landroid/util/AttributeSet;II)V
 SPLcom/google/android/material/internal/ThemeEnforcement;->checkTextAppearance(Landroid/content/Context;Landroid/util/AttributeSet;[III[I)V
 SPLcom/google/android/material/internal/ThemeEnforcement;->checkTheme(Landroid/content/Context;[ILjava/lang/String;)V
+SPLcom/google/android/material/internal/ThemeEnforcement;->isCustomTextAppearanceValid(Landroid/content/Context;Landroid/util/AttributeSet;[III[I)Z
 SPLcom/google/android/material/internal/ThemeEnforcement;->isTheme(Landroid/content/Context;[I)Z
 SPLcom/google/android/material/internal/ThemeEnforcement;->obtainStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[III[I)Landroid/content/res/TypedArray;
 SPLcom/google/android/material/internal/ThemeEnforcement;->obtainTintedStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[III[I)Landroidx/appcompat/widget/TintTypedArray;
 Lcom/google/android/material/internal/ViewUtils;
+SPLcom/google/android/material/internal/ViewUtils;->doOnApplyWindowInsets(Landroid/view/View;Lcom/google/android/material/internal/ViewUtils$OnApplyWindowInsetsListener;)V
 SPLcom/google/android/material/internal/ViewUtils;->getParentAbsoluteElevation(Landroid/view/View;)F
 SPLcom/google/android/material/internal/ViewUtils;->parseTintMode(ILandroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuff$Mode;
-Lcom/google/android/material/internal/VisibilityAwareImageButton;
-SPLcom/google/android/material/internal/VisibilityAwareImageButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLcom/google/android/material/internal/ViewUtils;->requestApplyInsetsWhenAttached(Landroid/view/View;)V
+Lcom/google/android/material/internal/ViewUtils$2;
+SPLcom/google/android/material/internal/ViewUtils$2;-><init>(Lcom/google/android/material/internal/ViewUtils$OnApplyWindowInsetsListener;Lcom/google/android/material/internal/ViewUtils$RelativePadding;)V
+SPLcom/google/android/material/internal/ViewUtils$2;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+Lcom/google/android/material/internal/ViewUtils$3;
+SPLcom/google/android/material/internal/ViewUtils$3;-><init>()V
+SPLcom/google/android/material/internal/ViewUtils$3;->onViewAttachedToWindow(Landroid/view/View;)V
+Lcom/google/android/material/internal/ViewUtils$OnApplyWindowInsetsListener;
+Lcom/google/android/material/internal/ViewUtils$RelativePadding;
+SPLcom/google/android/material/internal/ViewUtils$RelativePadding;-><init>(IIII)V
+SPLcom/google/android/material/internal/ViewUtils$RelativePadding;-><init>(Lcom/google/android/material/internal/ViewUtils$RelativePadding;)V
+SPLcom/google/android/material/internal/ViewUtils$RelativePadding;->applyToView(Landroid/view/View;)V
 Lcom/google/android/material/internal/WindowUtils;
 SPLcom/google/android/material/internal/WindowUtils;->getCurrentWindowBounds(Landroid/content/Context;)Landroid/graphics/Rect;
 Lcom/google/android/material/internal/WindowUtils$Api30Impl;
@@ -6619,13 +7327,210 @@ Lcom/google/android/material/motion/MaterialBackOrchestrator$BackCallbackDelegat
 Lcom/google/android/material/motion/MaterialSideContainerBackHelper;
 SPLcom/google/android/material/motion/MaterialSideContainerBackHelper;-><init>(Landroid/view/View;)V
 Lcom/google/android/material/motion/MotionUtils;
+SPLcom/google/android/material/motion/MotionUtils;->getLegacyControlPoint([Ljava/lang/String;I)F
+SPLcom/google/android/material/motion/MotionUtils;->getLegacyEasingContent(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+SPLcom/google/android/material/motion/MotionUtils;->getLegacyThemeInterpolator(Ljava/lang/String;)Landroid/animation/TimeInterpolator;
+SPLcom/google/android/material/motion/MotionUtils;->isLegacyEasingAttribute(Ljava/lang/String;)Z
+SPLcom/google/android/material/motion/MotionUtils;->isLegacyEasingType(Ljava/lang/String;Ljava/lang/String;)Z
 SPLcom/google/android/material/motion/MotionUtils;->resolveThemeDuration(Landroid/content/Context;II)I
+SPLcom/google/android/material/motion/MotionUtils;->resolveThemeInterpolator(Landroid/content/Context;ILandroid/animation/TimeInterpolator;)Landroid/animation/TimeInterpolator;
+Lcom/google/android/material/navigation/DividerMenuItem;
+Lcom/google/android/material/navigation/NavigationBarItemView;
+SPLcom/google/android/material/navigation/NavigationBarItemView;-><clinit>()V
+SPLcom/google/android/material/navigation/NavigationBarItemView;-><init>(Landroid/content/Context;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->calculateTextScaleFactors()V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->getActiveIndicatorDrawable()Landroid/graphics/drawable/Drawable;
+SPLcom/google/android/material/navigation/NavigationBarItemView;->getItemBackgroundResId()I
+SPLcom/google/android/material/navigation/NavigationBarItemView;->getItemData()Landroidx/appcompat/view/menu/MenuItemImpl;
+SPLcom/google/android/material/navigation/NavigationBarItemView;->initialize(Landroidx/appcompat/view/menu/MenuItemImpl;I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->initializeDefaultExpandedLabelGroupViews()V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->isActiveIndicatorResizeableAndUnlabeled()Z
+SPLcom/google/android/material/navigation/NavigationBarItemView;->maybeAnimateActiveIndicatorToProgress(F)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->onCreateDrawableState(I)[I
+SPLcom/google/android/material/navigation/NavigationBarItemView;->refreshChecked()V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->refreshItemBackground()V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorDrawable(Landroid/graphics/drawable/Drawable;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorExpandedHeight(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorExpandedMarginHorizontal(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorExpandedPadding(Landroid/graphics/Rect;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorExpandedWidth(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorHeight(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorLabelPadding(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorMarginHorizontal(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorProgress(FF)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorResizeable(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorWidth(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setCheckable(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setChecked(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setExpanded(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setExpandedLabelGroupMargins()V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setHorizontalTextAppearanceActive(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setHorizontalTextAppearanceInactive(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setIcon(Landroid/graphics/drawable/Drawable;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setIconLabelHorizontalSpacing(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setIconSize(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setIconTintList(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setItemBackground(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setItemBackground(Landroid/graphics/drawable/Drawable;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setItemGravity(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setItemIconGravity(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setItemPaddingBottom(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setItemPaddingTop(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setItemPosition(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setItemRippleColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setLabelFontScalingEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setLabelMaxLines(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setLabelPivots(Landroid/widget/TextView;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setLabelVisibilityMode(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setLayoutConfigurationIconAndLabel(Landroid/view/View;Landroid/view/View;FF)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setMeasureBottomPaddingFromLabelBaseline(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setOnlyShowWhenExpanded(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setShifting(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setTextAppearanceActive(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setTextAppearanceActiveBoldEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setTextAppearanceForLabel(Landroid/widget/TextView;I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setTextAppearanceInactive(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setTextAppearanceWithoutFontScaling(Landroid/widget/TextView;I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setTextColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setTitle(Ljava/lang/CharSequence;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setViewMarginAndGravity(Landroid/view/View;III)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setViewScaleValues(Landroid/view/View;FFI)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->updateActiveIndicatorLayoutParams(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->updateActiveIndicatorTransform()V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->updateActiveLabelBoldness()V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->updateActiveLabelTextAppearance(Landroid/widget/TextView;I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->updateInactiveLabelTextAppearance(Landroid/widget/TextView;I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->updateViewPaddingBottom(Landroid/view/View;I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->updateVisibility()V
+Lcom/google/android/material/navigation/NavigationBarItemView$$ExternalSyntheticLambda1;
+SPLcom/google/android/material/navigation/NavigationBarItemView$$ExternalSyntheticLambda1;-><init>(Lcom/google/android/material/navigation/NavigationBarItemView;)V
+Lcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorTransform;
+SPLcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorTransform;-><init>()V
+SPLcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorTransform;-><init>(Lcom/google/android/material/navigation/NavigationBarItemView$1;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorTransform;->calculateAlpha(FF)F
+SPLcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorTransform;->calculateScaleX(F)F
+SPLcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorTransform;->calculateScaleY(F)F
+SPLcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorTransform;->updateForProgress(FFLandroid/view/View;)V
+Lcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorUnlabeledTransform;
+SPLcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorUnlabeledTransform;-><init>()V
+SPLcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorUnlabeledTransform;-><init>(Lcom/google/android/material/navigation/NavigationBarItemView$1;)V
+Lcom/google/android/material/navigation/NavigationBarMenu;
+SPLcom/google/android/material/navigation/NavigationBarMenu;-><init>(Landroid/content/Context;Ljava/lang/Class;IZ)V
+SPLcom/google/android/material/navigation/NavigationBarMenu;->addInternal(IIILjava/lang/CharSequence;)Landroid/view/MenuItem;
+Lcom/google/android/material/navigation/NavigationBarMenuBuilder;
+SPLcom/google/android/material/navigation/NavigationBarMenuBuilder;-><init>(Landroidx/appcompat/view/menu/MenuBuilder;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuBuilder;->getContentItemCount()I
+SPLcom/google/android/material/navigation/NavigationBarMenuBuilder;->getItemAt(I)Landroid/view/MenuItem;
+SPLcom/google/android/material/navigation/NavigationBarMenuBuilder;->getVisibleMainContentItemCount()I
+SPLcom/google/android/material/navigation/NavigationBarMenuBuilder;->refreshItems()V
+SPLcom/google/android/material/navigation/NavigationBarMenuBuilder;->size()I
+Lcom/google/android/material/navigation/NavigationBarMenuItemView;
+Lcom/google/android/material/navigation/NavigationBarMenuView;
+SPLcom/google/android/material/navigation/NavigationBarMenuView;-><clinit>()V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;-><init>(Landroid/content/Context;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->buildMenuView()V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->createDefaultColorStateList(I)Landroid/content/res/ColorStateList;
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->createItemActiveIndicatorDrawable()Landroid/graphics/drawable/Drawable;
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->createMenuItem(ILandroidx/appcompat/view/menu/MenuItemImpl;ZZ)Lcom/google/android/material/navigation/NavigationBarItemView;
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->getCollapsedVisibleItemCount()I
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->getCurrentVisibleContentItemCount()I
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->getItemGravity()I
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->getItemIconGravity()I
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->getLabelVisibilityMode()I
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->getNewItem()Lcom/google/android/material/navigation/NavigationBarItemView;
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->initialize(Landroidx/appcompat/view/menu/MenuBuilder;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->isMenuStructureSame()Z
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->isShifting(II)Z
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->isValidId(I)Z
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->releaseItemPool()V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->removeUnusedBadges()V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setActiveIndicatorLabelPadding(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setBadgeIfNeeded(Lcom/google/android/material/navigation/NavigationBarItemView;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setCheckedItem(Landroid/view/MenuItem;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setCollapsedMaxItemCount(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setIconLabelHorizontalSpacing(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setIconTintList(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorExpandedHeight(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorExpandedMarginHorizontal(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorExpandedPadding(IIII)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorExpandedWidth(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorHeight(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorMarginHorizontal(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorShapeAppearance(Lcom/google/android/material/shape/ShapeAppearanceModel;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorWidth(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemIconSize(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemPaddingBottom(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemPaddingTop(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemRippleColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemTextAppearanceActive(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemTextAppearanceActiveBoldEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemTextAppearanceInactive(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemTextColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setLabelFontScalingEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setLabelMaxLines(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setLabelVisibilityMode(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setMeasurePaddingFromLabelBaseline(Z)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setPresenter(Lcom/google/android/material/navigation/NavigationBarPresenter;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->updateMenuView()V
+Lcom/google/android/material/navigation/NavigationBarMenuView$1;
+SPLcom/google/android/material/navigation/NavigationBarMenuView$1;-><init>(Lcom/google/android/material/navigation/NavigationBarMenuView;)V
+Lcom/google/android/material/navigation/NavigationBarPresenter;
+SPLcom/google/android/material/navigation/NavigationBarPresenter;-><init>()V
+SPLcom/google/android/material/navigation/NavigationBarPresenter;->initForMenu(Landroid/content/Context;Landroidx/appcompat/view/menu/MenuBuilder;)V
+SPLcom/google/android/material/navigation/NavigationBarPresenter;->setId(I)V
+SPLcom/google/android/material/navigation/NavigationBarPresenter;->setMenuView(Lcom/google/android/material/navigation/NavigationBarMenuView;)V
+SPLcom/google/android/material/navigation/NavigationBarPresenter;->setUpdateSuspended(Z)V
+SPLcom/google/android/material/navigation/NavigationBarPresenter;->updateMenuView(Z)V
+Lcom/google/android/material/navigation/NavigationBarView;
+SPLcom/google/android/material/navigation/NavigationBarView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
+SPLcom/google/android/material/navigation/NavigationBarView;->getCollapsedMaxItemCount()I
+SPLcom/google/android/material/navigation/NavigationBarView;->getMenuInflater()Landroid/view/MenuInflater;
+SPLcom/google/android/material/navigation/NavigationBarView;->getMenuView()Landroidx/appcompat/view/menu/MenuView;
+SPLcom/google/android/material/navigation/NavigationBarView;->inflateMenu(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->isSubMenuSupported()Z
+SPLcom/google/android/material/navigation/NavigationBarView;->onAttachedToWindow()V
+SPLcom/google/android/material/navigation/NavigationBarView;->setActiveIndicatorLabelPadding(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setElevation(F)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setIconLabelHorizontalSpacing(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorExpandedHeight(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorExpandedMarginHorizontal(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorExpandedPadding(IIII)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorExpandedWidth(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorHeight(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorMarginHorizontal(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorShapeAppearance(Lcom/google/android/material/shape/ShapeAppearanceModel;)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorWidth(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemGravity(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemIconGravity(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemIconSize(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemPaddingBottom(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemPaddingTop(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemRippleColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemTextAppearanceActive(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemTextAppearanceActiveBoldEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemTextAppearanceInactive(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemTextColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setLabelFontScalingEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setLabelMaxLines(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setLabelVisibilityMode(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setMeasureBottomPaddingFromLabelBaseline(Z)V
+SPLcom/google/android/material/navigation/NavigationBarView;->shouldAddMenuView()Z
+Lcom/google/android/material/navigation/NavigationBarView$1;
+SPLcom/google/android/material/navigation/NavigationBarView$1;-><init>(Lcom/google/android/material/navigation/NavigationBarView;)V
 Lcom/google/android/material/navigation/NavigationView;
 SPLcom/google/android/material/navigation/NavigationView;-><clinit>()V
 SPLcom/google/android/material/navigation/NavigationView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 SPLcom/google/android/material/navigation/NavigationView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-SPLcom/google/android/material/navigation/NavigationView;->access$200(Lcom/google/android/material/navigation/NavigationView;)[I
-SPLcom/google/android/material/navigation/NavigationView;->access$300(Lcom/google/android/material/navigation/NavigationView;)Lcom/google/android/material/internal/NavigationMenuPresenter;
+SPLcom/google/android/material/navigation/NavigationView;->access$300(Lcom/google/android/material/navigation/NavigationView;)[I
+SPLcom/google/android/material/navigation/NavigationView;->access$400(Lcom/google/android/material/navigation/NavigationView;)Lcom/google/android/material/internal/NavigationMenuPresenter;
+SPLcom/google/android/material/navigation/NavigationView;->getDividerInsetStart()I
+SPLcom/google/android/material/navigation/NavigationView;->getItemHorizontalPadding()I
 SPLcom/google/android/material/navigation/NavigationView;->getMenu()Landroid/view/Menu;
 SPLcom/google/android/material/navigation/NavigationView;->getMenuInflater()Landroid/view/MenuInflater;
 SPLcom/google/android/material/navigation/NavigationView;->inflateHeaderView(I)Landroid/view/View;
@@ -6634,7 +7539,6 @@ SPLcom/google/android/material/navigation/NavigationView;->isStartInsetScrimEnab
 SPLcom/google/android/material/navigation/NavigationView;->isTopInsetScrimEnabled()Z
 SPLcom/google/android/material/navigation/NavigationView;->maybeUpdateCornerSizeForDrawerLayout(II)V
 SPLcom/google/android/material/navigation/NavigationView;->onAttachedToWindow()V
-SPLcom/google/android/material/navigation/NavigationView;->onInsetsChanged(Landroidx/core/view/WindowInsetsCompat;)V
 SPLcom/google/android/material/navigation/NavigationView;->onMeasure(II)V
 SPLcom/google/android/material/navigation/NavigationView;->onSizeChanged(IIII)V
 SPLcom/google/android/material/navigation/NavigationView;->setBottomInsetScrimEnabled(Z)V
@@ -6660,6 +7564,10 @@ SPLcom/google/android/material/navigation/NavigationView$2;-><init>(Lcom/google/
 Lcom/google/android/material/navigation/NavigationView$3;
 SPLcom/google/android/material/navigation/NavigationView$3;-><init>(Lcom/google/android/material/navigation/NavigationView;)V
 SPLcom/google/android/material/navigation/NavigationView$3;->onGlobalLayout()V
+Lcom/google/android/material/navigation/NavigationView$FocusDrawerListener;
+SPLcom/google/android/material/navigation/NavigationView$FocusDrawerListener;-><init>(Lcom/google/android/material/navigation/NavigationView;)V
+SPLcom/google/android/material/navigation/NavigationView$FocusDrawerListener;-><init>(Lcom/google/android/material/navigation/NavigationView;Lcom/google/android/material/navigation/NavigationView$1;)V
+SPLcom/google/android/material/navigation/NavigationView$FocusDrawerListener;->clearLastFocusedView()V
 Lcom/google/android/material/navigation/NavigationView$OnNavigationItemSelectedListener;
 Lcom/google/android/material/progressindicator/AnimatorDurationScaleProvider;
 SPLcom/google/android/material/progressindicator/AnimatorDurationScaleProvider;-><init>()V
@@ -6685,6 +7593,8 @@ SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->setProg
 SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->setProgressDrawable(Landroid/graphics/drawable/Drawable;)V
 SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->unregisterAnimationCallbacks()V
 SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->visibleToUser()Z
+Lcom/google/android/material/progressindicator/BaseProgressIndicator$$ExternalSyntheticLambda0;
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator$$ExternalSyntheticLambda0;-><init>(Lcom/google/android/material/progressindicator/BaseProgressIndicator;)V
 Lcom/google/android/material/progressindicator/BaseProgressIndicator$1;
 SPLcom/google/android/material/progressindicator/BaseProgressIndicator$1;-><init>(Lcom/google/android/material/progressindicator/BaseProgressIndicator;)V
 Lcom/google/android/material/progressindicator/BaseProgressIndicator$2;
@@ -6802,14 +7712,21 @@ SPLcom/google/android/material/progressindicator/LinearProgressIndicatorSpec;-><
 SPLcom/google/android/material/progressindicator/LinearProgressIndicatorSpec;->validateSpec()V
 Lcom/google/android/material/resources/MaterialAttributes;
 SPLcom/google/android/material/resources/MaterialAttributes;->resolve(Landroid/content/Context;I)Landroid/util/TypedValue;
+SPLcom/google/android/material/resources/MaterialAttributes;->resolve(Landroid/content/res/Resources$Theme;I)Landroid/util/TypedValue;
 SPLcom/google/android/material/resources/MaterialAttributes;->resolveBoolean(Landroid/content/Context;IZ)Z
+SPLcom/google/android/material/resources/MaterialAttributes;->resolveBoolean(Landroid/content/res/Resources$Theme;IZ)Z
 SPLcom/google/android/material/resources/MaterialAttributes;->resolveInteger(Landroid/content/Context;II)I
+SPLcom/google/android/material/resources/MaterialAttributes;->resolveInteger(Landroid/content/res/Resources$Theme;II)I
 SPLcom/google/android/material/resources/MaterialAttributes;->resolveTypedValueOrThrow(Landroid/content/Context;ILjava/lang/String;)Landroid/util/TypedValue;
 SPLcom/google/android/material/resources/MaterialAttributes;->resolveTypedValueOrThrow(Landroid/view/View;I)Landroid/util/TypedValue;
 Lcom/google/android/material/resources/MaterialResources;
 SPLcom/google/android/material/resources/MaterialResources;->getColorStateList(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/content/res/ColorStateList;
+SPLcom/google/android/material/resources/MaterialResources;->getColorStateList(Landroid/content/Context;Landroidx/appcompat/widget/TintTypedArray;I)Landroid/content/res/ColorStateList;
+SPLcom/google/android/material/resources/MaterialResources;->getComplexUnit(Landroid/util/TypedValue;)I
 SPLcom/google/android/material/resources/MaterialResources;->getDimensionPixelSize(Landroid/content/Context;Landroid/content/res/TypedArray;II)I
 SPLcom/google/android/material/resources/MaterialResources;->getDrawable(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
+SPLcom/google/android/material/resources/MaterialResources;->getUnscaledLineHeight(Landroid/content/Context;II)I
+SPLcom/google/android/material/resources/MaterialResources;->getUnscaledTextSize(Landroid/content/Context;II)I
 Lcom/google/android/material/ripple/RippleUtils;
 SPLcom/google/android/material/ripple/RippleUtils;-><clinit>()V
 SPLcom/google/android/material/ripple/RippleUtils;->sanitizeRippleDrawableColor(Landroid/content/res/ColorStateList;)Landroid/content/res/ColorStateList;
@@ -6818,7 +7735,6 @@ SPLcom/google/android/material/shadow/ShadowRenderer;-><clinit>()V
 SPLcom/google/android/material/shadow/ShadowRenderer;-><init>()V
 SPLcom/google/android/material/shadow/ShadowRenderer;-><init>(I)V
 SPLcom/google/android/material/shadow/ShadowRenderer;->setShadowColor(I)V
-Lcom/google/android/material/shadow/ShadowViewDelegate;
 Lcom/google/android/material/shape/AbsoluteCornerSize;
 SPLcom/google/android/material/shape/AbsoluteCornerSize;-><init>(F)V
 SPLcom/google/android/material/shape/AbsoluteCornerSize;->getCornerSize(Landroid/graphics/RectF;)F
@@ -6833,15 +7749,11 @@ SPLcom/google/android/material/shape/EdgeTreatment;->getEdgePath(FFFLcom/google/
 Lcom/google/android/material/shape/MaterialShapeDrawable;
 SPLcom/google/android/material/shape/MaterialShapeDrawable;-><clinit>()V
 SPLcom/google/android/material/shape/MaterialShapeDrawable;-><init>(Lcom/google/android/material/shape/MaterialShapeDrawable$MaterialShapeDrawableState;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;-><init>(Lcom/google/android/material/shape/ShapeAppearance;)V
 SPLcom/google/android/material/shape/MaterialShapeDrawable;-><init>(Lcom/google/android/material/shape/ShapeAppearanceModel;)V
-SPLcom/google/android/material/shape/MaterialShapeDrawable;->access$100(Lcom/google/android/material/shape/MaterialShapeDrawable;)Ljava/util/BitSet;
-SPLcom/google/android/material/shape/MaterialShapeDrawable;->access$200(Lcom/google/android/material/shape/MaterialShapeDrawable;)[Lcom/google/android/material/shape/ShapePath$ShadowCompatOperation;
-SPLcom/google/android/material/shape/MaterialShapeDrawable;->access$300(Lcom/google/android/material/shape/MaterialShapeDrawable;)[Lcom/google/android/material/shape/ShapePath$ShadowCompatOperation;
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->access$602(Lcom/google/android/material/shape/MaterialShapeDrawable;Z)Z
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->access$702(Lcom/google/android/material/shape/MaterialShapeDrawable;Z)Z
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->calculatePaintColorTintFilter(Landroid/graphics/Paint;Z)Landroid/graphics/PorterDuffColorFilter;
-SPLcom/google/android/material/shape/MaterialShapeDrawable;->calculatePath(Landroid/graphics/RectF;Landroid/graphics/Path;)V
-SPLcom/google/android/material/shape/MaterialShapeDrawable;->calculatePathForSize(Landroid/graphics/RectF;Landroid/graphics/Path;)V
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->calculateRoundRectCornerSize(Landroid/graphics/RectF;Lcom/google/android/material/shape/ShapeAppearanceModel;[F)F
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->calculateTintColorTintFilter(Landroid/content/res/ColorStateList;Landroid/graphics/PorterDuff$Mode;Z)Landroid/graphics/PorterDuffColorFilter;
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->calculateTintFilter(Landroid/content/res/ColorStateList;Landroid/graphics/PorterDuff$Mode;Landroid/graphics/Paint;Z)Landroid/graphics/PorterDuffColorFilter;
@@ -6878,6 +7790,7 @@ SPLcom/google/android/material/shape/MaterialShapeDrawable;->setColorFilter(Land
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->setElevation(F)V
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->setFillColor(Landroid/content/res/ColorStateList;)V
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->setParentAbsoluteElevation(F)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->setShapeAppearance(Lcom/google/android/material/shape/ShapeAppearance;)V
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->setShapeAppearanceModel(Lcom/google/android/material/shape/ShapeAppearanceModel;)V
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->setStroke(FI)V
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->setStroke(FLandroid/content/res/ColorStateList;)V
@@ -6886,6 +7799,7 @@ SPLcom/google/android/material/shape/MaterialShapeDrawable;->setStrokeWidth(F)V
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->setTint(I)V
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->setTintList(Landroid/content/res/ColorStateList;)V
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->setTintMode(Landroid/graphics/PorterDuff$Mode;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->shouldCalculatePath()Z
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->updateColorsForState([I)Z
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->updateTintFilter()Z
 SPLcom/google/android/material/shape/MaterialShapeDrawable;->updateZ()V
@@ -6893,11 +7807,9 @@ Lcom/google/android/material/shape/MaterialShapeDrawable$1;
 SPLcom/google/android/material/shape/MaterialShapeDrawable$1;-><init>(Lcom/google/android/material/shape/MaterialShapeDrawable;)V
 Lcom/google/android/material/shape/MaterialShapeDrawable$2;
 SPLcom/google/android/material/shape/MaterialShapeDrawable$2;-><init>(Lcom/google/android/material/shape/MaterialShapeDrawable;)V
-SPLcom/google/android/material/shape/MaterialShapeDrawable$2;->onCornerPathCreated(Lcom/google/android/material/shape/ShapePath;Landroid/graphics/Matrix;I)V
-SPLcom/google/android/material/shape/MaterialShapeDrawable$2;->onEdgePathCreated(Lcom/google/android/material/shape/ShapePath;Landroid/graphics/Matrix;I)V
 Lcom/google/android/material/shape/MaterialShapeDrawable$MaterialShapeDrawableState;
 SPLcom/google/android/material/shape/MaterialShapeDrawable$MaterialShapeDrawableState;-><init>(Lcom/google/android/material/shape/MaterialShapeDrawable$MaterialShapeDrawableState;)V
-SPLcom/google/android/material/shape/MaterialShapeDrawable$MaterialShapeDrawableState;-><init>(Lcom/google/android/material/shape/ShapeAppearanceModel;Lcom/google/android/material/elevation/ElevationOverlayProvider;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable$MaterialShapeDrawableState;-><init>(Lcom/google/android/material/shape/ShapeAppearance;Lcom/google/android/material/elevation/ElevationOverlayProvider;)V
 SPLcom/google/android/material/shape/MaterialShapeDrawable$MaterialShapeDrawableState;->newDrawable()Landroid/graphics/drawable/Drawable;
 Lcom/google/android/material/shape/MaterialShapeDrawable$SpringAnimatedCornerSizeProperty;
 SPLcom/google/android/material/shape/MaterialShapeDrawable$SpringAnimatedCornerSizeProperty;-><init>(I)V
@@ -6915,23 +7827,29 @@ SPLcom/google/android/material/shape/RelativeCornerSize;->getMaxCornerSize(Landr
 Lcom/google/android/material/shape/RoundedCornerTreatment;
 SPLcom/google/android/material/shape/RoundedCornerTreatment;-><init>()V
 SPLcom/google/android/material/shape/RoundedCornerTreatment;->getCornerPath(Lcom/google/android/material/shape/ShapePath;FFF)V
+Lcom/google/android/material/shape/ShapeAppearance;
 Lcom/google/android/material/shape/ShapeAppearanceModel;
 SPLcom/google/android/material/shape/ShapeAppearanceModel;-><clinit>()V
 SPLcom/google/android/material/shape/ShapeAppearanceModel;-><init>(Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;)V
 SPLcom/google/android/material/shape/ShapeAppearanceModel;-><init>(Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;Lcom/google/android/material/shape/ShapeAppearanceModel$1;)V
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->builder()Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->builder(Landroid/content/Context;II)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->builder(Landroid/content/Context;III)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->builder(Landroid/content/Context;IILcom/google/android/material/shape/CornerSize;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->builder(Landroid/content/Context;Landroid/util/AttributeSet;II)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->builder(Landroid/content/Context;Landroid/util/AttributeSet;III)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->builder(Landroid/content/Context;Landroid/util/AttributeSet;IILcom/google/android/material/shape/CornerSize;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->builder(Landroid/content/res/TypedArray;Lcom/google/android/material/shape/CornerSize;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->getBottomEdge()Lcom/google/android/material/shape/EdgeTreatment;
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->getBottomLeftCorner()Lcom/google/android/material/shape/CornerTreatment;
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->getBottomLeftCornerSize()Lcom/google/android/material/shape/CornerSize;
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->getBottomRightCorner()Lcom/google/android/material/shape/CornerTreatment;
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->getBottomRightCornerSize()Lcom/google/android/material/shape/CornerSize;
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->getCornerSize(Landroid/content/res/TypedArray;ILcom/google/android/material/shape/CornerSize;)Lcom/google/android/material/shape/CornerSize;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->getDefaultShape()Lcom/google/android/material/shape/ShapeAppearanceModel;
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->getLeftEdge()Lcom/google/android/material/shape/EdgeTreatment;
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->getRightEdge()Lcom/google/android/material/shape/EdgeTreatment;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->getShapeForState([I)Lcom/google/android/material/shape/ShapeAppearanceModel;
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->getTopEdge()Lcom/google/android/material/shape/EdgeTreatment;
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->getTopLeftCorner()Lcom/google/android/material/shape/CornerTreatment;
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->getTopLeftCornerSize()Lcom/google/android/material/shape/CornerSize;
@@ -6939,6 +7857,7 @@ SPLcom/google/android/material/shape/ShapeAppearanceModel;->getTopRightCorner()L
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->getTopRightCornerSize()Lcom/google/android/material/shape/CornerSize;
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->hasRoundedCorners()Z
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->isRoundRect(Landroid/graphics/RectF;)Z
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->isStateful()Z
 SPLcom/google/android/material/shape/ShapeAppearanceModel;->toBuilder()Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
 Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
 SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;-><init>()V
@@ -6991,6 +7910,7 @@ SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->getCornerTrea
 SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->getEdgeCenterForIndex(Landroid/graphics/RectF;I)F
 SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->getEdgeTreatmentForIndex(ILcom/google/android/material/shape/ShapeAppearanceModel;)Lcom/google/android/material/shape/EdgeTreatment;
 SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->getInstance()Lcom/google/android/material/shape/ShapeAppearancePathProvider;
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->getInstanceOrCreate()Lcom/google/android/material/shape/ShapeAppearancePathProvider;
 SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->pathOverlapsCorner(Landroid/graphics/Path;I)Z
 SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->setCornerPathAndTransform(Lcom/google/android/material/shape/ShapeAppearancePathProvider$ShapeAppearancePathSpec;I[F)V
 SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->setEdgePathAndTransform(I)V
@@ -7005,10 +7925,7 @@ SPLcom/google/android/material/shape/ShapePath;->addArc(FFFFFF)V
 SPLcom/google/android/material/shape/ShapePath;->addConnectingShadowIfNecessary(F)V
 SPLcom/google/android/material/shape/ShapePath;->addShadowCompatOperation(Lcom/google/android/material/shape/ShapePath$ShadowCompatOperation;FF)V
 SPLcom/google/android/material/shape/ShapePath;->applyToPath(Landroid/graphics/Matrix;Landroid/graphics/Path;)V
-SPLcom/google/android/material/shape/ShapePath;->containsIncompatibleShadowOp()Z
-SPLcom/google/android/material/shape/ShapePath;->createShadowCompatOperation(Landroid/graphics/Matrix;)Lcom/google/android/material/shape/ShapePath$ShadowCompatOperation;
 SPLcom/google/android/material/shape/ShapePath;->getCurrentShadowAngle()F
-SPLcom/google/android/material/shape/ShapePath;->getEndShadowAngle()F
 SPLcom/google/android/material/shape/ShapePath;->getEndX()F
 SPLcom/google/android/material/shape/ShapePath;->getEndY()F
 SPLcom/google/android/material/shape/ShapePath;->getStartX()F
@@ -7022,8 +7939,6 @@ SPLcom/google/android/material/shape/ShapePath;->setEndX(F)V
 SPLcom/google/android/material/shape/ShapePath;->setEndY(F)V
 SPLcom/google/android/material/shape/ShapePath;->setStartX(F)V
 SPLcom/google/android/material/shape/ShapePath;->setStartY(F)V
-Lcom/google/android/material/shape/ShapePath$1;
-SPLcom/google/android/material/shape/ShapePath$1;-><init>(Lcom/google/android/material/shape/ShapePath;Ljava/util/List;Landroid/graphics/Matrix;)V
 Lcom/google/android/material/shape/ShapePath$ArcShadowOperation;
 SPLcom/google/android/material/shape/ShapePath$ArcShadowOperation;-><init>(Lcom/google/android/material/shape/ShapePath$PathArcOperation;)V
 Lcom/google/android/material/shape/ShapePath$LineShadowOperation;
@@ -7088,6 +8003,7 @@ SPLcom/google/android/material/textview/MaterialTextView;->canApplyTextAppearanc
 SPLcom/google/android/material/textview/MaterialTextView;->findViewAppearanceResourceId(Landroid/content/res/Resources$Theme;Landroid/util/AttributeSet;II)I
 SPLcom/google/android/material/textview/MaterialTextView;->initialize(Landroid/util/AttributeSet;II)V
 SPLcom/google/android/material/textview/MaterialTextView;->readFirstAvailableDimension(Landroid/content/Context;Landroid/content/res/TypedArray;[I)I
+SPLcom/google/android/material/textview/MaterialTextView;->setTextAppearance(Landroid/content/Context;I)V
 SPLcom/google/android/material/textview/MaterialTextView;->viewAttrsHasLineHeight(Landroid/content/Context;Landroid/content/res/Resources$Theme;Landroid/util/AttributeSet;II)Z
 Lcom/google/android/material/theme/MaterialComponentsViewInflater;
 SPLcom/google/android/material/theme/MaterialComponentsViewInflater;-><init>()V
@@ -7172,9 +8088,8 @@ SPLcom/google/protobuf/CodedInputStream;->newInstance([BIIZ)Lcom/google/protobuf
 Lcom/google/protobuf/CodedInputStream$ArrayDecoder;
 SPLcom/google/protobuf/CodedInputStream$ArrayDecoder;-><init>([BIIZ)V
 SPLcom/google/protobuf/CodedInputStream$ArrayDecoder;-><init>([BIIZLcom/google/protobuf/CodedInputStream$1;)V
-SPLcom/google/protobuf/CodedInputStream$ArrayDecoder;->getTotalBytesRead()I
 SPLcom/google/protobuf/CodedInputStream$ArrayDecoder;->pushLimit(I)I
-SPLcom/google/protobuf/CodedInputStream$ArrayDecoder;->recomputeBufferSizeAfterLimit()V
+SPLcom/google/protobuf/CodedInputStream$ArrayDecoder;->setCurrentLimit(I)V
 Lcom/google/protobuf/CodedInputStream$ArrayDecoderOldVarint;
 SPLcom/google/protobuf/CodedInputStream$ArrayDecoderOldVarint;-><init>([BIIZ)V
 SPLcom/google/protobuf/CodedInputStream$ArrayDecoderOldVarint;-><init>([BIIZLcom/google/protobuf/CodedInputStream$1;)V
@@ -7183,10 +8098,8 @@ SPLcom/google/protobuf/CodedInputStream$VarintExperiment;->$values()[Lcom/google
 SPLcom/google/protobuf/CodedInputStream$VarintExperiment;-><clinit>()V
 SPLcom/google/protobuf/CodedInputStream$VarintExperiment;-><init>(Ljava/lang/String;I)V
 Lcom/google/protobuf/CodedOutputStream;
-SPLcom/google/protobuf/CodedOutputStream;-><clinit>()V
 SPLcom/google/protobuf/CodedOutputStream;-><init>()V
 SPLcom/google/protobuf/CodedOutputStream;-><init>(Lcom/google/protobuf/CodedOutputStream$1;)V
-SPLcom/google/protobuf/CodedOutputStream;->access$100()Z
 SPLcom/google/protobuf/CodedOutputStream;->checkNoSpaceLeft()V
 SPLcom/google/protobuf/CodedOutputStream;->computeBoolSize(IZ)I
 SPLcom/google/protobuf/CodedOutputStream;->computeBoolSizeNoTag(Z)I
@@ -7215,6 +8128,7 @@ SPLcom/google/protobuf/CodedOutputStream;->writeInt64(IJ)V
 SPLcom/google/protobuf/CodedOutputStream;->writeSInt32(II)V
 Lcom/google/protobuf/CodedOutputStream$ArrayEncoder;
 SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;-><init>([BII)V
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;-><init>([BIILcom/google/protobuf/CodedOutputStream$ByteBufferFlusher;)V
 SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->spaceLeft()I
 SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->write(B)V
 SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->write([BII)V
@@ -7231,9 +8145,9 @@ SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->writeUInt32(II)V
 SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->writeUInt32NoTag(I)V
 SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->writeUInt64(IJ)V
 SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->writeUInt64NoTag(J)V
+Lcom/google/protobuf/CodedOutputStream$ByteBufferFlusher;
 Lcom/google/protobuf/CodedOutputStreamWriter;
 SPLcom/google/protobuf/CodedOutputStreamWriter;-><init>(Lcom/google/protobuf/CodedOutputStream;)V
-SPLcom/google/protobuf/CodedOutputStreamWriter;->fieldOrder()Lcom/google/protobuf/Writer$FieldOrder;
 SPLcom/google/protobuf/CodedOutputStreamWriter;->forCodedOutput(Lcom/google/protobuf/CodedOutputStream;)Lcom/google/protobuf/CodedOutputStreamWriter;
 SPLcom/google/protobuf/CodedOutputStreamWriter;->writeBool(IZ)V
 SPLcom/google/protobuf/CodedOutputStreamWriter;->writeBytes(ILcom/google/protobuf/ByteString;)V
@@ -7253,6 +8167,11 @@ Lcom/google/protobuf/ExtensionRegistryLite;
 SPLcom/google/protobuf/ExtensionRegistryLite;-><clinit>()V
 SPLcom/google/protobuf/ExtensionRegistryLite;-><init>(Z)V
 SPLcom/google/protobuf/ExtensionRegistryLite;->getEmptyRegistry()Lcom/google/protobuf/ExtensionRegistryLite;
+Lcom/google/protobuf/ExtensionRegistryLite$LazyExtensionMode;
+SPLcom/google/protobuf/ExtensionRegistryLite$LazyExtensionMode;->$values()[Lcom/google/protobuf/ExtensionRegistryLite$LazyExtensionMode;
+SPLcom/google/protobuf/ExtensionRegistryLite$LazyExtensionMode;-><clinit>()V
+SPLcom/google/protobuf/ExtensionRegistryLite$LazyExtensionMode;-><init>(Ljava/lang/String;I)V
+Lcom/google/protobuf/ExtensionSchema;
 Lcom/google/protobuf/FieldType;
 SPLcom/google/protobuf/FieldType;->$values()[Lcom/google/protobuf/FieldType;
 SPLcom/google/protobuf/FieldType;-><clinit>()V
@@ -7269,7 +8188,6 @@ Lcom/google/protobuf/GeneratedMessageInfoFactory;
 SPLcom/google/protobuf/GeneratedMessageInfoFactory;-><clinit>()V
 SPLcom/google/protobuf/GeneratedMessageInfoFactory;-><init>()V
 SPLcom/google/protobuf/GeneratedMessageInfoFactory;->getInstance()Lcom/google/protobuf/GeneratedMessageInfoFactory;
-SPLcom/google/protobuf/GeneratedMessageInfoFactory;->isSupported(Ljava/lang/Class;)Z
 SPLcom/google/protobuf/GeneratedMessageInfoFactory;->messageInfoFor(Ljava/lang/Class;)Lcom/google/protobuf/MessageInfo;
 Lcom/google/protobuf/GeneratedMessageLite;
 SPLcom/google/protobuf/GeneratedMessageLite;-><clinit>()V
@@ -7334,24 +8252,16 @@ SPLcom/google/protobuf/ListFieldSchemaLite;->makeImmutableListAt(Ljava/lang/Obje
 Lcom/google/protobuf/ListFieldSchemas;
 SPLcom/google/protobuf/ListFieldSchemas;-><clinit>()V
 SPLcom/google/protobuf/ListFieldSchemas;->lite()Lcom/google/protobuf/ListFieldSchema;
-SPLcom/google/protobuf/ListFieldSchemas;->loadSchemaForFullRuntime()Lcom/google/protobuf/ListFieldSchema;
 Lcom/google/protobuf/ManifestSchemaFactory;
-SPLcom/google/protobuf/ManifestSchemaFactory;-><clinit>()V
 SPLcom/google/protobuf/ManifestSchemaFactory;-><init>()V
 SPLcom/google/protobuf/ManifestSchemaFactory;-><init>(Lcom/google/protobuf/MessageInfoFactory;)V
 SPLcom/google/protobuf/ManifestSchemaFactory;->allowExtensions(Lcom/google/protobuf/MessageInfo;)Z
 SPLcom/google/protobuf/ManifestSchemaFactory;->createSchema(Ljava/lang/Class;)Lcom/google/protobuf/Schema;
 SPLcom/google/protobuf/ManifestSchemaFactory;->getDefaultMessageInfoFactory()Lcom/google/protobuf/MessageInfoFactory;
-SPLcom/google/protobuf/ManifestSchemaFactory;->getDescriptorMessageInfoFactory()Lcom/google/protobuf/MessageInfoFactory;
 SPLcom/google/protobuf/ManifestSchemaFactory;->newSchema(Ljava/lang/Class;Lcom/google/protobuf/MessageInfo;)Lcom/google/protobuf/Schema;
 SPLcom/google/protobuf/ManifestSchemaFactory;->useLiteRuntime(Ljava/lang/Class;)Z
 Lcom/google/protobuf/ManifestSchemaFactory$1;
-SPLcom/google/protobuf/ManifestSchemaFactory$1;-><init>()V
-Lcom/google/protobuf/ManifestSchemaFactory$2;
-SPLcom/google/protobuf/ManifestSchemaFactory$2;-><clinit>()V
-Lcom/google/protobuf/ManifestSchemaFactory$CompositeMessageInfoFactory;
-SPLcom/google/protobuf/ManifestSchemaFactory$CompositeMessageInfoFactory;-><init>([Lcom/google/protobuf/MessageInfoFactory;)V
-SPLcom/google/protobuf/ManifestSchemaFactory$CompositeMessageInfoFactory;->messageInfoFor(Ljava/lang/Class;)Lcom/google/protobuf/MessageInfo;
+SPLcom/google/protobuf/ManifestSchemaFactory$1;-><clinit>()V
 Lcom/google/protobuf/MapEntryLite;
 SPLcom/google/protobuf/MapEntryLite;-><init>(Lcom/google/protobuf/WireFormat$FieldType;Ljava/lang/Object;Lcom/google/protobuf/WireFormat$FieldType;Ljava/lang/Object;)V
 SPLcom/google/protobuf/MapEntryLite;->getMetadata()Lcom/google/protobuf/MapEntryLite$Metadata;
@@ -7380,7 +8290,6 @@ SPLcom/google/protobuf/MapFieldSchemaLite;->toImmutable(Ljava/lang/Object;)Ljava
 Lcom/google/protobuf/MapFieldSchemas;
 SPLcom/google/protobuf/MapFieldSchemas;-><clinit>()V
 SPLcom/google/protobuf/MapFieldSchemas;->lite()Lcom/google/protobuf/MapFieldSchema;
-SPLcom/google/protobuf/MapFieldSchemas;->loadSchemaForFullRuntime()Lcom/google/protobuf/MapFieldSchema;
 Lcom/google/protobuf/MessageInfo;
 Lcom/google/protobuf/MessageInfoFactory;
 Lcom/google/protobuf/MessageLite;
@@ -7423,11 +8332,10 @@ SPLcom/google/protobuf/MessageSchema;->storeMessageField(Ljava/lang/Object;ILjav
 SPLcom/google/protobuf/MessageSchema;->storeOneofMessageField(Ljava/lang/Object;IILjava/lang/Object;)V
 SPLcom/google/protobuf/MessageSchema;->type(I)I
 SPLcom/google/protobuf/MessageSchema;->typeAndOffsetAt(I)I
-SPLcom/google/protobuf/MessageSchema;->writeFieldsInAscendingOrder(Ljava/lang/Object;Lcom/google/protobuf/Writer;)V
-SPLcom/google/protobuf/MessageSchema;->writeMapHelper(Lcom/google/protobuf/Writer;ILjava/lang/Object;I)V
-SPLcom/google/protobuf/MessageSchema;->writeString(ILjava/lang/Object;Lcom/google/protobuf/Writer;)V
-SPLcom/google/protobuf/MessageSchema;->writeTo(Ljava/lang/Object;Lcom/google/protobuf/Writer;)V
-SPLcom/google/protobuf/MessageSchema;->writeUnknownInMessageTo(Lcom/google/protobuf/UnknownFieldSchema;Ljava/lang/Object;Lcom/google/protobuf/Writer;)V
+SPLcom/google/protobuf/MessageSchema;->writeMapHelper(Lcom/google/protobuf/CodedOutputStreamWriter;ILjava/lang/Object;I)V
+SPLcom/google/protobuf/MessageSchema;->writeString(ILjava/lang/Object;Lcom/google/protobuf/CodedOutputStreamWriter;)V
+SPLcom/google/protobuf/MessageSchema;->writeTo(Ljava/lang/Object;Lcom/google/protobuf/CodedOutputStreamWriter;)V
+SPLcom/google/protobuf/MessageSchema;->writeUnknownInMessageTo(Lcom/google/protobuf/UnknownFieldSchema;Ljava/lang/Object;Lcom/google/protobuf/CodedOutputStreamWriter;)V
 Lcom/google/protobuf/NewInstanceSchema;
 Lcom/google/protobuf/NewInstanceSchemaLite;
 SPLcom/google/protobuf/NewInstanceSchemaLite;-><init>()V
@@ -7435,7 +8343,6 @@ SPLcom/google/protobuf/NewInstanceSchemaLite;->newInstance(Ljava/lang/Object;)Lj
 Lcom/google/protobuf/NewInstanceSchemas;
 SPLcom/google/protobuf/NewInstanceSchemas;-><clinit>()V
 SPLcom/google/protobuf/NewInstanceSchemas;->lite()Lcom/google/protobuf/NewInstanceSchema;
-SPLcom/google/protobuf/NewInstanceSchemas;->loadSchemaForFullRuntime()Lcom/google/protobuf/NewInstanceSchema;
 Lcom/google/protobuf/PrimitiveNonBoxingCollection;
 Lcom/google/protobuf/ProtoSyntax;
 SPLcom/google/protobuf/ProtoSyntax;->$values()[Lcom/google/protobuf/ProtoSyntax;
@@ -7446,8 +8353,9 @@ Lcom/google/protobuf/Protobuf;
 SPLcom/google/protobuf/Protobuf;-><clinit>()V
 SPLcom/google/protobuf/Protobuf;-><init>()V
 SPLcom/google/protobuf/Protobuf;->getInstance()Lcom/google/protobuf/Protobuf;
+SPLcom/google/protobuf/Protobuf;->registerSchema(Ljava/lang/Class;)Lcom/google/protobuf/Schema;
+SPLcom/google/protobuf/Protobuf;->schemaFor(Lcom/google/protobuf/GeneratedMessageLite;)Lcom/google/protobuf/Schema;
 SPLcom/google/protobuf/Protobuf;->schemaFor(Ljava/lang/Class;)Lcom/google/protobuf/Schema;
-SPLcom/google/protobuf/Protobuf;->schemaFor(Ljava/lang/Object;)Lcom/google/protobuf/Schema;
 Lcom/google/protobuf/ProtobufArrayList;
 SPLcom/google/protobuf/ProtobufArrayList;-><clinit>()V
 SPLcom/google/protobuf/ProtobufArrayList;-><init>([Ljava/lang/Object;IZ)V
@@ -7468,16 +8376,13 @@ SPLcom/google/protobuf/RawMessageInfo;->getStringInfo()Ljava/lang/String;
 SPLcom/google/protobuf/RawMessageInfo;->getSyntax()Lcom/google/protobuf/ProtoSyntax;
 SPLcom/google/protobuf/RawMessageInfo;->isMessageSetWireFormat()Z
 Lcom/google/protobuf/Schema;
-Lcom/google/protobuf/SchemaFactory;
 Lcom/google/protobuf/SchemaUtil;
 SPLcom/google/protobuf/SchemaUtil;-><clinit>()V
 SPLcom/google/protobuf/SchemaUtil;->computeSizeStringList(ILjava/util/List;)I
 SPLcom/google/protobuf/SchemaUtil;->getGeneratedMessageClass()Ljava/lang/Class;
-SPLcom/google/protobuf/SchemaUtil;->getUnknownFieldSetSchema()Lcom/google/protobuf/UnknownFieldSchema;
-SPLcom/google/protobuf/SchemaUtil;->getUnknownFieldSetSchemaClass()Ljava/lang/Class;
 SPLcom/google/protobuf/SchemaUtil;->requireGeneratedMessage(Ljava/lang/Class;)V
 SPLcom/google/protobuf/SchemaUtil;->unknownFieldSetLiteSchema()Lcom/google/protobuf/UnknownFieldSchema;
-SPLcom/google/protobuf/SchemaUtil;->writeStringList(ILjava/util/List;Lcom/google/protobuf/Writer;)V
+SPLcom/google/protobuf/SchemaUtil;->writeStringList(ILjava/util/List;Lcom/google/protobuf/CodedOutputStreamWriter;)V
 Lcom/google/protobuf/UninitializedMessageException;
 Lcom/google/protobuf/UnknownFieldSchema;
 SPLcom/google/protobuf/UnknownFieldSchema;-><clinit>()V
@@ -7488,7 +8393,7 @@ SPLcom/google/protobuf/UnknownFieldSetLite;-><init>(I[I[Ljava/lang/Object;Z)V
 SPLcom/google/protobuf/UnknownFieldSetLite;->getDefaultInstance()Lcom/google/protobuf/UnknownFieldSetLite;
 SPLcom/google/protobuf/UnknownFieldSetLite;->getSerializedSize()I
 SPLcom/google/protobuf/UnknownFieldSetLite;->makeImmutable()V
-SPLcom/google/protobuf/UnknownFieldSetLite;->writeTo(Lcom/google/protobuf/Writer;)V
+SPLcom/google/protobuf/UnknownFieldSetLite;->writeTo(Lcom/google/protobuf/CodedOutputStreamWriter;)V
 Lcom/google/protobuf/UnknownFieldSetLiteSchema;
 SPLcom/google/protobuf/UnknownFieldSetLiteSchema;-><init>()V
 SPLcom/google/protobuf/UnknownFieldSetLiteSchema;->getFromMessage(Ljava/lang/Object;)Lcom/google/protobuf/UnknownFieldSetLite;
@@ -7496,8 +8401,8 @@ SPLcom/google/protobuf/UnknownFieldSetLiteSchema;->getFromMessage(Ljava/lang/Obj
 SPLcom/google/protobuf/UnknownFieldSetLiteSchema;->getSerializedSize(Lcom/google/protobuf/UnknownFieldSetLite;)I
 SPLcom/google/protobuf/UnknownFieldSetLiteSchema;->getSerializedSize(Ljava/lang/Object;)I
 SPLcom/google/protobuf/UnknownFieldSetLiteSchema;->makeImmutable(Ljava/lang/Object;)V
-SPLcom/google/protobuf/UnknownFieldSetLiteSchema;->writeTo(Lcom/google/protobuf/UnknownFieldSetLite;Lcom/google/protobuf/Writer;)V
-SPLcom/google/protobuf/UnknownFieldSetLiteSchema;->writeTo(Ljava/lang/Object;Lcom/google/protobuf/Writer;)V
+SPLcom/google/protobuf/UnknownFieldSetLiteSchema;->writeTo(Lcom/google/protobuf/UnknownFieldSetLite;Lcom/google/protobuf/CodedOutputStreamWriter;)V
+SPLcom/google/protobuf/UnknownFieldSetLiteSchema;->writeTo(Ljava/lang/Object;Lcom/google/protobuf/CodedOutputStreamWriter;)V
 Lcom/google/protobuf/UnsafeUtil;
 SPLcom/google/protobuf/UnsafeUtil;-><clinit>()V
 SPLcom/google/protobuf/UnsafeUtil;->access$700(Ljava/lang/Object;J)Z
@@ -7516,8 +8421,6 @@ SPLcom/google/protobuf/UnsafeUtil;->getLong(Ljava/lang/Object;J)J
 SPLcom/google/protobuf/UnsafeUtil;->getMemoryAccessor()Lcom/google/protobuf/UnsafeUtil$MemoryAccessor;
 SPLcom/google/protobuf/UnsafeUtil;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 SPLcom/google/protobuf/UnsafeUtil;->getUnsafe()Lsun/misc/Unsafe;
-SPLcom/google/protobuf/UnsafeUtil;->hasUnsafeArrayOperations()Z
-SPLcom/google/protobuf/UnsafeUtil;->hasUnsafeByteBufferOperations()Z
 SPLcom/google/protobuf/UnsafeUtil;->putBoolean(Ljava/lang/Object;JZ)V
 SPLcom/google/protobuf/UnsafeUtil;->putBooleanLittleEndian(Ljava/lang/Object;JZ)V
 SPLcom/google/protobuf/UnsafeUtil;->putByteLittleEndian(Ljava/lang/Object;JB)V
@@ -7545,15 +8448,16 @@ SPLcom/google/protobuf/UnsafeUtil$MemoryAccessor;->putInt(Ljava/lang/Object;JI)V
 SPLcom/google/protobuf/UnsafeUtil$MemoryAccessor;->supportsUnsafeArrayOperations()Z
 Lcom/google/protobuf/Utf8;
 SPLcom/google/protobuf/Utf8;-><clinit>()V
+SPLcom/google/protobuf/Utf8;->createProcessor()Lcom/google/protobuf/Utf8$Processor;
 SPLcom/google/protobuf/Utf8;->decodeUtf8([BII)Ljava/lang/String;
 SPLcom/google/protobuf/Utf8;->encode(Ljava/lang/String;[BII)I
 SPLcom/google/protobuf/Utf8;->encodedLength(Ljava/lang/String;)I
 Lcom/google/protobuf/Utf8$DecodeUtil;
-SPLcom/google/protobuf/Utf8$DecodeUtil;->access$100(B)Z
-SPLcom/google/protobuf/Utf8$DecodeUtil;->access$200(B[CI)V
-SPLcom/google/protobuf/Utf8$DecodeUtil;->access$300(B)Z
-SPLcom/google/protobuf/Utf8$DecodeUtil;->access$500(B)Z
-SPLcom/google/protobuf/Utf8$DecodeUtil;->access$600(BBB[CI)V
+SPLcom/google/protobuf/Utf8$DecodeUtil;->access$000(B)Z
+SPLcom/google/protobuf/Utf8$DecodeUtil;->access$100(B[CI)V
+SPLcom/google/protobuf/Utf8$DecodeUtil;->access$200(B)Z
+SPLcom/google/protobuf/Utf8$DecodeUtil;->access$400(B)Z
+SPLcom/google/protobuf/Utf8$DecodeUtil;->access$500(BBB[CI)V
 SPLcom/google/protobuf/Utf8$DecodeUtil;->handleOneByte(B[CI)V
 SPLcom/google/protobuf/Utf8$DecodeUtil;->handleThreeBytes(BBB[CI)V
 SPLcom/google/protobuf/Utf8$DecodeUtil;->isNotTrailingByte(B)Z
@@ -7561,15 +8465,14 @@ SPLcom/google/protobuf/Utf8$DecodeUtil;->isOneByte(B)Z
 SPLcom/google/protobuf/Utf8$DecodeUtil;->isThreeBytes(B)Z
 SPLcom/google/protobuf/Utf8$DecodeUtil;->isTwoBytes(B)Z
 SPLcom/google/protobuf/Utf8$DecodeUtil;->trailingByteValue(B)I
+Lcom/google/protobuf/Utf8$MobileProcessor;
+SPLcom/google/protobuf/Utf8$MobileProcessor;-><init>()V
+SPLcom/google/protobuf/Utf8$MobileProcessor;->decodeUtf8([BII)Ljava/lang/String;
+SPLcom/google/protobuf/Utf8$MobileProcessor;->encodeUtf8(Ljava/lang/String;[BII)I
 Lcom/google/protobuf/Utf8$Processor;
 SPLcom/google/protobuf/Utf8$Processor;-><init>()V
-Lcom/google/protobuf/Utf8$SafeProcessor;
-SPLcom/google/protobuf/Utf8$SafeProcessor;-><init>()V
-SPLcom/google/protobuf/Utf8$SafeProcessor;->decodeUtf8([BII)Ljava/lang/String;
-SPLcom/google/protobuf/Utf8$SafeProcessor;->encodeUtf8(Ljava/lang/String;[BII)I
+SPLcom/google/protobuf/Utf8$Processor;->encodedLength(Ljava/lang/String;)I
 Lcom/google/protobuf/Utf8$UnpairedSurrogateException;
-Lcom/google/protobuf/Utf8$UnsafeProcessor;
-SPLcom/google/protobuf/Utf8$UnsafeProcessor;->isAvailable()Z
 Lcom/google/protobuf/WireFormat;
 SPLcom/google/protobuf/WireFormat;-><clinit>()V
 SPLcom/google/protobuf/WireFormat;->makeTag(II)I
@@ -7590,24 +8493,10 @@ Lcom/google/protobuf/WireFormat$JavaType;
 SPLcom/google/protobuf/WireFormat$JavaType;->$values()[Lcom/google/protobuf/WireFormat$JavaType;
 SPLcom/google/protobuf/WireFormat$JavaType;-><clinit>()V
 SPLcom/google/protobuf/WireFormat$JavaType;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
-Lcom/google/protobuf/Writer;
-Lcom/google/protobuf/Writer$FieldOrder;
-SPLcom/google/protobuf/Writer$FieldOrder;->$values()[Lcom/google/protobuf/Writer$FieldOrder;
-SPLcom/google/protobuf/Writer$FieldOrder;-><clinit>()V
-SPLcom/google/protobuf/Writer$FieldOrder;-><init>(Ljava/lang/String;I)V
-Lcom/google/protobuf/kotlin/ByteStringsKt;
-SPLcom/google/protobuf/kotlin/ByteStringsKt;->toByteStringUtf8(Ljava/lang/String;)Lcom/google/protobuf/ByteString;
 Lcom/ichi2/anim/ActivityTransitionAnimation;
 SPLcom/ichi2/anim/ActivityTransitionAnimation;-><clinit>()V
 SPLcom/ichi2/anim/ActivityTransitionAnimation;-><init>()V
-SPLcom/ichi2/anim/ActivityTransitionAnimation;->slide(Landroid/app/Activity;Lcom/ichi2/anim/ActivityTransitionAnimation$Direction;)V
-Lcom/ichi2/anim/ActivityTransitionAnimation$Direction;
-SPLcom/ichi2/anim/ActivityTransitionAnimation$Direction;->$values()[Lcom/ichi2/anim/ActivityTransitionAnimation$Direction;
-SPLcom/ichi2/anim/ActivityTransitionAnimation$Direction;-><clinit>()V
-SPLcom/ichi2/anim/ActivityTransitionAnimation$Direction;-><init>(Ljava/lang/String;I)V
-SPLcom/ichi2/anim/ActivityTransitionAnimation$Direction;->values()[Lcom/ichi2/anim/ActivityTransitionAnimation$Direction;
-Lcom/ichi2/anim/ActivityTransitionAnimation$Direction$Creator;
-SPLcom/ichi2/anim/ActivityTransitionAnimation$Direction$Creator;-><init>()V
+SPLcom/ichi2/anim/ActivityTransitionAnimation;->slide(Landroid/app/Activity;Lcom/ichi2/anki/common/ui/TransitionDirection;Z)V
 Lcom/ichi2/anim/ActivityTransitionAnimation$WhenMappings;
 SPLcom/ichi2/anim/ActivityTransitionAnimation$WhenMappings;-><clinit>()V
 Lcom/ichi2/anki/AbstractFlashcardViewer;
@@ -7616,24 +8505,52 @@ Lcom/ichi2/anki/AbstractFlashcardViewer$Companion;
 SPLcom/ichi2/anki/AbstractFlashcardViewer$Companion;-><init>()V
 SPLcom/ichi2/anki/AbstractFlashcardViewer$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 Lcom/ichi2/anki/AbstractIntentHandler;
+SPLcom/ichi2/anki/AbstractIntentHandler;-><clinit>()V
 SPLcom/ichi2/anki/AbstractIntentHandler;-><init>()V
 SPLcom/ichi2/anki/AbstractIntentHandler;->onCreate(Landroid/os/Bundle;)V
+SPLcom/ichi2/anki/AbstractIntentHandler;->showedActivityFailedScreen(Landroid/os/Bundle;)Z
+Lcom/ichi2/anki/AbstractIntentHandler$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/AbstractIntentHandler$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/AbstractIntentHandler;)V
+Lcom/ichi2/anki/AcraCrashReporter;
+SPLcom/ichi2/anki/AcraCrashReporter;-><clinit>()V
+SPLcom/ichi2/anki/AcraCrashReporter;-><init>()V
+SPLcom/ichi2/anki/AcraCrashReporter;->createAcraCoreConfigBuilder()Lorg/acra/config/CoreConfigurationBuilder;
+SPLcom/ichi2/anki/AcraCrashReporter;->fetchWebViewInformation()Ljava/util/HashMap;
+SPLcom/ichi2/anki/AcraCrashReporter;->initialize(Landroid/app/Application;)V
+SPLcom/ichi2/anki/AcraCrashReporter;->isEnabled(Landroid/content/Context;Z)Z
+SPLcom/ichi2/anki/AcraCrashReporter;->isProperServiceProcess()Z
+SPLcom/ichi2/anki/AcraCrashReporter;->setProductionACRAConfig(Landroid/content/SharedPreferences;)V
+SPLcom/ichi2/anki/AcraCrashReporter;->setReportingMode(Ljava/lang/String;)V
+Lcom/ichi2/anki/AcraCrashReporter$ToastType;
+SPLcom/ichi2/anki/AcraCrashReporter$ToastType;->$values()[Lcom/ichi2/anki/AcraCrashReporter$ToastType;
+SPLcom/ichi2/anki/AcraCrashReporter$ToastType;-><clinit>()V
+SPLcom/ichi2/anki/AcraCrashReporter$ToastType;-><init>(Ljava/lang/String;II)V
+SPLcom/ichi2/anki/AcraCrashReporter$ToastType;->getToastMessage(Landroid/content/Context;)Ljava/lang/String;
+Lcom/ichi2/anki/AcraCrashReporterKt;
+SPLcom/ichi2/anki/AcraCrashReporterKt;->initializeAcraCrashReporter(Landroid/app/Application;)V
+SPLcom/ichi2/anki/AcraCrashReporterKt;->isAcraSenderProcess()Z
 Lcom/ichi2/anki/ActionProviderCompat;
+SPLcom/ichi2/anki/ActionProviderCompat;-><clinit>()V
 SPLcom/ichi2/anki/ActionProviderCompat;-><init>(Landroid/content/Context;)V
 Lcom/ichi2/anki/AndroidTtsVoice;
+SPLcom/ichi2/anki/AndroidTtsVoice;-><clinit>()V
 SPLcom/ichi2/anki/AndroidTtsVoice;-><init>(Landroid/speech/tts/Voice;Ljava/lang/String;)V
+SPLcom/ichi2/anki/AndroidTtsVoice;->getEngine()Ljava/lang/String;
+SPLcom/ichi2/anki/AndroidTtsVoice;->getVoice()Landroid/speech/tts/Voice;
 Lcom/ichi2/anki/AnkiActivity;
 SPLcom/ichi2/anki/AnkiActivity;-><clinit>()V
 SPLcom/ichi2/anki/AnkiActivity;-><init>(Ljava/lang/Integer;)V
-SPLcom/ichi2/anki/AnkiActivity;->animationDisabled()Z
-SPLcom/ichi2/anki/AnkiActivity;->animationEnabled()Z
-SPLcom/ichi2/anki/AnkiActivity;->enableActivityAnimation(Lcom/ichi2/anim/ActivityTransitionAnimation$Direction;)V
+SPLcom/ichi2/anki/AnkiActivity;->enableActivityAnimation(Lcom/ichi2/anki/common/ui/TransitionDirection;Z)V
 SPLcom/ichi2/anki/AnkiActivity;->enableIntentAnimation(Landroid/content/Intent;)V
 SPLcom/ichi2/anki/AnkiActivity;->enableToolbar()Landroidx/appcompat/app/ActionBar;
+SPLcom/ichi2/anki/AnkiActivity;->exportReadyViewModel_delegate$lambda$0()Landroidx/lifecycle/ViewModelProvider$Factory;
 SPLcom/ichi2/anki/AnkiActivity;->finish()V
-SPLcom/ichi2/anki/AnkiActivity;->finishWithAnimation(Lcom/ichi2/anim/ActivityTransitionAnimation$Direction;)V
+SPLcom/ichi2/anki/AnkiActivity;->finishWithAnimation(Lcom/ichi2/anki/common/ui/TransitionDirection;)V
+SPLcom/ichi2/anki/AnkiActivity;->getAnalyticsScreenName()Ljava/lang/String;
 SPLcom/ichi2/anki/AnkiActivity;->getBroadcastsActions()Ljava/util/Map;
+SPLcom/ichi2/anki/AnkiActivity;->getDefaultViewModelCreationExtras()Landroidx/lifecycle/viewmodel/CreationExtras;
 SPLcom/ichi2/anki/AnkiActivity;->getDialogHandler()Lcom/ichi2/anki/dialogs/DialogHandler;
+SPLcom/ichi2/anki/AnkiActivity;->getExportReadyViewModel()Lcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel;
 SPLcom/ichi2/anki/AnkiActivity;->hideProgressBar()V
 SPLcom/ichi2/anki/AnkiActivity;->onCreate(Landroid/os/Bundle;)V
 SPLcom/ichi2/anki/AnkiActivity;->onDestroy()V
@@ -7644,7 +8561,7 @@ SPLcom/ichi2/anki/AnkiActivity;->registerReceiver()V
 SPLcom/ichi2/anki/AnkiActivity;->setContentView(Landroid/view/View;)V
 SPLcom/ichi2/anki/AnkiActivity;->showedActivityFailedScreen(Landroid/os/Bundle;)Z
 SPLcom/ichi2/anki/AnkiActivity;->startActivity(Landroid/content/Intent;)V
-SPLcom/ichi2/anki/AnkiActivity;->startActivityWithAnimation(Landroid/content/Intent;Lcom/ichi2/anim/ActivityTransitionAnimation$Direction;)V
+SPLcom/ichi2/anki/AnkiActivity;->startActivityWithAnimation(Landroid/content/Intent;Lcom/ichi2/anki/common/ui/TransitionDirection;)V
 Lcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda0;
 SPLcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/AnkiActivity;)V
 Lcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda1;
@@ -7652,80 +8569,136 @@ SPLcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda1;-><init>(Lcom/ichi2/ank
 Lcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda2;
 SPLcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda2;-><init>(Lcom/ichi2/anki/AnkiActivity;)V
 Lcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda3;
-SPLcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda3;-><init>(Lcom/ichi2/anki/AnkiActivity;)V
+SPLcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda3;-><init>()V
+SPLcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda3;->invoke()Ljava/lang/Object;
 Lcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda4;
 SPLcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda4;-><init>(Lcom/ichi2/anki/AnkiActivity;)V
+Lcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda5;
+SPLcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda5;-><init>(Lcom/ichi2/anki/AnkiActivity;)V
 Lcom/ichi2/anki/AnkiActivity$Companion;
 SPLcom/ichi2/anki/AnkiActivity$Companion;-><init>()V
 SPLcom/ichi2/anki/AnkiActivity$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/AnkiActivity$onCreate$3;
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3;-><init>(Lcom/ichi2/anki/AnkiActivity;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/AnkiActivity$onCreate$3$1;
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3$1;-><init>(Lcom/ichi2/anki/AnkiActivity;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/AnkiActivity$onCreate$3$1$1;
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3$1$1;-><init>(Lcom/ichi2/anki/AnkiActivity;)V
 Lcom/ichi2/anki/AnkiActivity$registerReceiver$1;
 SPLcom/ichi2/anki/AnkiActivity$registerReceiver$1;-><init>(Lcom/ichi2/anki/AnkiActivity;)V
+Lcom/ichi2/anki/AnkiActivity$special$$inlined$viewModels$default$2;
+SPLcom/ichi2/anki/AnkiActivity$special$$inlined$viewModels$default$2;-><init>(Landroidx/activity/ComponentActivity;)V
+SPLcom/ichi2/anki/AnkiActivity$special$$inlined$viewModels$default$2;->invoke()Landroidx/lifecycle/ViewModelStore;
+SPLcom/ichi2/anki/AnkiActivity$special$$inlined$viewModels$default$2;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/AnkiActivity$special$$inlined$viewModels$default$3;
+SPLcom/ichi2/anki/AnkiActivity$special$$inlined$viewModels$default$3;-><init>(Lkotlin/jvm/functions/Function0;Landroidx/activity/ComponentActivity;)V
+SPLcom/ichi2/anki/AnkiActivity$special$$inlined$viewModels$default$3;->invoke()Landroidx/lifecycle/viewmodel/CreationExtras;
+SPLcom/ichi2/anki/AnkiActivity$special$$inlined$viewModels$default$3;->invoke()Ljava/lang/Object;
 Lcom/ichi2/anki/AnkiActivityProvider;
 Lcom/ichi2/anki/AnkiDroidApp;
-SPLcom/ichi2/anki/AnkiDroidApp;->$r8$lambda$ZK6dATWn0LJelHcBgV-4TIMEho4()Lkotlinx/coroutines/CoroutineScope;
 SPLcom/ichi2/anki/AnkiDroidApp;-><clinit>()V
 SPLcom/ichi2/anki/AnkiDroidApp;-><init>()V
-SPLcom/ichi2/anki/AnkiDroidApp;->access$getApplicationScope$delegate$cp()Lkotlin/Lazy;
 SPLcom/ichi2/anki/AnkiDroidApp;->access$getFatalInitializationError$p(Lcom/ichi2/anki/AnkiDroidApp;)Lcom/ichi2/anki/FatalInitializationError;
-SPLcom/ichi2/anki/AnkiDroidApp;->access$getINSTRUMENTATION_TESTING$cp()Z
 SPLcom/ichi2/anki/AnkiDroidApp;->access$getInstance$cp()Lcom/ichi2/anki/AnkiDroidApp;
+SPLcom/ichi2/anki/AnkiDroidApp;->access$getNotifications$p(Lcom/ichi2/anki/AnkiDroidApp;)Landroidx/lifecycle/MutableLiveData;
 SPLcom/ichi2/anki/AnkiDroidApp;->access$getSharedPreferencesTestingOverride$cp()Landroid/content/SharedPreferences;
-SPLcom/ichi2/anki/AnkiDroidApp;->applicationScope_delegate$lambda$0()Lkotlinx/coroutines/CoroutineScope;
+SPLcom/ichi2/anki/AnkiDroidApp;->access$setAppLifecycleObserver$p(Lcom/ichi2/anki/AnkiDroidApp;Lcom/ichi2/anki/AppLifecycleObserver;)V
+SPLcom/ichi2/anki/AnkiDroidApp;->access$setInstance$cp(Lcom/ichi2/anki/AnkiDroidApp;)V
+SPLcom/ichi2/anki/AnkiDroidApp;->access$syncPlatform(Lcom/ichi2/anki/AnkiDroidApp;)Ljava/lang/String;
+SPLcom/ichi2/anki/AnkiDroidApp;->attachBaseContext(Landroid/content/Context;)V
 SPLcom/ichi2/anki/AnkiDroidApp;->checkWebViewAvailable()Z
-SPLcom/ichi2/anki/AnkiDroidApp;->initializeAnkiDroidDirectory()V
+SPLcom/ichi2/anki/AnkiDroidApp;->getCacheDir()Ljava/io/File;
+SPLcom/ichi2/anki/AnkiDroidApp;->getDatabasePath(Ljava/lang/String;)Ljava/io/File;
+SPLcom/ichi2/anki/AnkiDroidApp;->getDir(Ljava/lang/String;I)Ljava/io/File;
+SPLcom/ichi2/anki/AnkiDroidApp;->getFilesDir()Ljava/io/File;
+SPLcom/ichi2/anki/AnkiDroidApp;->getNoBackupFilesDir()Ljava/io/File;
+SPLcom/ichi2/anki/AnkiDroidApp;->getProfileContext()Landroid/content/Context;
+SPLcom/ichi2/anki/AnkiDroidApp;->getSharedPreferences(Ljava/lang/String;I)Landroid/content/SharedPreferences;
+SPLcom/ichi2/anki/AnkiDroidApp;->initAnkiBackend(Z)V
+SPLcom/ichi2/anki/AnkiDroidApp;->initializeAnkiDroidDirectory(Lcom/ichi2/anki/AnkiDroidApp$AnkiContext;)V
+SPLcom/ichi2/anki/AnkiDroidApp;->launchCacheCleanup()Lkotlinx/coroutines/Job;
+SPLcom/ichi2/anki/AnkiDroidApp;->onCreate$lambda$2(Landroid/content/Context;)Lcom/ichi2/anki/common/preferences/AnimationPreferences;
 SPLcom/ichi2/anki/AnkiDroidApp;->onCreate()V
 SPLcom/ichi2/anki/AnkiDroidApp;->setActivityAgnosticDialogs(Lcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs;)V
+SPLcom/ichi2/anki/AnkiDroidApp;->setupAnkiBackend()V
+SPLcom/ichi2/anki/AnkiDroidApp;->setupAnkiDroidApp()Z
+SPLcom/ichi2/anki/AnkiDroidApp;->setupAppLifecycleObserver()V
+SPLcom/ichi2/anki/AnkiDroidApp;->setupBackendChangeManager()V
+SPLcom/ichi2/anki/AnkiDroidApp;->setupContextMenus()V
+SPLcom/ichi2/anki/AnkiDroidApp;->setupCustomFieldFilters()V
+SPLcom/ichi2/anki/AnkiDroidApp;->setupDayRollover(Lcom/ichi2/anki/AnkiDroidApp$AnkiContext;)V
+SPLcom/ichi2/anki/AnkiDroidApp;->setupLifecycleLogging()V
+SPLcom/ichi2/anki/AnkiDroidApp;->setupNotifications()Ljava/lang/Object;
+SPLcom/ichi2/anki/AnkiDroidApp;->setupTextToSpeech()V
 SPLcom/ichi2/anki/AnkiDroidApp;->syncPlatform()Ljava/lang/String;
 Lcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda0;
 SPLcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/AnkiDroidApp;)V
 Lcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda1;
 SPLcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda1;-><init>()V
-SPLcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda1;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda2;-><init>()V
+SPLcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda3;-><init>(Lcom/ichi2/anki/AnkiDroidApp;)V
+Lcom/ichi2/anki/AnkiDroidApp$AnkiContext;
+SPLcom/ichi2/anki/AnkiDroidApp$AnkiContext;-><clinit>()V
+SPLcom/ichi2/anki/AnkiDroidApp$AnkiContext;-><init>()V
 Lcom/ichi2/anki/AnkiDroidApp$Companion;
 SPLcom/ichi2/anki/AnkiDroidApp$Companion;-><init>()V
 SPLcom/ichi2/anki/AnkiDroidApp$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/AnkiDroidApp$Companion;->_get_sharedPreferencesProvider_$lambda$0()Landroid/content/SharedPreferences;
 SPLcom/ichi2/anki/AnkiDroidApp$Companion;->getAppResources()Landroid/content/res/Resources;
-SPLcom/ichi2/anki/AnkiDroidApp$Companion;->getApplicationScope()Lkotlinx/coroutines/CoroutineScope;
 SPLcom/ichi2/anki/AnkiDroidApp$Companion;->getFatalError()Lcom/ichi2/anki/FatalInitializationError;
-SPLcom/ichi2/anki/AnkiDroidApp$Companion;->getINSTRUMENTATION_TESTING()Z
 SPLcom/ichi2/anki/AnkiDroidApp$Companion;->getInstance()Lcom/ichi2/anki/AnkiDroidApp;
+SPLcom/ichi2/anki/AnkiDroidApp$Companion;->getSharedPreferencesProvider()Lcom/ichi2/anki/preferences/SharedPreferencesProvider;
 SPLcom/ichi2/anki/AnkiDroidApp$Companion;->getSharedPreferencesTestingOverride()Landroid/content/SharedPreferences;
 SPLcom/ichi2/anki/AnkiDroidApp$Companion;->isInitialized()Z
 SPLcom/ichi2/anki/AnkiDroidApp$Companion;->makeBackendUsable(Landroid/content/Context;)V
 SPLcom/ichi2/anki/AnkiDroidApp$Companion;->sharedPrefs()Landroid/content/SharedPreferences;
+Lcom/ichi2/anki/AnkiDroidApp$Companion$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/AnkiDroidApp$Companion$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/AnkiDroidApp$Companion$$ExternalSyntheticLambda0;->sharedPrefs()Landroid/content/SharedPreferences;
 Lcom/ichi2/anki/AnkiDroidApp$WhenMappings;
 SPLcom/ichi2/anki/AnkiDroidApp$WhenMappings;-><clinit>()V
-Lcom/ichi2/anki/AnkiDroidApp$onCreate$2;
-SPLcom/ichi2/anki/AnkiDroidApp$onCreate$2;-><init>(Lcom/ichi2/anki/AnkiDroidApp;Lkotlin/coroutines/Continuation;)V
-SPLcom/ichi2/anki/AnkiDroidApp$onCreate$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-SPLcom/ichi2/anki/AnkiDroidApp$onCreate$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
-Lcom/ichi2/anki/AnkiDroidApp$onCreate$4;
-SPLcom/ichi2/anki/AnkiDroidApp$onCreate$4;-><init>()V
-SPLcom/ichi2/anki/AnkiDroidApp$onCreate$4;->onActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
-SPLcom/ichi2/anki/AnkiDroidApp$onCreate$4;->onActivityDestroyed(Landroid/app/Activity;)V
-SPLcom/ichi2/anki/AnkiDroidApp$onCreate$4;->onActivityPaused(Landroid/app/Activity;)V
-SPLcom/ichi2/anki/AnkiDroidApp$onCreate$4;->onActivityResumed(Landroid/app/Activity;)V
-SPLcom/ichi2/anki/AnkiDroidApp$onCreate$4;->onActivityStarted(Landroid/app/Activity;)V
-SPLcom/ichi2/anki/AnkiDroidApp$onCreate$4;->onActivityStopped(Landroid/app/Activity;)V
+Lcom/ichi2/anki/AnkiDroidApp$launchCacheCleanup$1;
+SPLcom/ichi2/anki/AnkiDroidApp$launchCacheCleanup$1;-><init>(Lcom/ichi2/anki/AnkiDroidApp;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/AnkiDroidApp$launchCacheCleanup$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/AnkiDroidApp$launchCacheCleanup$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/AnkiDroidApp$onCreate$5;
+SPLcom/ichi2/anki/AnkiDroidApp$onCreate$5;-><init>(Lcom/ichi2/anki/AnkiDroidApp;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/AnkiDroidApp$onCreate$5;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/AnkiDroidApp$onCreate$5;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/AnkiDroidApp$sam$androidx_lifecycle_Observer$0;
 SPLcom/ichi2/anki/AnkiDroidApp$sam$androidx_lifecycle_Observer$0;-><init>(Lkotlin/jvm/functions/Function1;)V
-Lcom/ichi2/anki/AnkiDroidFolder;
-SPLcom/ichi2/anki/AnkiDroidFolder;-><init>(Lcom/ichi2/anki/PermissionSet;)V
-SPLcom/ichi2/anki/AnkiDroidFolder;-><init>(Lcom/ichi2/anki/PermissionSet;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-SPLcom/ichi2/anki/AnkiDroidFolder;->hasRequiredPermissions(Landroid/content/Context;)Z
-Lcom/ichi2/anki/AnkiDroidFolder$AppPrivateFolder;
-SPLcom/ichi2/anki/AnkiDroidFolder$AppPrivateFolder;-><clinit>()V
-SPLcom/ichi2/anki/AnkiDroidFolder$AppPrivateFolder;-><init>()V
+Lcom/ichi2/anki/AnkiDroidApp$setupLifecycleLogging$1$1;
+SPLcom/ichi2/anki/AnkiDroidApp$setupLifecycleLogging$1$1;-><init>()V
+SPLcom/ichi2/anki/AnkiDroidApp$setupLifecycleLogging$1$1;->onActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
+SPLcom/ichi2/anki/AnkiDroidApp$setupLifecycleLogging$1$1;->onActivityDestroyed(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/AnkiDroidApp$setupLifecycleLogging$1$1;->onActivityPaused(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/AnkiDroidApp$setupLifecycleLogging$1$1;->onActivityResumed(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/AnkiDroidApp$setupLifecycleLogging$1$1;->onActivityStarted(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/AnkiDroidApp$setupLifecycleLogging$1$1;->onActivityStopped(Landroid/app/Activity;)V
+Lcom/ichi2/anki/AnkiDroidApp$setupNotifications$1$2;
+SPLcom/ichi2/anki/AnkiDroidApp$setupNotifications$1$2;-><init>(Landroid/content/Context;)V
 Lcom/ichi2/anki/AppLifecycleObserver;
+SPLcom/ichi2/anki/AppLifecycleObserver;-><clinit>()V
 SPLcom/ichi2/anki/AppLifecycleObserver;-><init>(Landroid/content/Context;)V
 SPLcom/ichi2/anki/AppLifecycleObserver;->onCreate(Landroidx/lifecycle/LifecycleOwner;)V
 SPLcom/ichi2/anki/AppLifecycleObserver;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
 SPLcom/ichi2/anki/AppLifecycleObserver;->onStart(Landroidx/lifecycle/LifecycleOwner;)V
 Lcom/ichi2/anki/BackendBackupsKt;
-SPLcom/ichi2/anki/BackendBackupsKt;->$r8$lambda$VE13hT4gNARNfKQDjZC_TfzqKjM(ZLcom/ichi2/anki/libanki/Collection;)Z
+SPLcom/ichi2/anki/BackendBackupsKt;-><clinit>()V
 SPLcom/ichi2/anki/BackendBackupsKt;->access$createBackup(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/BackendBackupsKt;->createBackup$lambda$0(ZLcom/ichi2/anki/libanki/Collection;)Z
+SPLcom/ichi2/anki/BackendBackupsKt;->access$createBackupHoldingLock(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/BackendBackupsKt;->createBackup(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/BackendBackupsKt;->createBackupHoldingLock$lambda$0(ZLcom/ichi2/anki/libanki/Collection;)Z
+SPLcom/ichi2/anki/BackendBackupsKt;->createBackupHoldingLock(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/BackendBackupsKt;->performBackupInBackground$default(ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 SPLcom/ichi2/anki/BackendBackupsKt;->performBackupInBackground(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Lcom/ichi2/anki/BackendBackupsKt$$ExternalSyntheticLambda0;
@@ -7734,12 +8707,15 @@ SPLcom/ichi2/anki/BackendBackupsKt$$ExternalSyntheticLambda0;->invoke(Ljava/lang
 Lcom/ichi2/anki/BackendBackupsKt$createBackup$1;
 SPLcom/ichi2/anki/BackendBackupsKt$createBackup$1;-><init>(Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/BackendBackupsKt$createBackup$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
-Lcom/ichi2/anki/BackendBackupsKt$createBackup$3;
-SPLcom/ichi2/anki/BackendBackupsKt$createBackup$3;-><init>(Lkotlin/coroutines/Continuation;)V
-SPLcom/ichi2/anki/BackendBackupsKt$createBackup$3;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-SPLcom/ichi2/anki/BackendBackupsKt$createBackup$3;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-SPLcom/ichi2/anki/BackendBackupsKt$createBackup$3;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/BackendBackupsKt$createBackup$3;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$1;
+SPLcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$1;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$2;
+SPLcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$2;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$2;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/BackendBackupsKt$performBackupInBackground$1;
 SPLcom/ichi2/anki/BackendBackupsKt$performBackupInBackground$1;-><init>(Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/BackendBackupsKt$performBackupInBackground$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
@@ -7754,6 +8730,14 @@ SPLcom/ichi2/anki/BackupManager$Companion;->enoughDiscSpace(Ljava/io/File;)Z
 SPLcom/ichi2/anki/BackupManager$Companion;->getBackupDirectory(Ljava/io/File;)Ljava/io/File;
 SPLcom/ichi2/anki/BackupManager$Companion;->getBackupDirectoryFromCollection(Ljava/io/File;)Ljava/lang/String;
 SPLcom/ichi2/anki/BackupManager$Companion;->getFreeDiscSpace(Ljava/io/File;)J
+Lcom/ichi2/anki/BottomNavController$NavigationItem;
+SPLcom/ichi2/anki/BottomNavController$NavigationItem;->$values()[Lcom/ichi2/anki/BottomNavController$NavigationItem;
+SPLcom/ichi2/anki/BottomNavController$NavigationItem;-><clinit>()V
+SPLcom/ichi2/anki/BottomNavController$NavigationItem;-><init>(Ljava/lang/String;IILjava/lang/String;ILjava/lang/String;)V
+SPLcom/ichi2/anki/BottomNavController$NavigationItem;->getTag()Ljava/lang/String;
+Lcom/ichi2/anki/BottomNavController$NavigationItem$Companion;
+SPLcom/ichi2/anki/BottomNavController$NavigationItem$Companion;-><init>()V
+SPLcom/ichi2/anki/BottomNavController$NavigationItem$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 Lcom/ichi2/anki/BuildConfig;
 SPLcom/ichi2/anki/BuildConfig;-><clinit>()V
 Lcom/ichi2/anki/CardBrowser;
@@ -7762,41 +8746,22 @@ Lcom/ichi2/anki/CardBrowser$Companion;
 SPLcom/ichi2/anki/CardBrowser$Companion;-><init>()V
 SPLcom/ichi2/anki/CardBrowser$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLcom/ichi2/anki/CardBrowser$Companion;->clearLastDeckId()V
-Lcom/ichi2/anki/Channel;
-SPLcom/ichi2/anki/Channel;->$values()[Lcom/ichi2/anki/Channel;
-SPLcom/ichi2/anki/Channel;-><clinit>()V
-SPLcom/ichi2/anki/Channel;-><init>(Ljava/lang/String;ILjava/lang/String;I)V
-SPLcom/ichi2/anki/Channel;->getEntries()Lkotlin/enums/EnumEntries;
-SPLcom/ichi2/anki/Channel;->getId()Ljava/lang/String;
-SPLcom/ichi2/anki/Channel;->getName(Landroid/content/res/Resources;)Ljava/lang/String;
-Lcom/ichi2/anki/CollectionHelper;
-SPLcom/ichi2/anki/CollectionHelper;-><clinit>()V
-SPLcom/ichi2/anki/CollectionHelper;-><init>()V
-SPLcom/ichi2/anki/CollectionHelper;->getAppSpecificExternalDirectories(Landroid/content/Context;)Ljava/util/List;
-SPLcom/ichi2/anki/CollectionHelper;->getAppSpecificInternalAnkiDroidDirectory(Landroid/content/Context;)Ljava/lang/String;
-SPLcom/ichi2/anki/CollectionHelper;->getCurrentAnkiDroidDirectory(Landroid/content/Context;)Ljava/io/File;
-SPLcom/ichi2/anki/CollectionHelper;->getCurrentAnkiDroidDirectoryOptionalContext$AnkiDroid_playNonMinifiedRelease(Landroid/content/SharedPreferences;Lkotlin/jvm/functions/Function0;)Ljava/io/File;
-SPLcom/ichi2/anki/CollectionHelper;->initializeAnkiDroidDirectory(Ljava/io/File;)V
-Lcom/ichi2/anki/CollectionHelper$$ExternalSyntheticLambda1;
-SPLcom/ichi2/anki/CollectionHelper$$ExternalSyntheticLambda1;-><init>(Lkotlin/jvm/functions/Function0;)V
-Lcom/ichi2/anki/CollectionHelper$$ExternalSyntheticLambda2;
-SPLcom/ichi2/anki/CollectionHelper$$ExternalSyntheticLambda2;-><init>(Landroid/content/Context;)V
+Lcom/ichi2/anki/CollectionLeaseManager;
+SPLcom/ichi2/anki/CollectionLeaseManager;-><clinit>()V
+SPLcom/ichi2/anki/CollectionLeaseManager;-><init>()V
+SPLcom/ichi2/anki/CollectionLeaseManager;->getFlowOfLease()Lkotlinx/coroutines/flow/StateFlow;
 Lcom/ichi2/anki/CollectionManager;
-SPLcom/ichi2/anki/CollectionManager;->$r8$lambda$A3eVuVLc79cO7kS8pQ3SMoriiy4()Lcom/ichi2/anki/libanki/Collection;
 SPLcom/ichi2/anki/CollectionManager;->$r8$lambda$CVrn_Kh6Msxahpe8OehADhoCTBs(Lcom/ichi2/anki/CollectionManager;)Lcom/ichi2/anki/libanki/Collection;
-SPLcom/ichi2/anki/CollectionManager;->$r8$lambda$CdEUfwruqg89QRB7ootI6f97AOo(Lkotlin/jvm/functions/Function1;Lcom/ichi2/anki/CollectionManager;)Ljava/lang/Object;
-SPLcom/ichi2/anki/CollectionManager;->$r8$lambda$LNk46KshV-5ez7Cho-SNGjzWnlA(Lnet/ankiweb/rsdroid/Backend;)Lcom/ichi2/anki/libanki/DB;
 SPLcom/ichi2/anki/CollectionManager;->$r8$lambda$W1MuSlVHYw8laATlr7Q27r6qm7c(Lcom/ichi2/anki/CollectionManager;)Z
-SPLcom/ichi2/anki/CollectionManager;->$r8$lambda$YWF2-7xOSLjf6_Rj2swd1g-bkIA(Lkotlin/jvm/functions/Function1;Lcom/ichi2/anki/CollectionManager;)Ljava/lang/Object;
-SPLcom/ichi2/anki/CollectionManager;->$r8$lambda$nApnmIuefbWwgL9QU2GbrZ3jC2g()Z
 SPLcom/ichi2/anki/CollectionManager;-><clinit>()V
 SPLcom/ichi2/anki/CollectionManager;-><init>()V
+SPLcom/ichi2/anki/CollectionManager;->access$ensureBackendInner(Lcom/ichi2/anki/CollectionManager;)V
 SPLcom/ichi2/anki/CollectionManager;->access$withQueue(Lcom/ichi2/anki/CollectionManager;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/CollectionManager;->backend()Lnet/ankiweb/rsdroid/Backend;
 SPLcom/ichi2/anki/CollectionManager;->blockForQueue(Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 SPLcom/ichi2/anki/CollectionManager;->collectionPathInValidFolder()Lcom/ichi2/anki/libanki/CollectionFiles;
 SPLcom/ichi2/anki/CollectionManager;->ensureBackendInner()V
-SPLcom/ichi2/anki/CollectionManager;->ensureOpenInner$lambda$0(Lnet/ankiweb/rsdroid/Backend;)Lcom/ichi2/anki/libanki/DB;
+SPLcom/ichi2/anki/CollectionManager;->ensureOpenInner$lambda$1(Lnet/ankiweb/rsdroid/Backend;)Lcom/ichi2/anki/libanki/DB;
 SPLcom/ichi2/anki/CollectionManager;->ensureOpenInner()V
 SPLcom/ichi2/anki/CollectionManager;->getBackend()Lnet/ankiweb/rsdroid/Backend;
 SPLcom/ichi2/anki/CollectionManager;->getColUnsafe$lambda$0$0(Lcom/ichi2/anki/CollectionManager;)Lcom/ichi2/anki/libanki/Collection;
@@ -7812,31 +8777,29 @@ SPLcom/ichi2/anki/CollectionManager;->logUIHangs(Lkotlin/jvm/functions/Function0
 SPLcom/ichi2/anki/CollectionManager;->setBackend(Lnet/ankiweb/rsdroid/Backend;)V
 SPLcom/ichi2/anki/CollectionManager;->setCollection(Lcom/ichi2/anki/libanki/Collection;)V
 SPLcom/ichi2/anki/CollectionManager;->updateCustomCertificate(Ljava/lang/String;)Z
-SPLcom/ichi2/anki/CollectionManager;->withCol$lambda$0(Lkotlin/jvm/functions/Function1;Lcom/ichi2/anki/CollectionManager;)Ljava/lang/Object;
-SPLcom/ichi2/anki/CollectionManager;->withCol(Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CollectionManager;->withColInternal$lambda$0(Lkotlin/jvm/functions/Function1;Lcom/ichi2/anki/CollectionManager;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CollectionManager;->withColInternal(Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/CollectionManager;->withOpenColOrNull$lambda$0(Lkotlin/jvm/functions/Function1;Lcom/ichi2/anki/CollectionManager;)Ljava/lang/Object;
 SPLcom/ichi2/anki/CollectionManager;->withOpenColOrNull(Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/CollectionManager;->withQueue(Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Lcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda1;
-SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda1;-><init>(Lkotlin/jvm/functions/Function1;)V
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda1;-><init>()V
 SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda11;
 SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda11;-><init>()V
 SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda11;->invoke()Ljava/lang/Object;
-Lcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda14;
-SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda14;-><init>()V
-SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda14;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-Lcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda5;
-SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda5;-><init>()V
-SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda5;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda2;-><init>(Lkotlin/jvm/functions/Function1;)V
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda6;
 SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda6;-><init>()V
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda6;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda7;
-SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda7;-><init>(Lkotlin/jvm/functions/Function1;)V
-SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda7;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda7;-><init>()V
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda7;->invoke()Ljava/lang/Object;
 Lcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda8;
-SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda8;-><init>()V
-SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda8;->invoke()Ljava/lang/Object;
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda8;-><init>(Lkotlin/jvm/functions/Function1;)V
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda8;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda9;
 SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda9;-><init>()V
 SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda9;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
@@ -7844,6 +8807,14 @@ Lcom/ichi2/anki/CollectionManager$blockForQueue$2;
 SPLcom/ichi2/anki/CollectionManager$blockForQueue$2;-><init>(Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/CollectionManager$blockForQueue$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 SPLcom/ichi2/anki/CollectionManager$blockForQueue$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CollectionManager$getBackend$1;
+SPLcom/ichi2/anki/CollectionManager$getBackend$1;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/CollectionManager$getBackend$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/CollectionManager$getBackend$1;->invokeSuspend$lambda$0(Lcom/ichi2/anki/CollectionManager;)Lkotlin/Unit;
+SPLcom/ichi2/anki/CollectionManager$getBackend$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CollectionManager$getBackend$1$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/CollectionManager$getBackend$1$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/CollectionManager$getBackend$1$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/CollectionManager$withQueue$3;
 SPLcom/ichi2/anki/CollectionManager$withQueue$3;-><init>(Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/CollectionManager$withQueue$3;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
@@ -7852,19 +8823,14 @@ Lcom/ichi2/anki/CoroutineHelpersKt;
 SPLcom/ichi2/anki/CoroutineHelpersKt;-><clinit>()V
 SPLcom/ichi2/anki/CoroutineHelpersKt;->access$dismissDialogIfShowing(Landroid/app/Dialog;)V
 SPLcom/ichi2/anki/CoroutineHelpersKt;->dismissDialogIfShowing(Landroid/app/Dialog;)V
-SPLcom/ichi2/anki/CoroutineHelpersKt;->launchCatching(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
 SPLcom/ichi2/anki/CoroutineHelpersKt;->launchCatchingIO(Landroidx/lifecycle/ViewModel;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
 SPLcom/ichi2/anki/CoroutineHelpersKt;->launchCatchingTask$default(Landroidx/fragment/app/FragmentActivity;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
 SPLcom/ichi2/anki/CoroutineHelpersKt;->launchCatchingTask(Landroidx/fragment/app/FragmentActivity;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
 SPLcom/ichi2/anki/CoroutineHelpersKt;->runCatching(Landroidx/fragment/app/FragmentActivity;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/CoroutineHelpersKt;->withProgress$default(Landroid/app/Activity;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 SPLcom/ichi2/anki/CoroutineHelpersKt;->withProgress(Landroid/app/Activity;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/CoroutineHelpersKt;->withProgressDialog$default(Landroid/app/Activity;Lkotlin/jvm/functions/Function0;JLjava/lang/Integer;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-SPLcom/ichi2/anki/CoroutineHelpersKt;->withProgressDialog(Landroid/app/Activity;Lkotlin/jvm/functions/Function0;JLjava/lang/Integer;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-Lcom/ichi2/anki/CoroutineHelpersKt$launchCatching$1;
-SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatching$1;-><init>(Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
-SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatching$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatching$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CoroutineHelpersKt;->withProgressDialog-WPi__2c$default(Landroid/app/Activity;Lkotlin/jvm/functions/Function0;JLjava/lang/Integer;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CoroutineHelpersKt;->withProgressDialog-WPi__2c(Landroid/app/Activity;Lkotlin/jvm/functions/Function0;JLjava/lang/Integer;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Lcom/ichi2/anki/CoroutineHelpersKt$launchCatchingIO$1;
 SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatchingIO$1;-><init>(Landroidx/lifecycle/ViewModel;Lkotlin/coroutines/Continuation;)V
 Lcom/ichi2/anki/CoroutineHelpersKt$launchCatchingIO$2;
@@ -7893,8 +8859,6 @@ SPLcom/ichi2/anki/CoroutineHelpersKt$withProgress$8;->invoke(Landroid/app/Progre
 SPLcom/ichi2/anki/CoroutineHelpersKt$withProgress$8;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 SPLcom/ichi2/anki/CoroutineHelpersKt$withProgress$8;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2;
-SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2;->$r8$lambda$Ig687pjO6PY-xJRAdVlVIngnZ4Q(Landroid/app/Activity;)V
-SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2;->$r8$lambda$hOqt-ECZDfdDp0GItaFz0S8D73Q(Landroid/app/Activity;)V
 SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2;-><init>(Landroid/app/Activity;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;Ljava/lang/Integer;JLkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -7912,146 +8876,188 @@ Lcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2$dialogJob$1;
 SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2$dialogJob$1;-><init>(JLkotlin/jvm/functions/Function0;Ljava/lang/Integer;Landroid/app/ProgressDialog;Lkotlin/jvm/internal/Ref$BooleanRef;Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2$dialogJob$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2$dialogJob$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
-Lcom/ichi2/anki/CrashReportService;
-SPLcom/ichi2/anki/CrashReportService;-><clinit>()V
-SPLcom/ichi2/anki/CrashReportService;-><init>()V
-SPLcom/ichi2/anki/CrashReportService;->createAcraCoreConfigBuilder()Lorg/acra/config/CoreConfigurationBuilder;
-SPLcom/ichi2/anki/CrashReportService;->fetchWebViewInformation()Ljava/util/HashMap;
-SPLcom/ichi2/anki/CrashReportService;->initialize(Landroid/app/Application;)V
-SPLcom/ichi2/anki/CrashReportService;->isAcraEnabled(Landroid/content/Context;Z)Z
-SPLcom/ichi2/anki/CrashReportService;->isProperServiceProcess()Z
-SPLcom/ichi2/anki/CrashReportService;->setAcraReportingMode(Ljava/lang/String;)V
-SPLcom/ichi2/anki/CrashReportService;->setProductionACRAConfig(Landroid/content/SharedPreferences;)V
-Lcom/ichi2/anki/CrashReportService$ToastType;
-SPLcom/ichi2/anki/CrashReportService$ToastType;->$values()[Lcom/ichi2/anki/CrashReportService$ToastType;
-SPLcom/ichi2/anki/CrashReportService$ToastType;-><clinit>()V
-SPLcom/ichi2/anki/CrashReportService$ToastType;-><init>(Ljava/lang/String;II)V
-SPLcom/ichi2/anki/CrashReportService$ToastType;->getToastMessage(Landroid/content/Context;)Ljava/lang/String;
-Lcom/ichi2/anki/CrashReportServiceKt;
-SPLcom/ichi2/anki/CrashReportServiceKt;->runCatchingWithReport(Ljava/lang/String;ZLkotlin/jvm/functions/Function0;)Ljava/lang/Object;
 Lcom/ichi2/anki/DayRolloverHandler;
+SPLcom/ichi2/anki/DayRolloverHandler;->$r8$lambda$UUd88d_6FpFa_FHFUjhALzYt_Sw(Lcom/ichi2/anki/libanki/Collection;)J
 SPLcom/ichi2/anki/DayRolloverHandler;-><clinit>()V
 SPLcom/ichi2/anki/DayRolloverHandler;-><init>()V
+SPLcom/ichi2/anki/DayRolloverHandler;->handleTimeChange$AnkiDroid(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DayRolloverHandler;->handleTimeChange$lambda$0$0(Lcom/ichi2/anki/libanki/Collection;)J
 SPLcom/ichi2/anki/DayRolloverHandler;->listenForRolloverEvents$register(Landroid/content/Context;Landroid/content/IntentFilter;)Landroid/content/Intent;
 SPLcom/ichi2/anki/DayRolloverHandler;->listenForRolloverEvents(Landroid/content/Context;)V
+SPLcom/ichi2/anki/DayRolloverHandler;->onReceiveBroadcast(Landroid/content/Context;Landroid/content/Intent;)V
+Lcom/ichi2/anki/DayRolloverHandler$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/DayRolloverHandler$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/DayRolloverHandler$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DayRolloverHandler$handleTimeChange$1;
+SPLcom/ichi2/anki/DayRolloverHandler$handleTimeChange$1;-><init>(Lcom/ichi2/anki/DayRolloverHandler;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/DayRolloverHandler$handleTimeChange$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DayRolloverHandler$onReceiveBroadcast$1;
+SPLcom/ichi2/anki/DayRolloverHandler$onReceiveBroadcast$1;-><init>(Lkotlin/coroutines/Continuation;)V
+Lcom/ichi2/anki/DayRolloverHandler$onReceiveBroadcast$2;
+SPLcom/ichi2/anki/DayRolloverHandler$onReceiveBroadcast$2;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/DayRolloverHandler$onReceiveBroadcast$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/DayRolloverHandler$onReceiveBroadcast$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DayRolloverHandler$onReceiveBroadcast$2;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DayRolloverHandler$onReceiveBroadcast$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/DeckPicker;
-SPLcom/ichi2/anki/DeckPicker;->$r8$lambda$DMaxOB3raCRB9rKUgk2jx15uCGU(Lcom/ichi2/anki/DeckPicker;)V
-SPLcom/ichi2/anki/DeckPicker;->$r8$lambda$ZhK_jVuQN1upte6e9X7ETJzpuF4(Lcom/ichi2/anki/DeckPicker;Z)V
-SPLcom/ichi2/anki/DeckPicker;->$r8$lambda$bwwEepgyylOiXrrLhsc1zTHvEW0(Lcom/ichi2/anki/DeckPicker;I)V
 SPLcom/ichi2/anki/DeckPicker;-><clinit>()V
 SPLcom/ichi2/anki/DeckPicker;-><init>()V
 SPLcom/ichi2/anki/DeckPicker;->access$applyDeckPickerBackground(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onCardsDueChanged$21(Lcom/ichi2/anki/DeckPicker;Ljava/lang/Integer;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onCollectionStatusChanged$20(Lcom/ichi2/anki/DeckPicker;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onDeckListChanged$23(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onDecksReloaded$26(Lcom/ichi2/anki/DeckPicker;Lkotlin/Unit;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onFocusedDeckChanged$24(Lcom/ichi2/anki/DeckPicker;Ljava/lang/Long;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onResizingDividerVisibilityChanged$25(Lcom/ichi2/anki/DeckPicker;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onStartupResponse$27(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onStudiedTodayChanged$19(Lcom/ichi2/anki/DeckPicker;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onStudyOptionsVisibilityChanged$22(Lcom/ichi2/anki/DeckPicker;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onUndoUpdated$18(Lcom/ichi2/anki/DeckPicker;Lkotlin/Unit;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker;->access$getDecksLayoutManager$p(Lcom/ichi2/anki/DeckPicker;)Landroidx/recyclerview/widget/LinearLayoutManager;
+SPLcom/ichi2/anki/DeckPicker;->access$getPullToSyncWrapper$p(Lcom/ichi2/anki/DeckPicker;)Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;
+SPLcom/ichi2/anki/DeckPicker;->access$restoreSearchState(Lcom/ichi2/anki/DeckPicker;Landroid/view/Menu;)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onCardsDueChanged(Lcom/ichi2/anki/DeckPicker;Ljava/lang/Integer;)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onCollectionStatusChanged(Lcom/ichi2/anki/DeckPicker;Z)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onDeckListChanged(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onDecksReloaded(Lcom/ichi2/anki/DeckPicker;Lkotlin/Unit;)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onFocusedDeckChanged(Lcom/ichi2/anki/DeckPicker;Ljava/lang/Long;)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onOptionsMenuUpdated(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/deckpicker/OptionsMenuState;)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onResizingDividerVisibilityChanged(Lcom/ichi2/anki/DeckPicker;Z)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onStartupResponse(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse;)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onStudiedTodayChanged(Lcom/ichi2/anki/DeckPicker;Ljava/lang/String;)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onStudyOptionsVisibilityChanged(Lcom/ichi2/anki/DeckPicker;Z)V
 SPLcom/ichi2/anki/DeckPicker;->access$updateDeckRelatedMenuItems(Lcom/ichi2/anki/DeckPicker;Landroid/view/Menu;)V
 SPLcom/ichi2/anki/DeckPicker;->access$updateSearchVisibilityFromState(Lcom/ichi2/anki/DeckPicker;Landroid/view/Menu;)V
 SPLcom/ichi2/anki/DeckPicker;->applyDeckPickerBackground(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker;->automaticSync$default(Lcom/ichi2/anki/DeckPicker;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker;->automaticSync(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker;->fitsSystemWindows()Z
+SPLcom/ichi2/anki/DeckPicker;->getAnalyticsScreenName()Ljava/lang/String;
+SPLcom/ichi2/anki/DeckPicker;->getBinding$AnkiDroid()Lcom/ichi2/anki/databinding/ActivityHomescreenBinding;
+SPLcom/ichi2/anki/DeckPicker;->getBottomNavigationEnabled$AnkiDroid()Z
 SPLcom/ichi2/anki/DeckPicker;->getBroadcastsActions()Ljava/util/Map;
-SPLcom/ichi2/anki/DeckPicker;->getDeckPickerBinding$AnkiDroid_playNonMinifiedRelease()Lcom/ichi2/anki/databinding/IncludeDeckPickerBinding;
+SPLcom/ichi2/anki/DeckPicker;->getDeckPickerBinding$AnkiDroid()Lcom/ichi2/anki/databinding/IncludeDeckPickerBinding;
+SPLcom/ichi2/anki/DeckPicker;->getFloatingActionButtonBinding()Lcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;
+SPLcom/ichi2/anki/DeckPicker;->getFragment()Lcom/ichi2/anki/StudyOptionsFragment;
 SPLcom/ichi2/anki/DeckPicker;->getFragmented()Z
-SPLcom/ichi2/anki/DeckPicker;->getOptionsMenuState()Lcom/ichi2/anki/deckpicker/OptionsMenuState;
+SPLcom/ichi2/anki/DeckPicker;->getImportViewModel()Lcom/ichi2/anki/dialogs/ImportViewModel;
 SPLcom/ichi2/anki/DeckPicker;->getViewModel()Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;
 SPLcom/ichi2/anki/DeckPicker;->handleStartup()V
 SPLcom/ichi2/anki/DeckPicker;->onAttachedToWindow()V
-SPLcom/ichi2/anki/DeckPicker;->onCreate$lambda$4$1(Lcom/ichi2/anki/DeckPicker;)V
-SPLcom/ichi2/anki/DeckPicker;->onCreate$lambda$5$0(Lcom/ichi2/anki/DeckPicker;Z)V
+SPLcom/ichi2/anki/DeckPicker;->onCreate$lambda$0(Landroid/content/res/Resources;)Z
 SPLcom/ichi2/anki/DeckPicker;->onCreate(Landroid/os/Bundle;)V
 SPLcom/ichi2/anki/DeckPicker;->onCreateOptionsMenu(Landroid/view/Menu;)Z
 SPLcom/ichi2/anki/DeckPicker;->onFinishedStartup()V
-SPLcom/ichi2/anki/DeckPicker;->onPrepareOptionsMenu(Landroid/view/Menu;)Z
 SPLcom/ichi2/anki/DeckPicker;->onResume()V
+SPLcom/ichi2/anki/DeckPicker;->raiseFabAboveSummary(I)V
 SPLcom/ichi2/anki/DeckPicker;->recreateActivityResultLauncher(Lcom/ichi2/anki/AnkiActivity;)Landroidx/activity/result/ActivityResultLauncher;
 SPLcom/ichi2/anki/DeckPicker;->refreshState()V
-SPLcom/ichi2/anki/DeckPicker;->setOptionsMenuState(Lcom/ichi2/anki/deckpicker/OptionsMenuState;)V
+SPLcom/ichi2/anki/DeckPicker;->restoreSearchState(Landroid/view/Menu;)V
+SPLcom/ichi2/anki/DeckPicker;->setFloatingActionMenu(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
 SPLcom/ichi2/anki/DeckPicker;->setupBackPressedCallbacks()V
-SPLcom/ichi2/anki/DeckPicker;->setupFlows$onCardsDueChanged$21(Lcom/ichi2/anki/DeckPicker;Ljava/lang/Integer;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker;->setupEdgeToEdge$lambda$0(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+SPLcom/ichi2/anki/DeckPicker;->setupEdgeToEdge$lambda$1(Lcom/ichi2/anki/DeckPicker;Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+SPLcom/ichi2/anki/DeckPicker;->setupEdgeToEdge$lambda$2(Lcom/ichi2/anki/DeckPicker;)Lkotlin/Unit;
+SPLcom/ichi2/anki/DeckPicker;->setupEdgeToEdge$lambda$3(Lcom/ichi2/anki/DeckPicker;Landroid/view/View;IIIIIIII)V
+SPLcom/ichi2/anki/DeckPicker;->setupEdgeToEdge$listAnchor(Lcom/ichi2/anki/DeckPicker;)Landroid/view/View;
+SPLcom/ichi2/anki/DeckPicker;->setupEdgeToEdge$setRecyclerViewBottomPaddingAbove(Lcom/ichi2/anki/DeckPicker;Landroid/view/View;)V
+SPLcom/ichi2/anki/DeckPicker;->setupEdgeToEdge()V
 SPLcom/ichi2/anki/DeckPicker;->setupFlows$onCardsDueChanged(Lcom/ichi2/anki/DeckPicker;Ljava/lang/Integer;)V
-SPLcom/ichi2/anki/DeckPicker;->setupFlows$onCollectionStatusChanged$20(Lcom/ichi2/anki/DeckPicker;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker;->setupFlows$onCollectionStatusChanged(Lcom/ichi2/anki/DeckPicker;Z)V
-SPLcom/ichi2/anki/DeckPicker;->setupFlows$onDeckListChanged$23(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker;->setupFlows$onDeckListChanged(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;)V
-SPLcom/ichi2/anki/DeckPicker;->setupFlows$onDecksReloaded$26(Lcom/ichi2/anki/DeckPicker;Lkotlin/Unit;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker;->setupFlows$onDecksReloaded(Lcom/ichi2/anki/DeckPicker;Lkotlin/Unit;)V
-SPLcom/ichi2/anki/DeckPicker;->setupFlows$onFocusedDeckChanged$24(Lcom/ichi2/anki/DeckPicker;Ljava/lang/Long;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker;->setupFlows$onFocusedDeckChanged$lambda$7(Lcom/ichi2/anki/DeckPicker;I)V
+SPLcom/ichi2/anki/DeckPicker;->setupFlows$onFocusedDeckChanged$lambda$4(Lcom/ichi2/anki/DeckPicker;I)V
 SPLcom/ichi2/anki/DeckPicker;->setupFlows$onFocusedDeckChanged(Lcom/ichi2/anki/DeckPicker;Ljava/lang/Long;)V
-SPLcom/ichi2/anki/DeckPicker;->setupFlows$onResizingDividerVisibilityChanged$25(Lcom/ichi2/anki/DeckPicker;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker;->setupFlows$onOptionsMenuUpdated(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/deckpicker/OptionsMenuState;)V
 SPLcom/ichi2/anki/DeckPicker;->setupFlows$onResizingDividerVisibilityChanged(Lcom/ichi2/anki/DeckPicker;Z)V
-SPLcom/ichi2/anki/DeckPicker;->setupFlows$onStartupResponse$27(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker;->setupFlows$onStartupResponse(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse;)V
-SPLcom/ichi2/anki/DeckPicker;->setupFlows$onStudiedTodayChanged$19(Lcom/ichi2/anki/DeckPicker;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker;->setupFlows$onStudiedTodayChanged(Lcom/ichi2/anki/DeckPicker;Ljava/lang/String;)V
-SPLcom/ichi2/anki/DeckPicker;->setupFlows$onStudyOptionsVisibilityChanged$22(Lcom/ichi2/anki/DeckPicker;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker;->setupFlows$onStudyOptionsVisibilityChanged(Lcom/ichi2/anki/DeckPicker;Z)V
-SPLcom/ichi2/anki/DeckPicker;->setupFlows$onUndoUpdated$18(Lcom/ichi2/anki/DeckPicker;Lkotlin/Unit;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker;->setupFlows$onUndoUpdated(Lcom/ichi2/anki/DeckPicker;Lkotlin/Unit;)V
 SPLcom/ichi2/anki/DeckPicker;->setupFlows()V
 SPLcom/ichi2/anki/DeckPicker;->setupMediaSyncMenuItem(Landroid/view/Menu;)V
+SPLcom/ichi2/anki/DeckPicker;->setupPullToSync()V
 SPLcom/ichi2/anki/DeckPicker;->setupSearchIcon(Landroid/view/MenuItem;)V
 SPLcom/ichi2/anki/DeckPicker;->showStartupScreensAndDialogs(Landroid/content/SharedPreferences;I)V
 SPLcom/ichi2/anki/DeckPicker;->tryShowStudyOptionsPanel()Z
 SPLcom/ichi2/anki/DeckPicker;->updateDeckList()V
 SPLcom/ichi2/anki/DeckPicker;->updateDeckRelatedMenuItems(Landroid/view/Menu;)V
 SPLcom/ichi2/anki/DeckPicker;->updateMenuFromState(Landroid/view/Menu;)V
-SPLcom/ichi2/anki/DeckPicker;->updateMenuState(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker;->updateSearchVisibilityFromState(Landroid/view/Menu;)V
 SPLcom/ichi2/anki/DeckPicker;->updateSyncIconFromState(Landroid/view/MenuItem;Lcom/ichi2/anki/deckpicker/OptionsMenuState;)V
 SPLcom/ichi2/anki/DeckPicker;->updateUndoLabelFromState(Landroid/view/MenuItem;Ljava/lang/String;Z)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/content/pm/PackageManager;Landroid/content/Intent;Landroid/content/pm/PackageManager$ResolveInfoFlags;)Landroid/content/pm/ResolveInfo;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m()Landroid/graphics/Bitmap$CompressFormat;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m()Landroid/graphics/BlendMode;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(J)Landroid/content/pm/PackageManager$PackageInfoFlags;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(J)Landroid/content/pm/PackageManager$ResolveInfoFlags;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/Activity;)I
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/ActivityManager;Ljava/lang/String;II)Ljava/util/List;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/ApplicationExitInfo;)I
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/PackageManager;Landroid/content/Intent;Landroid/content/pm/PackageManager$ResolveInfoFlags;)Landroid/content/pm/ResolveInfo;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/PackageManager;Landroid/content/Intent;Landroid/content/pm/PackageManager$ResolveInfoFlags;)Ljava/util/List;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/PackageManager;Ljava/lang/String;Landroid/content/pm/PackageManager$PackageInfoFlags;)Landroid/content/pm/PackageInfo;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Landroid/graphics/Paint;Landroid/graphics/BlendMode;)V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/Window;Z)V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Ljava/lang/Object;)Landroid/app/ApplicationExitInfo;
 Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda1;
 SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda1;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda1;->onScrollChanged()V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda10;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda10;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda12;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda12;-><init>(Lcom/ichi2/anki/DeckPicker;)V
 Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda13;
-SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda13;-><init>(Lcom/ichi2/anki/DeckPicker;I)V
-SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda13;->run()V
-Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda15;
-SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda15;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda16;
-SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda16;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda17;
-SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda17;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda18;
-SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda18;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda13;-><init>(Lcom/ichi2/anki/DeckPicker;)V
 Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda19;
-SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda19;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda19;-><init>()V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda19;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
 Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda2;
 SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda2;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda2;->onBeginToggle(Z)V
 Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda20;
 SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda20;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda20;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
 Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda21;
 SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda21;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda21;->invoke()Ljava/lang/Object;
 Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda23;
 SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda23;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda24;
-SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda24;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda23;->onLayoutChange(Landroid/view/View;IIIIIIII)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda26;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda26;-><init>(Lcom/ichi2/anki/DeckPicker;I)V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda26;->run()V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda28;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda28;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda29;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda29;-><init>(Lcom/ichi2/anki/DeckPicker;)V
 Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda3;
-SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda3;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda38;
-SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda38;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda3;-><init>()V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda30;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda30;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda31;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda31;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda32;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda32;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda34;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda34;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda35;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda35;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda36;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda36;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda37;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda37;-><init>(Lcom/ichi2/anki/DeckPicker;)V
 Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda39;
 SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda39;-><init>(Lcom/ichi2/anki/DeckPicker;)V
 Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda4;
 SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda4;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda40;
-SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda40;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda41;
-SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda41;-><init>(Lcom/ichi2/anki/DeckPicker;)V
 Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda42;
 SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda42;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda43;
-SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda43;-><init>(Lcom/ichi2/anki/DeckPicker;)V
 Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda5;
 SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda5;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda50;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda50;-><init>()V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda50;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda51;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda51;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda52;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda52;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda6;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda6;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda7;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda7;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda8;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda8;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda9;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda9;-><init>(Lcom/ichi2/anki/DeckPicker;)V
 Lcom/ichi2/anki/DeckPicker$Companion;
 SPLcom/ichi2/anki/DeckPicker$Companion;-><init>()V
 SPLcom/ichi2/anki/DeckPicker$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -8075,14 +9081,20 @@ SPLcom/ichi2/anki/DeckPicker$closeFloatingActionBarBackPressCallback$1;-><init>(
 Lcom/ichi2/anki/DeckPicker$exitAndSyncBackCallback$1;
 SPLcom/ichi2/anki/DeckPicker$exitAndSyncBackCallback$1;-><init>(Lcom/ichi2/anki/DeckPicker;)V
 Lcom/ichi2/anki/DeckPicker$handleStartup$environment$1;
-SPLcom/ichi2/anki/DeckPicker$handleStartup$environment$1;-><init>(Lcom/ichi2/anki/AnkiDroidApp;)V
+SPLcom/ichi2/anki/DeckPicker$handleStartup$environment$1;-><init>(Landroid/content/Context;)V
+SPLcom/ichi2/anki/DeckPicker$handleStartup$environment$1;->decideStorageIfUndecided()V
+SPLcom/ichi2/anki/DeckPicker$handleStartup$environment$1;->getPreferences()Landroid/content/SharedPreferences;
 SPLcom/ichi2/anki/DeckPicker$handleStartup$environment$1;->hasRequiredPermissions()Z
-Lcom/ichi2/anki/DeckPicker$onCreate$4;
-SPLcom/ichi2/anki/DeckPicker$onCreate$4;-><init>(Ljava/lang/Object;)V
-Lcom/ichi2/anki/DeckPicker$onCreate$6;
-SPLcom/ichi2/anki/DeckPicker$onCreate$6;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)V
-SPLcom/ichi2/anki/DeckPicker$onCreate$6;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-SPLcom/ichi2/anki/DeckPicker$onCreate$6;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$onCreate$8;
+SPLcom/ichi2/anki/DeckPicker$onCreate$8;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/DeckPicker$onCreate$8;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/DeckPicker$onCreate$8;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$onCreate$8$1;
+SPLcom/ichi2/anki/DeckPicker$onCreate$8$1;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/DeckPicker$onCreate$8$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/DeckPicker$onCreate$8$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$onCreate$8$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$onCreate$8$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/DeckPicker$onCreateOptionsMenu$2;
 SPLcom/ichi2/anki/DeckPicker$onCreateOptionsMenu$2;-><init>(Lcom/ichi2/anki/DeckPicker;Landroid/view/Menu;Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/DeckPicker$onCreateOptionsMenu$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
@@ -8098,74 +9110,77 @@ SPLcom/ichi2/anki/DeckPicker$onFinishedStartup$1;->invokeSuspend(Ljava/lang/Obje
 Lcom/ichi2/anki/DeckPicker$setupFlows$1;
 SPLcom/ichi2/anki/DeckPicker$setupFlows$1;-><init>(Lcom/ichi2/anki/DeckPicker;)V
 Lcom/ichi2/anki/DeckPicker$setupFlows$10;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$10;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-SPLcom/ichi2/anki/DeckPicker$setupFlows$10;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$10;->invoke(Lkotlin/Unit;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$10;-><init>(Ljava/lang/Object;)V
 Lcom/ichi2/anki/DeckPicker$setupFlows$11;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$11;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-SPLcom/ichi2/anki/DeckPicker$setupFlows$11;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$11;->invoke(Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$11;-><init>(Ljava/lang/Object;)V
 Lcom/ichi2/anki/DeckPicker$setupFlows$12;
 SPLcom/ichi2/anki/DeckPicker$setupFlows$12;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-SPLcom/ichi2/anki/DeckPicker$setupFlows$12;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$12;->invoke(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Lcom/ichi2/anki/DeckPicker$setupFlows$13;
 SPLcom/ichi2/anki/DeckPicker$setupFlows$13;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-SPLcom/ichi2/anki/DeckPicker$setupFlows$13;->invoke(Ljava/lang/Integer;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$13;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/DeckPicker$setupFlows$14;
 SPLcom/ichi2/anki/DeckPicker$setupFlows$14;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$14;->invoke(Lcom/ichi2/anki/deckpicker/OptionsMenuState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker$setupFlows$14;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$14;->invoke(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Lcom/ichi2/anki/DeckPicker$setupFlows$15;
 SPLcom/ichi2/anki/DeckPicker$setupFlows$15;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-SPLcom/ichi2/anki/DeckPicker$setupFlows$15;->invoke(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker$setupFlows$15;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$15;->invoke(Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Lcom/ichi2/anki/DeckPicker$setupFlows$16;
 SPLcom/ichi2/anki/DeckPicker$setupFlows$16;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-SPLcom/ichi2/anki/DeckPicker$setupFlows$16;->invoke(Ljava/lang/Long;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker$setupFlows$16;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$16;->invoke(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Lcom/ichi2/anki/DeckPicker$setupFlows$17;
 SPLcom/ichi2/anki/DeckPicker$setupFlows$17;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$17;->invoke(Ljava/lang/Integer;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker$setupFlows$17;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$17;->invoke(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Lcom/ichi2/anki/DeckPicker$setupFlows$18;
 SPLcom/ichi2/anki/DeckPicker$setupFlows$18;-><init>(Lcom/ichi2/anki/DeckPicker;)V
 SPLcom/ichi2/anki/DeckPicker$setupFlows$18;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$18;->invoke(Lkotlin/Unit;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$18;->invoke(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Lcom/ichi2/anki/DeckPicker$setupFlows$19;
 SPLcom/ichi2/anki/DeckPicker$setupFlows$19;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-SPLcom/ichi2/anki/DeckPicker$setupFlows$19;->invoke(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$19;->invoke(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker$setupFlows$19;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/DeckPicker$setupFlows$2;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$2;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$2;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$20;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$20;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$20;->invoke(Ljava/lang/Long;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$20;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupFlows$21;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$21;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$21;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$21;->invoke(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupFlows$22;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$22;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$22;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$22;->invoke(Lkotlin/Unit;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupFlows$23;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$23;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$23;->invoke(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$23;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupFlows$24;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$24;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$25;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$25;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$26;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$26;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$27;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$27;-><init>(Ljava/lang/Object;)V
 Lcom/ichi2/anki/DeckPicker$setupFlows$3;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$3;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$3;-><init>(Ljava/lang/Object;)V
 Lcom/ichi2/anki/DeckPicker$setupFlows$4;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$4;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$4;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)V
 Lcom/ichi2/anki/DeckPicker$setupFlows$5;
 SPLcom/ichi2/anki/DeckPicker$setupFlows$5;-><init>(Lcom/ichi2/anki/DeckPicker;)V
 Lcom/ichi2/anki/DeckPicker$setupFlows$6;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$6;-><init>(Ljava/lang/Object;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$6;-><init>(Lcom/ichi2/anki/DeckPicker;)V
 Lcom/ichi2/anki/DeckPicker$setupFlows$7;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$7;-><init>(Ljava/lang/Object;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$7;-><init>(Lcom/ichi2/anki/DeckPicker;)V
 Lcom/ichi2/anki/DeckPicker$setupFlows$8;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$8;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$8;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)V
 Lcom/ichi2/anki/DeckPicker$setupFlows$9;
 SPLcom/ichi2/anki/DeckPicker$setupFlows$9;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-Lcom/ichi2/anki/DeckPicker$setupFlows$onStudiedTodayChanged$$inlined$doOnLayout$1;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$onStudiedTodayChanged$$inlined$doOnLayout$1;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-Lcom/ichi2/anki/DeckPicker$setupFlows$onUndoUpdated$1;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$onUndoUpdated$1;->$r8$lambda$oIFVYnbmddw0jolB0yipsgJjdRQ(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/libanki/Collection;)Lkotlin/Unit;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$onUndoUpdated$1;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)V
-SPLcom/ichi2/anki/DeckPicker$setupFlows$onUndoUpdated$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$onUndoUpdated$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$onUndoUpdated$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$onUndoUpdated$1;->invokeSuspend$lambda$0(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/libanki/Collection;)Lkotlin/Unit;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$onUndoUpdated$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
-Lcom/ichi2/anki/DeckPicker$setupFlows$onUndoUpdated$1$$ExternalSyntheticLambda0;
-SPLcom/ichi2/anki/DeckPicker$setupFlows$onUndoUpdated$1$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/DeckPicker;)V
-SPLcom/ichi2/anki/DeckPicker$setupFlows$onUndoUpdated$1$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/DeckPicker$setupMediaSyncMenuItem$1;
 SPLcom/ichi2/anki/DeckPicker$setupMediaSyncMenuItem$1;-><init>(Lkotlinx/coroutines/flow/Flow;Lcom/ichi2/anki/DeckPicker;Lcom/google/android/material/progressindicator/LinearProgressIndicator;Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/DeckPicker$setupMediaSyncMenuItem$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
@@ -8176,10 +9191,13 @@ SPLcom/ichi2/anki/DeckPicker$setupMediaSyncMenuItem$1$1;->create(Ljava/lang/Obje
 SPLcom/ichi2/anki/DeckPicker$setupMediaSyncMenuItem$1$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker$setupMediaSyncMenuItem$1$1;->invoke(Ljava/util/List;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker$setupMediaSyncMenuItem$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupPullToSync$$inlined$doOnScrolled$1;
+SPLcom/ichi2/anki/DeckPicker$setupPullToSync$$inlined$doOnScrolled$1;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupPullToSync$$inlined$doOnScrolled$1;->onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
 Lcom/ichi2/anki/DeckPicker$setupSearchIcon$1;
 SPLcom/ichi2/anki/DeckPicker$setupSearchIcon$1;-><init>(Lcom/ichi2/anki/DeckPicker;)V
 Lcom/ichi2/anki/DeckPicker$setupSearchIcon$2$1;
-SPLcom/ichi2/anki/DeckPicker$setupSearchIcon$2$1;-><init>(Lcom/ichi2/ui/AccessibleSearchView;Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupSearchIcon$2$1;-><init>(Lcom/ichi2/ui/AccessibleSearchView;Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/ui/AccessibleSearchView;Landroid/view/MenuItem;)V
 Lcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$1;
 SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$1;-><init>(Landroidx/activity/ComponentActivity;)V
 SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$1;->invoke()Landroidx/lifecycle/ViewModelProvider$Factory;
@@ -8192,6 +9210,18 @@ Lcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$3;
 SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$3;-><init>(Lkotlin/jvm/functions/Function0;Landroidx/activity/ComponentActivity;)V
 SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$3;->invoke()Landroidx/lifecycle/viewmodel/CreationExtras;
 SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$3;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$4;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$4;-><init>(Landroidx/activity/ComponentActivity;)V
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$4;->invoke()Landroidx/lifecycle/ViewModelProvider$Factory;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$4;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$5;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$5;-><init>(Landroidx/activity/ComponentActivity;)V
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$5;->invoke()Landroidx/lifecycle/ViewModelStore;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$5;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$6;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$6;-><init>(Lkotlin/jvm/functions/Function0;Landroidx/activity/ComponentActivity;)V
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$6;->invoke()Landroidx/lifecycle/viewmodel/CreationExtras;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$6;->invoke()Ljava/lang/Object;
 Lcom/ichi2/anki/DeckPicker$updateDeckList$1;
 SPLcom/ichi2/anki/DeckPicker$updateDeckList$1;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/DeckPicker$updateDeckList$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
@@ -8204,36 +9234,29 @@ SPLcom/ichi2/anki/DeckPicker$updateDeckList$1$1;->create(Lkotlin/coroutines/Cont
 SPLcom/ichi2/anki/DeckPicker$updateDeckList$1$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker$updateDeckList$1$1;->invoke(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/DeckPicker$updateDeckList$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
-Lcom/ichi2/anki/DeckPicker$updateMenuState$1;
-SPLcom/ichi2/anki/DeckPicker$updateMenuState$1;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)V
-SPLcom/ichi2/anki/DeckPicker$updateMenuState$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/DeckPickerFloatingActionMenu;
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;->$r8$lambda$LNLVbyL2ZOjV8NBtr-vvg5EWjbY(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;-><init>(Landroid/content/Context;Lcom/ichi2/anki/databinding/ActivityHomescreenBinding;Lcom/ichi2/anki/DeckPicker;)V
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;->closeFloatingActionMenu$lambda$4$0(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;->closeFloatingActionMenu(Z)V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;-><clinit>()V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;-><init>(Landroid/content/Context;Lcom/ichi2/anki/databinding/ActivityHomescreenBinding;Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/DeckPickerFloatingActionMenu$FloatingActionBarToggleListener;Z)V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;->access$resetMenuAfterAdding(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
 SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;->createActivationKeyListener(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Landroid/view/View$OnKeyListener;
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;->isFABOpen()Z
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;->setToggleListener(Lcom/ichi2/anki/DeckPickerFloatingActionMenu$FloatingActionBarToggleListener;)V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;->resetMenuAfterAdding()V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;->setCreateDeckButtonLabel()V
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
 Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda1;
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda1;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda1;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
 Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda10;
 SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda10;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
-Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda11;
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda11;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
-Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda12;
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda12;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
-Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda13;
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda13;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
 Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda2;
 SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda2;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
 Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda3;
 SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda3;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
 Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda4;
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda4;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda4;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
 Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda5;
 SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda5;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda5;->run()V
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda6;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda6;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
 Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda7;
 SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda7;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
 Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda8;
@@ -8241,20 +9264,16 @@ SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda8;-><init
 Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda9;
 SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda9;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
 Lcom/ichi2/anki/DeckPickerFloatingActionMenu$1;
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$1;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;Landroid/content/Context;)V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$1;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$1;->onCreate(Landroidx/lifecycle/LifecycleOwner;)V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$1;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$1;->onStart(Landroidx/lifecycle/LifecycleOwner;)V
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu$2;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$2;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;Landroid/content/Context;)V
 Lcom/ichi2/anki/DeckPickerFloatingActionMenu$FloatingActionBarToggleListener;
-Lcom/ichi2/anki/DeckPickerFloatingActionMenu$closeFloatingActionMenu$6$1;
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$closeFloatingActionMenu$6$1;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;Lcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;)V
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$closeFloatingActionMenu$6$1;->onAnimationCancel(Landroid/animation/Animator;)V
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$closeFloatingActionMenu$6$1;->onAnimationEnd(Landroid/animation/Animator;)V
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$closeFloatingActionMenu$6$1;->onAnimationStart(Landroid/animation/Animator;)V
-Lcom/ichi2/anki/DeckPickerFloatingActionMenu$closeFloatingActionMenu$6$2;
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$closeFloatingActionMenu$6$2;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;Lcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;)V
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$closeFloatingActionMenu$6$2;->onAnimationCancel(Landroid/animation/Animator;)V
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$closeFloatingActionMenu$6$2;->onAnimationEnd(Landroid/animation/Animator;)V
-SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$closeFloatingActionMenu$6$2;->onAnimationStart(Landroid/animation/Animator;)V
 Lcom/ichi2/anki/DeckPickerKt;
 SPLcom/ichi2/anki/DeckPickerKt;->getStudyoptionsFrame(Lcom/ichi2/anki/databinding/ActivityHomescreenBinding;)Landroidx/fragment/app/FragmentContainerView;
+Lcom/ichi2/anki/DispatchKeyEventListener;
 Lcom/ichi2/anki/Flag;
 SPLcom/ichi2/anki/Flag;->$values()[Lcom/ichi2/anki/Flag;
 SPLcom/ichi2/anki/Flag;-><clinit>()V
@@ -8267,33 +9286,45 @@ SPLcom/ichi2/anki/Flag$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructo
 Lcom/ichi2/anki/FlashCardsContract;
 SPLcom/ichi2/anki/FlashCardsContract;-><clinit>()V
 SPLcom/ichi2/anki/FlashCardsContract;-><init>()V
+SPLcom/ichi2/anki/FlashCardsContract;->getAuthority$default(Lcom/ichi2/anki/FlashCardsContract;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
+SPLcom/ichi2/anki/FlashCardsContract;->getAuthority(Ljava/lang/String;)Ljava/lang/String;
+SPLcom/ichi2/anki/FlashCardsContract;->getAuthorityUri$default(Lcom/ichi2/anki/FlashCardsContract;Ljava/lang/String;ILjava/lang/Object;)Landroid/net/Uri;
+SPLcom/ichi2/anki/FlashCardsContract;->getAuthorityUri(Ljava/lang/String;)Landroid/net/Uri;
+SPLcom/ichi2/anki/FlashCardsContract;->getPermission(Ljava/lang/String;)Ljava/lang/String;
 Lcom/ichi2/anki/FlashCardsContract$Note;
 SPLcom/ichi2/anki/FlashCardsContract$Note;-><clinit>()V
 SPLcom/ichi2/anki/FlashCardsContract$Note;-><init>()V
+SPLcom/ichi2/anki/FlashCardsContract$Note;->getDefaultColumns()[Ljava/lang/String;
+Lcom/ichi2/anki/HomeScreenNavigationKt;
+SPLcom/ichi2/anki/HomeScreenNavigationKt;->selectedBottomNavItem(Lcom/ichi2/anki/DeckPicker;)Lcom/ichi2/anki/BottomNavController$NavigationItem;
+SPLcom/ichi2/anki/HomeScreenNavigationKt;->setupBottomNavigation(Lcom/ichi2/anki/DeckPicker;)V
 Lcom/ichi2/anki/ImportColpkgListener;
 Lcom/ichi2/anki/InitialActivity;
 SPLcom/ichi2/anki/InitialActivity;-><clinit>()V
 SPLcom/ichi2/anki/InitialActivity;-><init>()V
-SPLcom/ichi2/anki/InitialActivity;->getStartupFailureType(Lkotlin/jvm/functions/Function0;)Lcom/ichi2/anki/InitialActivity$StartupFailure;
+SPLcom/ichi2/anki/InitialActivity;->decideStorageIfUndecided(Landroid/content/Context;)V
+SPLcom/ichi2/anki/InitialActivity;->getStartupFailureType(Landroid/content/SharedPreferences;Lkotlin/jvm/functions/Function0;)Lcom/ichi2/anki/InitialActivity$StartupFailure;
+SPLcom/ichi2/anki/InitialActivity;->isLatestVersion(Landroid/content/SharedPreferences;)Z
 SPLcom/ichi2/anki/InitialActivity;->performSetupFromFreshInstallOrClearedPreferences(Landroid/content/SharedPreferences;)Z
 SPLcom/ichi2/anki/InitialActivity;->setUpgradedToLatestVersion(Landroid/content/SharedPreferences;)V
 SPLcom/ichi2/anki/InitialActivity;->wasFreshInstall(Landroid/content/SharedPreferences;)Z
+Lcom/ichi2/anki/InitialActivity$StartupFailure;
 Lcom/ichi2/anki/InitialActivityKt;
 SPLcom/ichi2/anki/InitialActivityKt;->configureRenderingMode()V
-SPLcom/ichi2/anki/InitialActivityKt;->selectAnkiDroidFolder(Landroid/content/Context;)Lcom/ichi2/anki/AnkiDroidFolder;
-SPLcom/ichi2/anki/InitialActivityKt;->selectAnkiDroidFolder(ZZ)Lcom/ichi2/anki/AnkiDroidFolder;
+SPLcom/ichi2/anki/InitialActivityKt;->selectStoragePermissions(Landroid/content/Context;)Lcom/ichi2/anki/StoragePermissionSet;
 Lcom/ichi2/anki/IntentHandler;
 SPLcom/ichi2/anki/IntentHandler;-><clinit>()V
 SPLcom/ichi2/anki/IntentHandler;-><init>()V
 SPLcom/ichi2/anki/IntentHandler;->launchDeckPickerIfNoOtherTasks(Landroid/content/Intent;)V
 SPLcom/ichi2/anki/IntentHandler;->onCreate(Landroid/os/Bundle;)V
+SPLcom/ichi2/anki/IntentHandler;->onDestroy()V
 Lcom/ichi2/anki/IntentHandler$$ExternalSyntheticLambda0;
 SPLcom/ichi2/anki/IntentHandler$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/IntentHandler;Landroid/content/Intent;Ljava/lang/String;)V
 Lcom/ichi2/anki/IntentHandler$Companion;
 SPLcom/ichi2/anki/IntentHandler$Companion;-><init>()V
 SPLcom/ichi2/anki/IntentHandler$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLcom/ichi2/anki/IntentHandler$Companion;->getLaunchType(Landroid/content/Intent;)Lcom/ichi2/anki/IntentHandler$LaunchType;
-SPLcom/ichi2/anki/IntentHandler$Companion;->grantedStoragePermissions(Landroid/content/Context;Z)Z
+SPLcom/ichi2/anki/IntentHandler$Companion;->isBrowserDeepLink(Landroid/content/Intent;)Z
 SPLcom/ichi2/anki/IntentHandler$Companion;->requiresCollectionAccess(Lcom/ichi2/anki/IntentHandler$LaunchType;)Z
 Lcom/ichi2/anki/IntentHandler$Companion$WhenMappings;
 SPLcom/ichi2/anki/IntentHandler$Companion$WhenMappings;-><clinit>()V
@@ -8306,7 +9337,6 @@ Lcom/ichi2/anki/IntentHandler$WhenMappings;
 SPLcom/ichi2/anki/IntentHandler$WhenMappings;-><clinit>()V
 Lcom/ichi2/anki/IntentHandler2;
 Lcom/ichi2/anki/IntroductionActivity;
-SPLcom/ichi2/anki/IntroductionActivity;->$r8$lambda$FFZVZ3pUWAq7hknvRFwnlXXyQ4Y(Lcom/ichi2/anki/IntroductionActivity;Ljava/lang/String;Landroid/os/Bundle;)Lkotlin/Unit;
 SPLcom/ichi2/anki/IntroductionActivity;-><clinit>()V
 SPLcom/ichi2/anki/IntroductionActivity;-><init>()V
 SPLcom/ichi2/anki/IntroductionActivity;->onCreate$lambda$0(Lcom/ichi2/anki/IntroductionActivity;Ljava/lang/String;Landroid/os/Bundle;)Lkotlin/Unit;
@@ -8318,6 +9348,8 @@ SPLcom/ichi2/anki/IntroductionActivity$$ExternalSyntheticLambda0;-><init>(Lcom/i
 SPLcom/ichi2/anki/IntroductionActivity$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/IntroductionActivity$$ExternalSyntheticLambda1;
 SPLcom/ichi2/anki/IntroductionActivity$$ExternalSyntheticLambda1;-><init>(Lcom/ichi2/anki/IntroductionActivity;)V
+Lcom/ichi2/anki/IntroductionActivity$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/IntroductionActivity$$ExternalSyntheticLambda2;-><init>(Lcom/ichi2/anki/IntroductionActivity;)V
 Lcom/ichi2/anki/IntroductionActivity$Companion;
 SPLcom/ichi2/anki/IntroductionActivity$Companion;-><init>()V
 SPLcom/ichi2/anki/IntroductionActivity$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -8325,20 +9357,31 @@ Lcom/ichi2/anki/IntroductionActivity$WhenMappings;
 SPLcom/ichi2/anki/IntroductionActivity$WhenMappings;-><clinit>()V
 Lcom/ichi2/anki/IntroductionActivityKt;
 SPLcom/ichi2/anki/IntroductionActivityKt;->hasShownAppIntro(Landroid/content/Context;)Z
+Lcom/ichi2/anki/LaunchCatchingKt;
+SPLcom/ichi2/anki/LaunchCatchingKt;->launchCatching(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
+Lcom/ichi2/anki/LaunchCatchingKt$launchCatching$1;
+SPLcom/ichi2/anki/LaunchCatchingKt$launchCatching$1;-><init>(Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/LaunchCatchingKt$launchCatching$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/LaunchCatchingKt$launchCatching$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/LeakCanaryConfiguration;
 SPLcom/ichi2/anki/LeakCanaryConfiguration;-><clinit>()V
 SPLcom/ichi2/anki/LeakCanaryConfiguration;-><init>()V
 SPLcom/ichi2/anki/LeakCanaryConfiguration;->disable()V
+Lcom/ichi2/anki/MetaDbWidgetRepository;
+SPLcom/ichi2/anki/MetaDbWidgetRepository;-><clinit>()V
+SPLcom/ichi2/anki/MetaDbWidgetRepository;-><init>(Landroid/content/Context;)V
+Lcom/ichi2/anki/MetaDbWidgetRepositoryKt;
+SPLcom/ichi2/anki/MetaDbWidgetRepositoryKt;->initializeWidgetRepository(Landroid/app/Application;)V
 Lcom/ichi2/anki/NavigationDrawerActivity;
 SPLcom/ichi2/anki/NavigationDrawerActivity;-><clinit>()V
 SPLcom/ichi2/anki/NavigationDrawerActivity;-><init>(Ljava/lang/Integer;)V
 SPLcom/ichi2/anki/NavigationDrawerActivity;-><init>(Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-SPLcom/ichi2/anki/NavigationDrawerActivity;->fitsSystemWindows()Z
 SPLcom/ichi2/anki/NavigationDrawerActivity;->getDrawerLayout()Landroidx/drawerlayout/widget/DrawerLayout;
 SPLcom/ichi2/anki/NavigationDrawerActivity;->getDrawerToggle()Landroidx/appcompat/app/ActionBarDrawerToggle;
 SPLcom/ichi2/anki/NavigationDrawerActivity;->getNavigationDrawerLayout()I
 SPLcom/ichi2/anki/NavigationDrawerActivity;->initNavigationDrawer$default(Lcom/ichi2/anki/NavigationDrawerActivity;Landroid/view/View;ILjava/lang/Object;)V
 SPLcom/ichi2/anki/NavigationDrawerActivity;->initNavigationDrawer(Landroid/view/View;)V
+SPLcom/ichi2/anki/NavigationDrawerActivity;->isDrawerOpen()Z
 SPLcom/ichi2/anki/NavigationDrawerActivity;->navDrawerIsReady()Z
 SPLcom/ichi2/anki/NavigationDrawerActivity;->onPostCreate(Landroid/os/Bundle;)V
 SPLcom/ichi2/anki/NavigationDrawerActivity;->selectNavigationItem(I)V
@@ -8346,18 +9389,24 @@ SPLcom/ichi2/anki/NavigationDrawerActivity;->setDrawerLayout(Landroidx/drawerlay
 SPLcom/ichi2/anki/NavigationDrawerActivity;->setTitle(Ljava/lang/CharSequence;)V
 SPLcom/ichi2/anki/NavigationDrawerActivity;->setViewBinding(Landroidx/viewbinding/ViewBinding;)V
 SPLcom/ichi2/anki/NavigationDrawerActivity;->setupBackPressedCallbacks()V
+SPLcom/ichi2/anki/NavigationDrawerActivity;->setupDrawerInsets$lambda$0(Lkotlin/jvm/internal/Ref$IntRef;Lcom/google/android/material/navigation/NavigationView;IIILandroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+SPLcom/ichi2/anki/NavigationDrawerActivity;->setupDrawerInsets(Lcom/google/android/material/navigation/NavigationView;)V
 Lcom/ichi2/anki/NavigationDrawerActivity$$ExternalSyntheticLambda0;
 SPLcom/ichi2/anki/NavigationDrawerActivity$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/NavigationDrawerActivity;)V
 Lcom/ichi2/anki/NavigationDrawerActivity$$ExternalSyntheticLambda1;
 SPLcom/ichi2/anki/NavigationDrawerActivity$$ExternalSyntheticLambda1;-><init>(Lcom/ichi2/anki/NavigationDrawerActivity;)V
+Lcom/ichi2/anki/NavigationDrawerActivity$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/NavigationDrawerActivity$$ExternalSyntheticLambda2;-><init>(Lkotlin/jvm/internal/Ref$IntRef;Lcom/google/android/material/navigation/NavigationView;III)V
+SPLcom/ichi2/anki/NavigationDrawerActivity$$ExternalSyntheticLambda2;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
 Lcom/ichi2/anki/NavigationDrawerActivity$Companion;
 SPLcom/ichi2/anki/NavigationDrawerActivity$Companion;-><init>()V
 SPLcom/ichi2/anki/NavigationDrawerActivity$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLcom/ichi2/anki/NavigationDrawerActivity$Companion;->enablePostShortcut(Landroid/content/Context;)V
 Lcom/ichi2/anki/NavigationDrawerActivity$drawerBackCallback$1;
 SPLcom/ichi2/anki/NavigationDrawerActivity$drawerBackCallback$1;-><init>(Lcom/ichi2/anki/NavigationDrawerActivity;)V
-Lcom/ichi2/anki/NavigationDrawerActivity$initNavigationDrawer$2;
-SPLcom/ichi2/anki/NavigationDrawerActivity$initNavigationDrawer$2;-><init>(Lcom/ichi2/anki/NavigationDrawerActivity;Landroidx/drawerlayout/widget/DrawerLayout;II)V
+Lcom/ichi2/anki/NavigationDrawerActivity$initNavigationDrawer$3;
+SPLcom/ichi2/anki/NavigationDrawerActivity$initNavigationDrawer$3;-><init>(Lcom/ichi2/anki/NavigationDrawerActivity;Landroidx/drawerlayout/widget/DrawerLayout;II)V
+Lcom/ichi2/anki/NoteEditorActivity;
 Lcom/ichi2/anki/NoteEditorFragment$Companion$NoteEditorCaller;
 SPLcom/ichi2/anki/NoteEditorFragment$Companion$NoteEditorCaller;->$values()[Lcom/ichi2/anki/NoteEditorFragment$Companion$NoteEditorCaller;
 SPLcom/ichi2/anki/NoteEditorFragment$Companion$NoteEditorCaller;-><clinit>()V
@@ -8366,19 +9415,21 @@ SPLcom/ichi2/anki/NoteEditorFragment$Companion$NoteEditorCaller;->getValue()I
 Lcom/ichi2/anki/NoteEditorFragment$Companion$NoteEditorCaller$Companion;
 SPLcom/ichi2/anki/NoteEditorFragment$Companion$NoteEditorCaller$Companion;-><init>()V
 SPLcom/ichi2/anki/NoteEditorFragment$Companion$NoteEditorCaller$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/NotificationChannel;
+SPLcom/ichi2/anki/NotificationChannel;->$values()[Lcom/ichi2/anki/NotificationChannel;
+SPLcom/ichi2/anki/NotificationChannel;-><clinit>()V
+SPLcom/ichi2/anki/NotificationChannel;-><init>(Ljava/lang/String;ILjava/lang/String;II)V
+SPLcom/ichi2/anki/NotificationChannel;->getEntries()Lkotlin/enums/EnumEntries;
+SPLcom/ichi2/anki/NotificationChannel;->getId()Ljava/lang/String;
+SPLcom/ichi2/anki/NotificationChannel;->getImportance()I
+SPLcom/ichi2/anki/NotificationChannel;->getName(Landroid/content/res/Resources;)Ljava/lang/String;
 Lcom/ichi2/anki/NotificationChannelKt;
+SPLcom/ichi2/anki/NotificationChannelKt;-><clinit>()V
 SPLcom/ichi2/anki/NotificationChannelKt;->setupNotificationChannels(Landroid/content/Context;)V
 Lcom/ichi2/anki/OnErrorListener;
 Lcom/ichi2/anki/OnPageFinishedCallback;
 Lcom/ichi2/anki/PermissionSet;
-SPLcom/ichi2/anki/PermissionSet;->$values()[Lcom/ichi2/anki/PermissionSet;
-SPLcom/ichi2/anki/PermissionSet;-><clinit>()V
-SPLcom/ichi2/anki/PermissionSet;-><init>(Ljava/lang/String;ILjava/util/List;Ljava/lang/Class;)V
-SPLcom/ichi2/anki/PermissionSet;->getPermissions()Ljava/util/List;
-Lcom/ichi2/anki/PermissionSet$Creator;
-SPLcom/ichi2/anki/PermissionSet$Creator;-><init>()V
-Lcom/ichi2/anki/R$attr;
-Lcom/ichi2/anki/R$bool;
+SPLcom/ichi2/anki/PermissionSet;->hasRequiredPermissions(Landroid/content/Context;)Z
 Lcom/ichi2/anki/R$color;
 Lcom/ichi2/anki/R$dimen;
 Lcom/ichi2/anki/R$drawable;
@@ -8390,11 +9441,35 @@ Lcom/ichi2/anki/R$string;
 Lcom/ichi2/anki/R$style;
 Lcom/ichi2/anki/Reviewer;
 SPLcom/ichi2/anki/Reviewer;-><clinit>()V
+Lcom/ichi2/anki/Reviewer$$ExternalSyntheticLambda17;
+SPLcom/ichi2/anki/Reviewer$$ExternalSyntheticLambda17;-><init>()V
+Lcom/ichi2/anki/Reviewer$$ExternalSyntheticLambda18;
+SPLcom/ichi2/anki/Reviewer$$ExternalSyntheticLambda18;-><init>()V
 Lcom/ichi2/anki/Reviewer$Companion;
 SPLcom/ichi2/anki/Reviewer$Companion;-><init>()V
 SPLcom/ichi2/anki/Reviewer$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLcom/ichi2/anki/Reviewer$Companion;->getIntent(Landroid/content/Context;)Landroid/content/Intent;
+Lcom/ichi2/anki/StoragePermissionSet;
+SPLcom/ichi2/anki/StoragePermissionSet;->$values()[Lcom/ichi2/anki/StoragePermissionSet;
+SPLcom/ichi2/anki/StoragePermissionSet;-><clinit>()V
+SPLcom/ichi2/anki/StoragePermissionSet;-><init>(Ljava/lang/String;ILjava/util/List;Ljava/lang/Class;)V
+SPLcom/ichi2/anki/StoragePermissionSet;->getPermissions()Ljava/util/List;
+SPLcom/ichi2/anki/StoragePermissionSet;->hasRequiredPermissions(Landroid/content/Context;)Z
+Lcom/ichi2/anki/StoragePermissionSet$Creator;
+SPLcom/ichi2/anki/StoragePermissionSet$Creator;-><init>()V
+Lcom/ichi2/anki/StudyOptionsFragment;
+SPLcom/ichi2/anki/StudyOptionsFragment;-><clinit>()V
+Lcom/ichi2/anki/StudyOptionsFragment$Companion;
+SPLcom/ichi2/anki/StudyOptionsFragment$Companion;-><init>()V
+SPLcom/ichi2/anki/StudyOptionsFragment$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/StudyOptionsFragment$Companion;->registerStudyOptionsAddEditReminderHandler(Landroidx/fragment/app/FragmentActivity;Lkotlin/jvm/functions/Function1;)V
+SPLcom/ichi2/anki/StudyOptionsFragment$Companion;->registerStudyOptionsStudyHandler(Landroidx/fragment/app/FragmentActivity;Lkotlin/jvm/functions/Function0;)V
+Lcom/ichi2/anki/StudyOptionsFragment$Companion$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/StudyOptionsFragment$Companion$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/functions/Function0;)V
+Lcom/ichi2/anki/StudyOptionsFragment$Companion$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/StudyOptionsFragment$Companion$$ExternalSyntheticLambda1;-><init>(Lkotlin/jvm/functions/Function1;)V
 Lcom/ichi2/anki/SyncActionProvider;
+SPLcom/ichi2/anki/SyncActionProvider;-><clinit>()V
 SPLcom/ichi2/anki/SyncActionProvider;-><init>(Landroid/content/Context;)V
 SPLcom/ichi2/anki/SyncActionProvider;->getIcon()Landroid/graphics/drawable/Drawable;
 SPLcom/ichi2/anki/SyncActionProvider;->onCreateActionView(Landroid/view/MenuItem;)Landroid/view/View;
@@ -8403,30 +9478,49 @@ SPLcom/ichi2/anki/SyncActionProvider;->setTooltipText(Ljava/lang/CharSequence;)V
 Lcom/ichi2/anki/SyncActionProvider$$ExternalSyntheticLambda0;
 SPLcom/ichi2/anki/SyncActionProvider$$ExternalSyntheticLambda0;-><init>(Landroid/view/MenuItem;Lcom/ichi2/anki/SyncActionProvider;)V
 Lcom/ichi2/anki/SyncKt;
+SPLcom/ichi2/anki/SyncKt;-><clinit>()V
 SPLcom/ichi2/anki/SyncKt;->getEndpoint()Ljava/lang/String;
-SPLcom/ichi2/anki/SyncKt;->syncAuth()Lanki/sync/SyncAuth;
+SPLcom/ichi2/anki/SyncKt;->syncAuth()Lcom/ichi2/anki/sync/SyncAuth;
 Lcom/ichi2/anki/TtsVoices;
 SPLcom/ichi2/anki/TtsVoices;-><clinit>()V
 SPLcom/ichi2/anki/TtsVoices;-><init>()V
-SPLcom/ichi2/anki/TtsVoices;->access$getAvailableLocaleData$p()Ljava/util/List;
-SPLcom/ichi2/anki/TtsVoices;->access$loadTtsVoicesData(Lcom/ichi2/anki/TtsVoices;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/TtsVoices;->access$getAvailableVoices$p()Ljava/util/List;
+SPLcom/ichi2/anki/TtsVoices;->access$setAvailableVoices$p(Ljava/util/List;)V
 SPLcom/ichi2/anki/TtsVoices;->access$setBuildLocalesJob$p(Lkotlinx/coroutines/Job;)V
 SPLcom/ichi2/anki/TtsVoices;->access$setTtsEngine$p(Ljava/lang/String;)V
-SPLcom/ichi2/anki/TtsVoices;->createTts(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/TtsVoices;->createTts(Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/TtsVoices;->launchBuildLocalesJob()V
-SPLcom/ichi2/anki/TtsVoices;->loadTtsVoicesData(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/TtsVoices;->loadVoices$AnkiDroid(Lkotlinx/coroutines/CompletableDeferred;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/TtsVoices;->loadVoicesFromEngines$AnkiDroid(Ljava/util/List;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/TtsVoices;->readLocales(Landroid/speech/tts/TextToSpeech;)Ljava/util/List;
+Lcom/ichi2/anki/TtsVoices$EngineLocales;
+SPLcom/ichi2/anki/TtsVoices$EngineLocales;-><clinit>()V
+SPLcom/ichi2/anki/TtsVoices$EngineLocales;-><init>(Ljava/lang/String;Ljava/util/List;)V
 Lcom/ichi2/anki/TtsVoices$createTts$2$1;
 SPLcom/ichi2/anki/TtsVoices$createTts$2$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;)V
-Lcom/ichi2/anki/TtsVoices$createTts$2$2;
-SPLcom/ichi2/anki/TtsVoices$createTts$2$2;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlinx/coroutines/CancellableContinuation;)V
-SPLcom/ichi2/anki/TtsVoices$createTts$2$2;->onInit(I)V
+Lcom/ichi2/anki/TtsVoices$createTts$2$onInit$1;
+SPLcom/ichi2/anki/TtsVoices$createTts$2$onInit$1;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlinx/coroutines/CancellableContinuation;)V
+SPLcom/ichi2/anki/TtsVoices$createTts$2$onInit$1;->onInit(I)V
 Lcom/ichi2/anki/TtsVoices$launchBuildLocalesJob$1;
-SPLcom/ichi2/anki/TtsVoices$launchBuildLocalesJob$1;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/TtsVoices$launchBuildLocalesJob$1;-><init>(Lkotlinx/coroutines/CompletableDeferred;Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/TtsVoices$launchBuildLocalesJob$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 SPLcom/ichi2/anki/TtsVoices$launchBuildLocalesJob$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
-Lcom/ichi2/anki/TtsVoices$loadTtsVoicesData$1;
-SPLcom/ichi2/anki/TtsVoices$loadTtsVoicesData$1;-><init>(Lcom/ichi2/anki/TtsVoices;Lkotlin/coroutines/Continuation;)V
-SPLcom/ichi2/anki/TtsVoices$loadTtsVoicesData$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/TtsVoices$launchBuildLocalesJob$1$1;
+SPLcom/ichi2/anki/TtsVoices$launchBuildLocalesJob$1$1;-><init>(Ljava/lang/Object;)V
+SPLcom/ichi2/anki/TtsVoices$launchBuildLocalesJob$1$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/TtsVoices$launchBuildLocalesJob$1$1;->invoke(Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/TtsVoices$loadVoices$1;
+SPLcom/ichi2/anki/TtsVoices$loadVoices$1;-><init>(Lcom/ichi2/anki/TtsVoices;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/TtsVoices$loadVoices$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/TtsVoices$loadVoices$2;
+SPLcom/ichi2/anki/TtsVoices$loadVoices$2;-><init>(Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/TtsVoices$loadVoices$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/TtsVoices$loadVoices$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/TtsVoices$loadVoices$2;->invoke(Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/TtsVoices$loadVoices$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/TtsVoices$loadVoicesFromEngines$1;
+SPLcom/ichi2/anki/TtsVoices$loadVoicesFromEngines$1;-><init>(Lcom/ichi2/anki/TtsVoices;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/TtsVoices$loadVoicesFromEngines$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/TtsVoicesFieldFilter;
 SPLcom/ichi2/anki/TtsVoicesFieldFilter;-><clinit>()V
 SPLcom/ichi2/anki/TtsVoicesFieldFilter;-><init>()V
@@ -8437,32 +9531,62 @@ SPLcom/ichi2/anki/TtsVoicesFieldFilter$Companion;->ensureApplied()V
 Lcom/ichi2/anki/TtsVoicesKt;
 SPLcom/ichi2/anki/TtsVoicesKt;->toTtsVoice(Landroid/speech/tts/Voice;Ljava/lang/String;)Lcom/ichi2/anki/AndroidTtsVoice;
 Lcom/ichi2/anki/WhiteboardMultiTouchMethods;
+Lcom/ichi2/anki/analytics/AnalyticsConstants;
+SPLcom/ichi2/anki/analytics/AnalyticsConstants;-><clinit>()V
+SPLcom/ichi2/anki/analytics/AnalyticsConstants;-><init>()V
+SPLcom/ichi2/anki/analytics/AnalyticsConstants;->getReportablePrefKeys()Ljava/util/Set;
+Lcom/ichi2/anki/analytics/AnalyticsExceptionHandler;
+SPLcom/ichi2/anki/analytics/AnalyticsExceptionHandler;-><clinit>()V
+SPLcom/ichi2/anki/analytics/AnalyticsExceptionHandler;-><init>(Ljava/lang/Thread$UncaughtExceptionHandler;Lkotlin/jvm/functions/Function2;)V
+Lcom/ichi2/anki/analytics/AnalyticsExceptionHandler$Companion;
+SPLcom/ichi2/anki/analytics/AnalyticsExceptionHandler$Companion;-><init>()V
+SPLcom/ichi2/anki/analytics/AnalyticsExceptionHandler$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/analytics/AnalyticsExceptionHandler$Companion;->install(Lkotlin/jvm/functions/Function2;)V
+Lcom/ichi2/anki/analytics/AnalyticsSamplePercentage;
+SPLcom/ichi2/anki/analytics/AnalyticsSamplePercentage;-><clinit>()V
+SPLcom/ichi2/anki/analytics/AnalyticsSamplePercentage;->access$getUninitialized$cp()I
+SPLcom/ichi2/anki/analytics/AnalyticsSamplePercentage;->constructor-impl(I)I
+SPLcom/ichi2/anki/analytics/AnalyticsSamplePercentage;->isInitialized-impl(I)Z
+Lcom/ichi2/anki/analytics/AnalyticsSamplePercentage$Companion;
+SPLcom/ichi2/anki/analytics/AnalyticsSamplePercentage$Companion;-><init>()V
+SPLcom/ichi2/anki/analytics/AnalyticsSamplePercentage$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/analytics/AnalyticsSamplePercentage$Companion;->getUninitialized--UvX6DQ()I
 Lcom/ichi2/anki/analytics/AnkiDroidCrashReportDialog;
-Lcom/ichi2/anki/analytics/UsageAnalytics;
-SPLcom/ichi2/anki/analytics/UsageAnalytics;->$r8$lambda$zAhSKf_JYwU6Jy5QWJJPNKyvXVM(Landroid/content/SharedPreferences;Ljava/lang/String;)V
-SPLcom/ichi2/anki/analytics/UsageAnalytics;-><clinit>()V
-SPLcom/ichi2/anki/analytics/UsageAnalytics;-><init>()V
-SPLcom/ichi2/anki/analytics/UsageAnalytics;->canGetDefaultUserAgent$AnkiDroid_playNonMinifiedRelease()Z
-SPLcom/ichi2/anki/analytics/UsageAnalytics;->getAnalyticsSamplePercentage(Landroid/content/Context;)I
-SPLcom/ichi2/anki/analytics/UsageAnalytics;->getAnalyticsTag(Landroid/content/Context;)Ljava/lang/String;
-SPLcom/ichi2/anki/analytics/UsageAnalytics;->getOptIn()Z
-SPLcom/ichi2/anki/analytics/UsageAnalytics;->initialize$lambda$0(Landroid/content/SharedPreferences;Ljava/lang/String;)V
-SPLcom/ichi2/anki/analytics/UsageAnalytics;->initialize(Landroid/content/Context;)Lcom/brsanthu/googleanalytics/GoogleAnalytics;
-SPLcom/ichi2/anki/analytics/UsageAnalytics;->initializePrefKeys(Landroid/content/Context;)V
-SPLcom/ichi2/anki/analytics/UsageAnalytics;->installDefaultExceptionHandler()V
-SPLcom/ichi2/anki/analytics/UsageAnalytics;->sendAnalyticsScreenView(Ljava/lang/Object;)V
-SPLcom/ichi2/anki/analytics/UsageAnalytics;->sendAnalyticsScreenView(Ljava/lang/String;)V
-SPLcom/ichi2/anki/analytics/UsageAnalytics;->setOptIn(Z)V
-SPLcom/ichi2/anki/analytics/UsageAnalytics;->setPreferencesWhoseChangesShouldBeReported(Ljava/util/Set;)V
-Lcom/ichi2/anki/analytics/UsageAnalytics$$ExternalSyntheticLambda0;
-SPLcom/ichi2/anki/analytics/UsageAnalytics$$ExternalSyntheticLambda0;-><init>()V
-Lcom/ichi2/anki/analytics/UsageAnalytics$$ExternalSyntheticLambda1;
-SPLcom/ichi2/anki/analytics/UsageAnalytics$$ExternalSyntheticLambda1;-><init>()V
-SPLcom/ichi2/anki/analytics/UsageAnalytics$$ExternalSyntheticLambda1;->onSharedPreferenceChanged(Landroid/content/SharedPreferences;Ljava/lang/String;)V
-Lcom/ichi2/anki/analytics/UsageAnalytics$AnalyticsLoggingExceptionHandler;
-Lcom/ichi2/anki/analytics/UsageAnalytics$AndroidDefaultRequest;
-SPLcom/ichi2/anki/analytics/UsageAnalytics$AndroidDefaultRequest;-><init>()V
-SPLcom/ichi2/anki/analytics/UsageAnalytics$AndroidDefaultRequest;->setAndroidRequestParameters(Landroid/content/Context;)Lcom/brsanthu/googleanalytics/request/DefaultRequest;
+Lcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;-><clinit>()V
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;-><init>()V
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;->configure$lambda$0(Lcom/criticalay/GoogleAnalyticsBuilder;)Lkotlin/Unit;
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;->configure(Landroid/content/Context;)V
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;->getAnalyticsSamplePercentage(Landroid/content/Context;)I
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;->handlePreferences(Landroid/content/Context;)V
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;->initialize(Landroid/content/Context;)V
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;->initializePrefKeys(Landroid/content/Context;)V
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;->sendAnalyticsScreenView(Ljava/lang/String;)V
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;->sharedPrefsListener$lambda$0(Landroid/content/SharedPreferences;Ljava/lang/String;)V
+Lcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$$ExternalSyntheticLambda1;-><init>()V
+Lcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$$ExternalSyntheticLambda2;-><init>()V
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$$ExternalSyntheticLambda2;->onSharedPreferenceChanged(Landroid/content/SharedPreferences;Ljava/lang/String;)V
+Lcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$initialize$1;
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$initialize$1;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/analytics/AnkiDroidUsageAnalyticsKt;
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalyticsKt;->initializeAnalytics(Landroid/app/Application;)V
+Lcom/ichi2/anki/analytics/PreviousAnrReporterKt;
+SPLcom/ichi2/anki/analytics/PreviousAnrReporterKt;->launchPreviousAnrReporting(Lcom/ichi2/anki/AnkiDroidApp;)V
+SPLcom/ichi2/anki/analytics/PreviousAnrReporterKt;->reportPreviousAnr(Lcom/ichi2/anki/AnkiDroidApp;)V
+Lcom/ichi2/anki/analytics/PreviousAnrReporterKt$launchPreviousAnrReporting$1;
+SPLcom/ichi2/anki/analytics/PreviousAnrReporterKt$launchPreviousAnrReporting$1;-><init>(Lcom/ichi2/anki/AnkiDroidApp;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/analytics/PreviousAnrReporterKt$launchPreviousAnrReporting$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/analytics/PreviousAnrReporterKt$launchPreviousAnrReporting$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/analytics/SharedPreferencesAnrReportState;
+SPLcom/ichi2/anki/analytics/SharedPreferencesAnrReportState;-><clinit>()V
+SPLcom/ichi2/anki/analytics/SharedPreferencesAnrReportState;-><init>(Landroid/content/Context;)V
+SPLcom/ichi2/anki/analytics/SharedPreferencesAnrReportState;->getLastProcessedTimestamp()J
+SPLcom/ichi2/anki/analytics/SharedPreferencesAnrReportState;->getPreferences()Landroid/content/SharedPreferences;
 Lcom/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallbackKt;
 SPLcom/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallbackKt;->$r8$lambda$sbRJqOl07LNxTzNXor0XAVnGA1Q(Lcom/ichi2/anki/AnkiActivity;Lcom/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallbackKt$exitViaDoubleTapBackCallback$1;Landroid/content/SharedPreferences;Ljava/lang/String;)V
 SPLcom/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallbackKt;->exitViaDoubleTapBackCallback$lambda$0$0(Lcom/ichi2/anki/AnkiActivity;Lcom/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallbackKt$exitViaDoubleTapBackCallback$1;Landroid/content/SharedPreferences;Ljava/lang/String;)V
@@ -8475,15 +9599,46 @@ SPLcom/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallbackKt$exitViaDo
 SPLcom/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallbackKt$exitViaDoubleTapBackCallback$1;->getStrongListenerReference()Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
 SPLcom/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallbackKt$exitViaDoubleTapBackCallback$1;->setStrongListenerReference(Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;)V
 Lcom/ichi2/anki/android/input/ShortcutGroupProvider;
-Lcom/ichi2/anki/backend/BackendDBUtilsKt;
-SPLcom/ichi2/anki/backend/BackendDBUtilsKt;->createDatabaseUsingRustBackend(Lnet/ankiweb/rsdroid/Backend;)Lcom/ichi2/anki/libanki/DB;
+Lcom/ichi2/anki/android/view/ViewLocation;
+SPLcom/ichi2/anki/android/view/ViewLocation;->constructor-impl([I)[I
+SPLcom/ichi2/anki/android/view/ViewLocation;->getY-impl([I)I
+Lcom/ichi2/anki/android/view/ViewLocationKt;
+SPLcom/ichi2/anki/android/view/ViewLocationKt;->locationInWindow$default(Landroid/view/View;[IILjava/lang/Object;)[I
+SPLcom/ichi2/anki/android/view/ViewLocationKt;->locationInWindow(Landroid/view/View;[I)[I
+SPLcom/ichi2/anki/android/view/ViewLocationKt;->locationOnScreen(Landroid/view/View;[I)[I
+Lcom/ichi2/anki/ankicommon/R$string;
+Lcom/ichi2/anki/backend/AnkiBackendLanguage;
+SPLcom/ichi2/anki/backend/AnkiBackendLanguage;-><clinit>()V
+SPLcom/ichi2/anki/backend/AnkiBackendLanguage;->access$constructor-impl(Ljava/lang/String;)Ljava/lang/String;
+SPLcom/ichi2/anki/backend/AnkiBackendLanguage;->access$getLANGUAGE_IDENTIFIER$cp()Lkotlin/text/Regex;
+SPLcom/ichi2/anki/backend/AnkiBackendLanguage;->constructor-impl(Ljava/lang/String;)Ljava/lang/String;
+Lcom/ichi2/anki/backend/AnkiBackendLanguage$Companion;
+SPLcom/ichi2/anki/backend/AnkiBackendLanguage$Companion;-><init>()V
+SPLcom/ichi2/anki/backend/AnkiBackendLanguage$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/backend/AnkiBackendLanguage$Companion;->fromIdentifier-hHuSVNI(Ljava/lang/String;)Ljava/lang/String;
+SPLcom/ichi2/anki/backend/AnkiBackendLanguage$Companion;->fromLanguageTag-hHuSVNI(Ljava/lang/String;)Ljava/lang/String;
+Lcom/ichi2/anki/backend/BackendDatabaseKt;
+SPLcom/ichi2/anki/backend/BackendDatabaseKt;->createDatabaseUsingRustBackend(Lnet/ankiweb/rsdroid/Backend;)Lcom/ichi2/anki/libanki/DB;
+Lcom/ichi2/anki/backend/BackendLocales;
+SPLcom/ichi2/anki/backend/BackendLocales;-><clinit>()V
+SPLcom/ichi2/anki/backend/BackendLocales;-><init>(Ljava/util/List;)V
+SPLcom/ichi2/anki/backend/BackendLocales;->getAll()Ljava/util/List;
+Lcom/ichi2/anki/backend/BackendLocalesKt;
+SPLcom/ichi2/anki/backend/BackendLocalesKt;->getLocales(Lnet/ankiweb/rsdroid/Backend;)Lcom/ichi2/anki/backend/BackendLocales;
+Lcom/ichi2/anki/browser/BrowserDestinationKt;
+SPLcom/ichi2/anki/browser/BrowserDestinationKt;->toIntent(Lcom/ichi2/anki/common/destinations/BrowserDestination;Landroid/content/Context;)Landroid/content/Intent;
 Lcom/ichi2/anki/browser/CardBrowserColumn;
 SPLcom/ichi2/anki/browser/CardBrowserColumn;->$values()[Lcom/ichi2/anki/browser/CardBrowserColumn;
 SPLcom/ichi2/anki/browser/CardBrowserColumn;-><clinit>()V
-SPLcom/ichi2/anki/browser/CardBrowserColumn;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+SPLcom/ichi2/anki/browser/CardBrowserColumn;-><init>(Ljava/lang/String;ILjava/lang/String;Lcom/ichi2/anki/browser/ColumnType;Lcom/ichi2/anki/browser/ColumnType;)V
+SPLcom/ichi2/anki/browser/CardBrowserColumn;-><init>(Ljava/lang/String;ILjava/lang/String;Lcom/ichi2/anki/browser/ColumnType;Lcom/ichi2/anki/browser/ColumnType;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 Lcom/ichi2/anki/browser/CardBrowserColumn$Companion;
 SPLcom/ichi2/anki/browser/CardBrowserColumn$Companion;-><init>()V
 SPLcom/ichi2/anki/browser/CardBrowserColumn$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/browser/ColumnType;
+SPLcom/ichi2/anki/browser/ColumnType;->$values()[Lcom/ichi2/anki/browser/ColumnType;
+SPLcom/ichi2/anki/browser/ColumnType;-><clinit>()V
+SPLcom/ichi2/anki/browser/ColumnType;-><init>(Ljava/lang/String;I)V
 Lcom/ichi2/anki/browser/LastDeckIdRepository;
 Lcom/ichi2/anki/browser/SharedPreferencesLastDeckIdRepository;
 SPLcom/ichi2/anki/browser/SharedPreferencesLastDeckIdRepository;-><clinit>()V
@@ -8500,14 +9655,183 @@ SPLcom/ichi2/anki/cardviewer/MediaErrorHandler$Companion;-><init>()V
 SPLcom/ichi2/anki/cardviewer/MediaErrorHandler$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 Lcom/ichi2/anki/cardviewer/MediaErrorListener;
 Lcom/ichi2/anki/cardviewer/ViewerCommand$CommandProcessor;
+Lcom/ichi2/anki/common/analytics/Analytics;
+SPLcom/ichi2/anki/common/analytics/Analytics;-><clinit>()V
+SPLcom/ichi2/anki/common/analytics/Analytics;-><init>()V
+SPLcom/ichi2/anki/common/analytics/Analytics;->sendAnalyticsScreenView(Ljava/lang/String;)V
+SPLcom/ichi2/anki/common/analytics/Analytics;->setAnalytics(Lcom/ichi2/anki/common/analytics/UsageAnalytics;)V
+Lcom/ichi2/anki/common/analytics/Analytics$Unregistered;
+SPLcom/ichi2/anki/common/analytics/Analytics$Unregistered;-><clinit>()V
+SPLcom/ichi2/anki/common/analytics/Analytics$Unregistered;-><init>()V
+Lcom/ichi2/anki/common/analytics/UsageAnalytics;
+SPLcom/ichi2/anki/common/analytics/UsageAnalytics;-><clinit>()V
+Lcom/ichi2/anki/common/analytics/UsageAnalytics$Companion;
+SPLcom/ichi2/anki/common/analytics/UsageAnalytics$Companion;-><clinit>()V
+SPLcom/ichi2/anki/common/analytics/UsageAnalytics$Companion;-><init>()V
+Lcom/ichi2/anki/common/android/AdaptionUtil;
+SPLcom/ichi2/anki/common/android/AdaptionUtil;-><clinit>()V
+SPLcom/ichi2/anki/common/android/AdaptionUtil;-><init>()V
+SPLcom/ichi2/anki/common/android/AdaptionUtil;->isRunningUnderFirebaseTestLab()Z
+SPLcom/ichi2/anki/common/android/AdaptionUtil;->isRunningUnderFirebaseTestLab(Landroid/content/ContentResolver;)Z
+SPLcom/ichi2/anki/common/android/AdaptionUtil;->isUserATestClient()Z
+Lcom/ichi2/anki/common/android/AdaptionUtil$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/common/android/AdaptionUtil$$ExternalSyntheticLambda0;-><init>()V
+Lcom/ichi2/anki/common/android/AdaptionUtil$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/common/android/AdaptionUtil$$ExternalSyntheticLambda1;-><init>()V
+Lcom/ichi2/anki/common/android/AlarmManagement;
+SPLcom/ichi2/anki/common/android/AlarmManagement;-><clinit>()V
+SPLcom/ichi2/anki/common/android/AlarmManagement;-><init>()V
+SPLcom/ichi2/anki/common/android/AlarmManagement;->getWINDOW_LENGTH_MS()J
+SPLcom/ichi2/anki/common/android/AlarmManagement;->useAlarmManager$default(Lcom/ichi2/anki/common/android/AlarmManagement;Landroid/content/Context;ZLkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+SPLcom/ichi2/anki/common/android/AlarmManagement;->useAlarmManager(Landroid/content/Context;ZLkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)V
+Lcom/ichi2/anki/common/android/AlarmManagement$useAlarmManager$1;
+SPLcom/ichi2/anki/common/android/AlarmManagement$useAlarmManager$1;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/android/Animations;
+SPLcom/ichi2/anki/common/android/Animations;-><clinit>()V
+SPLcom/ichi2/anki/common/android/Animations;-><init>()V
+SPLcom/ichi2/anki/common/android/Animations;->areAnimationsEnabled(Landroid/content/Context;)Z
+SPLcom/ichi2/anki/common/android/Animations;->areSystemAnimationsEnabled(Landroid/content/Context;)Z
+SPLcom/ichi2/anki/common/android/Animations;->setPreferencesProvider(Landroid/app/Application;Lkotlin/jvm/functions/Function1;)V
+Lcom/ichi2/anki/common/android/AnimationsKt;
+SPLcom/ichi2/anki/common/android/AnimationsKt;->animationDisabled(Landroidx/fragment/app/FragmentActivity;)Z
+SPLcom/ichi2/anki/common/android/AnimationsKt;->animationEnabled(Landroidx/fragment/app/FragmentActivity;)Z
+Lcom/ichi2/anki/common/android/AnkiBroadcastReceiver;
+SPLcom/ichi2/anki/common/android/AnkiBroadcastReceiver;-><clinit>()V
+SPLcom/ichi2/anki/common/android/AnkiBroadcastReceiver;-><init>()V
+SPLcom/ichi2/anki/common/android/AnkiBroadcastReceiver;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V
+Lcom/ichi2/anki/common/android/AppLocaleKt;
+SPLcom/ichi2/anki/common/android/AppLocaleKt;->getCurrentLocaleTag()Ljava/lang/String;
+SPLcom/ichi2/anki/common/android/AppLocaleKt;->withAppLocale(Landroid/content/Context;)Landroid/content/Context;
+Lcom/ichi2/anki/common/android/ApplicationContextInitializer;
+SPLcom/ichi2/anki/common/android/ApplicationContextInitializer;-><clinit>()V
+SPLcom/ichi2/anki/common/android/ApplicationContextInitializer;-><init>()V
+SPLcom/ichi2/anki/common/android/ApplicationContextInitializer;->getInstanceOrNull()Landroid/content/Context;
+SPLcom/ichi2/anki/common/android/ApplicationContextInitializer;->setInstance(Landroid/app/Application;)V
+Lcom/ichi2/anki/common/android/ApplicationContextInitializerKt;
+SPLcom/ichi2/anki/common/android/ApplicationContextInitializerKt;->access$getAppContext$p()Landroid/content/Context;
+SPLcom/ichi2/anki/common/android/ApplicationContextInitializerKt;->access$setAppContext$p(Landroid/content/Context;)V
+SPLcom/ichi2/anki/common/android/ApplicationContextInitializerKt;->getAppContext()Landroid/content/Context;
+Lcom/ichi2/anki/common/android/R$attr;
+Lcom/ichi2/anki/common/android/R$color;
+Lcom/ichi2/anki/common/android/R$drawable;
+Lcom/ichi2/anki/common/android/R$string;
+Lcom/ichi2/anki/common/android/R$style;
+Lcom/ichi2/anki/common/android/themes/XiaomiKt;
+SPLcom/ichi2/anki/common/android/themes/XiaomiKt;->disableXiaomiForceDarkMode(Landroid/content/Context;)V
+Lcom/ichi2/anki/common/coroutines/ApplicationScopeKt;
+SPLcom/ichi2/anki/common/coroutines/ApplicationScopeKt;-><clinit>()V
+SPLcom/ichi2/anki/common/coroutines/ApplicationScopeKt;->applicationScope_delegate$lambda$0()Lkotlinx/coroutines/CoroutineScope;
+SPLcom/ichi2/anki/common/coroutines/ApplicationScopeKt;->getApplicationScope()Lkotlinx/coroutines/CoroutineScope;
+Lcom/ichi2/anki/common/coroutines/ApplicationScopeKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/common/coroutines/ApplicationScopeKt$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/common/coroutines/ApplicationScopeKt$$ExternalSyntheticLambda0;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/common/crashreporting/CrashReportService;
+SPLcom/ichi2/anki/common/crashreporting/CrashReportService;-><clinit>()V
+SPLcom/ichi2/anki/common/crashreporting/CrashReportService;-><init>()V
+SPLcom/ichi2/anki/common/crashreporting/CrashReportService;->isEnabled(Landroid/content/Context;Z)Z
+SPLcom/ichi2/anki/common/crashreporting/CrashReportService;->setReporter(Lcom/ichi2/anki/common/crashreporting/CrashReporter;)V
+Lcom/ichi2/anki/common/crashreporting/CrashReportServiceKt;
+SPLcom/ichi2/anki/common/crashreporting/CrashReportServiceKt;->runCatchingWithReport(Ljava/lang/String;ZLkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+Lcom/ichi2/anki/common/crashreporting/CrashReporter;
+Lcom/ichi2/anki/common/crashreporting/UninitializedCrashReporter;
+SPLcom/ichi2/anki/common/crashreporting/UninitializedCrashReporter;-><clinit>()V
+SPLcom/ichi2/anki/common/crashreporting/UninitializedCrashReporter;-><init>()V
+Lcom/ichi2/anki/common/destinations/BrowserDestination;
+SPLcom/ichi2/anki/common/destinations/BrowserDestination;-><clinit>()V
+SPLcom/ichi2/anki/common/destinations/BrowserDestination;-><init>()V
+SPLcom/ichi2/anki/common/destinations/BrowserDestination;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/common/destinations/BrowserDestination$Open;
+SPLcom/ichi2/anki/common/destinations/BrowserDestination$Open;-><clinit>()V
+SPLcom/ichi2/anki/common/destinations/BrowserDestination$Open;-><init>()V
+Lcom/ichi2/anki/common/destinations/CardInfoDestination;
+Lcom/ichi2/anki/common/destinations/DeferredNavigation;
+SPLcom/ichi2/anki/common/destinations/DeferredNavigation;-><clinit>()V
+Lcom/ichi2/anki/common/destinations/DeferredNavigation$Companion;
+SPLcom/ichi2/anki/common/destinations/DeferredNavigation$Companion;-><clinit>()V
+SPLcom/ichi2/anki/common/destinations/DeferredNavigation$Companion;-><init>()V
+Lcom/ichi2/anki/common/destinations/Destination;
+SPLcom/ichi2/anki/common/destinations/Destination;-><clinit>()V
+SPLcom/ichi2/anki/common/destinations/Destination;-><init>()V
+SPLcom/ichi2/anki/common/destinations/Destination;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/common/destinations/Navigator;
+SPLcom/ichi2/anki/common/destinations/Navigator;-><clinit>()V
+Lcom/ichi2/anki/common/destinations/Navigator$Companion;
+SPLcom/ichi2/anki/common/destinations/Navigator$Companion;-><clinit>()V
+SPLcom/ichi2/anki/common/destinations/Navigator$Companion;-><init>()V
+SPLcom/ichi2/anki/common/destinations/Navigator$Companion;->register(Lcom/ichi2/anki/common/destinations/Navigator;)V
+Lcom/ichi2/anki/common/destinations/NavigatorKt;
+SPLcom/ichi2/anki/common/destinations/NavigatorKt;->access$setNavigatorInstance$p(Lcom/ichi2/anki/common/destinations/Navigator;)V
+SPLcom/ichi2/anki/common/destinations/NavigatorKt;->toIntent(Lcom/ichi2/anki/common/destinations/DeferredNavigation;Lcom/ichi2/anki/common/destinations/Destination;)Landroid/content/Intent;
+Lcom/ichi2/anki/common/destinations/NoteEditorDestination;
+SPLcom/ichi2/anki/common/destinations/NoteEditorDestination;-><clinit>()V
+SPLcom/ichi2/anki/common/destinations/NoteEditorDestination;-><init>()V
+SPLcom/ichi2/anki/common/destinations/NoteEditorDestination;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/common/destinations/NoteEditorDestination$AddNote;
+SPLcom/ichi2/anki/common/destinations/NoteEditorDestination$AddNote;-><clinit>()V
+SPLcom/ichi2/anki/common/destinations/NoteEditorDestination$AddNote;-><init>(Ljava/lang/Long;)V
+SPLcom/ichi2/anki/common/destinations/NoteEditorDestination$AddNote;-><init>(Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/common/destinations/NoteEditorDestination$AddNote;->getDeckId()Ljava/lang/Long;
+Lcom/ichi2/anki/common/json/JSONContainerKt;
+SPLcom/ichi2/anki/common/json/JSONContainerKt;->jsonArray(Lcom/ichi2/anki/common/json/JSONObjectHolder;Ljava/lang/String;)Lcom/ichi2/anki/common/json/JsonArrayDelegate;
+SPLcom/ichi2/anki/common/json/JSONContainerKt;->jsonBoolean(Lcom/ichi2/anki/common/json/JSONObjectHolder;Ljava/lang/String;)Lcom/ichi2/anki/common/json/JsonBooleanDelegate;
+SPLcom/ichi2/anki/common/json/JSONContainerKt;->jsonBoolean(Lcom/ichi2/anki/common/json/JSONObjectHolder;Ljava/lang/String;Z)Lcom/ichi2/anki/common/json/JsonBooleanDelegate;
+SPLcom/ichi2/anki/common/json/JSONContainerKt;->jsonLong(Lcom/ichi2/anki/common/json/JSONObjectHolder;Ljava/lang/String;)Lcom/ichi2/anki/common/json/JsonLongDelegate;
+SPLcom/ichi2/anki/common/json/JSONContainerKt;->jsonString(Lcom/ichi2/anki/common/json/JSONObjectHolder;Ljava/lang/String;)Lcom/ichi2/anki/common/json/JsonStringDelegate;
+SPLcom/ichi2/anki/common/json/JSONContainerKt;->jsonString(Lcom/ichi2/anki/common/json/JSONObjectHolder;Ljava/lang/String;Ljava/lang/String;)Lcom/ichi2/anki/common/json/JsonStringDelegate;
+Lcom/ichi2/anki/common/json/JSONObjectHolder;
+Lcom/ichi2/anki/common/json/JsonArrayDelegate;
+SPLcom/ichi2/anki/common/json/JsonArrayDelegate;-><init>(Lorg/json/JSONObject;Ljava/lang/String;)V
+Lcom/ichi2/anki/common/json/JsonBooleanDelegate;
+SPLcom/ichi2/anki/common/json/JsonBooleanDelegate;-><init>(Lorg/json/JSONObject;Ljava/lang/String;Ljava/lang/Boolean;)V
+SPLcom/ichi2/anki/common/json/JsonBooleanDelegate;-><init>(Lorg/json/JSONObject;Ljava/lang/String;Ljava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/common/json/JsonLongDelegate;
+SPLcom/ichi2/anki/common/json/JsonLongDelegate;-><init>(Lorg/json/JSONObject;Ljava/lang/String;Ljava/lang/Long;)V
+SPLcom/ichi2/anki/common/json/JsonLongDelegate;-><init>(Lorg/json/JSONObject;Ljava/lang/String;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/common/json/JsonLongDelegate;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)J
+Lcom/ichi2/anki/common/json/JsonStringDelegate;
+SPLcom/ichi2/anki/common/json/JsonStringDelegate;-><init>(Lorg/json/JSONObject;Ljava/lang/String;Ljava/lang/String;)V
+SPLcom/ichi2/anki/common/json/JsonStringDelegate;-><init>(Lorg/json/JSONObject;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/common/permissions/PermissionsKt;
+SPLcom/ichi2/anki/common/permissions/PermissionsKt;->hasAllPermissions(Landroid/content/Context;Ljava/util/Collection;)Z
+SPLcom/ichi2/anki/common/permissions/PermissionsKt;->hasPermission(Landroid/content/Context;Ljava/lang/String;)Z
+Lcom/ichi2/anki/common/permissions/StoragePermissionsKt;
+SPLcom/ichi2/anki/common/permissions/StoragePermissionsKt;->hasLegacyStorageAccessPermission(Landroid/content/Context;)Z
+SPLcom/ichi2/anki/common/permissions/StoragePermissionsKt;->hasStorageReadAccessPermission(Landroid/content/Context;)Z
+Lcom/ichi2/anki/common/preferences/AnimationPreferences;
+Lcom/ichi2/anki/common/preferences/NotificationPreferences;
+Lcom/ichi2/anki/common/preferences/SharedPreferencesTestHook;
+SPLcom/ichi2/anki/common/preferences/SharedPreferencesTestHook;-><clinit>()V
+SPLcom/ichi2/anki/common/preferences/SharedPreferencesTestHook;-><init>()V
+SPLcom/ichi2/anki/common/preferences/SharedPreferencesTestHook;->getOverride()Lkotlin/jvm/functions/Function1;
+Lcom/ichi2/anki/common/preferences/SharedPrefsKt;
+SPLcom/ichi2/anki/common/preferences/SharedPrefsKt;->sharedPrefs(Landroid/content/Context;)Landroid/content/SharedPreferences;
+Lcom/ichi2/anki/common/storage/CollectionHelper;
+SPLcom/ichi2/anki/common/storage/CollectionHelper;-><clinit>()V
+SPLcom/ichi2/anki/common/storage/CollectionHelper;-><init>()V
+SPLcom/ichi2/anki/common/storage/CollectionHelper;->getAppSpecificExternalDirectories(Landroid/content/Context;)Ljava/util/List;
+SPLcom/ichi2/anki/common/storage/CollectionHelper;->getAppSpecificInternalAnkiDroidDirectory(Landroid/content/Context;)Ljava/lang/String;
+SPLcom/ichi2/anki/common/storage/CollectionHelper;->getCurrentAnkiDroidDirectory(Landroid/content/Context;)Ljava/io/File;
+SPLcom/ichi2/anki/common/storage/CollectionHelper;->getCurrentAnkiDroidDirectory(Landroid/content/SharedPreferences;)Ljava/io/File;
+SPLcom/ichi2/anki/common/storage/CollectionHelper;->getStorageDecisionTestOverride()Lcom/ichi2/anki/common/storage/StorageDecision;
+SPLcom/ichi2/anki/common/storage/CollectionHelper;->initializeAnkiDroidDirectory(Ljava/io/File;)V
+SPLcom/ichi2/anki/common/storage/CollectionHelper;->storageDecision(Landroid/content/SharedPreferences;)Lcom/ichi2/anki/common/storage/StorageDecision;
+Lcom/ichi2/anki/common/storage/LegacyStorageKt;
+SPLcom/ichi2/anki/common/storage/LegacyStorageKt;->grantedStoragePermissions(Landroid/content/Context;)Z
+SPLcom/ichi2/anki/common/storage/LegacyStorageKt;->grantedStoragePermissions(Landroid/content/Context;Z)Z
+SPLcom/ichi2/anki/common/storage/LegacyStorageKt;->isLegacyStorage(Landroid/content/Context;)Z
+SPLcom/ichi2/anki/common/storage/LegacyStorageKt;->isLegacyStorage(Landroid/content/Context;Z)Ljava/lang/Boolean;
+SPLcom/ichi2/anki/common/storage/LegacyStorageKt;->isLegacyStorage(Ljava/io/File;Landroid/content/Context;)Z
+Lcom/ichi2/anki/common/storage/StorageDecision;
+Lcom/ichi2/anki/common/storage/StorageDecision$Decided;
+SPLcom/ichi2/anki/common/storage/StorageDecision$Decided;-><clinit>()V
+SPLcom/ichi2/anki/common/storage/StorageDecision$Decided;-><init>()V
+SPLcom/ichi2/anki/common/storage/StorageDecision$Decided;->equals(Ljava/lang/Object;)Z
 Lcom/ichi2/anki/common/time/SystemTime;
 SPLcom/ichi2/anki/common/time/SystemTime;-><init>()V
 SPLcom/ichi2/anki/common/time/SystemTime;->intTimeMS()J
 Lcom/ichi2/anki/common/time/Time;
 SPLcom/ichi2/anki/common/time/Time;-><clinit>()V
 SPLcom/ichi2/anki/common/time/Time;-><init>()V
-SPLcom/ichi2/anki/common/time/Time;->calendar()Ljava/util/Calendar;
-SPLcom/ichi2/anki/common/time/Time;->getCurrentDate()Ljava/util/Date;
 SPLcom/ichi2/anki/common/time/Time;->intTime()J
 Lcom/ichi2/anki/common/time/Time$Companion;
 SPLcom/ichi2/anki/common/time/Time$Companion;-><init>()V
@@ -8516,19 +9840,146 @@ Lcom/ichi2/anki/common/time/TimeManager;
 SPLcom/ichi2/anki/common/time/TimeManager;-><clinit>()V
 SPLcom/ichi2/anki/common/time/TimeManager;-><init>()V
 SPLcom/ichi2/anki/common/time/TimeManager;->getTime()Lcom/ichi2/anki/common/time/Time;
-Lcom/ichi2/anki/common/time/TimeUtilsKt;
-SPLcom/ichi2/anki/common/time/TimeUtilsKt;->getDayStart(Lcom/ichi2/anki/common/time/Time;)J
+Lcom/ichi2/anki/common/ui/TransitionDirection;
+SPLcom/ichi2/anki/common/ui/TransitionDirection;->$values()[Lcom/ichi2/anki/common/ui/TransitionDirection;
+SPLcom/ichi2/anki/common/ui/TransitionDirection;-><clinit>()V
+SPLcom/ichi2/anki/common/ui/TransitionDirection;-><init>(Ljava/lang/String;I)V
+SPLcom/ichi2/anki/common/ui/TransitionDirection;->values()[Lcom/ichi2/anki/common/ui/TransitionDirection;
+Lcom/ichi2/anki/common/ui/TransitionDirection$Creator;
+SPLcom/ichi2/anki/common/ui/TransitionDirection$Creator;-><init>()V
+Lcom/ichi2/anki/common/utils/ConfigProperty;
+SPLcom/ichi2/anki/common/utils/ConfigProperty;-><clinit>()V
+SPLcom/ichi2/anki/common/utils/ConfigProperty;-><init>(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)V
+SPLcom/ichi2/anki/common/utils/ConfigProperty;->getValue(Lcom/ichi2/anki/libanki/Config;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+SPLcom/ichi2/anki/common/utils/ConfigProperty;->mapped$lambda$0(Lkotlin/jvm/functions/Function1;Lcom/ichi2/anki/common/utils/ConfigProperty;Lcom/ichi2/anki/libanki/Config;)Ljava/lang/Object;
+SPLcom/ichi2/anki/common/utils/ConfigProperty;->mapped(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lcom/ichi2/anki/common/utils/ConfigProperty;
+Lcom/ichi2/anki/common/utils/ConfigProperty$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/common/utils/ConfigProperty$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/functions/Function1;Lcom/ichi2/anki/common/utils/ConfigProperty;)V
+SPLcom/ichi2/anki/common/utils/ConfigProperty$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/common/utils/ConfigProperty$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/common/utils/ConfigProperty$$ExternalSyntheticLambda1;-><init>(Lcom/ichi2/anki/common/utils/ConfigProperty;Lkotlin/jvm/functions/Function1;)V
+Lcom/ichi2/anki/common/utils/ConfigPropertyKt;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt;->configProperty(Lanki/config/ConfigKey$Bool;)Lcom/ichi2/anki/common/utils/ConfigProperty;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt;->configProperty(Lanki/config/ConfigKey$String;)Lcom/ichi2/anki/common/utils/ConfigProperty;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt;->orDefault$lambda$0(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt;->orDefault(Lcom/ichi2/anki/common/utils/ConfigProperty;Ljava/lang/Object;)Lcom/ichi2/anki/common/utils/ConfigProperty;
+Lcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda0;-><init>(Ljava/lang/Object;)V
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda1;-><init>()V
+Lcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda2;-><init>(Lanki/config/ConfigKey$String;)V
+Lcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda3;-><init>(Lanki/config/ConfigKey$String;)V
+Lcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda4;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda4;-><init>(Lanki/config/ConfigKey$Bool;)V
+Lcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda5;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda5;-><init>(Lanki/config/ConfigKey$Bool;)V
+Lcom/ichi2/anki/common/utils/Dp;
+SPLcom/ichi2/anki/common/utils/Dp;->constructor-impl(F)F
+SPLcom/ichi2/anki/common/utils/Dp;->toPx-impl(FLandroid/content/Context;)I
+Lcom/ichi2/anki/common/utils/DpKt;
+SPLcom/ichi2/anki/common/utils/DpKt;->access$dpToPx(FLandroid/content/Context;)I
+SPLcom/ichi2/anki/common/utils/DpKt;->dpToPx(FLandroid/content/Context;)I
+SPLcom/ichi2/anki/common/utils/DpKt;->getDp(I)F
+Lcom/ichi2/anki/common/utils/android/HandlerUtils;
+SPLcom/ichi2/anki/common/utils/android/HandlerUtils;-><clinit>()V
+SPLcom/ichi2/anki/common/utils/android/HandlerUtils;-><init>()V
+SPLcom/ichi2/anki/common/utils/android/HandlerUtils;->getDefaultLooper()Landroid/os/Looper;
 Lcom/ichi2/anki/common/utils/android/TestUtilsKt;
+SPLcom/ichi2/anki/common/utils/android/TestUtilsKt;-><clinit>()V
+SPLcom/ichi2/anki/common/utils/android/TestUtilsKt;->isInstrumentationTest()Z
 SPLcom/ichi2/anki/common/utils/android/TestUtilsKt;->isRobolectric()Z
+Lcom/ichi2/anki/common/utils/android/ThemeUtilsKt;
+SPLcom/ichi2/anki/common/utils/android/ThemeUtilsKt;->systemIsInNightMode(Landroid/content/Context;)Z
+Lcom/ichi2/anki/common/utils/android/Threads;
+SPLcom/ichi2/anki/common/utils/android/Threads;-><clinit>()V
+SPLcom/ichi2/anki/common/utils/android/Threads;-><init>()V
+SPLcom/ichi2/anki/common/utils/android/Threads;->isOnMainThread()Z
+Lcom/ichi2/anki/common/utils/ext/ConfigKt;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt;-><clinit>()V
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt;->getFsrsEnabled(Lcom/ichi2/anki/libanki/Config;)Ljava/lang/Boolean;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt;->getSchedulerVersion(Lcom/ichi2/anki/libanki/Config;)J
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda0;-><init>()V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda1;-><init>()V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda2;-><init>()V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda3;-><init>()V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda4;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda4;-><init>()V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda5;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda5;-><init>()V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda6;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda6;-><init>()V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda7;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda7;-><init>()V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$1;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$1;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$1;->invoke(Lcom/ichi2/anki/libanki/Config;)Ljava/lang/Object;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$2;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$2;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$1;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$1;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$10;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$10;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$11;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$11;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$12;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$12;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$13;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$13;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$14;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$14;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$15;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$15;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$16;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$16;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$17;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$17;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$18;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$18;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$19;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$19;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$2;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$2;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$20;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$20;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$3;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$3;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$3;->invoke(Lcom/ichi2/anki/libanki/Config;)Ljava/lang/Object;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$3;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$4;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$4;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$5;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$5;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$6;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$6;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$7;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$7;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$8;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$8;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$9;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$9;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
 Lcom/ichi2/anki/common/utils/ext/JSONArrayKt;
-SPLcom/ichi2/anki/common/utils/ext/JSONArrayKt;->deepClone(Lorg/json/JSONArray;)Lorg/json/JSONArray;
-Lcom/ichi2/anki/common/utils/ext/JSONObjectKt;
-SPLcom/ichi2/anki/common/utils/ext/JSONObjectKt;->deepClonedInto(Lorg/json/JSONObject;Lorg/json/JSONObject;)Lorg/json/JSONObject;
+SPLcom/ichi2/anki/common/utils/ext/JSONArrayKt;->stringIterable(Lorg/json/JSONArray;)Ljava/lang/Iterable;
+SPLcom/ichi2/anki/common/utils/ext/JSONArrayKt;->stringIterator(Lorg/json/JSONArray;)Ljava/util/Iterator;
+Lcom/ichi2/anki/common/utils/ext/JSONArrayKt$stringIterable$$inlined$Iterable$1;
+SPLcom/ichi2/anki/common/utils/ext/JSONArrayKt$stringIterable$$inlined$Iterable$1;-><init>(Lorg/json/JSONArray;)V
+SPLcom/ichi2/anki/common/utils/ext/JSONArrayKt$stringIterable$$inlined$Iterable$1;->iterator()Ljava/util/Iterator;
+Lcom/ichi2/anki/common/utils/ext/JSONArrayKt$stringIterator$1;
+SPLcom/ichi2/anki/common/utils/ext/JSONArrayKt$stringIterator$1;-><init>(Lorg/json/JSONArray;)V
+SPLcom/ichi2/anki/common/utils/ext/JSONArrayKt$stringIterator$1;->hasNext()Z
+SPLcom/ichi2/anki/common/utils/ext/JSONArrayKt$stringIterator$1;->next()Ljava/lang/Object;
+SPLcom/ichi2/anki/common/utils/ext/JSONArrayKt$stringIterator$1;->next()Ljava/lang/String;
 Lcom/ichi2/anki/compat/BaseCompat;
 SPLcom/ichi2/anki/compat/BaseCompat;-><init>()V
 Lcom/ichi2/anki/compat/Compat;
 Lcom/ichi2/anki/compat/CompatHelper;
-SPLcom/ichi2/anki/compat/CompatHelper;->$r8$lambda$rBMX6dDRkhYSInWuODlGN2hVjio()Lcom/ichi2/anki/compat/CompatHelper;
 SPLcom/ichi2/anki/compat/CompatHelper;-><clinit>()V
 SPLcom/ichi2/anki/compat/CompatHelper;-><init>()V
 SPLcom/ichi2/anki/compat/CompatHelper;->access$getCompatValue$p(Lcom/ichi2/anki/compat/CompatHelper;)Lcom/ichi2/anki/compat/Compat;
@@ -8550,15 +10001,19 @@ SPLcom/ichi2/anki/compat/CompatHelper$Companion;->registerReceiverCompat(Landroi
 SPLcom/ichi2/anki/compat/CompatHelper$Companion;->resolveActivityCompat(Landroid/content/pm/PackageManager;Landroid/content/Intent;Lcom/ichi2/anki/compat/ResolveInfoFlagsCompat;)Landroid/content/pm/ResolveInfo;
 SPLcom/ichi2/anki/compat/CompatHelper$Companion;->resolveServiceCompat(Landroid/content/pm/PackageManager;Landroid/content/Intent;Lcom/ichi2/anki/compat/ResolveInfoFlagsCompat;)Landroid/content/pm/ResolveInfo;
 Lcom/ichi2/anki/compat/CompatHelperKt;
+SPLcom/ichi2/anki/compat/CompatHelperKt;->setDstOutBlendCompat(Landroid/graphics/Paint;)V
 SPLcom/ichi2/anki/compat/CompatHelperKt;->setTooltipTextCompat(Landroid/view/View;Ljava/lang/CharSequence;)V
 Lcom/ichi2/anki/compat/CompatV26;
 SPLcom/ichi2/anki/compat/CompatV26;-><init>()V
 Lcom/ichi2/anki/compat/CompatV29;
 SPLcom/ichi2/anki/compat/CompatV29;-><clinit>()V
 SPLcom/ichi2/anki/compat/CompatV29;-><init>()V
+SPLcom/ichi2/anki/compat/CompatV29;->setDstOutBlend(Landroid/graphics/Paint;)V
 Lcom/ichi2/anki/compat/CompatV29$Companion;
 SPLcom/ichi2/anki/compat/CompatV29$Companion;-><init>()V
 SPLcom/ichi2/anki/compat/CompatV29$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/compat/CompatV30;
+SPLcom/ichi2/anki/compat/CompatV30;-><init>()V
 Lcom/ichi2/anki/compat/CompatV31;
 SPLcom/ichi2/anki/compat/CompatV31;-><init>()V
 Lcom/ichi2/anki/compat/CompatV33;
@@ -8607,31 +10062,62 @@ SPLcom/ichi2/anki/contextmenu/CardBrowserContextMenu$Companion;-><init>()V
 SPLcom/ichi2/anki/contextmenu/CardBrowserContextMenu$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLcom/ichi2/anki/contextmenu/CardBrowserContextMenu$Companion;->ensureConsistentStateWithPreferenceStatus(Landroid/content/Context;Z)V
 Lcom/ichi2/anki/contextmenu/SystemContextMenu;
+SPLcom/ichi2/anki/contextmenu/SystemContextMenu;-><clinit>()V
 SPLcom/ichi2/anki/contextmenu/SystemContextMenu;-><init>(Landroid/content/Context;)V
 SPLcom/ichi2/anki/contextmenu/SystemContextMenu;->ensureConsistentStateWithPreferenceStatus(Z)V
 SPLcom/ichi2/anki/contextmenu/SystemContextMenu;->getComponentName()Landroid/content/ComponentName;
 SPLcom/ichi2/anki/contextmenu/SystemContextMenu;->getPackageManager()Landroid/content/pm/PackageManager;
 SPLcom/ichi2/anki/contextmenu/SystemContextMenu;->getSystemMenuStatus()Ljava/lang/Boolean;
 Lcom/ichi2/anki/databinding/ActivityHomescreenBinding;
-SPLcom/ichi2/anki/databinding/ActivityHomescreenBinding;-><init>(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Lcom/ichi2/anki/databinding/IncludeDeckPickerBinding;Landroid/widget/LinearLayout;Lcom/ichi2/anki/ui/ResizingDivider;Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroidx/fragment/app/FragmentContainerView;)V
+SPLcom/ichi2/anki/databinding/ActivityHomescreenBinding;-><init>(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroidx/fragment/app/FragmentContainerView;Lcom/google/android/material/bottomnavigation/BottomNavigationView;Landroid/widget/LinearLayout;Lcom/ichi2/anki/databinding/IncludeDeckPickerBinding;Lcom/ichi2/anki/ui/ResizablePaneLayout;Lcom/ichi2/anki/ui/ResizingDivider;Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroidx/fragment/app/FragmentContainerView;Landroid/widget/FrameLayout;)V
 SPLcom/ichi2/anki/databinding/ActivityHomescreenBinding;->bind(Landroid/view/View;)Lcom/ichi2/anki/databinding/ActivityHomescreenBinding;
 SPLcom/ichi2/anki/databinding/ActivityHomescreenBinding;->getRoot()Landroid/view/View;
 SPLcom/ichi2/anki/databinding/ActivityHomescreenBinding;->getRoot()Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 SPLcom/ichi2/anki/databinding/ActivityHomescreenBinding;->inflate(Landroid/view/LayoutInflater;)Lcom/ichi2/anki/databinding/ActivityHomescreenBinding;
 SPLcom/ichi2/anki/databinding/ActivityHomescreenBinding;->inflate(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Z)Lcom/ichi2/anki/databinding/ActivityHomescreenBinding;
 Lcom/ichi2/anki/databinding/FragmentIntroductionBinding;
-SPLcom/ichi2/anki/databinding/FragmentIntroductionBinding;-><init>(Landroid/view/View;Landroid/widget/ImageView;Landroidx/constraintlayout/widget/Barrier;Landroid/widget/LinearLayout;Lcom/google/android/material/button/MaterialButton;Lcom/ichi2/ui/FixedTextView;Lcom/ichi2/ui/FixedTextView;Lcom/ichi2/ui/FixedTextView;Lcom/google/android/material/button/MaterialButton;Landroid/view/View;Landroid/widget/ImageView;)V
+SPLcom/ichi2/anki/databinding/FragmentIntroductionBinding;-><init>(Landroid/view/View;Landroid/widget/ImageView;Landroidx/constraintlayout/widget/Barrier;Landroid/widget/LinearLayout;Lcom/google/android/material/button/MaterialButton;Landroidx/constraintlayout/widget/ConstraintLayout;Lcom/ichi2/ui/FixedTextView;Lcom/ichi2/ui/FixedTextView;Lcom/ichi2/ui/FixedTextView;Lcom/google/android/material/button/MaterialButton;Landroid/view/View;Landroid/widget/ImageView;Landroidx/constraintlayout/widget/Guideline;)V
 SPLcom/ichi2/anki/databinding/FragmentIntroductionBinding;->bind(Landroid/view/View;)Lcom/ichi2/anki/databinding/FragmentIntroductionBinding;
 Lcom/ichi2/anki/databinding/IncludeDeckPickerBinding;
-SPLcom/ichi2/anki/databinding/IncludeDeckPickerBinding;-><init>(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/widget/ImageView;Landroid/widget/RelativeLayout;Landroid/widget/LinearLayout;Landroidx/recyclerview/widget/RecyclerView;Lcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;Landroid/widget/LinearLayout;Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;Lcom/ichi2/ui/FixedTextView;Landroidx/coordinatorlayout/widget/CoordinatorLayout;)V
+SPLcom/ichi2/anki/databinding/IncludeDeckPickerBinding;-><init>(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/widget/ImageView;Landroid/widget/RelativeLayout;Landroid/widget/LinearLayout;Landroidx/recyclerview/widget/RecyclerView;Lcom/ichi2/anki/ui/BottomFadeFrameLayout;Lcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;Landroid/widget/LinearLayout;Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;Lcom/ichi2/ui/FixedTextView;Landroidx/coordinatorlayout/widget/CoordinatorLayout;)V
 SPLcom/ichi2/anki/databinding/IncludeDeckPickerBinding;->bind(Landroid/view/View;)Lcom/ichi2/anki/databinding/IncludeDeckPickerBinding;
+SPLcom/ichi2/anki/databinding/IncludeDeckPickerBinding;->getRoot()Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 Lcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;
-SPLcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;-><init>(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Lcom/google/android/material/floatingactionbutton/FloatingActionButton;Landroid/widget/TextView;Landroid/widget/LinearLayout;Lcom/google/android/material/floatingactionbutton/FloatingActionButton;Landroid/widget/TextView;Landroid/widget/LinearLayout;Landroid/widget/TextView;Lcom/google/android/material/floatingactionbutton/FloatingActionButton;Landroid/widget/TextView;Landroid/widget/LinearLayout;Landroid/view/View;Landroid/widget/LinearLayout;Lcom/google/android/material/floatingactionbutton/FloatingActionButton;)V
+SPLcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;-><init>(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Landroid/view/View;Landroid/widget/LinearLayout;Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;)V
 SPLcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;->bind(Landroid/view/View;)Lcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;
+SPLcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;->getRoot()Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+Lcom/ichi2/anki/databinding/ItemDeckBinding;
+SPLcom/ichi2/anki/databinding/ItemDeckBinding;-><init>(Landroid/widget/RelativeLayout;Landroid/widget/LinearLayout;Landroid/widget/ImageButton;Landroid/widget/RelativeLayout;Lcom/ichi2/ui/FixedTextView;Lcom/ichi2/ui/FixedTextView;Landroid/widget/LinearLayout;Lcom/ichi2/ui/FixedTextView;Lcom/ichi2/ui/FixedTextView;Landroid/widget/ImageButton;)V
+SPLcom/ichi2/anki/databinding/ItemDeckBinding;->bind(Landroid/view/View;)Lcom/ichi2/anki/databinding/ItemDeckBinding;
+SPLcom/ichi2/anki/databinding/ItemDeckBinding;->getRoot()Landroid/widget/RelativeLayout;
+SPLcom/ichi2/anki/databinding/ItemDeckBinding;->inflate(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Z)Lcom/ichi2/anki/databinding/ItemDeckBinding;
+Lcom/ichi2/anki/deckpicker/BackgroundImage;
+SPLcom/ichi2/anki/deckpicker/BackgroundImage;-><clinit>()V
+SPLcom/ichi2/anki/deckpicker/BackgroundImage;-><init>()V
+SPLcom/ichi2/anki/deckpicker/BackgroundImage;->resolve(Landroid/content/Context;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/BackgroundImage$ResolveResult;
+Lcom/ichi2/anki/deckpicker/BackgroundImage$ResolveResult$Failure;
+Lcom/ichi2/anki/deckpicker/BackgroundImage$ResolveResult$None;
+SPLcom/ichi2/anki/deckpicker/BackgroundImage$ResolveResult$None;-><clinit>()V
+SPLcom/ichi2/anki/deckpicker/BackgroundImage$ResolveResult$None;-><init>()V
+Lcom/ichi2/anki/deckpicker/BackgroundImage$ResolveResult$Ready;
+Lcom/ichi2/anki/deckpicker/BackgroundImage$resolve$1;
+SPLcom/ichi2/anki/deckpicker/BackgroundImage$resolve$1;-><init>(Lcom/ichi2/anki/deckpicker/BackgroundImage;Lkotlin/coroutines/Continuation;)V
+Lcom/ichi2/anki/deckpicker/DeckFilters;
+SPLcom/ichi2/anki/deckpicker/DeckFilters;-><clinit>()V
+SPLcom/ichi2/anki/deckpicker/DeckFilters;-><init>(Ljava/util/List;)V
+SPLcom/ichi2/anki/deckpicker/DeckFilters;->accept(Ljava/lang/String;)Z
+SPLcom/ichi2/anki/deckpicker/DeckFilters;->isActive()Z
+Lcom/ichi2/anki/deckpicker/DeckFilters$Companion;
+SPLcom/ichi2/anki/deckpicker/DeckFilters$Companion;-><init>()V
+SPLcom/ichi2/anki/deckpicker/DeckFilters$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/deckpicker/DeckFilters$Companion;->create(Ljava/lang/CharSequence;)Lcom/ichi2/anki/deckpicker/DeckFilters;
 Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->$r8$lambda$Wxk-7C57DNHGjBrAfsSr9ge2lXo(Lcom/ichi2/anki/libanki/Collection;)Lcom/ichi2/anki/deckpicker/OptionsMenuState;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;-><clinit>()V
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;-><init>()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->access$getFlowOfRefreshDeckList$p(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;)Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->access$loadDeckList(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->access$refreshUndoMenuState(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->access$setDueTree(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lcom/ichi2/anki/libanki/sched/DeckNode;)V
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->access$setSchedulerUpgradeDialogShownForVersion$p(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Ljava/lang/Long;)V
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->fetchSyncIconState(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -8646,26 +10132,42 @@ SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfDeckCountsChanged()L
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfDeckList()Lkotlinx/coroutines/flow/StateFlow;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfDeckListInInitialState()Lkotlinx/coroutines/flow/StateFlow;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfDecksReloaded()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfDeleteDeckConfirmation()Lkotlinx/coroutines/flow/MutableSharedFlow;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfDestination()Lkotlinx/coroutines/flow/MutableSharedFlow;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfDisableShortcuts()Lkotlinx/coroutines/flow/MutableSharedFlow;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfExportDeck()Lkotlinx/coroutines/flow/MutableSharedFlow;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfFocusedDeck()Lkotlinx/coroutines/flow/MutableStateFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfNavigate()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfOptionsMenuState()Lkotlinx/coroutines/flow/MutableStateFlow;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfPromptUserToUpdateScheduler()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfRenameDeck()Lkotlinx/coroutines/flow/MutableSharedFlow;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfResizingDividerVisible()Lkotlinx/coroutines/flow/Flow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfShowContextMenu()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfShowRightClickContextMenu()Lkotlinx/coroutines/flow/MutableSharedFlow;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfStartupResponse()Lkotlinx/coroutines/flow/MutableStateFlow;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfStudiedTodayStats()Lkotlinx/coroutines/flow/MutableStateFlow;
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfUndoUpdated()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfStudyDeck()Lkotlinx/coroutines/flow/MutableSharedFlow;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getOnError()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getOptionsMenuState()Lcom/ichi2/anki/deckpicker/OptionsMenuState;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getProgressManager()Lcom/ichi2/anki/progress/ProgressManager;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->handleStartup(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$AnkiDroidEnvironment;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->isDeckSearchExpanded()Z
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->loadDeckList(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->onScreenResumed()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->refreshMenuState$lambda$0(Lcom/ichi2/anki/libanki/Collection;)Lcom/ichi2/anki/deckpicker/OptionsMenuState;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->refreshMenuState(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->refreshUndoMenuState$lambda$0(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lcom/ichi2/anki/libanki/Collection;)Lkotlin/Unit;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->refreshUndoMenuState(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->reloadDeckCounts()Lkotlinx/coroutines/Job;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->setDueTree(Lcom/ichi2/anki/libanki/sched/DeckNode;)V
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->setFocusedDeck(Ljava/lang/Long;)V
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->updateDeckList()Lkotlinx/coroutines/Job;
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->updateMenuState$lambda$0(Lcom/ichi2/anki/libanki/Collection;)Lcom/ichi2/anki/deckpicker/OptionsMenuState;
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->updateMenuState(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$$ExternalSyntheticLambda0;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$$ExternalSyntheticLambda0;-><init>()V
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$$ExternalSyntheticLambda1;-><init>(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$AnkiDroidEnvironment;
 Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$Companion;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$Companion;-><init>()V
@@ -8682,6 +10184,7 @@ SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList$Companion;-><
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList$Companion;->getEmpty()Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;
 Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse;-><clinit>()V
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse;-><init>()V
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse$FatalError;
@@ -8705,7 +10208,6 @@ SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$1;->invoke(Ljava
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$1;->invoke(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$2;
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$2;->$r8$lambda$bFRSR_7wm94-WeK-JvfxQv1iRaE(Lcom/ichi2/anki/libanki/Collection;)J
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$2;-><init>(Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$2;->invoke(Lcom/ichi2/anki/libanki/sched/DeckNode;Ljava/lang/String;Ljava/lang/Long;Lkotlin/Unit;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -8724,13 +10226,33 @@ SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfResizingDividerVisible$1;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfResizingDividerVisible$1;->invoke(Ljava/lang/Boolean;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfResizingDividerVisible$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfResizingDividerVisible$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
-Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$failure$1;
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$failure$1;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1;-><init>(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$AnkiDroidEnvironment;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$1;-><init>(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$failure$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$failure$1;-><init>(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$AnkiDroidEnvironment;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$failure$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$failure$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$failure$1$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$failure$1$1;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$loadDeckList$2;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$loadDeckList$2;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$loadDeckList$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$loadDeckList$2;->invoke(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$loadDeckList$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$loadDeckList$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$refreshMenuState$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$refreshMenuState$1;-><init>(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$refreshMenuState$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$refreshUndoMenuState$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$refreshUndoMenuState$1;-><init>(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$refreshUndoMenuState$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1;
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1;->$r8$lambda$BMMoQ96tPYpNvjZLGFOSUwmF4X8(Lcom/ichi2/anki/libanki/Collection;)Ljava/lang/String;
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1;->$r8$lambda$N1WL__Mg32xDn5DI1zSWiKu7MsY(Lcom/ichi2/anki/libanki/Collection;)J
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1;->$r8$lambda$QMAFwqxX2rgmL-9V3MSRhm-DbRk(Lcom/ichi2/anki/libanki/Collection;)Lkotlin/Pair;
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1;->$r8$lambda$gDm8O8QuQetku415Dzd_FfysJsE(Lcom/ichi2/anki/libanki/Collection;)J
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1;-><init>(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1;->invokeSuspend$lambda$0(Lcom/ichi2/anki/libanki/Collection;)Lkotlin/Pair;
@@ -8750,19 +10272,6 @@ SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts
 Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1$$ExternalSyntheticLambda3;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1$$ExternalSyntheticLambda3;-><init>()V
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1$$ExternalSyntheticLambda3;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$updateDeckList$1;
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$updateDeckList$1;-><init>(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)V
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$updateDeckList$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$updateDeckList$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
-Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$updateDeckList$1$1;
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$updateDeckList$1$1;-><init>(Lkotlin/coroutines/Continuation;)V
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$updateDeckList$1$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$updateDeckList$1$1;->invoke(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$updateDeckList$1$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$updateDeckList$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
-Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$updateMenuState$1;
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$updateMenuState$1;-><init>(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)V
-SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$updateMenuState$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/deckpicker/DeckPickerViewModelKt;
 SPLcom/ichi2/anki/deckpicker/DeckPickerViewModelKt;->onlyHasDefaultDeck(Lcom/ichi2/anki/libanki/sched/DeckNode;)Z
 Lcom/ichi2/anki/deckpicker/DisplayDeckNode;
@@ -8770,6 +10279,16 @@ SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;-><clinit>()V
 SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;-><init>(JLjava/lang/String;Ljava/lang/String;ZZIZIIIZ)V
 SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;-><init>(JLjava/lang/String;Ljava/lang/String;ZZIZIIIZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->equals(Ljava/lang/Object;)Z
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getCanCollapse()Z
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getCollapsed()Z
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getDepth()I
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getDid()J
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getFiltered()Z
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getLastDeckNameComponent()Ljava/lang/String;
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getLrnCount()I
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getNewCount()I
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getRevCount()I
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->isSelected()Z
 SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->setDeckNode(Lcom/ichi2/anki/libanki/sched/DeckNode;)V
 Lcom/ichi2/anki/deckpicker/DisplayDeckNode$Companion;
 SPLcom/ichi2/anki/deckpicker/DisplayDeckNode$Companion;-><init>()V
@@ -8777,15 +10296,14 @@ SPLcom/ichi2/anki/deckpicker/DisplayDeckNode$Companion;-><init>(Lkotlin/jvm/inte
 SPLcom/ichi2/anki/deckpicker/DisplayDeckNode$Companion;->from(Lcom/ichi2/anki/libanki/sched/DeckNode;ZJ)Lcom/ichi2/anki/deckpicker/DisplayDeckNode;
 Lcom/ichi2/anki/deckpicker/DisplayDeckNodeKt;
 SPLcom/ichi2/anki/deckpicker/DisplayDeckNodeKt;->addVisibleToList(Lcom/ichi2/anki/libanki/sched/DeckNode;Ljava/util/List;ZJ)V
-SPLcom/ichi2/anki/deckpicker/DisplayDeckNodeKt;->filterAndFlattenDisplay(Lcom/ichi2/anki/libanki/sched/DeckNode;Ljava/lang/CharSequence;J)Ljava/util/List;
-SPLcom/ichi2/anki/deckpicker/DisplayDeckNodeKt;->filterAndFlattenDisplayInner(Lcom/ichi2/anki/libanki/sched/DeckNode;Ljava/lang/CharSequence;Ljava/util/List;ZJ)V
-SPLcom/ichi2/anki/deckpicker/DisplayDeckNodeKt;->nameMatchesFilter(Lcom/ichi2/anki/libanki/sched/DeckNode;Ljava/lang/CharSequence;)Z
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNodeKt;->filterAndFlattenDisplay(Lcom/ichi2/anki/libanki/sched/DeckNode;Lcom/ichi2/anki/deckpicker/DeckFilters;J)Ljava/util/List;
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNodeKt;->filterAndFlattenDisplayInner(Lcom/ichi2/anki/libanki/sched/DeckNode;Lcom/ichi2/anki/deckpicker/DeckFilters;Ljava/util/List;ZJ)V
 Lcom/ichi2/anki/deckpicker/OptionsMenuState;
+SPLcom/ichi2/anki/deckpicker/OptionsMenuState;-><clinit>()V
 SPLcom/ichi2/anki/deckpicker/OptionsMenuState;-><init>(ZLjava/lang/String;Lcom/ichi2/anki/deckpicker/SyncIconState;ZZ)V
-SPLcom/ichi2/anki/deckpicker/OptionsMenuState;->component1()Z
-SPLcom/ichi2/anki/deckpicker/OptionsMenuState;->component2()Ljava/lang/String;
-SPLcom/ichi2/anki/deckpicker/OptionsMenuState;->component4()Z
-SPLcom/ichi2/anki/deckpicker/OptionsMenuState;->component5()Z
+SPLcom/ichi2/anki/deckpicker/OptionsMenuState;->copy$default(Lcom/ichi2/anki/deckpicker/OptionsMenuState;ZLjava/lang/String;Lcom/ichi2/anki/deckpicker/SyncIconState;ZZILjava/lang/Object;)Lcom/ichi2/anki/deckpicker/OptionsMenuState;
+SPLcom/ichi2/anki/deckpicker/OptionsMenuState;->copy(ZLjava/lang/String;Lcom/ichi2/anki/deckpicker/SyncIconState;ZZ)Lcom/ichi2/anki/deckpicker/OptionsMenuState;
+SPLcom/ichi2/anki/deckpicker/OptionsMenuState;->equals(Ljava/lang/Object;)Z
 SPLcom/ichi2/anki/deckpicker/OptionsMenuState;->getSearchIcon()Z
 SPLcom/ichi2/anki/deckpicker/OptionsMenuState;->getSyncIcon()Lcom/ichi2/anki/deckpicker/SyncIconState;
 SPLcom/ichi2/anki/deckpicker/OptionsMenuState;->getUndoAvailable()Z
@@ -8796,11 +10314,11 @@ SPLcom/ichi2/anki/deckpicker/SyncIconState;-><clinit>()V
 SPLcom/ichi2/anki/deckpicker/SyncIconState;-><init>(Ljava/lang/String;I)V
 SPLcom/ichi2/anki/deckpicker/SyncIconState;->values()[Lcom/ichi2/anki/deckpicker/SyncIconState;
 Lcom/ichi2/anki/dialogs/BackupPromptDialog;
-SPLcom/ichi2/anki/dialogs/BackupPromptDialog;->$r8$lambda$PdAG4heO00k13asnXbfRwGgVFTM(Lcom/ichi2/anki/libanki/Collection;)Z
 SPLcom/ichi2/anki/dialogs/BackupPromptDialog;-><clinit>()V
 SPLcom/ichi2/anki/dialogs/BackupPromptDialog;-><init>(Landroid/content/Context;)V
 SPLcom/ichi2/anki/dialogs/BackupPromptDialog;-><init>(Landroid/content/Context;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLcom/ichi2/anki/dialogs/BackupPromptDialog;->access$shouldShowDialog(Lcom/ichi2/anki/dialogs/BackupPromptDialog;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog;->access$userIsNewToAnkiDroid(Lcom/ichi2/anki/dialogs/BackupPromptDialog;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/dialogs/BackupPromptDialog;->getFirstInstallTime()Ljava/lang/Long;
 SPLcom/ichi2/anki/dialogs/BackupPromptDialog;->shouldShowDialog(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/dialogs/BackupPromptDialog;->userIsNewToAnkiDroid$lambda$0(Lcom/ichi2/anki/libanki/Collection;)Z
@@ -8818,12 +10336,23 @@ SPLcom/ichi2/anki/dialogs/BackupPromptDialog$Companion$showIfAvailable$1;->invok
 Lcom/ichi2/anki/dialogs/BackupPromptDialog$shouldShowDialog$1;
 SPLcom/ichi2/anki/dialogs/BackupPromptDialog$shouldShowDialog$1;-><init>(Lcom/ichi2/anki/dialogs/BackupPromptDialog;Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/dialogs/BackupPromptDialog$shouldShowDialog$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/dialogs/BackupPromptDialog$userIsNewToAnkiDroid$1;
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog$userIsNewToAnkiDroid$1;-><init>(Lcom/ichi2/anki/dialogs/BackupPromptDialog;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog$userIsNewToAnkiDroid$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/dialogs/DeckPickerContextMenu$DeckPickerContextMenuOption;
 SPLcom/ichi2/anki/dialogs/DeckPickerContextMenu$DeckPickerContextMenuOption;->$values()[Lcom/ichi2/anki/dialogs/DeckPickerContextMenu$DeckPickerContextMenuOption;
 SPLcom/ichi2/anki/dialogs/DeckPickerContextMenu$DeckPickerContextMenuOption;-><clinit>()V
-SPLcom/ichi2/anki/dialogs/DeckPickerContextMenu$DeckPickerContextMenuOption;-><init>(Ljava/lang/String;II)V
+SPLcom/ichi2/anki/dialogs/DeckPickerContextMenu$DeckPickerContextMenuOption;-><init>(Ljava/lang/String;I)V
 SPLcom/ichi2/anki/dialogs/DeckPickerContextMenu$DeckPickerContextMenuOption;->values()[Lcom/ichi2/anki/dialogs/DeckPickerContextMenu$DeckPickerContextMenuOption;
-Lcom/ichi2/anki/dialogs/DeckSelectionDialog$DeckSelectionListener;
+Lcom/ichi2/anki/dialogs/DeckPickerContextMenuKt;
+SPLcom/ichi2/anki/dialogs/DeckPickerContextMenuKt;->setDeckPickerContextMenuResultListener(Landroidx/fragment/app/FragmentActivity;Lkotlin/jvm/functions/Function1;)V
+Lcom/ichi2/anki/dialogs/DeckPickerContextMenuKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/dialogs/DeckPickerContextMenuKt$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/functions/Function1;)V
+Lcom/ichi2/anki/dialogs/DeckPickerMaintenanceDialog$Check;
+SPLcom/ichi2/anki/dialogs/DeckPickerMaintenanceDialog$Check;->$values()[Lcom/ichi2/anki/dialogs/DeckPickerMaintenanceDialog$Check;
+SPLcom/ichi2/anki/dialogs/DeckPickerMaintenanceDialog$Check;-><clinit>()V
+SPLcom/ichi2/anki/dialogs/DeckPickerMaintenanceDialog$Check;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+SPLcom/ichi2/anki/dialogs/DeckPickerMaintenanceDialog$Check;->getRequestKey()Ljava/lang/String;
 Lcom/ichi2/anki/dialogs/DialogHandler;
 SPLcom/ichi2/anki/dialogs/DialogHandler;-><clinit>()V
 SPLcom/ichi2/anki/dialogs/DialogHandler;-><init>(Lcom/ichi2/anki/AnkiActivity;)V
@@ -8832,9 +10361,17 @@ SPLcom/ichi2/anki/dialogs/DialogHandler;->popMessage()Landroid/os/Message;
 Lcom/ichi2/anki/dialogs/DialogHandler$Companion;
 SPLcom/ichi2/anki/dialogs/DialogHandler$Companion;-><init>()V
 SPLcom/ichi2/anki/dialogs/DialogHandler$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-Lcom/ichi2/anki/dialogs/ImportDialog$ImportDialogListener;
 Lcom/ichi2/anki/dialogs/ImportFileSelectionFragment$ApkgImportResultLauncherProvider;
 Lcom/ichi2/anki/dialogs/ImportFileSelectionFragment$CsvImportResultLauncherProvider;
+Lcom/ichi2/anki/dialogs/ImportViewModel;
+SPLcom/ichi2/anki/dialogs/ImportViewModel;-><clinit>()V
+SPLcom/ichi2/anki/dialogs/ImportViewModel;-><init>()V
+SPLcom/ichi2/anki/dialogs/ImportViewModel;->getImportAddFlow()Lkotlinx/coroutines/flow/SharedFlow;
+SPLcom/ichi2/anki/dialogs/ImportViewModel;->getImportReplaceFlow()Lkotlinx/coroutines/flow/SharedFlow;
+Lcom/ichi2/anki/dialogs/LoadingDialogFragment;
+Lcom/ichi2/anki/dialogs/LoadingDialogFragmentKt;
+SPLcom/ichi2/anki/dialogs/LoadingDialogFragmentKt;->dismissLoadingDialog(Lcom/ichi2/anki/AnkiActivity;Ljava/lang/String;)V
+SPLcom/ichi2/anki/dialogs/LoadingDialogFragmentKt;->removeImmediately(Lcom/ichi2/anki/AnkiActivity;Lcom/ichi2/anki/dialogs/LoadingDialogFragment;)V
 Lcom/ichi2/anki/dialogs/SyncErrorDialog$SyncErrorDialogListener;
 Lcom/ichi2/anki/dialogs/customstudy/CustomStudyDialog$CustomStudyAction;
 SPLcom/ichi2/anki/dialogs/customstudy/CustomStudyDialog$CustomStudyAction;->$values()[Lcom/ichi2/anki/dialogs/customstudy/CustomStudyDialog$CustomStudyAction;
@@ -8849,13 +10386,40 @@ SPLcom/ichi2/anki/dialogs/tags/TagsDialogListener;-><clinit>()V
 Lcom/ichi2/anki/dialogs/tags/TagsDialogListener$Companion;
 SPLcom/ichi2/anki/dialogs/tags/TagsDialogListener$Companion;-><clinit>()V
 SPLcom/ichi2/anki/dialogs/tags/TagsDialogListener$Companion;-><init>()V
+Lcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel;
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel;-><clinit>()V
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel;-><init>(Landroidx/lifecycle/SavedStateHandle;)V
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel;->access$getFactory$cp()Landroidx/lifecycle/ViewModelProvider$Factory;
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel;->getExportReadyDestination()Lkotlinx/coroutines/flow/StateFlow;
+Lcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel$Companion;
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel$Companion;-><init>()V
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel$Companion;->getFactory()Landroidx/lifecycle/ViewModelProvider$Factory;
+Lcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel$special$$inlined$savedStateViewModelFactory$1;
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel$special$$inlined$savedStateViewModelFactory$1;-><init>()V
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel$special$$inlined$savedStateViewModelFactory$1;->invoke(Landroidx/lifecycle/viewmodel/CreationExtras;)Landroidx/lifecycle/ViewModel;
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel$special$$inlined$savedStateViewModelFactory$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/exception/CollectionLockedException;
+SPLcom/ichi2/anki/exception/CollectionLockedException;-><clinit>()V
+SPLcom/ichi2/anki/exception/CollectionLockedException;->access$setMessageProvider$cp(Lkotlin/jvm/functions/Function0;)V
+Lcom/ichi2/anki/exception/CollectionLockedException$Companion;
+SPLcom/ichi2/anki/exception/CollectionLockedException$Companion;-><init>()V
+SPLcom/ichi2/anki/exception/CollectionLockedException$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/exception/CollectionLockedException$Companion;->setMessageProvider(Lkotlin/jvm/functions/Function0;)V
+Lcom/ichi2/anki/exception/SanitizedReportCollector;
+SPLcom/ichi2/anki/exception/SanitizedReportCollector;-><clinit>()V
+SPLcom/ichi2/anki/exception/SanitizedReportCollector;-><init>()V
+SPLcom/ichi2/anki/exception/SanitizedReportCollector;->enabled(Lorg/acra/config/CoreConfiguration;)Z
+SPLcom/ichi2/anki/exception/SanitizedReportCollector;->getOrder()Lorg/acra/collector/Collector$Order;
 Lcom/ichi2/anki/exception/StorageAccessException;
+Lcom/ichi2/anki/exception/StorageNotConfiguredException;
 Lcom/ichi2/anki/exception/SystemStorageException;
 Lcom/ichi2/anki/i18n/LocaleCodesKt;
 SPLcom/ichi2/anki/i18n/LocaleCodesKt;-><clinit>()V
-SPLcom/ichi2/anki/i18n/LocaleCodesKt;->getIso3Code(Ljava/util/Locale;)Ljava/lang/String;
 SPLcom/ichi2/anki/i18n/LocaleCodesKt;->normalize(Ljava/util/Locale;)Ljava/util/Locale;
 SPLcom/ichi2/anki/i18n/LocaleCodesKt;->toAnkiTwoLetterCode(Ljava/util/Locale;)Ljava/lang/String;
+Lcom/ichi2/anki/i18n/LocaleCodesKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/i18n/LocaleCodesKt$$ExternalSyntheticLambda0;-><init>()V
 Lcom/ichi2/anki/introduction/CollectionPermissionScreenLauncher;
 SPLcom/ichi2/anki/introduction/CollectionPermissionScreenLauncher;->recreateActivityResultLauncher(Lcom/ichi2/anki/AnkiActivity;)Landroidx/activity/result/ActivityResultLauncher;
 Lcom/ichi2/anki/introduction/CollectionPermissionScreenLauncher$$ExternalSyntheticLambda0;
@@ -8863,18 +10427,22 @@ SPLcom/ichi2/anki/introduction/CollectionPermissionScreenLauncher$$ExternalSynth
 Lcom/ichi2/anki/introduction/CollectionPermissionScreenLauncherKt;
 SPLcom/ichi2/anki/introduction/CollectionPermissionScreenLauncherKt;->hasCollectionStoragePermissions(Lcom/ichi2/anki/AnkiActivity;)Z
 Lcom/ichi2/anki/introduction/SetupCollectionFragment;
-SPLcom/ichi2/anki/introduction/SetupCollectionFragment;->$r8$lambda$xSwG1EYOxFolza8kS5BHiAcsUlY(Lcom/ichi2/anki/introduction/SetupCollectionFragment;Landroid/view/View;)V
 SPLcom/ichi2/anki/introduction/SetupCollectionFragment;-><clinit>()V
 SPLcom/ichi2/anki/introduction/SetupCollectionFragment;-><init>()V
 SPLcom/ichi2/anki/introduction/SetupCollectionFragment;->getBinding()Lcom/ichi2/anki/databinding/FragmentIntroductionBinding;
 SPLcom/ichi2/anki/introduction/SetupCollectionFragment;->onViewCreated$lambda$0(Lcom/ichi2/anki/introduction/SetupCollectionFragment;Landroid/view/View;)V
 SPLcom/ichi2/anki/introduction/SetupCollectionFragment;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 SPLcom/ichi2/anki/introduction/SetupCollectionFragment;->setResult(Lcom/ichi2/anki/introduction/SetupCollectionFragment$CollectionSetupOption;)V
+SPLcom/ichi2/anki/introduction/SetupCollectionFragment;->setupEdgeToEdge$lambda$0(Lcom/ichi2/anki/introduction/SetupCollectionFragment;Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+SPLcom/ichi2/anki/introduction/SetupCollectionFragment;->setupEdgeToEdge(Landroid/view/View;)V
 Lcom/ichi2/anki/introduction/SetupCollectionFragment$$ExternalSyntheticLambda0;
 SPLcom/ichi2/anki/introduction/SetupCollectionFragment$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/introduction/SetupCollectionFragment;)V
 SPLcom/ichi2/anki/introduction/SetupCollectionFragment$$ExternalSyntheticLambda0;->onClick(Landroid/view/View;)V
 Lcom/ichi2/anki/introduction/SetupCollectionFragment$$ExternalSyntheticLambda1;
 SPLcom/ichi2/anki/introduction/SetupCollectionFragment$$ExternalSyntheticLambda1;-><init>(Lcom/ichi2/anki/introduction/SetupCollectionFragment;)V
+Lcom/ichi2/anki/introduction/SetupCollectionFragment$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/introduction/SetupCollectionFragment$$ExternalSyntheticLambda2;-><init>(Lcom/ichi2/anki/introduction/SetupCollectionFragment;)V
+SPLcom/ichi2/anki/introduction/SetupCollectionFragment$$ExternalSyntheticLambda2;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
 Lcom/ichi2/anki/introduction/SetupCollectionFragment$CollectionSetupOption;
 SPLcom/ichi2/anki/introduction/SetupCollectionFragment$CollectionSetupOption;->$values()[Lcom/ichi2/anki/introduction/SetupCollectionFragment$CollectionSetupOption;
 SPLcom/ichi2/anki/introduction/SetupCollectionFragment$CollectionSetupOption;-><clinit>()V
@@ -8934,14 +10502,15 @@ SPLcom/ichi2/anki/libanki/Config;->getBackend()Lnet/ankiweb/rsdroid/Backend;
 Lcom/ichi2/anki/libanki/DB;
 SPLcom/ichi2/anki/libanki/DB;-><clinit>()V
 SPLcom/ichi2/anki/libanki/DB;-><init>(Landroidx/sqlite/db/SupportSQLiteDatabase;)V
-SPLcom/ichi2/anki/libanki/DB;->execute(Ljava/lang/String;[Ljava/lang/Object;)V
 SPLcom/ichi2/anki/libanki/DB;->queryScalar(Ljava/lang/String;[Ljava/lang/Object;)I
 Lcom/ichi2/anki/libanki/DB$Companion;
 SPLcom/ichi2/anki/libanki/DB$Companion;-><init>()V
 SPLcom/ichi2/anki/libanki/DB$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 Lcom/ichi2/anki/libanki/Deck;
+SPLcom/ichi2/anki/libanki/Deck;-><clinit>()V
 SPLcom/ichi2/anki/libanki/Deck;-><init>(Lorg/json/JSONObject;)V
 SPLcom/ichi2/anki/libanki/Deck;->getId()J
+SPLcom/ichi2/anki/libanki/Deck;->getJsonObject()Lorg/json/JSONObject;
 Lcom/ichi2/anki/libanki/DeckNameId;
 SPLcom/ichi2/anki/libanki/DeckNameId;-><init>(Ljava/lang/String;J)V
 Lcom/ichi2/anki/libanki/Decks;
@@ -8982,8 +10551,7 @@ Lcom/ichi2/anki/libanki/Storage;
 SPLcom/ichi2/anki/libanki/Storage;-><clinit>()V
 SPLcom/ichi2/anki/libanki/Storage;-><init>()V
 SPLcom/ichi2/anki/libanki/Storage;->collection(Lcom/ichi2/anki/libanki/CollectionFiles;Lkotlin/jvm/functions/Function1;Lnet/ankiweb/rsdroid/Backend;)Lcom/ichi2/anki/libanki/Collection;
-SPLcom/ichi2/anki/libanki/Storage;->createDB(Lcom/ichi2/anki/libanki/DB;Lcom/ichi2/anki/common/time/Time;)V
-SPLcom/ichi2/anki/libanki/Storage;->openDB$libanki_release(Lcom/ichi2/anki/libanki/Storage$OpenDbArgs;Lnet/ankiweb/rsdroid/Backend;ZLkotlin/jvm/functions/Function1;)Lkotlin/Pair;
+SPLcom/ichi2/anki/libanki/Storage;->openDB$libanki(Lcom/ichi2/anki/libanki/Storage$OpenDbArgs;Lnet/ankiweb/rsdroid/Backend;ZLkotlin/jvm/functions/Function1;)Lkotlin/Pair;
 Lcom/ichi2/anki/libanki/Storage$OpenDbArgs;
 SPLcom/ichi2/anki/libanki/Storage$OpenDbArgs;-><init>()V
 SPLcom/ichi2/anki/libanki/Storage$OpenDbArgs;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -9004,7 +10572,6 @@ SPLcom/ichi2/anki/libanki/TemplateManager$Companion;-><init>()V
 SPLcom/ichi2/anki/libanki/TemplateManager$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLcom/ichi2/anki/libanki/TemplateManager$Companion;->getFieldFilters()Ljava/util/Map;
 Lcom/ichi2/anki/libanki/TemplateManager$FieldFilter;
-SPLcom/ichi2/anki/libanki/TemplateManager$FieldFilter;-><init>()V
 Lcom/ichi2/anki/libanki/TtsVoice;
 SPLcom/ichi2/anki/libanki/TtsVoice;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 Lcom/ichi2/anki/libanki/UndoStatus;
@@ -9037,15 +10604,48 @@ SPLcom/ichi2/anki/libanki/sched/DeckNode;->getNewCount()I
 SPLcom/ichi2/anki/libanki/sched/DeckNode;->getParent()Ljava/lang/ref/WeakReference;
 SPLcom/ichi2/anki/libanki/sched/DeckNode;->getRevCount()I
 SPLcom/ichi2/anki/libanki/sched/DeckNode;->isSyntheticDeck()Z
+SPLcom/ichi2/anki/libanki/sched/DeckNode;->totalCardsDue()I
 Lcom/ichi2/anki/libanki/sched/Scheduler;
 SPLcom/ichi2/anki/libanki/sched/Scheduler;-><init>(Lcom/ichi2/anki/libanki/Collection;)V
 SPLcom/ichi2/anki/libanki/sched/Scheduler;->deckDueTree()Lcom/ichi2/anki/libanki/sched/DeckNode;
 SPLcom/ichi2/anki/libanki/sched/Scheduler;->deckTree(Z)Lcom/ichi2/anki/libanki/sched/DeckNode;
+SPLcom/ichi2/anki/libanki/sched/Scheduler;->getDayCutoff()J
 SPLcom/ichi2/anki/libanki/sched/Scheduler;->studiedToday()Ljava/lang/String;
+SPLcom/ichi2/anki/libanki/sched/Scheduler;->timingToday()Lanki/scheduler/SchedTimingTodayResponse;
 Lcom/ichi2/anki/libanki/utils/PythonExtensionsKt;
 SPLcom/ichi2/anki/libanki/utils/PythonExtensionsKt;->append(Ljava/util/List;Ljava/lang/Object;)V
 SPLcom/ichi2/anki/libanki/utils/PythonExtensionsKt;->len(Ljava/util/List;)I
+Lcom/ichi2/anki/logging/ActivityLaunchLoggerKt;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;-><clinit>()V
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->logActivityCreation$lambda$2(Landroid/content/Intent;)Ljava/lang/Object;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->logActivityCreation$lambda$3(Landroid/content/Intent;)Ljava/lang/Object;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->logActivityCreation$lambda$4(Landroid/app/Activity;)Ljava/lang/Object;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->logActivityCreation$lambda$5(Landroid/app/Activity;)Ljava/lang/Object;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->logActivityCreation$lambda$6(Landroid/app/Activity;)Ljava/lang/Object;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->logActivityCreation$lambda$7(Landroid/os/Bundle;)Ljava/lang/Object;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->logActivityCreation(Landroid/app/Activity;Landroid/os/Bundle;)V
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->readSafely(Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->summarizeNames(Ljava/util/Set;Ljava/util/Set;)Ljava/util/Map;
+Lcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda1;-><init>(Landroid/content/Intent;)V
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda1;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda2;-><init>(Landroid/content/Intent;)V
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda2;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda3;-><init>(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda3;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda4;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda4;-><init>(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda4;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda5;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda5;-><init>(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda5;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda6;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda6;-><init>(Landroid/os/Bundle;)V
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda6;->invoke()Ljava/lang/Object;
 Lcom/ichi2/anki/logging/FragmentLifecycleLogger;
+SPLcom/ichi2/anki/logging/FragmentLifecycleLogger;-><clinit>()V
 SPLcom/ichi2/anki/logging/FragmentLifecycleLogger;-><init>(Landroid/app/Activity;)V
 SPLcom/ichi2/anki/logging/FragmentLifecycleLogger;->onFragmentAttached(Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;Landroid/content/Context;)V
 SPLcom/ichi2/anki/logging/FragmentLifecycleLogger;->onFragmentCreated(Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;Landroid/os/Bundle;)V
@@ -9069,51 +10669,313 @@ SPLcom/ichi2/anki/logging/LogType$Companion;->getValue()Lcom/ichi2/anki/logging/
 Lcom/ichi2/anki/logging/ProductionCrashReportingTree;
 SPLcom/ichi2/anki/logging/ProductionCrashReportingTree;-><clinit>()V
 SPLcom/ichi2/anki/logging/ProductionCrashReportingTree;-><init>()V
+PLcom/ichi2/anki/logging/ProductionCrashReportingTree;->createStackElementTag(Ljava/lang/StackTraceElement;)Ljava/lang/String;
+PLcom/ichi2/anki/logging/ProductionCrashReportingTree;->getTag()Ljava/lang/String;
 SPLcom/ichi2/anki/logging/ProductionCrashReportingTree;->log(ILjava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 Lcom/ichi2/anki/logging/ProductionCrashReportingTree$Companion;
 SPLcom/ichi2/anki/logging/ProductionCrashReportingTree$Companion;-><init>()V
 SPLcom/ichi2/anki/logging/ProductionCrashReportingTree$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/logging/TimberLogger;
+SPLcom/ichi2/anki/logging/TimberLogger;-><init>(Ljava/lang/String;)V
+SPLcom/ichi2/anki/logging/TimberLogger;->handleNormalizedLoggingCall(Lorg/slf4j/event/Level;Lorg/slf4j/Marker;Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/Throwable;)V
+SPLcom/ichi2/anki/logging/TimberLogger;->isDebugEnabled()Z
+SPLcom/ichi2/anki/logging/TimberLogger;->isInfoEnabled()Z
+Lcom/ichi2/anki/logging/TimberLoggerFactory;
+SPLcom/ichi2/anki/logging/TimberLoggerFactory;-><init>()V
+SPLcom/ichi2/anki/logging/TimberLoggerFactory;->getLogger$lambda$0(Ljava/lang/String;)Lorg/slf4j/Logger;
+SPLcom/ichi2/anki/logging/TimberLoggerFactory;->getLogger$lambda$1(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Lorg/slf4j/Logger;
+SPLcom/ichi2/anki/logging/TimberLoggerFactory;->getLogger(Ljava/lang/String;)Lorg/slf4j/Logger;
+Lcom/ichi2/anki/logging/TimberLoggerFactory$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/logging/TimberLoggerFactory$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/logging/TimberLoggerFactory$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/logging/TimberLoggerFactory$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/logging/TimberLoggerFactory$$ExternalSyntheticLambda1;-><init>(Lkotlin/jvm/functions/Function1;)V
+SPLcom/ichi2/anki/logging/TimberLoggerFactory$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/logging/TimberServiceProvider;
+SPLcom/ichi2/anki/logging/TimberServiceProvider;-><clinit>()V
+SPLcom/ichi2/anki/logging/TimberServiceProvider;-><init>()V
+SPLcom/ichi2/anki/logging/TimberServiceProvider;->getLoggerFactory()Lorg/slf4j/ILoggerFactory;
+SPLcom/ichi2/anki/logging/TimberServiceProvider;->getMDCAdapter()Lorg/slf4j/spi/MDCAdapter;
+SPLcom/ichi2/anki/logging/TimberServiceProvider;->getRequestedApiVersion()Ljava/lang/String;
+SPLcom/ichi2/anki/logging/TimberServiceProvider;->initialize()V
+Lcom/ichi2/anki/logging/TimberServiceProviderKt;
+SPLcom/ichi2/anki/logging/TimberServiceProviderKt;->access$getPriority(Lorg/slf4j/event/Level;)I
+SPLcom/ichi2/anki/logging/TimberServiceProviderKt;->getPriority(Lorg/slf4j/event/Level;)I
+Lcom/ichi2/anki/logging/TimberServiceProviderKt$WhenMappings;
+SPLcom/ichi2/anki/logging/TimberServiceProviderKt$WhenMappings;-><clinit>()V
+Lcom/ichi2/anki/model/FieldFilter;
+Lcom/ichi2/anki/model/FieldFilters$NoSuggestFilter;
+SPLcom/ichi2/anki/model/FieldFilters$NoSuggestFilter;-><clinit>()V
+SPLcom/ichi2/anki/model/FieldFilters$NoSuggestFilter;-><init>()V
+SPLcom/ichi2/anki/model/FieldFilters$NoSuggestFilter;->ensureApplied()V
+SPLcom/ichi2/anki/model/FieldFilters$NoSuggestFilter;->getName()Ljava/lang/String;
+Lcom/ichi2/anki/multimedia/MultimediaArgsStorage;
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage;-><clinit>()V
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage;-><init>(Ljava/io/File;)V
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage;-><init>(Ljava/io/File;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage;->removeExpiredFiles$default(Lcom/ichi2/anki/multimedia/MultimediaArgsStorage;JILjava/lang/Object;)V
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage;->removeExpiredFiles$lambda$0(Ljava/io/File;Ljava/lang/String;)Z
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage;->removeExpiredFiles(J)V
+Lcom/ichi2/anki/multimedia/MultimediaArgsStorage$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage$$ExternalSyntheticLambda0;->accept(Ljava/io/File;Ljava/lang/String;)Z
+Lcom/ichi2/anki/multimedia/MultimediaArgsStorage$Companion;
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage$Companion;-><init>()V
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage$Companion;->create(Landroid/content/Context;)Lcom/ichi2/anki/multimedia/MultimediaArgsStorage;
+Lcom/ichi2/anki/multiprofile/AppRestartKt;
+SPLcom/ichi2/anki/multiprofile/AppRestartKt;->currentProcessName()Ljava/lang/String;
+SPLcom/ichi2/anki/multiprofile/AppRestartKt;->isPhoenixProcess()Z
+SPLcom/ichi2/anki/multiprofile/AppRestartKt;->isPhoenixProcessName(Ljava/lang/String;)Z
+Lcom/ichi2/anki/multiprofile/ProfileContextWrapper;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;-><clinit>()V
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;-><init>(Landroid/content/Context;Ljava/lang/String;Ljava/io/File;)V
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;-><init>(Landroid/content/Context;Ljava/lang/String;Ljava/io/File;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->access$requireCustomDirectories(Lcom/ichi2/anki/multiprofile/ProfileContextWrapper;)V
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->getCacheDir()Ljava/io/File;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->getDatabasePath(Ljava/lang/String;)Ljava/io/File;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->getDir(Ljava/lang/String;I)Ljava/io/File;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->getFilesDir()Ljava/io/File;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->getNoBackupFilesDir()Ljava/io/File;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->getProfileId-evi8WI0()Ljava/lang/String;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->getSharedPreferences(Ljava/lang/String;I)Landroid/content/SharedPreferences;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->requireCustomDirectories()V
+Lcom/ichi2/anki/multiprofile/ProfileContextWrapper$Companion;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper$Companion;-><init>()V
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper$Companion;->create-vKkjgeQ(Landroid/content/Context;Ljava/lang/String;Ljava/io/File;)Lcom/ichi2/anki/multiprofile/ProfileContextWrapper;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper$Companion;->requirePathInFilesDir(Ljava/io/File;Landroid/content/Context;)V
+Lcom/ichi2/anki/multiprofile/ProfileId;
+SPLcom/ichi2/anki/multiprofile/ProfileId;-><clinit>()V
+SPLcom/ichi2/anki/multiprofile/ProfileId;->constructor-impl(Ljava/lang/String;)Ljava/lang/String;
+SPLcom/ichi2/anki/multiprofile/ProfileId;->equals-impl0(Ljava/lang/String;Ljava/lang/String;)Z
+SPLcom/ichi2/anki/multiprofile/ProfileId;->isDefault-impl(Ljava/lang/String;)Z
+SPLcom/ichi2/anki/multiprofile/ProfileId;->toString-impl(Ljava/lang/String;)Ljava/lang/String;
+Lcom/ichi2/anki/multiprofile/ProfileId$Companion;
+SPLcom/ichi2/anki/multiprofile/ProfileId$Companion;-><init>()V
+SPLcom/ichi2/anki/multiprofile/ProfileId$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/multiprofile/ProfileManager;
+SPLcom/ichi2/anki/multiprofile/ProfileManager;-><clinit>()V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;-><init>(Landroid/content/Context;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;-><init>(Landroid/content/Context;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->access$getAttachError$cp()Ljava/lang/Throwable;
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->access$initializeActiveProfile(Lcom/ichi2/anki/multiprofile/ProfileManager;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->access$setAttachError$cp(Ljava/lang/Throwable;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->configureWebView-eoBvq2w(Ljava/lang/String;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->ensureProfileCollectionPath(Lcom/ichi2/anki/multiprofile/ProfileContextWrapper;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->getActiveProfileContext()Landroid/content/Context;
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->getGlobalProfilePrefs()Landroid/content/SharedPreferences;
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->getProfileRegistry()Lcom/ichi2/anki/multiprofile/ProfileManager$ProfileRegistry;
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->globalProfilePrefs_delegate$lambda$0(Lcom/ichi2/anki/multiprofile/ProfileManager;)Landroid/content/SharedPreferences;
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->initializeActiveProfile()V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->loadProfileData-eoBvq2w(Ljava/lang/String;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->profileRegistry_delegate$lambda$0(Lcom/ichi2/anki/multiprofile/ProfileManager;)Lcom/ichi2/anki/multiprofile/ProfileManager$ProfileRegistry;
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->resolveProfileDirectory-TRoClbo(Ljava/lang/String;)Ljava/io/File;
+Lcom/ichi2/anki/multiprofile/ProfileManager$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/multiprofile/ProfileManager$$ExternalSyntheticLambda3;-><init>(Lcom/ichi2/anki/multiprofile/ProfileManager;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager$$ExternalSyntheticLambda3;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/multiprofile/ProfileManager$$ExternalSyntheticLambda4;
+SPLcom/ichi2/anki/multiprofile/ProfileManager$$ExternalSyntheticLambda4;-><init>(Lcom/ichi2/anki/multiprofile/ProfileManager;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager$$ExternalSyntheticLambda4;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/multiprofile/ProfileManager$Companion;
+SPLcom/ichi2/anki/multiprofile/ProfileManager$Companion;-><init>()V
+SPLcom/ichi2/anki/multiprofile/ProfileManager$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager$Companion;->create(Landroid/content/Context;)Lcom/ichi2/anki/multiprofile/ProfileManager;
+SPLcom/ichi2/anki/multiprofile/ProfileManager$Companion;->createOrNull(Landroid/content/Context;)Lcom/ichi2/anki/multiprofile/ProfileManager;
+SPLcom/ichi2/anki/multiprofile/ProfileManager$Companion;->getAttachError()Ljava/lang/Throwable;
+Lcom/ichi2/anki/multiprofile/ProfileManager$ProfileRegistry;
+SPLcom/ichi2/anki/multiprofile/ProfileManager$ProfileRegistry;-><init>(Landroid/content/SharedPreferences;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager$ProfileRegistry;->getLastActiveProfileId-K_c7ANI()Ljava/lang/String;
+Lcom/ichi2/anki/multiprofile/ProfileRestrictedDirectory;
+SPLcom/ichi2/anki/multiprofile/ProfileRestrictedDirectory;->constructor-impl(Ljava/io/File;)Ljava/io/File;
+Lcom/ichi2/anki/navigation/AnkiDroidNavigator;
+SPLcom/ichi2/anki/navigation/AnkiDroidNavigator;-><clinit>()V
+SPLcom/ichi2/anki/navigation/AnkiDroidNavigator;-><init>()V
+SPLcom/ichi2/anki/navigation/AnkiDroidNavigator;->initialize(Landroid/app/Application;)V
+SPLcom/ichi2/anki/navigation/AnkiDroidNavigator;->toIntent(Lcom/ichi2/anki/common/destinations/Destination;)Landroid/content/Intent;
+Lcom/ichi2/anki/navigation/AnkiDroidNavigatorKt;
+SPLcom/ichi2/anki/navigation/AnkiDroidNavigatorKt;->initializeNavigator(Landroid/app/Application;)V
+Lcom/ichi2/anki/noteeditor/NoteEditorDestinationKt;
+SPLcom/ichi2/anki/noteeditor/NoteEditorDestinationKt;->toIntent(Lcom/ichi2/anki/common/destinations/NoteEditorDestination;Landroid/content/Context;)Landroid/content/Intent;
+Lcom/ichi2/anki/noteeditor/NoteEditorFragmentDelegate;
 Lcom/ichi2/anki/observability/ChangeManager;
-SPLcom/ichi2/anki/observability/ChangeManager;->$r8$lambda$BU3Q3o0l2QAhizGR2mPtL6erRiA(Lcom/ichi2/anki/observability/ChangeManager$Subscriber;Lcom/ichi2/anki/observability/ChangeManager$Subscriber;)Z
 SPLcom/ichi2/anki/observability/ChangeManager;-><clinit>()V
 SPLcom/ichi2/anki/observability/ChangeManager;-><init>()V
 SPLcom/ichi2/anki/observability/ChangeManager;->access$getSubscribers$p()Ljava/util/concurrent/CopyOnWriteArrayList;
+SPLcom/ichi2/anki/observability/ChangeManager;->setThrowOnDuplicateSubscription(Z)V
 SPLcom/ichi2/anki/observability/ChangeManager;->subscribe$default(Lcom/ichi2/anki/observability/ChangeManager;Lcom/ichi2/anki/observability/ChangeManager$Subscriber;Landroidx/lifecycle/LifecycleOwner;ILjava/lang/Object;)V
 SPLcom/ichi2/anki/observability/ChangeManager;->subscribe(Lcom/ichi2/anki/observability/ChangeManager$Subscriber;Landroidx/lifecycle/LifecycleOwner;)V
 SPLcom/ichi2/anki/observability/ChangeManager;->unsubscribe$lambda$0(Lcom/ichi2/anki/observability/ChangeManager$Subscriber;Lcom/ichi2/anki/observability/ChangeManager$Subscriber;)Z
 SPLcom/ichi2/anki/observability/ChangeManager;->unsubscribe(Lcom/ichi2/anki/observability/ChangeManager$Subscriber;)V
 Lcom/ichi2/anki/observability/ChangeManager$$ExternalSyntheticLambda0;
-SPLcom/ichi2/anki/observability/ChangeManager$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/observability/ChangeManager$Subscriber;)V
-SPLcom/ichi2/anki/observability/ChangeManager$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/observability/ChangeManager$$ExternalSyntheticLambda0;-><init>()V
+Lcom/ichi2/anki/observability/ChangeManager$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/observability/ChangeManager$$ExternalSyntheticLambda1;-><init>(Lcom/ichi2/anki/observability/ChangeManager$Subscriber;)V
+SPLcom/ichi2/anki/observability/ChangeManager$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/observability/ChangeManager$Subscriber;
-Lcom/ichi2/anki/observability/ChangeManager$subscribe$1;
-SPLcom/ichi2/anki/observability/ChangeManager$subscribe$1;-><init>(Ljava/lang/ref/WeakReference;Lcom/ichi2/anki/observability/ChangeManager$Subscriber;)V
-SPLcom/ichi2/anki/observability/ChangeManager$subscribe$1;->onCreate(Landroidx/lifecycle/LifecycleOwner;)V
-SPLcom/ichi2/anki/observability/ChangeManager$subscribe$1;->onDestroy(Landroidx/lifecycle/LifecycleOwner;)V
-SPLcom/ichi2/anki/observability/ChangeManager$subscribe$1;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
-SPLcom/ichi2/anki/observability/ChangeManager$subscribe$1;->onStart(Landroidx/lifecycle/LifecycleOwner;)V
+Lcom/ichi2/anki/observability/ChangeManager$subscribe$2;
+SPLcom/ichi2/anki/observability/ChangeManager$subscribe$2;-><init>(Ljava/lang/ref/WeakReference;Lcom/ichi2/anki/observability/ChangeManager$Subscriber;)V
+SPLcom/ichi2/anki/observability/ChangeManager$subscribe$2;->onCreate(Landroidx/lifecycle/LifecycleOwner;)V
+SPLcom/ichi2/anki/observability/ChangeManager$subscribe$2;->onDestroy(Landroidx/lifecycle/LifecycleOwner;)V
+SPLcom/ichi2/anki/observability/ChangeManager$subscribe$2;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
+SPLcom/ichi2/anki/observability/ChangeManager$subscribe$2;->onStart(Landroidx/lifecycle/LifecycleOwner;)V
 Lcom/ichi2/anki/observability/ChangeManagerKt;
-SPLcom/ichi2/anki/observability/ChangeManagerKt;->$r8$lambda$8t0n24DDrX6UZIBasO-85q-Nf8I(Lkotlin/jvm/functions/Function1;Ljava/lang/ref/WeakReference;)Z
 SPLcom/ichi2/anki/observability/ChangeManagerKt;->access$removeWeakReferences(Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
 SPLcom/ichi2/anki/observability/ChangeManagerKt;->removeWeakReferences$lambda$0(Lkotlin/jvm/functions/Function1;Ljava/lang/ref/WeakReference;)Z
 SPLcom/ichi2/anki/observability/ChangeManagerKt;->removeWeakReferences(Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
 Lcom/ichi2/anki/observability/ChangeManagerKt$$ExternalSyntheticLambda0;
 SPLcom/ichi2/anki/observability/ChangeManagerKt$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/functions/Function1;)V
 SPLcom/ichi2/anki/observability/ChangeManagerKt$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/observability/OpChangesPublisher;
+SPLcom/ichi2/anki/observability/OpChangesPublisher;-><clinit>()V
+SPLcom/ichi2/anki/observability/OpChangesPublisher;-><init>(Lkotlin/jvm/functions/Function2;)V
 Lcom/ichi2/anki/pages/PostRequestHandler;
-Lcom/ichi2/anki/preferences/PreferenceUtilsKt;
-SPLcom/ichi2/anki/preferences/PreferenceUtilsKt;->sharedPrefs(Landroid/content/Context;)Landroid/content/SharedPreferences;
+Lcom/ichi2/anki/preferences/SharedPreferencesProvider;
+Lcom/ichi2/anki/progress/HasProgress;
+Lcom/ichi2/anki/progress/ProgressManager;
+SPLcom/ichi2/anki/progress/ProgressManager;-><clinit>()V
+SPLcom/ichi2/anki/progress/ProgressManager;-><init>()V
+SPLcom/ichi2/anki/progress/ProgressManager;->getProgress()Lkotlinx/coroutines/flow/StateFlow;
+Lcom/ichi2/anki/progress/ProgressObserverKt;
+SPLcom/ichi2/anki/progress/ProgressObserverKt;-><clinit>()V
+SPLcom/ichi2/anki/progress/ProgressObserverKt;->access$observeProgress_exY8QGI$unblockInput(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/ichi2/anki/AnkiActivity;)V
+SPLcom/ichi2/anki/progress/ProgressObserverKt;->blockTouches(Landroid/view/Window;)V
+SPLcom/ichi2/anki/progress/ProgressObserverKt;->observeProgress-exY8QGI$default(Lcom/ichi2/anki/AnkiActivity;Lcom/ichi2/anki/progress/HasProgress;JLkotlin/jvm/functions/Function2;ILjava/lang/Object;)V
+SPLcom/ichi2/anki/progress/ProgressObserverKt;->observeProgress-exY8QGI(Lcom/ichi2/anki/AnkiActivity;Lcom/ichi2/anki/progress/HasProgress;JLkotlin/jvm/functions/Function2;)V
+SPLcom/ichi2/anki/progress/ProgressObserverKt;->observeProgress_exY8QGI$unblockInput(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/ichi2/anki/AnkiActivity;)V
+SPLcom/ichi2/anki/progress/ProgressObserverKt;->unblockTouches(Landroid/view/Window;)V
+Lcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1;
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1;-><init>(Lcom/ichi2/anki/AnkiActivity;Lcom/ichi2/anki/progress/HasProgress;Lkotlin/jvm/internal/Ref$BooleanRef;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/internal/Ref$ObjectRef;JLkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1;
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1;-><init>(Lcom/ichi2/anki/progress/HasProgress;Lkotlin/jvm/internal/Ref$BooleanRef;Lcom/ichi2/anki/AnkiActivity;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/internal/Ref$ObjectRef;JLkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1$1;
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$BooleanRef;Lcom/ichi2/anki/AnkiActivity;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lcom/ichi2/anki/progress/HasProgress;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/internal/Ref$ObjectRef;J)V
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1$1;->emit(Lcom/ichi2/anki/progress/ViewModelProgress;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1$1;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/progress/ViewModelProgress;
+Lcom/ichi2/anki/progress/ViewModelProgress$Idle;
+SPLcom/ichi2/anki/progress/ViewModelProgress$Idle;-><clinit>()V
+SPLcom/ichi2/anki/progress/ViewModelProgress$Idle;-><init>()V
 Lcom/ichi2/anki/provider/CardContentProvider;
 SPLcom/ichi2/anki/provider/CardContentProvider;-><clinit>()V
 SPLcom/ichi2/anki/provider/CardContentProvider;-><init>()V
 SPLcom/ichi2/anki/provider/CardContentProvider;->_init_$addUri(Ljava/lang/String;I)V
 SPLcom/ichi2/anki/provider/CardContentProvider;->onCreate()Z
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda0;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda1;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda10;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda10;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda11;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda11;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda12;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda12;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda13;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda13;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda14;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda14;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda15;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda15;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda16;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda16;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda17;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda17;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda18;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda18;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda19;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda19;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda2;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda21;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda21;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda22;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda22;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda23;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda23;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda24;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda24;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda25;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda25;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda26;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda26;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda27;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda27;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda28;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda28;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda3;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda4;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda4;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda5;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda5;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda6;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda6;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda7;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda7;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda8;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda8;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda9;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda9;-><init>()V
 Lcom/ichi2/anki/provider/CardContentProvider$Companion;
 SPLcom/ichi2/anki/provider/CardContentProvider$Companion;-><init>()V
 SPLcom/ichi2/anki/provider/CardContentProvider$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/provider/ContentProviderStartup;
+SPLcom/ichi2/anki/provider/ContentProviderStartup;-><clinit>()V
+SPLcom/ichi2/anki/provider/ContentProviderStartup;-><init>()V
+SPLcom/ichi2/anki/provider/ContentProviderStartup;->onProviderCreate$lambda$0(Lcom/ichi2/anki/provider/ContentProviderStartup;)V
+SPLcom/ichi2/anki/provider/ContentProviderStartup;->onProviderCreate()V
+Lcom/ichi2/anki/provider/ContentProviderStartup$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/provider/ContentProviderStartup$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/provider/ContentProviderStartup;)V
+SPLcom/ichi2/anki/provider/ContentProviderStartup$$ExternalSyntheticLambda0;->run()V
+Lcom/ichi2/anki/recorder/VoiceRecorder;
+SPLcom/ichi2/anki/recorder/VoiceRecorder;-><clinit>()V
+SPLcom/ichi2/anki/recorder/VoiceRecorder;->access$getRECORDING_RETENTION$cp()J
+Lcom/ichi2/anki/recorder/VoiceRecorder$Companion;
+SPLcom/ichi2/anki/recorder/VoiceRecorder$Companion;-><init>()V
+SPLcom/ichi2/anki/recorder/VoiceRecorder$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/recorder/VoiceRecorder$Companion;->recordingsDirectory(Landroid/content/Context;)Ljava/io/File;
+SPLcom/ichi2/anki/recorder/VoiceRecorder$Companion;->removeExpiredRecordings$default(Lcom/ichi2/anki/recorder/VoiceRecorder$Companion;Ljava/io/File;JILjava/lang/Object;)V
+SPLcom/ichi2/anki/recorder/VoiceRecorder$Companion;->removeExpiredRecordings(Ljava/io/File;J)V
+Lcom/ichi2/anki/recorder/VoiceRecorder$Companion$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/recorder/VoiceRecorder$Companion$$ExternalSyntheticLambda0;-><init>()V
 Lcom/ichi2/anki/reviewer/AutomaticAnswer$AutomaticallyAnswered;
 Lcom/ichi2/anki/reviewer/BindingProcessor;
 Lcom/ichi2/anki/reviewer/ReviewerUi;
+Lcom/ichi2/anki/reviewreminders/ReminderLogTree;
+SPLcom/ichi2/anki/reviewreminders/ReminderLogTree;-><clinit>()V
+SPLcom/ichi2/anki/reviewreminders/ReminderLogTree;-><init>(Landroid/content/Context;)V
+SPLcom/ichi2/anki/reviewreminders/ReminderLogTree;->isLoggable(Ljava/lang/String;I)Z
+SPLcom/ichi2/anki/reviewreminders/ReminderLogTree;->log(ILjava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+Lcom/ichi2/anki/reviewreminders/ReminderLogTree$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/reviewreminders/ReminderLogTree$$ExternalSyntheticLambda0;-><init>()V
+Lcom/ichi2/anki/reviewreminders/ReminderLogTree$Companion;
+SPLcom/ichi2/anki/reviewreminders/ReminderLogTree$Companion;-><init>()V
+SPLcom/ichi2/anki/reviewreminders/ReminderLogTree$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/reviewreminders/ReviewReminder;
+Lcom/ichi2/anki/reviewreminders/ReviewReminderSchema;
+Lcom/ichi2/anki/reviewreminders/ReviewReminderSchemaV1;
+Lcom/ichi2/anki/reviewreminders/ReviewReminderSchemaV2;
+Lcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion;
+SPLcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion;-><clinit>()V
+SPLcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion;-><init>(I)V
+SPLcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion;->box-impl(I)Lcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion;
+SPLcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion;->constructor-impl(I)I
+SPLcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion;->hashCode()I
+SPLcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion;->hashCode-impl(I)I
+Lcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion$Companion;
+SPLcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion$Companion;-><init>()V
+SPLcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/reviewreminders/ReviewRemindersDatabase;
+SPLcom/ichi2/anki/reviewreminders/ReviewRemindersDatabase;-><clinit>()V
+SPLcom/ichi2/anki/reviewreminders/ReviewRemindersDatabase;-><init>()V
+SPLcom/ichi2/anki/reviewreminders/ReviewRemindersDatabase;->checkDeserializationErrors(Landroid/content/Context;)V
 Lcom/ichi2/anki/servicelayer/DebugInfoService;
 SPLcom/ichi2/anki/servicelayer/DebugInfoService;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/DebugInfoService;-><init>()V
@@ -9123,7 +10985,6 @@ Lcom/ichi2/anki/servicelayer/DebugInfoService$getDebugInfo$1;
 SPLcom/ichi2/anki/servicelayer/DebugInfoService$getDebugInfo$1;-><init>(Lcom/ichi2/anki/servicelayer/DebugInfoService;Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/servicelayer/DebugInfoService$getDebugInfo$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/servicelayer/DebugInfoServiceKt;
-SPLcom/ichi2/anki/servicelayer/DebugInfoServiceKt;->$r8$lambda$XQy_klgseapixA9pLanAm7mGlT8(Lcom/ichi2/anki/libanki/Collection;)Ljava/lang/Boolean;
 SPLcom/ichi2/anki/servicelayer/DebugInfoServiceKt;->getFSRSStatus$lambda$0(Lcom/ichi2/anki/libanki/Collection;)Ljava/lang/Boolean;
 SPLcom/ichi2/anki/servicelayer/DebugInfoServiceKt;->getFSRSStatus(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Lcom/ichi2/anki/servicelayer/DebugInfoServiceKt$$ExternalSyntheticLambda0;
@@ -9142,7 +11003,6 @@ SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade;-><ini
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade;-><init>(ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade;->getVersionIdentifier()I
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$Companion;
-SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$Companion;->$r8$lambda$HOrn_rnH3_n7IHpuOTYCym4fziY(Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade;)I
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$Companion;-><init>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$Companion;->getAllInstances(J)Lkotlin/sequences/Sequence;
@@ -9150,7 +11010,7 @@ SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$Compan
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$Companion;->getAllVersionIdentifiers()Lkotlin/sequences/Sequence;
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$Companion;->getLatestVersion()I
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$Companion;->setPreferenceToLatestVersion(Landroid/content/SharedPreferences;)V
-SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$Companion;->setPreferenceVersion$AnkiDroid_playNonMinifiedRelease(Landroid/content/SharedPreferences;I)V
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$Companion;->setPreferenceVersion$AnkiDroid(Landroid/content/SharedPreferences;I)V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$Companion$$ExternalSyntheticLambda0;
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$Companion$$ExternalSyntheticLambda0;-><init>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$Companion$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
@@ -9165,32 +11025,52 @@ Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$LegacyPr
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$LegacyPreferenceUpgrade$Companion;-><init>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$LegacyPreferenceUpgrade$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveAnswerRecommended;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveAnswerRecommended;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveAnswerRecommended;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveBackupMax;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveBackupMax;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveBackupMax;-><init>()V
+Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveDeveloperFindReplace;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveDeveloperFindReplace;-><clinit>()V
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveDeveloperFindReplace;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveHostNum;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveHostNum;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveHostNum;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveInCardsMode;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveInCardsMode;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveInCardsMode;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveLastExportedAtTime;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveLastExportedAtTime;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveLastExportedAtTime;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveLongTouchGesture;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveLongTouchGesture;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveLongTouchGesture;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveNoCodeFormatting;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveNoCodeFormatting;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveNoCodeFormatting;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveReviewerETA;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveReviewerETA;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveReviewerETA;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveScrollingButtons;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveScrollingButtons;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$RemoveScrollingButtons;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$ResetAnalyticsOptIn;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$ResetAnalyticsOptIn;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$ResetAnalyticsOptIn;-><init>()V
+Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$ResetAnalyticsOptIn2;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$ResetAnalyticsOptIn2;-><clinit>()V
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$ResetAnalyticsOptIn2;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$SetShowDeckTitle;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$SetShowDeckTitle;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$SetShowDeckTitle;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpdateNoteEditorToolbarPrefs;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpdateNoteEditorToolbarPrefs;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpdateNoteEditorToolbarPrefs;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeAnswerControls;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeAnswerControls;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeAnswerControls;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeAppLocale;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeAppLocale;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeAppLocale;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeBrowserColumns;
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeBrowserColumns;-><clinit>()V
@@ -9199,14 +11079,19 @@ Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeB
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeBrowserColumns$Companion;-><init>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeBrowserColumns$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeDayAndNightThemes;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeDayAndNightThemes;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeDayAndNightThemes;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeDoubleTapTimeout;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeDoubleTapTimeout;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeDoubleTapTimeout;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeFetchMedia;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeFetchMedia;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeFetchMedia;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeGesturesToControls;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeGesturesToControls;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeGesturesToControls;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeHideAnswerButtons;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeHideAnswerButtons;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeHideAnswerButtons;-><init>()V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeThemes;
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeThemes;-><clinit>()V
@@ -9215,12 +11100,8 @@ Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeT
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeThemes$Companion;-><init>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeThemes$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 Lcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeToggleBacksideOnlyControl;
+SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeToggleBacksideOnlyControl;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/PreferenceUpgradeService$PreferenceUpgrade$UpgradeToggleBacksideOnlyControl;-><init>()V
-Lcom/ichi2/anki/servicelayer/ScopedStorageService;
-SPLcom/ichi2/anki/servicelayer/ScopedStorageService;-><clinit>()V
-SPLcom/ichi2/anki/servicelayer/ScopedStorageService;-><init>()V
-SPLcom/ichi2/anki/servicelayer/ScopedStorageService;->isLegacyStorage(Landroid/content/Context;)Z
-SPLcom/ichi2/anki/servicelayer/ScopedStorageService;->isLegacyStorage(Ljava/io/File;Landroid/content/Context;)Z
 Lcom/ichi2/anki/servicelayer/ThrowableFilterService;
 SPLcom/ichi2/anki/servicelayer/ThrowableFilterService;-><clinit>()V
 SPLcom/ichi2/anki/servicelayer/ThrowableFilterService;-><init>()V
@@ -9230,13 +11111,12 @@ Lcom/ichi2/anki/servicelayer/ThrowableFilterService$$ExternalSyntheticLambda0;
 SPLcom/ichi2/anki/servicelayer/ThrowableFilterService$$ExternalSyntheticLambda0;-><init>()V
 Lcom/ichi2/anki/servicelayer/ThrowableFilterService$FilteringExceptionHandler;
 Lcom/ichi2/anki/services/BootService;
-SPLcom/ichi2/anki/services/BootService;->$r8$lambda$SEeZpcFOCw0DBTJRBFzGzRpEJ5A(Landroid/content/Context;)V
 SPLcom/ichi2/anki/services/BootService;-><clinit>()V
 SPLcom/ichi2/anki/services/BootService;-><init>()V
 SPLcom/ichi2/anki/services/BootService;->catchAlarmManagerErrors(Landroid/content/Context;Ljava/lang/Runnable;)V
 SPLcom/ichi2/anki/services/BootService;->getColSafe()Lcom/ichi2/anki/libanki/Collection;
-SPLcom/ichi2/anki/services/BootService;->onReceive$lambda$1(Landroid/content/Context;)V
-SPLcom/ichi2/anki/services/BootService;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V
+SPLcom/ichi2/anki/services/BootService;->onReceiveBroadcast$lambda$1(Landroid/content/Context;)V
+SPLcom/ichi2/anki/services/BootService;->onReceiveBroadcast(Landroid/content/Context;Landroid/content/Intent;)V
 Lcom/ichi2/anki/services/BootService$$ExternalSyntheticLambda0;
 SPLcom/ichi2/anki/services/BootService$$ExternalSyntheticLambda0;-><init>(Landroid/content/Context;)V
 SPLcom/ichi2/anki/services/BootService$$ExternalSyntheticLambda0;->run()V
@@ -9251,20 +11131,24 @@ Lcom/ichi2/anki/settings/PrefsRepository;
 SPLcom/ichi2/anki/settings/PrefsRepository;-><clinit>()V
 SPLcom/ichi2/anki/settings/PrefsRepository;-><init>(Landroid/content/Context;)V
 SPLcom/ichi2/anki/settings/PrefsRepository;-><init>(Landroid/content/SharedPreferences;Landroid/content/res/Resources;)V
+SPLcom/ichi2/anki/settings/PrefsRepository;-><init>(Lcom/ichi2/anki/preferences/SharedPreferencesProvider;Landroid/content/res/Resources;)V
+SPLcom/ichi2/anki/settings/PrefsRepository;->_init_$lambda$0(Landroid/content/SharedPreferences;)Landroid/content/SharedPreferences;
 SPLcom/ichi2/anki/settings/PrefsRepository;->booleanPref(IZ)Lkotlin/properties/ReadWriteProperty;
 SPLcom/ichi2/anki/settings/PrefsRepository;->booleanPref(Ljava/lang/String;Z)Lkotlin/properties/ReadWriteProperty;
 SPLcom/ichi2/anki/settings/PrefsRepository;->enumPref(ILjava/lang/Enum;)Lkotlin/properties/ReadWriteProperty;
-SPLcom/ichi2/anki/settings/PrefsRepository;->getAllowSyncOnMeteredConnections()Z
 SPLcom/ichi2/anki/settings/PrefsRepository;->getAppTheme()Lcom/ichi2/anki/settings/enums/AppTheme;
 SPLcom/ichi2/anki/settings/PrefsRepository;->getBoolean(IZ)Z
 SPLcom/ichi2/anki/settings/PrefsRepository;->getCurrentSyncUri()Ljava/lang/String;
 SPLcom/ichi2/anki/settings/PrefsRepository;->getCustomSyncCertificate()Ljava/lang/String;
 SPLcom/ichi2/anki/settings/PrefsRepository;->getDayTheme()Lcom/ichi2/anki/settings/enums/DayTheme;
+SPLcom/ichi2/anki/settings/PrefsRepository;->getDevBottomNavEnabled()Z
 SPLcom/ichi2/anki/settings/PrefsRepository;->getDisplaySyncStatus()Z
 SPLcom/ichi2/anki/settings/PrefsRepository;->getEnum(ILjava/lang/Enum;)Ljava/lang/Enum;
 SPLcom/ichi2/anki/settings/PrefsRepository;->getExitViaDoubleTapBack()Z
 SPLcom/ichi2/anki/settings/PrefsRepository;->getHkey()Ljava/lang/String;
 SPLcom/ichi2/anki/settings/PrefsRepository;->getNewReviewRemindersEnabled()Z
+SPLcom/ichi2/anki/settings/PrefsRepository;->getRemoveAppAnimations()Z
+SPLcom/ichi2/anki/settings/PrefsRepository;->getReviewReminderDeserializationErrors()Ljava/lang/String;
 SPLcom/ichi2/anki/settings/PrefsRepository;->getSharedPrefs()Landroid/content/SharedPreferences;
 SPLcom/ichi2/anki/settings/PrefsRepository;->getString(ILjava/lang/String;)Ljava/lang/String;
 SPLcom/ichi2/anki/settings/PrefsRepository;->intPref(II)Lkotlin/properties/ReadWriteProperty;
@@ -9277,6 +11161,9 @@ SPLcom/ichi2/anki/settings/PrefsRepository;->key(I)Ljava/lang/String;
 SPLcom/ichi2/anki/settings/PrefsRepository;->longPref(IJ)Lkotlin/properties/ReadWriteProperty;
 SPLcom/ichi2/anki/settings/PrefsRepository;->stringPref$default(Lcom/ichi2/anki/settings/PrefsRepository;ILjava/lang/String;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty;
 SPLcom/ichi2/anki/settings/PrefsRepository;->stringPref(ILjava/lang/String;)Lkotlin/properties/ReadWriteProperty;
+Lcom/ichi2/anki/settings/PrefsRepository$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/settings/PrefsRepository$$ExternalSyntheticLambda0;-><init>(Landroid/content/SharedPreferences;)V
+SPLcom/ichi2/anki/settings/PrefsRepository$$ExternalSyntheticLambda0;->sharedPrefs()Landroid/content/SharedPreferences;
 Lcom/ichi2/anki/settings/PrefsRepository$Companion;
 SPLcom/ichi2/anki/settings/PrefsRepository$Companion;-><init>()V
 SPLcom/ichi2/anki/settings/PrefsRepository$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -9328,16 +11215,37 @@ SPLcom/ichi2/anki/settings/enums/ToolbarPosition;->$values()[Lcom/ichi2/anki/set
 SPLcom/ichi2/anki/settings/enums/ToolbarPosition;-><clinit>()V
 SPLcom/ichi2/anki/settings/enums/ToolbarPosition;-><init>(Ljava/lang/String;II)V
 Lcom/ichi2/anki/snackbar/BaseSnackbarBuilderProvider;
+Lcom/ichi2/anki/startup/BackendSetupKt;
+SPLcom/ichi2/anki/startup/BackendSetupKt;->configureBackendTemporaryDirectory(Landroid/content/Context;)V
+SPLcom/ichi2/anki/startup/BackendSetupKt;->isUsableTemporaryDirectory(Ljava/lang/String;)Z
+Lcom/ichi2/anki/startup/SetupStorageKt;
+SPLcom/ichi2/anki/startup/SetupStorageKt;->ensureCollectionPathSet(Landroid/content/Context;)V
+Lcom/ichi2/anki/ui/BottomFadeFrameLayout;
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout;-><clinit>()V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout;->dispatchDraw(Landroid/graphics/Canvas;)V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout;->setAnchorView(Landroid/view/View;)V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout;->setup(Landroid/view/Window;)V
+Lcom/ichi2/anki/ui/BottomFadeFrameLayout$Companion;
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout$Companion;-><init>()V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout$Companion;->navigationBarStyle$lambda$0(Landroid/content/res/Resources;)Z
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout$Companion;->navigationBarStyle()Landroidx/activity/SystemBarStyle;
+Lcom/ichi2/anki/ui/BottomFadeFrameLayout$Companion$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout$Companion$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout$Companion$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/ui/DoubleTapListener;
+SPLcom/ichi2/anki/ui/DoubleTapListener;-><clinit>()V
 SPLcom/ichi2/anki/ui/DoubleTapListener;-><init>(Landroid/content/Context;)V
 Lcom/ichi2/anki/ui/DoubleTapListener$detector$1;
 SPLcom/ichi2/anki/ui/DoubleTapListener$detector$1;-><init>(Landroid/content/Context;Lcom/ichi2/anki/ui/DoubleTapListener$detector$2;)V
 Lcom/ichi2/anki/ui/DoubleTapListener$detector$2;
 SPLcom/ichi2/anki/ui/DoubleTapListener$detector$2;-><init>(Lcom/ichi2/anki/ui/DoubleTapListener;)V
+Lcom/ichi2/anki/ui/ResizablePaneLayout;
 Lcom/ichi2/anki/ui/ResizingDivider;
 Lcom/ichi2/anki/ui/animations/ViewAnimationsKt;
-SPLcom/ichi2/anki/ui/animations/ViewAnimationsKt;->$r8$lambda$Md8x5lxmN9HxCdJZ36q-a8cpNV8(Landroid/view/View;)V
-SPLcom/ichi2/anki/ui/animations/ViewAnimationsKt;->$r8$lambda$ZsJKR0iOPvQsTUfpc_6Uyiv_GfI(Landroid/view/View;)V
 SPLcom/ichi2/anki/ui/animations/ViewAnimationsKt;->fadeIn$default(Landroid/view/View;IFLjava/lang/Runnable;ILjava/lang/Object;)Landroid/view/ViewPropertyAnimator;
 SPLcom/ichi2/anki/ui/animations/ViewAnimationsKt;->fadeIn$lambda$0(Landroid/view/View;)V
 SPLcom/ichi2/anki/ui/animations/ViewAnimationsKt;->fadeIn(Landroid/view/View;IFLjava/lang/Runnable;)Landroid/view/ViewPropertyAnimator;
@@ -9379,71 +11287,124 @@ SPLcom/ichi2/anki/ui/internationalization/SentenceCase;-><clinit>()V
 SPLcom/ichi2/anki/ui/internationalization/SentenceCase;-><init>()V
 SPLcom/ichi2/anki/ui/internationalization/SentenceCase;->getCheckDatabase(Landroid/content/Context;)Ljava/lang/String;
 SPLcom/ichi2/anki/ui/internationalization/SentenceCase;->getCheckMediaAction(Landroid/content/Context;)Ljava/lang/String;
+SPLcom/ichi2/anki/ui/internationalization/SentenceCase;->getCreateDeck(Landroid/content/Context;)Ljava/lang/String;
+SPLcom/ichi2/anki/ui/internationalization/SentenceCase;->getEmptyCards(Landroid/content/Context;)Ljava/lang/String;
 Lcom/ichi2/anki/ui/internationalization/SentenceCaseKt;
 SPLcom/ichi2/anki/ui/internationalization/SentenceCaseKt;->getSentenceCase(Lanki/i18n/GeneratedTranslations;)Lcom/ichi2/anki/ui/internationalization/SentenceCase;
+SPLcom/ichi2/anki/ui/internationalization/SentenceCaseKt;->matchesSentenceCaseResource(Ljava/lang/String;Ljava/lang/String;)Z
 SPLcom/ichi2/anki/ui/internationalization/SentenceCaseKt;->toSentenceCase(Landroid/content/Context;Ljava/lang/String;I)Ljava/lang/String;
 SPLcom/ichi2/anki/ui/internationalization/SentenceCaseKt;->toSentenceCase(Ljava/lang/String;Landroid/content/Context;I)Ljava/lang/String;
 Lcom/ichi2/anki/ui/windows/permissions/InternetPermissionFragment;
-Lcom/ichi2/anki/ui/windows/permissions/NotificationsPermissionFragment;
 Lcom/ichi2/anki/ui/windows/permissions/PermissionsFragment;
 Lcom/ichi2/anki/ui/windows/permissions/PermissionsStartingAt30Fragment;
 Lcom/ichi2/anki/ui/windows/permissions/PermissionsUntil29Fragment;
+Lcom/ichi2/anki/utils/ExceptionsKt;
+SPLcom/ichi2/anki/utils/ExceptionsKt;->runWithOOMCheck(Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+Lcom/ichi2/anki/utils/InsetsKt;
+SPLcom/ichi2/anki/utils/InsetsKt;->bottomCornerClearance(Landroidx/core/view/WindowInsetsCompat;Landroid/view/View;)I
+SPLcom/ichi2/anki/utils/InsetsKt;->getBottomRoundedCornerRadius(Landroidx/core/view/WindowInsetsCompat;)I
 Lcom/ichi2/anki/utils/MimeTypeUtils;
 SPLcom/ichi2/anki/utils/MimeTypeUtils;-><clinit>()V
 SPLcom/ichi2/anki/utils/MimeTypeUtils;-><init>()V
 SPLcom/ichi2/anki/utils/MimeTypeUtils;->getCSV_TSV_MIME_TYPES()[Ljava/lang/String;
 Lcom/ichi2/anki/utils/ext/FlowKt;
+SPLcom/ichi2/anki/utils/ext/FlowKt;->launchCollectionInLifecycleScope(Lcom/ichi2/anki/AnkiActivity;Lkotlinx/coroutines/flow/Flow;Landroidx/lifecycle/Lifecycle$State;Lkotlin/jvm/functions/Function2;)V
 SPLcom/ichi2/anki/utils/ext/FlowKt;->launchCollectionInLifecycleScope(Lcom/ichi2/anki/AnkiActivity;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;)V
 SPLcom/ichi2/anki/utils/ext/FlowKt;->launchCollectionInLifecycleScope(Lcom/ichi2/anki/AnkiActivity;Lkotlinx/coroutines/flow/StateFlow;Lkotlin/jvm/functions/Function2;)V
 Lcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2;
-SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2;-><init>(Lcom/ichi2/anki/AnkiActivity;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2;-><init>(Lcom/ichi2/anki/AnkiActivity;Landroidx/lifecycle/Lifecycle$State;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1;
-SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1;-><init>(Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1;-><init>(Lkotlinx/coroutines/flow/Flow;Lcom/ichi2/anki/AnkiActivity;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1$1;
-SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1$1;-><init>(Lkotlin/jvm/functions/Function2;)V
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1$1;-><init>(Lcom/ichi2/anki/AnkiActivity;Lkotlin/jvm/functions/Function2;)V
 SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1$1;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Lcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3;
 SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3;-><init>(Lcom/ichi2/anki/AnkiActivity;Lkotlinx/coroutines/flow/StateFlow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1;
-SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1;-><init>(Lkotlinx/coroutines/flow/StateFlow;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1;-><init>(Lkotlinx/coroutines/flow/StateFlow;Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/ichi2/anki/AnkiActivity;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1$1;
-SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlinx/coroutines/flow/StateFlow;Lkotlin/jvm/functions/Function2;)V
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/ichi2/anki/AnkiActivity;Lkotlin/jvm/functions/Function2;)V
 SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1$1;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Lcom/ichi2/anki/utils/ext/FragmentResultKt;
-SPLcom/ichi2/anki/utils/ext/FragmentResultKt;->$r8$lambda$do_Bsiwo5JBIz41hVRKHFyiUqo4(Lkotlin/jvm/functions/Function2;Ljava/lang/String;Landroid/os/Bundle;)V
 SPLcom/ichi2/anki/utils/ext/FragmentResultKt;->setFragmentResultListener$lambda$0(Lkotlin/jvm/functions/Function2;Ljava/lang/String;Landroid/os/Bundle;)V
 SPLcom/ichi2/anki/utils/ext/FragmentResultKt;->setFragmentResultListener(Landroidx/fragment/app/FragmentActivity;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)V
 Lcom/ichi2/anki/utils/ext/FragmentResultKt$$ExternalSyntheticLambda0;
 SPLcom/ichi2/anki/utils/ext/FragmentResultKt$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/functions/Function2;)V
 SPLcom/ichi2/anki/utils/ext/FragmentResultKt$$ExternalSyntheticLambda0;->onFragmentResult(Ljava/lang/String;Landroid/os/Bundle;)V
+Lcom/ichi2/anki/utils/ext/ImageViewKt;
+SPLcom/ichi2/anki/utils/ext/ImageViewKt;->setImageDrawableSafe$lambda$1(Landroid/widget/ImageView;Landroid/graphics/drawable/Drawable;)Z
+SPLcom/ichi2/anki/utils/ext/ImageViewKt;->setImageDrawableSafe(Landroid/widget/ImageView;Landroid/graphics/drawable/Drawable;Lkotlin/jvm/functions/Function1;)Z
+Lcom/ichi2/anki/utils/ext/ImageViewKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/utils/ext/ImageViewKt$$ExternalSyntheticLambda0;-><init>(Landroid/widget/ImageView;Landroid/graphics/drawable/Drawable;)V
+SPLcom/ichi2/anki/utils/ext/ImageViewKt$$ExternalSyntheticLambda0;->invoke()Ljava/lang/Object;
 Lcom/ichi2/anki/utils/ext/LinearLayoutManagerKt;
 SPLcom/ichi2/anki/utils/ext/LinearLayoutManagerKt;->getVisibleItemPositions(Landroidx/recyclerview/widget/LinearLayoutManager;)Lkotlin/ranges/IntRange;
 SPLcom/ichi2/anki/utils/ext/LinearLayoutManagerKt;->positionIsVisible(Landroidx/recyclerview/widget/LinearLayoutManager;I)Z
+Lcom/ichi2/anki/utils/ext/ViewKt;
+SPLcom/ichi2/anki/utils/ext/ViewKt;->onGlobalLayout$lambda$0(Lkotlin/jvm/functions/Function0;)V
+SPLcom/ichi2/anki/utils/ext/ViewKt;->onGlobalLayout(Landroid/view/View;Landroidx/lifecycle/LifecycleOwner;Lkotlin/jvm/functions/Function0;)V
+Lcom/ichi2/anki/utils/ext/ViewKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/utils/ext/ViewKt$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/functions/Function0;)V
+SPLcom/ichi2/anki/utils/ext/ViewKt$$ExternalSyntheticLambda0;->onGlobalLayout()V
+Lcom/ichi2/anki/utils/ext/ViewKt$onGlobalLayout$1;
+SPLcom/ichi2/anki/utils/ext/ViewKt$onGlobalLayout$1;-><init>(Landroid/view/View;Landroid/view/ViewTreeObserver$OnGlobalLayoutListener;)V
+SPLcom/ichi2/anki/utils/ext/ViewKt$onGlobalLayout$1;->onCreate(Landroidx/lifecycle/LifecycleOwner;)V
+SPLcom/ichi2/anki/utils/ext/ViewKt$onGlobalLayout$1;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
+SPLcom/ichi2/anki/utils/ext/ViewKt$onGlobalLayout$1;->onStart(Landroidx/lifecycle/LifecycleOwner;)V
+Lcom/ichi2/anki/widget/WidgetRegistryKt;
+SPLcom/ichi2/anki/widget/WidgetRegistryKt;-><clinit>()V
+SPLcom/ichi2/anki/widget/WidgetRegistryKt;->getRECURRING_WIDGETS()Ljava/util/List;
 Lcom/ichi2/anki/widgets/DeckAdapter;
 SPLcom/ichi2/anki/widgets/DeckAdapter;-><clinit>()V
 SPLcom/ichi2/anki/widgets/DeckAdapter;-><init>(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)V
+SPLcom/ichi2/anki/widgets/DeckAdapter;->access$setDeckExpander(Lcom/ichi2/anki/widgets/DeckAdapter;Landroid/widget/ImageButton;Landroid/widget/ImageButton;Lcom/ichi2/anki/deckpicker/DisplayDeckNode;)V
+SPLcom/ichi2/anki/widgets/DeckAdapter;->onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
+SPLcom/ichi2/anki/widgets/DeckAdapter;->onBindViewHolder(Lcom/ichi2/anki/widgets/DeckAdapter$ViewHolder;I)V
+SPLcom/ichi2/anki/widgets/DeckAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+SPLcom/ichi2/anki/widgets/DeckAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/ichi2/anki/widgets/DeckAdapter$ViewHolder;
 SPLcom/ichi2/anki/widgets/DeckAdapter;->setActivityHasBackground(Z)V
+SPLcom/ichi2/anki/widgets/DeckAdapter;->setDeckExpander(Landroid/widget/ImageButton;Landroid/widget/ImageButton;Lcom/ichi2/anki/deckpicker/DisplayDeckNode;)V
 SPLcom/ichi2/anki/widgets/DeckAdapter;->submit(Ljava/util/List;Z)V
+Lcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/widgets/DeckAdapter;Lcom/ichi2/anki/deckpicker/DisplayDeckNode;)V
+Lcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda1;-><init>(Lcom/ichi2/anki/widgets/DeckAdapter;Lcom/ichi2/anki/deckpicker/DisplayDeckNode;)V
+Lcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda2;-><init>(Lcom/ichi2/anki/widgets/DeckAdapter;Lcom/ichi2/anki/deckpicker/DisplayDeckNode;)V
+Lcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda3;-><init>(Lcom/ichi2/anki/widgets/DeckAdapter;Lcom/ichi2/anki/deckpicker/DisplayDeckNode;)V
+Lcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda4;
+SPLcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda4;-><init>(Lcom/ichi2/anki/widgets/DeckAdapter;Lcom/ichi2/anki/deckpicker/DisplayDeckNode;)V
 Lcom/ichi2/anki/widgets/DeckAdapter$Companion;
 SPLcom/ichi2/anki/widgets/DeckAdapter$Companion;-><init>()V
 SPLcom/ichi2/anki/widgets/DeckAdapter$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/widgets/DeckAdapter$ViewHolder;
+SPLcom/ichi2/anki/widgets/DeckAdapter$ViewHolder;-><clinit>()V
+SPLcom/ichi2/anki/widgets/DeckAdapter$ViewHolder;-><init>(Lcom/ichi2/anki/databinding/ItemDeckBinding;)V
+SPLcom/ichi2/anki/widgets/DeckAdapter$ViewHolder;->getBinding()Lcom/ichi2/anki/databinding/ItemDeckBinding;
+Lcom/ichi2/anki/widgets/DeckAdapter$onBindViewHolder$1;
+SPLcom/ichi2/anki/widgets/DeckAdapter$onBindViewHolder$1;-><init>(Lcom/ichi2/anki/widgets/DeckAdapter;Lcom/ichi2/anki/databinding/ItemDeckBinding;Lcom/ichi2/anki/widgets/DeckAdapter$ViewHolder;Lcom/ichi2/anki/deckpicker/DisplayDeckNode;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/widgets/DeckAdapter$onBindViewHolder$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/widgets/DeckAdapter$onBindViewHolder$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/anki/widgets/DeckAdapterKt;
 SPLcom/ichi2/anki/widgets/DeckAdapterKt;-><clinit>()V
 SPLcom/ichi2/anki/widgets/DeckAdapterKt;->access$getDeckNodeDiffCallback$p()Lcom/ichi2/anki/widgets/DeckAdapterKt$deckNodeDiffCallback$1;
 Lcom/ichi2/anki/widgets/DeckAdapterKt$deckNodeDiffCallback$1;
 SPLcom/ichi2/anki/widgets/DeckAdapterKt$deckNodeDiffCallback$1;-><init>()V
+Lcom/ichi2/anki/widgets/R$id;
+Lcom/ichi2/anki/widgets/R$layout;
 Lcom/ichi2/anki/workarounds/AppLoadedFromBackupWorkaround;
 SPLcom/ichi2/anki/workarounds/AppLoadedFromBackupWorkaround;-><clinit>()V
 SPLcom/ichi2/anki/workarounds/AppLoadedFromBackupWorkaround;-><init>()V
@@ -9456,16 +11417,29 @@ SPLcom/ichi2/anki/worker/SyncWorker$Companion;-><init>(Lkotlin/jvm/internal/Defa
 SPLcom/ichi2/anki/worker/SyncWorker$Companion;->cancel(Landroid/content/Context;)V
 Lcom/ichi2/compat/customtabs/CustomTabActivityHelper;
 SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;-><clinit>()V
-SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;-><init>()V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;-><init>(Lkotlinx/coroutines/CoroutineScope;Lkotlinx/coroutines/CoroutineDispatcher;)V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;-><init>(Lkotlinx/coroutines/CoroutineScope;Lkotlinx/coroutines/CoroutineDispatcher;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->access$getIoDispatcher$p(Lcom/ichi2/compat/customtabs/CustomTabActivityHelper;)Lkotlinx/coroutines/CoroutineDispatcher;
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->access$setCustomTabsSession$p(Lcom/ichi2/compat/customtabs/CustomTabActivityHelper;Landroidx/browser/customtabs/CustomTabsSession;)V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->access$warmup(Lcom/ichi2/compat/customtabs/CustomTabActivityHelper;Landroidx/browser/customtabs/CustomTabsClient;)V
 SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->bindCustomTabsService(Landroid/app/Activity;)V
-SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->getSession()Landroidx/browser/customtabs/CustomTabsSession;
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->getProviderInfo(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/String;
 SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->onServiceConnected(Landroidx/browser/customtabs/CustomTabsClient;)V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->onServiceDisconnected()V
 SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->unbindCustomTabsService(Landroid/app/Activity;)V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->warmup(Landroidx/browser/customtabs/CustomTabsClient;)V
 Lcom/ichi2/compat/customtabs/CustomTabActivityHelper$Companion;
 SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper$Companion;-><init>()V
 SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/compat/customtabs/CustomTabActivityHelper$onServiceConnected$1;
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper$onServiceConnected$1;-><init>(Lcom/ichi2/compat/customtabs/CustomTabActivityHelper;Landroidx/browser/customtabs/CustomTabsClient;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper$onServiceConnected$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper$onServiceConnected$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/compat/customtabs/CustomTabActivityHelper$onServiceConnected$1$1;
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper$onServiceConnected$1$1;-><init>(Lcom/ichi2/compat/customtabs/CustomTabActivityHelper;Landroidx/browser/customtabs/CustomTabsClient;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper$onServiceConnected$1$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper$onServiceConnected$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 Lcom/ichi2/compat/customtabs/CustomTabsHelper;
-SPLcom/ichi2/compat/customtabs/CustomTabsHelper;->$r8$lambda$gXetRGjBtEa98neoLMiNRJltawM(Landroid/content/pm/PackageManager;Landroid/content/Intent;)Landroid/content/pm/ResolveInfo;
 SPLcom/ichi2/compat/customtabs/CustomTabsHelper;-><clinit>()V
 SPLcom/ichi2/compat/customtabs/CustomTabsHelper;-><init>()V
 SPLcom/ichi2/compat/customtabs/CustomTabsHelper;->getPackageNameToUse$lambda$0(Landroid/content/pm/PackageManager;Landroid/content/Intent;)Landroid/content/pm/ResolveInfo;
@@ -9474,21 +11448,22 @@ Lcom/ichi2/compat/customtabs/CustomTabsHelper$$ExternalSyntheticLambda0;
 SPLcom/ichi2/compat/customtabs/CustomTabsHelper$$ExternalSyntheticLambda0;-><init>(Landroid/content/pm/PackageManager;Landroid/content/Intent;)V
 SPLcom/ichi2/compat/customtabs/CustomTabsHelper$$ExternalSyntheticLambda0;->invoke()Ljava/lang/Object;
 Lcom/ichi2/compat/customtabs/ServiceConnection;
+SPLcom/ichi2/compat/customtabs/ServiceConnection;-><clinit>()V
 SPLcom/ichi2/compat/customtabs/ServiceConnection;-><init>(Lcom/ichi2/compat/customtabs/ServiceConnectionCallback;)V
 SPLcom/ichi2/compat/customtabs/ServiceConnection;->onCustomTabsServiceConnected(Landroid/content/ComponentName;Landroidx/browser/customtabs/CustomTabsClient;)V
 Lcom/ichi2/compat/customtabs/ServiceConnectionCallback;
-Lcom/ichi2/preferences/PreferenceExtensionsKt;
-SPLcom/ichi2/preferences/PreferenceExtensionsKt;->getOrSetString(Landroid/content/SharedPreferences;Ljava/lang/String;Ljava/util/function/Supplier;)Ljava/lang/String;
 Lcom/ichi2/themes/Themes;
 SPLcom/ichi2/themes/Themes;-><clinit>()V
 SPLcom/ichi2/themes/Themes;-><init>()V
-SPLcom/ichi2/themes/Themes;->disableXiaomiForceDarkMode(Landroid/content/Context;)V
+SPLcom/ichi2/themes/Themes;->getCurrentTheme()Lcom/ichi2/anki/settings/enums/Theme;
+SPLcom/ichi2/themes/Themes;->isNightTheme()Z
+SPLcom/ichi2/themes/Themes;->setTheme(Landroid/app/Activity;Landroid/os/Bundle;)V
 SPLcom/ichi2/themes/Themes;->setTheme(Landroid/content/Context;)V
-SPLcom/ichi2/themes/Themes;->systemIsInNightMode(Landroid/content/Context;)Z
 SPLcom/ichi2/themes/Themes;->updateCurrentTheme(Landroid/content/Context;)V
 Lcom/ichi2/themes/Themes$WhenMappings;
 SPLcom/ichi2/themes/Themes$WhenMappings;-><clinit>()V
 Lcom/ichi2/ui/AccessibleSearchView;
+SPLcom/ichi2/ui/AccessibleSearchView;-><clinit>()V
 SPLcom/ichi2/ui/AccessibleSearchView;-><init>(Landroid/content/Context;)V
 Lcom/ichi2/ui/BadgeDrawable;
 SPLcom/ichi2/ui/BadgeDrawable;-><clinit>()V
@@ -9508,12 +11483,13 @@ Lcom/ichi2/ui/BadgeDrawableBuilder;
 SPLcom/ichi2/ui/BadgeDrawableBuilder;-><clinit>()V
 SPLcom/ichi2/ui/BadgeDrawableBuilder;-><init>(Landroid/content/Context;)V
 SPLcom/ichi2/ui/BadgeDrawableBuilder;->replaceBadge(Lcom/ichi2/anki/SyncActionProvider;)V
-SPLcom/ichi2/ui/BadgeDrawableBuilder;->withColor(Ljava/lang/Integer;)Lcom/ichi2/ui/BadgeDrawableBuilder;
+SPLcom/ichi2/ui/BadgeDrawableBuilder;->withColorAttr(I)Lcom/ichi2/ui/BadgeDrawableBuilder;
 SPLcom/ichi2/ui/BadgeDrawableBuilder;->withText(C)Lcom/ichi2/ui/BadgeDrawableBuilder;
 Lcom/ichi2/ui/BadgeDrawableBuilder$Companion;
 SPLcom/ichi2/ui/BadgeDrawableBuilder$Companion;-><init>()V
 SPLcom/ichi2/ui/BadgeDrawableBuilder$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 Lcom/ichi2/ui/FixedTextView;
+SPLcom/ichi2/ui/FixedTextView;-><clinit>()V
 SPLcom/ichi2/ui/FixedTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 SPLcom/ichi2/ui/FixedTextView;->onDraw(Landroid/graphics/Canvas;)V
 SPLcom/ichi2/ui/FixedTextView;->onMeasure(II)V
@@ -9524,122 +11500,239 @@ Lcom/ichi2/ui/RtlCompliantActionProvider$Companion;
 SPLcom/ichi2/ui/RtlCompliantActionProvider$Companion;-><init>()V
 SPLcom/ichi2/ui/RtlCompliantActionProvider$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLcom/ichi2/ui/RtlCompliantActionProvider$Companion;->unwrapContext(Landroid/content/Context;)Landroid/app/Activity;
-Lcom/ichi2/utils/AdaptionUtil;
-SPLcom/ichi2/utils/AdaptionUtil;-><clinit>()V
-SPLcom/ichi2/utils/AdaptionUtil;-><init>()V
-SPLcom/ichi2/utils/AdaptionUtil;->isRunningUnderFirebaseTestLab()Z
-SPLcom/ichi2/utils/AdaptionUtil;->isRunningUnderFirebaseTestLab(Landroid/content/ContentResolver;)Z
-SPLcom/ichi2/utils/AdaptionUtil;->isUserATestClient()Z
-Lcom/ichi2/utils/AdaptionUtil$$ExternalSyntheticLambda0;
-SPLcom/ichi2/utils/AdaptionUtil$$ExternalSyntheticLambda0;-><init>()V
-Lcom/ichi2/utils/AdaptionUtil$$ExternalSyntheticLambda1;
-SPLcom/ichi2/utils/AdaptionUtil$$ExternalSyntheticLambda1;-><init>()V
 Lcom/ichi2/utils/ClipboardUtil;
 SPLcom/ichi2/utils/ClipboardUtil;-><clinit>()V
 SPLcom/ichi2/utils/ClipboardUtil;-><init>()V
 SPLcom/ichi2/utils/ClipboardUtil;->getIMPORT_MIME_TYPES()[Ljava/lang/String;
-Lcom/ichi2/utils/DisplayUtils;
-SPLcom/ichi2/utils/DisplayUtils;-><clinit>()V
-SPLcom/ichi2/utils/DisplayUtils;-><init>()V
-SPLcom/ichi2/utils/DisplayUtils;->getDisplayDimensions(Landroid/content/Context;)Landroid/graphics/Point;
-SPLcom/ichi2/utils/DisplayUtils;->getDisplayDimensions(Landroid/view/WindowManager;)Landroid/graphics/Point;
-Lcom/ichi2/utils/Dp;
-SPLcom/ichi2/utils/Dp;->constructor-impl(F)F
-SPLcom/ichi2/utils/Dp;->toPx-impl(FLandroid/content/Context;)I
 Lcom/ichi2/utils/FileUtil;
 SPLcom/ichi2/utils/FileUtil;-><clinit>()V
 SPLcom/ichi2/utils/FileUtil;-><init>()V
 SPLcom/ichi2/utils/FileUtil;->getFreeDiskSpace(Ljava/io/File;J)J
-Lcom/ichi2/utils/HandlerUtils;
-SPLcom/ichi2/utils/HandlerUtils;-><clinit>()V
-SPLcom/ichi2/utils/HandlerUtils;-><init>()V
-SPLcom/ichi2/utils/HandlerUtils;->getDefaultLooper()Landroid/os/Looper;
+Lcom/ichi2/utils/LanguageDebugInfo;
+SPLcom/ichi2/utils/LanguageDebugInfo;-><clinit>()V
+SPLcom/ichi2/utils/LanguageDebugInfo;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;)V
+SPLcom/ichi2/utils/LanguageDebugInfo;->getAppLocale()Ljava/lang/String;
+SPLcom/ichi2/utils/LanguageDebugInfo;->getBackendLocales()Ljava/util/List;
+SPLcom/ichi2/utils/LanguageDebugInfo;->getSystemLocale()Ljava/lang/String;
 Lcom/ichi2/utils/LanguageUtil;
 SPLcom/ichi2/utils/LanguageUtil;-><clinit>()V
 SPLcom/ichi2/utils/LanguageUtil;-><init>()V
 SPLcom/ichi2/utils/LanguageUtil;->getLocaleCompat(Landroid/content/res/Resources;)Ljava/util/Locale;
 SPLcom/ichi2/utils/LanguageUtil;->getSystemLocale()Ljava/util/Locale;
-SPLcom/ichi2/utils/LanguageUtil;->languageTagToBackendCode(Ljava/lang/String;)Ljava/lang/String;
 SPLcom/ichi2/utils/LanguageUtil;->setDefaultBackendLanguages$default(Lcom/ichi2/utils/LanguageUtil;Ljava/lang/String;ILjava/lang/Object;)V
 SPLcom/ichi2/utils/LanguageUtil;->setDefaultBackendLanguages(Ljava/lang/String;)V
-Lcom/ichi2/utils/NetworkUtils;
-SPLcom/ichi2/utils/NetworkUtils;-><clinit>()V
-SPLcom/ichi2/utils/NetworkUtils;-><init>()V
-SPLcom/ichi2/utils/NetworkUtils;->getConnectivityManager()Landroid/net/ConnectivityManager;
-SPLcom/ichi2/utils/NetworkUtils;->isActiveNetworkMetered()Z
-SPLcom/ichi2/utils/NetworkUtils;->isOnline()Z
+Lcom/ichi2/utils/LanguageUtilKt;
+SPLcom/ichi2/utils/LanguageUtilKt;->getLanguageDebugInfo(Landroid/content/Context;)Lcom/ichi2/utils/LanguageDebugInfo;
 Lcom/ichi2/utils/Permissions;
 SPLcom/ichi2/utils/Permissions;-><clinit>()V
 SPLcom/ichi2/utils/Permissions;-><init>()V
-SPLcom/ichi2/utils/Permissions;->arePermissionsDefinedInAnkiDroidManifest(Landroid/content/Context;[Ljava/lang/String;)Z
-SPLcom/ichi2/utils/Permissions;->arePermissionsDefinedInManifest(Landroid/content/Context;Ljava/lang/String;[Ljava/lang/String;)Z
-SPLcom/ichi2/utils/Permissions;->canManageExternalStorage(Landroid/content/Context;)Z
 SPLcom/ichi2/utils/Permissions;->getAppPrivateStartupPermissions()Ljava/util/List;
 SPLcom/ichi2/utils/Permissions;->getExternalManagerStorageAccessStartupPermissions()Ljava/util/List;
 SPLcom/ichi2/utils/Permissions;->getLegacyStorageAccessStartupPermissions()Ljava/util/List;
-SPLcom/ichi2/utils/Permissions;->getPermissionsDefinedInManifest(Landroid/content/Context;Ljava/lang/String;)[Ljava/lang/String;
-SPLcom/ichi2/utils/Permissions;->hasAllPermissions(Landroid/content/Context;Ljava/util/Collection;)Z
-SPLcom/ichi2/utils/Permissions;->hasLegacyStorageAccessPermission(Landroid/content/Context;)Z
-SPLcom/ichi2/utils/Permissions;->hasPermission(Landroid/content/Context;Ljava/lang/String;)Z
-SPLcom/ichi2/utils/Permissions;->hasStorageReadAccessPermission(Landroid/content/Context;)Z
-Lcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;
-SPLcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;->m$1()I
-SPLcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/content/pm/PackageManager;Landroid/content/Intent;Landroid/content/pm/PackageManager$ResolveInfoFlags;)Landroid/content/pm/ResolveInfo;
-SPLcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/graphics/Insets;)I
-SPLcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;->m$2(Landroid/graphics/Insets;)I
-SPLcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;->m$3(Landroid/graphics/Insets;)I
-SPLcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;->m()I
-SPLcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;->m()Z
-SPLcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;->m(J)Landroid/content/pm/PackageManager$PackageInfoFlags;
-SPLcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;->m(J)Landroid/content/pm/PackageManager$ResolveInfoFlags;
-SPLcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/PackageManager;Landroid/content/Intent;Landroid/content/pm/PackageManager$ResolveInfoFlags;)Landroid/content/pm/ResolveInfo;
-SPLcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/PackageManager;Landroid/content/Intent;Landroid/content/pm/PackageManager$ResolveInfoFlags;)Ljava/util/List;
-SPLcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/PackageManager;Ljava/lang/String;Landroid/content/pm/PackageManager$PackageInfoFlags;)Landroid/content/pm/PackageInfo;
-SPLcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;->m(Landroid/graphics/Insets;)I
-SPLcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowInsets;I)Landroid/graphics/Insets;
-SPLcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowManager;)Landroid/view/WindowMetrics;
-SPLcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowMetrics;)Landroid/graphics/Rect;
-SPLcom/ichi2/utils/Permissions$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowMetrics;)Landroid/view/WindowInsets;
-Lcom/ichi2/utils/Threads;
-SPLcom/ichi2/utils/Threads;-><clinit>()V
-SPLcom/ichi2/utils/Threads;-><init>()V
-SPLcom/ichi2/utils/Threads;->isOnMainThread()Z
 Lcom/ichi2/utils/VersionUtils;
 SPLcom/ichi2/utils/VersionUtils;-><clinit>()V
 SPLcom/ichi2/utils/VersionUtils;-><init>()V
 SPLcom/ichi2/utils/VersionUtils;->getApplicationInstance()Landroid/content/Context;
 SPLcom/ichi2/utils/VersionUtils;->getPkgVersionName()Ljava/lang/String;
 Lcom/ichi2/utils/ViewUtilsKt;
-SPLcom/ichi2/utils/ViewUtilsKt;->access$dpToPx(FLandroid/content/Context;)I
 SPLcom/ichi2/utils/ViewUtilsKt;->configureView(Landroid/view/View;Landroid/app/Activity;[Ljava/lang/String;Landroidx/draganddrop/DropHelper$Options;Landroidx/core/view/OnReceiveContentListener;)V
-SPLcom/ichi2/utils/ViewUtilsKt;->dpToPx(FLandroid/content/Context;)I
-SPLcom/ichi2/utils/ViewUtilsKt;->getDp(I)F
+SPLcom/ichi2/utils/ViewUtilsKt;->isRtl(Landroid/content/res/Resources;)Z
+SPLcom/ichi2/utils/ViewUtilsKt;->isRtl(Landroid/view/View;)Z
 Lcom/ichi2/utils/WebViewInfo;
+SPLcom/ichi2/utils/WebViewInfo;-><clinit>()V
 SPLcom/ichi2/utils/WebViewInfo;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)V
 SPLcom/ichi2/utils/WebViewInfo;->getPackageName()Ljava/lang/String;
 SPLcom/ichi2/utils/WebViewInfo;->getUserAgent()Ljava/lang/String;
 SPLcom/ichi2/utils/WebViewInfo;->getVersionCode()Ljava/lang/Long;
 Lcom/ichi2/utils/WebViewUtilsKt;
-SPLcom/ichi2/utils/WebViewUtilsKt;->checkWebViewVersionComponents(Ljava/lang/String;Ljava/lang/String;JLjava/lang/String;)Ljava/lang/Integer;
-SPLcom/ichi2/utils/WebViewUtilsKt;->checkWebviewVersion(Lcom/ichi2/anki/AnkiActivity;)V
-SPLcom/ichi2/utils/WebViewUtilsKt;->getAndroidSystemWebViewPackageInfo$getPackage(Landroid/content/pm/PackageManager;Ljava/lang/String;)Landroid/content/pm/PackageInfo;
-SPLcom/ichi2/utils/WebViewUtilsKt;->getAndroidSystemWebViewPackageInfo(Landroid/content/pm/PackageManager;)Landroid/content/pm/PackageInfo;
-SPLcom/ichi2/utils/WebViewUtilsKt;->getChromeLikeWebViewVersionIfOutdated(Lcom/ichi2/anki/AnkiActivity;)Ljava/lang/Integer;
+SPLcom/ichi2/utils/WebViewUtilsKt;-><clinit>()V
+SPLcom/ichi2/utils/WebViewUtilsKt;->checkWebViewVersionComponents-kAAzjZc(Ljava/lang/String;Ljava/lang/String;JLjava/lang/String;I)Ljava/lang/Integer;
+SPLcom/ichi2/utils/WebViewUtilsKt;->getChromeLikeWebViewVersionIfOutdated-3O3hvnY(Landroid/content/Context;I)Ljava/lang/Integer;
 SPLcom/ichi2/utils/WebViewUtilsKt;->getWebViewInfo(Landroid/content/Context;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLcom/ichi2/utils/WebViewUtilsKt;->getWebviewUserAgent(Landroid/content/Context;)Ljava/lang/String;
 SPLcom/ichi2/utils/WebViewUtilsKt;->setWebContentsDebuggingEnabled(Z)V
+SPLcom/ichi2/utils/WebViewUtilsKt;->showDialogIfWebViewOutdated-DpGE9L0$default(Landroid/content/Context;ILkotlin/jvm/functions/Function0;ILjava/lang/Object;)Z
+SPLcom/ichi2/utils/WebViewUtilsKt;->showDialogIfWebViewOutdated-DpGE9L0(Landroid/content/Context;ILkotlin/jvm/functions/Function0;)Z
+Lcom/ichi2/utils/WebViewUtilsKt$$ExternalSyntheticLambda1;
+SPLcom/ichi2/utils/WebViewUtilsKt$$ExternalSyntheticLambda1;-><init>()V
 Lcom/ichi2/utils/WebViewUtilsKt$getWebViewInfo$2;
 SPLcom/ichi2/utils/WebViewUtilsKt$getWebViewInfo$2;-><init>(Landroid/content/Context;Lkotlin/coroutines/Continuation;)V
 SPLcom/ichi2/utils/WebViewUtilsKt$getWebViewInfo$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 SPLcom/ichi2/utils/WebViewUtilsKt$getWebViewInfo$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/utils/WebViewVersion;
+SPLcom/ichi2/utils/WebViewVersion;->constructor-impl(I)I
+Lcom/ichi2/utils/WebViewVersionCode;
+SPLcom/ichi2/utils/WebViewVersionCode;->constructor-impl(J)J
+Lcom/ichi2/widget/AddNoteWidget;
+SPLcom/ichi2/widget/AddNoteWidget;-><clinit>()V
+Lcom/ichi2/widget/AddNoteWidget$Companion;
+SPLcom/ichi2/widget/AddNoteWidget$Companion;-><init>()V
+SPLcom/ichi2/widget/AddNoteWidget$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/widget/AddNoteWidget$Companion;->updateWidgets-g9s5mYc(Landroid/content/Context;Landroid/appwidget/AppWidgetManager;[I)V
+Lcom/ichi2/widget/AnalyticsWidgetProvider;
+Lcom/ichi2/widget/AnkiDroidWidgetSmall;
+Lcom/ichi2/widget/AppWidgetIds;
+SPLcom/ichi2/widget/AppWidgetIds;-><clinit>()V
+SPLcom/ichi2/widget/AppWidgetIds;->constructor-impl([I)[I
+Lcom/ichi2/widget/AppWidgetIds$Companion;
+SPLcom/ichi2/widget/AppWidgetIds$Companion;-><init>()V
+SPLcom/ichi2/widget/AppWidgetIds$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/widget/DayRolloverAlarm;
+SPLcom/ichi2/widget/DayRolloverAlarm;-><clinit>()V
+Lcom/ichi2/widget/DayRolloverAlarm$Companion;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;-><init>()V
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;->access$nextFutureCutoffMs(Lcom/ichi2/widget/DayRolloverAlarm$Companion;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;->buildPendingIntent(Landroid/content/Context;Ljava/lang/String;)Landroid/app/PendingIntent;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;->nextFutureCutoffMs$lambda$0(Lcom/ichi2/anki/libanki/Collection;)J
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;->nextFutureCutoffMs(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;->scheduleNext(Landroid/content/Context;)V
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;->scheduleNextInternal$lambda$0(JLandroid/app/PendingIntent;Landroid/app/AlarmManager;)Lkotlin/Unit;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;->scheduleNextInternal(Landroid/content/Context;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/widget/DayRolloverAlarm$Companion$$ExternalSyntheticLambda0;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$$ExternalSyntheticLambda0;-><init>(JLandroid/app/PendingIntent;)V
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/widget/DayRolloverAlarm$Companion$$ExternalSyntheticLambda1;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$$ExternalSyntheticLambda1;-><init>()V
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/widget/DayRolloverAlarm$Companion$nextFutureCutoffMs$1;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$nextFutureCutoffMs$1;-><init>(Lcom/ichi2/widget/DayRolloverAlarm$Companion;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$nextFutureCutoffMs$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNext$1;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNext$1;-><init>(Landroid/content/Context;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNext$1;->create(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNext$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNext$1;->invoke(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNext$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNextInternal$1;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNextInternal$1;-><init>(Lcom/ichi2/widget/DayRolloverAlarm$Companion;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNextInternal$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/widget/DayRolloverAlarmKt;
+SPLcom/ichi2/widget/DayRolloverAlarmKt;->access$launchCatchingIoWithReport(Lkotlinx/coroutines/CoroutineScope;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+SPLcom/ichi2/widget/DayRolloverAlarmKt;->launchCatchingIoWithReport(Lkotlinx/coroutines/CoroutineScope;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+Lcom/ichi2/widget/DayRolloverAlarmKt$launchCatchingIoWithReport$1;
+SPLcom/ichi2/widget/DayRolloverAlarmKt$launchCatchingIoWithReport$1;-><init>(Ljava/lang/String;Lkotlin/coroutines/Continuation;)V
+Lcom/ichi2/widget/DayRolloverAlarmKt$launchCatchingIoWithReport$2;
+SPLcom/ichi2/widget/DayRolloverAlarmKt$launchCatchingIoWithReport$2;-><init>(Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/widget/DayRolloverAlarmKt$launchCatchingIoWithReport$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/widget/DayRolloverAlarmKt$launchCatchingIoWithReport$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/widget/DayRolloverAlarmKt$launchCatchingIoWithReport$2;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/widget/DayRolloverAlarmKt$launchCatchingIoWithReport$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/widget/IdKt;
+SPLcom/ichi2/widget/IdKt;->getAppWidgetIdsEx(Landroid/appwidget/AppWidgetManager;Landroid/content/ComponentName;)[I
+SPLcom/ichi2/widget/IdKt;->updateAppWidget-DMUWGG8(Landroid/appwidget/AppWidgetManager;[ILandroid/widget/RemoteViews;)V
+Lcom/ichi2/widget/WidgetAlarmKt;
+SPLcom/ichi2/widget/WidgetAlarmKt;->getAppWidgetIds(Landroid/appwidget/AppWidgetManager;Landroid/content/Context;Ljava/lang/Class;)Ljava/util/List;
+SPLcom/ichi2/widget/WidgetAlarmKt;->restoreRecurringAlarms(Landroid/content/Context;Ljava/util/List;)V
+Lcom/ichi2/widget/WidgetNotificationScheduler;
+SPLcom/ichi2/widget/WidgetNotificationScheduler;-><clinit>()V
+Lcom/ichi2/widget/WidgetNotificationScheduler$Companion;
+SPLcom/ichi2/widget/WidgetNotificationScheduler$Companion;-><clinit>()V
+SPLcom/ichi2/widget/WidgetNotificationScheduler$Companion;-><init>()V
+SPLcom/ichi2/widget/WidgetNotificationScheduler$Companion;->register(Lcom/ichi2/widget/WidgetNotificationScheduler;)V
+Lcom/ichi2/widget/WidgetNotificationSchedulerKt;
+SPLcom/ichi2/widget/WidgetNotificationSchedulerKt;->access$setWidgetNotificationScheduler$p(Lcom/ichi2/widget/WidgetNotificationScheduler;)V
+Lcom/ichi2/widget/WidgetPermissionReceiver;
+SPLcom/ichi2/widget/WidgetPermissionReceiver;-><init>()V
+SPLcom/ichi2/widget/WidgetPermissionReceiver;->onReceiveBroadcast(Landroid/content/Context;Landroid/content/Intent;)V
+Lcom/ichi2/widget/WidgetRepository;
+SPLcom/ichi2/widget/WidgetRepository;-><clinit>()V
+Lcom/ichi2/widget/WidgetRepository$Companion;
+SPLcom/ichi2/widget/WidgetRepository$Companion;-><clinit>()V
+SPLcom/ichi2/widget/WidgetRepository$Companion;-><init>()V
+SPLcom/ichi2/widget/WidgetRepository$Companion;->register(Lcom/ichi2/widget/WidgetRepository;)V
+Lcom/ichi2/widget/WidgetRepositoryKt;
+SPLcom/ichi2/widget/WidgetRepositoryKt;->access$setWidgetRepository$p(Lcom/ichi2/widget/WidgetRepository;)V
+Lcom/ichi2/widget/WidgetStatus;
+SPLcom/ichi2/widget/WidgetStatus;-><clinit>()V
+SPLcom/ichi2/widget/WidgetStatus;-><init>()V
+SPLcom/ichi2/widget/WidgetStatus;->register(Landroid/app/Application;Lcom/ichi2/anki/common/preferences/NotificationPreferences;Lkotlin/jvm/functions/Function1;)V
+Lcom/ichi2/widget/WidgetUtilsKt;
+SPLcom/ichi2/widget/WidgetUtilsKt;->getAppWidgetManager(Landroid/content/Context;)Landroid/appwidget/AppWidgetManager;
+Lcom/ichi2/widget/cardanalysis/CardAnalysisWidget;
+Lcom/ichi2/widget/deckpicker/DeckPickerWidget;
+Ldev/androidbroadcast/vbpd/FragmentViewBindingProperty;
+SPLdev/androidbroadcast/vbpd/FragmentViewBindingProperty;-><init>(Lkotlin/jvm/functions/Function1;)V
+SPLdev/androidbroadcast/vbpd/FragmentViewBindingProperty;->clear()V
+SPLdev/androidbroadcast/vbpd/FragmentViewBindingProperty;->getValue(Landroidx/fragment/app/Fragment;Lkotlin/reflect/KProperty;)Landroidx/viewbinding/ViewBinding;
+SPLdev/androidbroadcast/vbpd/FragmentViewBindingProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+SPLdev/androidbroadcast/vbpd/FragmentViewBindingProperty;->registerLifecycleCallbacksIfNeeded(Landroidx/fragment/app/Fragment;)V
+Ldev/androidbroadcast/vbpd/FragmentViewBindingProperty$VBFragmentLifecycleCallback;
+SPLdev/androidbroadcast/vbpd/FragmentViewBindingProperty$VBFragmentLifecycleCallback;-><clinit>()V
+SPLdev/androidbroadcast/vbpd/FragmentViewBindingProperty$VBFragmentLifecycleCallback;-><init>(Ldev/androidbroadcast/vbpd/FragmentViewBindingProperty;Landroidx/fragment/app/Fragment;)V
+SPLdev/androidbroadcast/vbpd/FragmentViewBindingProperty$VBFragmentLifecycleCallback;->getFragment()Landroidx/fragment/app/Fragment;
+SPLdev/androidbroadcast/vbpd/FragmentViewBindingProperty$VBFragmentLifecycleCallback;->onFragmentViewDestroyed(Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;)V
 Ldev/androidbroadcast/vbpd/FragmentViewBindings;
 SPLdev/androidbroadcast/vbpd/FragmentViewBindings;->fragmentViewBinding(Lkotlin/jvm/functions/Function1;)Ldev/androidbroadcast/vbpd/ViewBindingProperty;
+Ldev/androidbroadcast/vbpd/LazyViewBindingProperty;
+SPLdev/androidbroadcast/vbpd/LazyViewBindingProperty;-><init>(Lkotlin/jvm/functions/Function1;)V
+SPLdev/androidbroadcast/vbpd/LazyViewBindingProperty;->clear()V
+SPLdev/androidbroadcast/vbpd/LazyViewBindingProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Landroidx/viewbinding/ViewBinding;
 Ldev/androidbroadcast/vbpd/ViewBindingProperty;
 Ldev/androidbroadcast/vbpd/internal/VbpdUtilsKt;
 SPLdev/androidbroadcast/vbpd/internal/VbpdUtilsKt;->weakReference(Ljava/lang/Object;)Lkotlin/properties/ReadWriteProperty;
+Ldev/androidbroadcast/vbpd/internal/VbpdUtilsKt$weakReference$1;
+SPLdev/androidbroadcast/vbpd/internal/VbpdUtilsKt$weakReference$1;-><init>(Ljava/lang/Object;)V
+SPLdev/androidbroadcast/vbpd/internal/VbpdUtilsKt$weakReference$1;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+Lio/github/oshai/kotlinlogging/DelegatingKLogger;
+Lio/github/oshai/kotlinlogging/KLogger;
+Lio/github/oshai/kotlinlogging/KLogger$DefaultImpls;
+SPLio/github/oshai/kotlinlogging/KLogger$DefaultImpls;->at$default(Lio/github/oshai/kotlinlogging/KLogger;Lio/github/oshai/kotlinlogging/Level;Lio/github/oshai/kotlinlogging/Marker;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+SPLio/github/oshai/kotlinlogging/KLogger$DefaultImpls;->info(Lio/github/oshai/kotlinlogging/KLogger;Lkotlin/jvm/functions/Function0;)V
+Lio/github/oshai/kotlinlogging/KLogger$info$1;
+SPLio/github/oshai/kotlinlogging/KLogger$info$1;-><init>(Lkotlin/jvm/functions/Function0;)V
+SPLio/github/oshai/kotlinlogging/KLogger$info$1;->invoke(Lio/github/oshai/kotlinlogging/KLoggingEventBuilder;)V
+SPLio/github/oshai/kotlinlogging/KLogger$info$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lio/github/oshai/kotlinlogging/KLoggingEventBuilder;
+SPLio/github/oshai/kotlinlogging/KLoggingEventBuilder;-><init>()V
+SPLio/github/oshai/kotlinlogging/KLoggingEventBuilder;->getCause()Ljava/lang/Throwable;
+SPLio/github/oshai/kotlinlogging/KLoggingEventBuilder;->getMessage()Ljava/lang/String;
+SPLio/github/oshai/kotlinlogging/KLoggingEventBuilder;->getPayload()Ljava/util/Map;
+SPLio/github/oshai/kotlinlogging/KLoggingEventBuilder;->setMessage(Ljava/lang/String;)V
+Lio/github/oshai/kotlinlogging/KotlinLogging;
+SPLio/github/oshai/kotlinlogging/KotlinLogging;-><clinit>()V
+SPLio/github/oshai/kotlinlogging/KotlinLogging;-><init>()V
+SPLio/github/oshai/kotlinlogging/KotlinLogging;->logger(Ljava/lang/String;)Lio/github/oshai/kotlinlogging/KLogger;
+SPLio/github/oshai/kotlinlogging/KotlinLogging;->logger(Lkotlin/jvm/functions/Function0;)Lio/github/oshai/kotlinlogging/KLogger;
+Lio/github/oshai/kotlinlogging/Level;
+SPLio/github/oshai/kotlinlogging/Level;->$values()[Lio/github/oshai/kotlinlogging/Level;
+SPLio/github/oshai/kotlinlogging/Level;-><clinit>()V
+SPLio/github/oshai/kotlinlogging/Level;-><init>(Ljava/lang/String;IILjava/lang/String;)V
+SPLio/github/oshai/kotlinlogging/Level;->values()[Lio/github/oshai/kotlinlogging/Level;
+Lio/github/oshai/kotlinlogging/internal/KLoggerFactory;
+SPLio/github/oshai/kotlinlogging/internal/KLoggerFactory;-><clinit>()V
+SPLio/github/oshai/kotlinlogging/internal/KLoggerFactory;-><init>()V
+SPLio/github/oshai/kotlinlogging/internal/KLoggerFactory;->logger$kotlin_logging(Ljava/lang/String;)Lio/github/oshai/kotlinlogging/KLogger;
+Lio/github/oshai/kotlinlogging/internal/KLoggerNameResolver;
+SPLio/github/oshai/kotlinlogging/internal/KLoggerNameResolver;-><clinit>()V
+SPLio/github/oshai/kotlinlogging/internal/KLoggerNameResolver;-><init>()V
+SPLio/github/oshai/kotlinlogging/internal/KLoggerNameResolver;->name$kotlin_logging(Lkotlin/jvm/functions/Function0;)Ljava/lang/String;
+Lio/github/oshai/kotlinlogging/internal/MessageInvokerKt;
+SPLio/github/oshai/kotlinlogging/internal/MessageInvokerKt;->toStringSafe(Lkotlin/jvm/functions/Function0;)Ljava/lang/String;
+Lio/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger;
+SPLio/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger;-><init>(Lorg/slf4j/Logger;)V
+SPLio/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger;->at(Lio/github/oshai/kotlinlogging/Level;Lio/github/oshai/kotlinlogging/Marker;Lkotlin/jvm/functions/Function1;)V
+SPLio/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger;->getUnderlyingLogger()Lorg/slf4j/Logger;
+SPLio/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger;->isLoggingEnabledFor(Lio/github/oshai/kotlinlogging/Level;Lio/github/oshai/kotlinlogging/Marker;)Z
+SPLio/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger;->logWithoutPayload(Lio/github/oshai/kotlinlogging/KLoggingEventBuilder;Lio/github/oshai/kotlinlogging/Level;Lio/github/oshai/kotlinlogging/Marker;)V
+Lio/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger$WhenMappings;
+SPLio/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger$WhenMappings;-><clinit>()V
+Lio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLogger;
+SPLio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLogger;-><init>()V
+SPLio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLogger;->info(Lkotlin/jvm/functions/Function0;)V
+SPLio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLogger;->isLoggingEnabledFor(Lorg/slf4j/Logger;Lio/github/oshai/kotlinlogging/Level;Lio/github/oshai/kotlinlogging/Marker;)Z
+Lio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLogger$WhenMappings;
+SPLio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLogger$WhenMappings;-><clinit>()V
+Lio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLoggerFactory;
+SPLio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLoggerFactory;-><clinit>()V
+SPLio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLoggerFactory;-><init>()V
+SPLio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLoggerFactory;->jLogger$kotlin_logging(Ljava/lang/String;)Lorg/slf4j/Logger;
+SPLio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLoggerFactory;->wrapJLogger$kotlin_logging(Lorg/slf4j/Logger;)Lio/github/oshai/kotlinlogging/KLogger;
 Lj$/util/DesugarTimeZone;
 SPLj$/util/DesugarTimeZone;->getTimeZone(Ljava/lang/String;)Ljava/util/TimeZone;
 Lkotlin/Function;
+Lkotlin/InitializedLazyImpl;
+SPLkotlin/InitializedLazyImpl;-><init>(Ljava/lang/Object;)V
 Lkotlin/Lazy;
 Lkotlin/LazyKt;
 Lkotlin/LazyKt__LazyJVMKt;
@@ -9648,6 +11741,7 @@ SPLkotlin/LazyKt__LazyJVMKt;->lazy(Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy
 Lkotlin/LazyKt__LazyJVMKt$WhenMappings;
 SPLkotlin/LazyKt__LazyJVMKt$WhenMappings;-><clinit>()V
 Lkotlin/LazyKt__LazyKt;
+SPLkotlin/LazyKt__LazyKt;->lazyOf(Ljava/lang/Object;)Lkotlin/Lazy;
 Lkotlin/LazyThreadSafetyMode;
 SPLkotlin/LazyThreadSafetyMode;->$values()[Lkotlin/LazyThreadSafetyMode;
 SPLkotlin/LazyThreadSafetyMode;-><clinit>()V
@@ -9661,6 +11755,7 @@ SPLkotlin/Pair;->component1()Ljava/lang/Object;
 SPLkotlin/Pair;->component2()Ljava/lang/Object;
 SPLkotlin/Pair;->getFirst()Ljava/lang/Object;
 SPLkotlin/Pair;->getSecond()Ljava/lang/Object;
+SPLkotlin/Pair;->hashCode()I
 Lkotlin/Result;
 SPLkotlin/Result;-><clinit>()V
 SPLkotlin/Result;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
@@ -9689,16 +11784,45 @@ SPLkotlin/SynchronizedLazyImpl;->getValue()Ljava/lang/Object;
 SPLkotlin/SynchronizedLazyImpl;->isInitialized()Z
 Lkotlin/TuplesKt;
 SPLkotlin/TuplesKt;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+Lkotlin/UByte;
+SPLkotlin/UByte;-><clinit>()V
 Lkotlin/UByte$$ExternalSyntheticBackport0;
+SPLkotlin/UByte$$ExternalSyntheticBackport0;->m(JJ)I
 SPLkotlin/UByte$$ExternalSyntheticBackport0;->m(Ljava/lang/Object;)Ljava/util/List;
 SPLkotlin/UByte$$ExternalSyntheticBackport0;->m(Ljava/lang/Object;)V
 SPLkotlin/UByte$$ExternalSyntheticBackport0;->m([Ljava/lang/Object;)Ljava/util/List;
+Lkotlin/UByte$Companion;
+SPLkotlin/UByte$Companion;-><init>()V
+SPLkotlin/UByte$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/UByteArray;
+Lkotlin/UInt;
+SPLkotlin/UInt;-><clinit>()V
+Lkotlin/UInt$Companion;
+SPLkotlin/UInt$Companion;-><init>()V
+SPLkotlin/UInt$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/UIntArray;
+Lkotlin/ULong;
+SPLkotlin/ULong;-><clinit>()V
+SPLkotlin/ULong;->constructor-impl(J)J
+Lkotlin/ULong$Companion;
+SPLkotlin/ULong$Companion;-><init>()V
+SPLkotlin/ULong$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/ULongArray;
 Lkotlin/UNINITIALIZED_VALUE;
 SPLkotlin/UNINITIALIZED_VALUE;-><clinit>()V
 SPLkotlin/UNINITIALIZED_VALUE;-><init>()V
+Lkotlin/UShort;
+SPLkotlin/UShort;-><clinit>()V
+Lkotlin/UShort$Companion;
+SPLkotlin/UShort$Companion;-><init>()V
+SPLkotlin/UShort$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/UShortArray;
 Lkotlin/Unit;
 SPLkotlin/Unit;-><clinit>()V
 SPLkotlin/Unit;-><init>()V
+Lkotlin/annotation/MustBeDocumented;
+Lkotlin/annotation/Retention;
+Lkotlin/annotation/Target;
 Lkotlin/collections/AbstractCollection;
 SPLkotlin/collections/AbstractCollection;-><init>()V
 SPLkotlin/collections/AbstractCollection;->size()I
@@ -9710,6 +11834,7 @@ Lkotlin/collections/AbstractList$Companion;
 SPLkotlin/collections/AbstractList$Companion;-><init>()V
 SPLkotlin/collections/AbstractList$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLkotlin/collections/AbstractList$Companion;->checkElementIndex$kotlin_stdlib(II)V
+SPLkotlin/collections/AbstractList$Companion;->newCapacity$kotlin_stdlib(II)I
 Lkotlin/collections/AbstractList$IteratorImpl;
 SPLkotlin/collections/AbstractList$IteratorImpl;-><init>(Lkotlin/collections/AbstractList;)V
 SPLkotlin/collections/AbstractList$IteratorImpl;->hasNext()Z
@@ -9742,7 +11867,6 @@ SPLkotlin/collections/ArrayDeque;->removeAt(I)Ljava/lang/Object;
 SPLkotlin/collections/ArrayDeque;->removeFirst()Ljava/lang/Object;
 SPLkotlin/collections/ArrayDeque;->removeFirstOrNull()Ljava/lang/Object;
 SPLkotlin/collections/ArrayDeque;->removeLast()Ljava/lang/Object;
-SPLkotlin/collections/ArrayDeque;->removeLastOrNull()Ljava/lang/Object;
 Lkotlin/collections/ArrayDeque$Companion;
 SPLkotlin/collections/ArrayDeque$Companion;-><init>()V
 SPLkotlin/collections/ArrayDeque$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -9757,20 +11881,19 @@ SPLkotlin/collections/ArraysKt___ArraysJvmKt;->copyInto$default([Ljava/lang/Obje
 SPLkotlin/collections/ArraysKt___ArraysJvmKt;->copyInto([I[IIII)[I
 SPLkotlin/collections/ArraysKt___ArraysJvmKt;->copyInto([Ljava/lang/Object;[Ljava/lang/Object;III)[Ljava/lang/Object;
 SPLkotlin/collections/ArraysKt___ArraysJvmKt;->copyOfRange([Ljava/lang/Object;II)[Ljava/lang/Object;
+SPLkotlin/collections/ArraysKt___ArraysJvmKt;->fill$default([JJIIILjava/lang/Object;)V
 SPLkotlin/collections/ArraysKt___ArraysJvmKt;->fill$default([Ljava/lang/Object;Ljava/lang/Object;IIILjava/lang/Object;)V
+SPLkotlin/collections/ArraysKt___ArraysJvmKt;->fill([JJII)V
 SPLkotlin/collections/ArraysKt___ArraysJvmKt;->fill([Ljava/lang/Object;Ljava/lang/Object;II)V
 SPLkotlin/collections/ArraysKt___ArraysJvmKt;->sortWith([Ljava/lang/Object;Ljava/util/Comparator;)V
 Lkotlin/collections/ArraysKt___ArraysKt;
-SPLkotlin/collections/ArraysKt___ArraysKt;->contains([Ljava/lang/Object;Ljava/lang/Object;)Z
 SPLkotlin/collections/ArraysKt___ArraysKt;->filterNotNull([Ljava/lang/Object;)Ljava/util/List;
 SPLkotlin/collections/ArraysKt___ArraysKt;->filterNotNullTo([Ljava/lang/Object;Ljava/util/Collection;)Ljava/util/Collection;
 SPLkotlin/collections/ArraysKt___ArraysKt;->getLastIndex([Ljava/lang/Object;)I
-SPLkotlin/collections/ArraysKt___ArraysKt;->indexOf([Ljava/lang/Object;Ljava/lang/Object;)I
 SPLkotlin/collections/ArraysKt___ArraysKt;->sortedArrayWith([Ljava/lang/Object;Ljava/util/Comparator;)[Ljava/lang/Object;
 SPLkotlin/collections/ArraysKt___ArraysKt;->sortedWith([Ljava/lang/Object;Ljava/util/Comparator;)Ljava/util/List;
 SPLkotlin/collections/ArraysKt___ArraysKt;->toCollection([Ljava/lang/Object;Ljava/util/Collection;)Ljava/util/Collection;
 SPLkotlin/collections/ArraysKt___ArraysKt;->toList([Ljava/lang/Object;)Ljava/util/List;
-SPLkotlin/collections/ArraysKt___ArraysKt;->toMutableList([Ljava/lang/Object;)Ljava/util/List;
 SPLkotlin/collections/ArraysKt___ArraysKt;->toSet([Ljava/lang/Object;)Ljava/util/Set;
 Lkotlin/collections/ArraysUtilJVM;
 SPLkotlin/collections/ArraysUtilJVM;->asList([Ljava/lang/Object;)Ljava/util/List;
@@ -9781,12 +11904,14 @@ SPLkotlin/collections/CollectionsKt__CollectionsJVMKt;->copyToArrayOfAny([Ljava/
 SPLkotlin/collections/CollectionsKt__CollectionsJVMKt;->createListBuilder()Ljava/util/List;
 SPLkotlin/collections/CollectionsKt__CollectionsJVMKt;->listOf(Ljava/lang/Object;)Ljava/util/List;
 Lkotlin/collections/CollectionsKt__CollectionsKt;
-SPLkotlin/collections/CollectionsKt__CollectionsKt;->asCollection$default([Ljava/lang/Object;ZILjava/lang/Object;)Ljava/util/Collection;
 SPLkotlin/collections/CollectionsKt__CollectionsKt;->asCollection([Ljava/lang/Object;Z)Ljava/util/Collection;
 SPLkotlin/collections/CollectionsKt__CollectionsKt;->emptyList()Ljava/util/List;
 SPLkotlin/collections/CollectionsKt__CollectionsKt;->getLastIndex(Ljava/util/List;)I
 SPLkotlin/collections/CollectionsKt__CollectionsKt;->listOf([Ljava/lang/Object;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt__CollectionsKt;->listOfNotNull(Ljava/lang/Object;)Ljava/util/List;
 SPLkotlin/collections/CollectionsKt__CollectionsKt;->listOfNotNull([Ljava/lang/Object;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt__CollectionsKt;->mutableListOf([Ljava/lang/Object;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt__CollectionsKt;->optimizeReadOnlyList(Ljava/util/List;)Ljava/util/List;
 Lkotlin/collections/CollectionsKt__IterablesKt;
 SPLkotlin/collections/CollectionsKt__IterablesKt;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 SPLkotlin/collections/CollectionsKt__IterablesKt;->collectionSizeOrNull(Ljava/lang/Iterable;)Ljava/lang/Integer;
@@ -9798,10 +11923,12 @@ SPLkotlin/collections/CollectionsKt__MutableCollectionsKt;->addAll(Ljava/util/Co
 SPLkotlin/collections/CollectionsKt__MutableCollectionsKt;->addAll(Ljava/util/Collection;[Ljava/lang/Object;)Z
 SPLkotlin/collections/CollectionsKt__MutableCollectionsKt;->filterInPlace$CollectionsKt__MutableCollectionsKt(Ljava/util/List;Lkotlin/jvm/functions/Function1;Z)Z
 SPLkotlin/collections/CollectionsKt__MutableCollectionsKt;->removeAll(Ljava/util/List;Lkotlin/jvm/functions/Function1;)Z
+SPLkotlin/collections/CollectionsKt__MutableCollectionsKt;->removeLastOrNull(Ljava/util/List;)Ljava/lang/Object;
 Lkotlin/collections/CollectionsKt__ReversedViewsKt;
 Lkotlin/collections/CollectionsKt___CollectionsJvmKt;
 Lkotlin/collections/CollectionsKt___CollectionsKt;
 SPLkotlin/collections/CollectionsKt___CollectionsKt;->any(Ljava/lang/Iterable;)Z
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->distinct(Ljava/lang/Iterable;)Ljava/util/List;
 SPLkotlin/collections/CollectionsKt___CollectionsKt;->joinTo$default(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/Appendable;
 SPLkotlin/collections/CollectionsKt___CollectionsKt;->joinTo(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Ljava/lang/Appendable;
 SPLkotlin/collections/CollectionsKt___CollectionsKt;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/String;
@@ -9815,7 +11942,9 @@ SPLkotlin/collections/CollectionsKt___CollectionsKt;->singleOrNull(Ljava/util/Li
 SPLkotlin/collections/CollectionsKt___CollectionsKt;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 SPLkotlin/collections/CollectionsKt___CollectionsKt;->toCollection(Ljava/lang/Iterable;Ljava/util/Collection;)Ljava/util/Collection;
 SPLkotlin/collections/CollectionsKt___CollectionsKt;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->toMutableList(Ljava/lang/Iterable;)Ljava/util/List;
 SPLkotlin/collections/CollectionsKt___CollectionsKt;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->toMutableSet(Ljava/lang/Iterable;)Ljava/util/Set;
 SPLkotlin/collections/CollectionsKt___CollectionsKt;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
 Lkotlin/collections/EmptyIterator;
 SPLkotlin/collections/EmptyIterator;-><clinit>()V
@@ -9852,6 +11981,9 @@ SPLkotlin/collections/IndexedValue;->getValue()Ljava/lang/Object;
 Lkotlin/collections/MapsKt;
 Lkotlin/collections/MapsKt__MapWithDefaultKt;
 Lkotlin/collections/MapsKt__MapsJVMKt;
+SPLkotlin/collections/MapsKt__MapsJVMKt;->build(Ljava/util/Map;)Ljava/util/Map;
+SPLkotlin/collections/MapsKt__MapsJVMKt;->createMapBuilder()Ljava/util/Map;
+SPLkotlin/collections/MapsKt__MapsJVMKt;->createMapBuilder(I)Ljava/util/Map;
 SPLkotlin/collections/MapsKt__MapsJVMKt;->mapCapacity(I)I
 SPLkotlin/collections/MapsKt__MapsJVMKt;->mapOf(Lkotlin/Pair;)Ljava/util/Map;
 Lkotlin/collections/MapsKt__MapsKt;
@@ -9899,6 +12031,7 @@ SPLkotlin/collections/builders/ListBuilder$Companion;-><init>()V
 SPLkotlin/collections/builders/ListBuilder$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 Lkotlin/collections/builders/ListBuilderKt;
 SPLkotlin/collections/builders/ListBuilderKt;->arrayOfUninitializedElements(I)[Ljava/lang/Object;
+SPLkotlin/collections/builders/ListBuilderKt;->copyOfUninitializedElements([Ljava/lang/Object;I)[Ljava/lang/Object;
 Lkotlin/collections/builders/MapBuilder;
 SPLkotlin/collections/builders/MapBuilder;-><clinit>()V
 SPLkotlin/collections/builders/MapBuilder;-><init>()V
@@ -9910,15 +12043,24 @@ SPLkotlin/collections/builders/MapBuilder;->access$getLength$p(Lkotlin/collectio
 SPLkotlin/collections/builders/MapBuilder;->access$getModCount$p(Lkotlin/collections/builders/MapBuilder;)I
 SPLkotlin/collections/builders/MapBuilder;->access$getPresenceArray$p(Lkotlin/collections/builders/MapBuilder;)[I
 SPLkotlin/collections/builders/MapBuilder;->addKey$kotlin_stdlib(Ljava/lang/Object;)I
+SPLkotlin/collections/builders/MapBuilder;->allocateValuesArray()[Ljava/lang/Object;
 SPLkotlin/collections/builders/MapBuilder;->build()Ljava/util/Map;
 SPLkotlin/collections/builders/MapBuilder;->checkIsMutable$kotlin_stdlib()V
+SPLkotlin/collections/builders/MapBuilder;->ensureCapacity(I)V
+SPLkotlin/collections/builders/MapBuilder;->ensureExtraCapacity(I)V
+SPLkotlin/collections/builders/MapBuilder;->findKey(Ljava/lang/Object;)I
+SPLkotlin/collections/builders/MapBuilder;->get(Ljava/lang/Object;)Ljava/lang/Object;
 SPLkotlin/collections/builders/MapBuilder;->getCapacity$kotlin_stdlib()I
 SPLkotlin/collections/builders/MapBuilder;->getHashSize()I
 SPLkotlin/collections/builders/MapBuilder;->getSize()I
 SPLkotlin/collections/builders/MapBuilder;->hash(Ljava/lang/Object;)I
 SPLkotlin/collections/builders/MapBuilder;->isEmpty()Z
 SPLkotlin/collections/builders/MapBuilder;->keysIterator$kotlin_stdlib()Lkotlin/collections/builders/MapBuilder$KeysItr;
+SPLkotlin/collections/builders/MapBuilder;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlin/collections/builders/MapBuilder;->putRehash(I)Z
 SPLkotlin/collections/builders/MapBuilder;->registerModification()V
+SPLkotlin/collections/builders/MapBuilder;->rehash(I)V
+SPLkotlin/collections/builders/MapBuilder;->shouldCompact(I)Z
 SPLkotlin/collections/builders/MapBuilder;->size()I
 Lkotlin/collections/builders/MapBuilder$Companion;
 SPLkotlin/collections/builders/MapBuilder$Companion;-><init>()V
@@ -9980,7 +12122,7 @@ Lkotlin/coroutines/Continuation;
 Lkotlin/coroutines/ContinuationInterceptor;
 SPLkotlin/coroutines/ContinuationInterceptor;-><clinit>()V
 Lkotlin/coroutines/ContinuationInterceptor$DefaultImpls;
-SPLkotlin/coroutines/ContinuationInterceptor$DefaultImpls;->get(Lkotlin/coroutines/ContinuationInterceptor;Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
+HSPLkotlin/coroutines/ContinuationInterceptor$DefaultImpls;->get(Lkotlin/coroutines/ContinuationInterceptor;Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
 SPLkotlin/coroutines/ContinuationInterceptor$DefaultImpls;->minusKey(Lkotlin/coroutines/ContinuationInterceptor;Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext;
 Lkotlin/coroutines/ContinuationInterceptor$Key;
 SPLkotlin/coroutines/ContinuationInterceptor$Key;-><clinit>()V
@@ -9989,8 +12131,7 @@ Lkotlin/coroutines/ContinuationKt;
 SPLkotlin/coroutines/ContinuationKt;->startCoroutine(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
 Lkotlin/coroutines/CoroutineContext;
 Lkotlin/coroutines/CoroutineContext$DefaultImpls;
-SPLkotlin/coroutines/CoroutineContext$DefaultImpls;->$r8$lambda$IMQRUXJxEerD0hyYDf50b5mQ5Cc(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext$Element;)Lkotlin/coroutines/CoroutineContext;
-SPLkotlin/coroutines/CoroutineContext$DefaultImpls;->plus$lambda$0(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext$Element;)Lkotlin/coroutines/CoroutineContext;
+HSPLkotlin/coroutines/CoroutineContext$DefaultImpls;->plus$lambda$0(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext$Element;)Lkotlin/coroutines/CoroutineContext;
 SPLkotlin/coroutines/CoroutineContext$DefaultImpls;->plus(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
 Lkotlin/coroutines/CoroutineContext$DefaultImpls$$ExternalSyntheticLambda0;
 SPLkotlin/coroutines/CoroutineContext$DefaultImpls$$ExternalSyntheticLambda0;-><init>()V
@@ -10121,10 +12262,15 @@ Lkotlin/jvm/functions/Function9;
 Lkotlin/jvm/internal/AdaptedFunctionReference;
 SPLkotlin/jvm/internal/AdaptedFunctionReference;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 SPLkotlin/jvm/internal/AdaptedFunctionReference;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+Lkotlin/jvm/internal/BooleanCompanionObject;
+SPLkotlin/jvm/internal/BooleanCompanionObject;-><clinit>()V
+SPLkotlin/jvm/internal/BooleanCompanionObject;-><init>()V
+Lkotlin/jvm/internal/ByteCompanionObject;
+SPLkotlin/jvm/internal/ByteCompanionObject;-><clinit>()V
+SPLkotlin/jvm/internal/ByteCompanionObject;-><init>()V
 Lkotlin/jvm/internal/CallableReference;
 SPLkotlin/jvm/internal/CallableReference;-><clinit>()V
 SPLkotlin/jvm/internal/CallableReference;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Z)V
-SPLkotlin/jvm/internal/CallableReference;->getBoundReceiver()Ljava/lang/Object;
 SPLkotlin/jvm/internal/CallableReference;->getName()Ljava/lang/String;
 SPLkotlin/jvm/internal/CallableReference;->getOwner()Lkotlin/reflect/KDeclarationContainer;
 SPLkotlin/jvm/internal/CallableReference;->getSignature()Ljava/lang/String;
@@ -10132,8 +12278,17 @@ Lkotlin/jvm/internal/CallableReference$NoReceiver;
 SPLkotlin/jvm/internal/CallableReference$NoReceiver;-><clinit>()V
 SPLkotlin/jvm/internal/CallableReference$NoReceiver;-><init>()V
 SPLkotlin/jvm/internal/CallableReference$NoReceiver;->access$000()Lkotlin/jvm/internal/CallableReference$NoReceiver;
+Lkotlin/jvm/internal/CharCompanionObject;
+SPLkotlin/jvm/internal/CharCompanionObject;-><clinit>()V
+SPLkotlin/jvm/internal/CharCompanionObject;-><init>()V
 Lkotlin/jvm/internal/ClassBasedDeclarationContainer;
 Lkotlin/jvm/internal/DefaultConstructorMarker;
+Lkotlin/jvm/internal/DoubleCompanionObject;
+SPLkotlin/jvm/internal/DoubleCompanionObject;-><clinit>()V
+SPLkotlin/jvm/internal/DoubleCompanionObject;-><init>()V
+Lkotlin/jvm/internal/FloatCompanionObject;
+SPLkotlin/jvm/internal/FloatCompanionObject;-><clinit>()V
+SPLkotlin/jvm/internal/FloatCompanionObject;-><init>()V
 Lkotlin/jvm/internal/FunctionAdapter;
 Lkotlin/jvm/internal/FunctionBase;
 Lkotlin/jvm/internal/FunctionReference;
@@ -10142,8 +12297,11 @@ SPLkotlin/jvm/internal/FunctionReference;->getArity()I
 Lkotlin/jvm/internal/FunctionReferenceImpl;
 SPLkotlin/jvm/internal/FunctionReferenceImpl;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 SPLkotlin/jvm/internal/FunctionReferenceImpl;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+Lkotlin/jvm/internal/IntCompanionObject;
+SPLkotlin/jvm/internal/IntCompanionObject;-><clinit>()V
+SPLkotlin/jvm/internal/IntCompanionObject;-><init>()V
 Lkotlin/jvm/internal/Intrinsics;
-SPLkotlin/jvm/internal/Intrinsics;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+HSPLkotlin/jvm/internal/Intrinsics;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 SPLkotlin/jvm/internal/Intrinsics;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 SPLkotlin/jvm/internal/Intrinsics;->checkNotNull(Ljava/lang/Object;)V
 SPLkotlin/jvm/internal/Intrinsics;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)V
@@ -10152,8 +12310,15 @@ SPLkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljav
 SPLkotlin/jvm/internal/Intrinsics;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 SPLkotlin/jvm/internal/Intrinsics;->compare(II)I
 Lkotlin/jvm/internal/Intrinsics$Kotlin;
+Lkotlin/jvm/internal/KTypeBase;
+Lkotlin/jvm/internal/KotlinGenericDeclaration;
 Lkotlin/jvm/internal/Lambda;
 SPLkotlin/jvm/internal/Lambda;-><init>(I)V
+Lkotlin/jvm/internal/LongCompanionObject;
+SPLkotlin/jvm/internal/LongCompanionObject;-><clinit>()V
+SPLkotlin/jvm/internal/LongCompanionObject;-><init>()V
+Lkotlin/jvm/internal/MagicApiIntrinsics;
+SPLkotlin/jvm/internal/MagicApiIntrinsics;->voidMagicApiCall(Ljava/lang/Object;)V
 Lkotlin/jvm/internal/MutablePropertyReference;
 SPLkotlin/jvm/internal/MutablePropertyReference;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 Lkotlin/jvm/internal/MutablePropertyReference1;
@@ -10168,15 +12333,20 @@ Lkotlin/jvm/internal/PropertyReference1Impl;
 SPLkotlin/jvm/internal/PropertyReference1Impl;-><init>(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 Lkotlin/jvm/internal/Ref$BooleanRef;
 SPLkotlin/jvm/internal/Ref$BooleanRef;-><init>()V
+Lkotlin/jvm/internal/Ref$IntRef;
+SPLkotlin/jvm/internal/Ref$IntRef;-><init>()V
 Lkotlin/jvm/internal/Ref$ObjectRef;
 SPLkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
 Lkotlin/jvm/internal/Reflection;
 SPLkotlin/jvm/internal/Reflection;-><clinit>()V
 SPLkotlin/jvm/internal/Reflection;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/KClass;
 SPLkotlin/jvm/internal/Reflection;->mutableProperty1(Lkotlin/jvm/internal/MutablePropertyReference1;)Lkotlin/reflect/KMutableProperty1;
-SPLkotlin/jvm/internal/Reflection;->property1(Lkotlin/jvm/internal/PropertyReference1;)Lkotlin/reflect/KProperty1;
+SPLkotlin/jvm/internal/Reflection;->nullableTypeOf(Ljava/lang/Class;)Lkotlin/reflect/KType;
 Lkotlin/jvm/internal/ReflectionFactory;
 SPLkotlin/jvm/internal/ReflectionFactory;-><init>()V
+Lkotlin/jvm/internal/ShortCompanionObject;
+SPLkotlin/jvm/internal/ShortCompanionObject;-><clinit>()V
+SPLkotlin/jvm/internal/ShortCompanionObject;-><init>()V
 Lkotlin/jvm/internal/SpreadBuilder;
 SPLkotlin/jvm/internal/SpreadBuilder;-><init>(I)V
 SPLkotlin/jvm/internal/SpreadBuilder;->addSpread(Ljava/lang/Object;)V
@@ -10217,9 +12387,11 @@ Lkotlin/random/Random$Default;
 SPLkotlin/random/Random$Default;-><init>()V
 SPLkotlin/random/Random$Default;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLkotlin/random/Random$Default;->nextInt(I)I
+SPLkotlin/random/Random$Default;->nextInt(II)I
 Lkotlin/random/jdk8/PlatformThreadLocalRandom;
 SPLkotlin/random/jdk8/PlatformThreadLocalRandom;-><init>()V
 SPLkotlin/random/jdk8/PlatformThreadLocalRandom;->getImpl()Ljava/util/Random;
+SPLkotlin/random/jdk8/PlatformThreadLocalRandom;->nextInt(II)I
 Lkotlin/ranges/ClosedRange;
 Lkotlin/ranges/IntProgression;
 SPLkotlin/ranges/IntProgression;-><clinit>()V
@@ -10255,6 +12427,10 @@ Lkotlin/reflect/KMutableProperty;
 Lkotlin/reflect/KMutableProperty1;
 Lkotlin/reflect/KProperty;
 Lkotlin/reflect/KProperty1;
+Lkotlin/reflect/KType;
+Lkotlin/reflect/full/KClassifiers;
+SPLkotlin/reflect/full/KClassifiers;->createTypeImpl$default(Lkotlin/reflect/KClassifier;Ljava/util/List;ZLjava/util/List;Lkotlin/reflect/KClass;ILjava/lang/Object;)Lkotlin/reflect/jvm/internal/types/AbstractKType;
+SPLkotlin/reflect/full/KClassifiers;->createTypeImpl(Lkotlin/reflect/KClassifier;Ljava/util/List;ZLjava/util/List;Lkotlin/reflect/KClass;)Lkotlin/reflect/jvm/internal/types/AbstractKType;
 Lkotlin/reflect/jvm/internal/CacheByClass;
 SPLkotlin/reflect/jvm/internal/CacheByClass;-><init>()V
 Lkotlin/reflect/jvm/internal/CacheByClassKt;
@@ -10262,8 +12438,11 @@ SPLkotlin/reflect/jvm/internal/CacheByClassKt;-><clinit>()V
 SPLkotlin/reflect/jvm/internal/CacheByClassKt;->createCache(Lkotlin/jvm/functions/Function1;)Lkotlin/reflect/jvm/internal/CacheByClass;
 Lkotlin/reflect/jvm/internal/CachesKt;
 SPLkotlin/reflect/jvm/internal/CachesKt;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/CachesKt;->CACHE_FOR_NULLABLE_BASE_CLASSIFIERS$lambda$0(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/types/AbstractKType;
 SPLkotlin/reflect/jvm/internal/CachesKt;->K_CLASS_CACHE$lambda$0(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/KClassImpl;
 SPLkotlin/reflect/jvm/internal/CachesKt;->accessor$CachesKt$lambda0(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/KClassImpl;
+SPLkotlin/reflect/jvm/internal/CachesKt;->accessor$CachesKt$lambda3(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/types/AbstractKType;
+SPLkotlin/reflect/jvm/internal/CachesKt;->getOrCreateKType(Ljava/lang/Class;Ljava/util/List;Z)Lkotlin/reflect/KType;
 SPLkotlin/reflect/jvm/internal/CachesKt;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/KClassImpl;
 Lkotlin/reflect/jvm/internal/CachesKt$$Lambda$0;
 SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$0;-><clinit>()V
@@ -10278,6 +12457,7 @@ SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$2;-><init>()V
 Lkotlin/reflect/jvm/internal/CachesKt$$Lambda$3;
 SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$3;-><clinit>()V
 SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$3;-><init>()V
+SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$3;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Lkotlin/reflect/jvm/internal/CachesKt$$Lambda$4;
 SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$4;-><clinit>()V
 SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$4;-><init>()V
@@ -10290,50 +12470,13 @@ Lkotlin/reflect/jvm/internal/ComputableClassValue;
 SPLkotlin/reflect/jvm/internal/ComputableClassValue;-><init>(Lkotlin/jvm/functions/Function1;)V
 SPLkotlin/reflect/jvm/internal/ComputableClassValue;->computeValue(Ljava/lang/Class;)Ljava/lang/Object;
 SPLkotlin/reflect/jvm/internal/ComputableClassValue;->computeValue(Ljava/lang/Class;)Ljava/lang/ref/SoftReference;
-Lkotlin/reflect/jvm/internal/DescriptorKCallable;
-SPLkotlin/reflect/jvm/internal/DescriptorKCallable;-><init>()V
-Lkotlin/reflect/jvm/internal/DescriptorKCallable$$Lambda$0;
-SPLkotlin/reflect/jvm/internal/DescriptorKCallable$$Lambda$0;-><init>(Lkotlin/reflect/jvm/internal/DescriptorKCallable;)V
-Lkotlin/reflect/jvm/internal/DescriptorKCallable$$Lambda$1;
-SPLkotlin/reflect/jvm/internal/DescriptorKCallable$$Lambda$1;-><init>(Lkotlin/reflect/jvm/internal/DescriptorKCallable;)V
-Lkotlin/reflect/jvm/internal/DescriptorKCallable$$Lambda$2;
-SPLkotlin/reflect/jvm/internal/DescriptorKCallable$$Lambda$2;-><init>(Lkotlin/reflect/jvm/internal/DescriptorKCallable;)V
-Lkotlin/reflect/jvm/internal/DescriptorKCallable$$Lambda$3;
-SPLkotlin/reflect/jvm/internal/DescriptorKCallable$$Lambda$3;-><init>(Lkotlin/reflect/jvm/internal/DescriptorKCallable;)V
-Lkotlin/reflect/jvm/internal/DescriptorKCallable$$Lambda$4;
-SPLkotlin/reflect/jvm/internal/DescriptorKCallable$$Lambda$4;-><init>(Lkotlin/reflect/jvm/internal/DescriptorKCallable;)V
-Lkotlin/reflect/jvm/internal/DescriptorKCallable$$Lambda$5;
-SPLkotlin/reflect/jvm/internal/DescriptorKCallable$$Lambda$5;-><init>(Lkotlin/reflect/jvm/internal/DescriptorKCallable;)V
-Lkotlin/reflect/jvm/internal/DescriptorKCallable$$Lambda$6;
-SPLkotlin/reflect/jvm/internal/DescriptorKCallable$$Lambda$6;-><init>(Lkotlin/reflect/jvm/internal/DescriptorKCallable;)V
-Lkotlin/reflect/jvm/internal/DescriptorKMutableProperty1;
-SPLkotlin/reflect/jvm/internal/DescriptorKMutableProperty1;-><init>(Lkotlin/reflect/jvm/internal/KDeclarationContainerImpl;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
-Lkotlin/reflect/jvm/internal/DescriptorKMutableProperty1$$Lambda$0;
-SPLkotlin/reflect/jvm/internal/DescriptorKMutableProperty1$$Lambda$0;-><init>(Lkotlin/reflect/jvm/internal/DescriptorKMutableProperty1;)V
-Lkotlin/reflect/jvm/internal/DescriptorKProperty;
-SPLkotlin/reflect/jvm/internal/DescriptorKProperty;-><clinit>()V
-SPLkotlin/reflect/jvm/internal/DescriptorKProperty;-><init>(Lkotlin/reflect/jvm/internal/KDeclarationContainerImpl;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
-SPLkotlin/reflect/jvm/internal/DescriptorKProperty;-><init>(Lkotlin/reflect/jvm/internal/KDeclarationContainerImpl;Ljava/lang/String;Ljava/lang/String;Lkotlin/reflect/jvm/internal/impl/descriptors/PropertyDescriptor;Ljava/lang/Object;)V
-Lkotlin/reflect/jvm/internal/DescriptorKProperty$$Lambda$0;
-SPLkotlin/reflect/jvm/internal/DescriptorKProperty$$Lambda$0;-><init>(Lkotlin/reflect/jvm/internal/DescriptorKProperty;)V
-Lkotlin/reflect/jvm/internal/DescriptorKProperty$$Lambda$1;
-SPLkotlin/reflect/jvm/internal/DescriptorKProperty$$Lambda$1;-><init>(Lkotlin/reflect/jvm/internal/DescriptorKProperty;)V
-Lkotlin/reflect/jvm/internal/DescriptorKProperty$Companion;
-SPLkotlin/reflect/jvm/internal/DescriptorKProperty$Companion;-><init>()V
-SPLkotlin/reflect/jvm/internal/DescriptorKProperty$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-Lkotlin/reflect/jvm/internal/DescriptorKProperty1;
-SPLkotlin/reflect/jvm/internal/DescriptorKProperty1;-><init>(Lkotlin/reflect/jvm/internal/KDeclarationContainerImpl;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
-Lkotlin/reflect/jvm/internal/DescriptorKProperty1$$Lambda$0;
-SPLkotlin/reflect/jvm/internal/DescriptorKProperty1$$Lambda$0;-><init>(Lkotlin/reflect/jvm/internal/DescriptorKProperty1;)V
-Lkotlin/reflect/jvm/internal/DescriptorKProperty1$$Lambda$1;
-SPLkotlin/reflect/jvm/internal/DescriptorKProperty1$$Lambda$1;-><init>(Lkotlin/reflect/jvm/internal/DescriptorKProperty1;)V
 Lkotlin/reflect/jvm/internal/KClassImpl;
 SPLkotlin/reflect/jvm/internal/KClassImpl;-><clinit>()V
 SPLkotlin/reflect/jvm/internal/KClassImpl;-><init>(Ljava/lang/Class;)V
-SPLkotlin/reflect/jvm/internal/KClassImpl;->access$getClassId(Lkotlin/reflect/jvm/internal/KClassImpl;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 SPLkotlin/reflect/jvm/internal/KClassImpl;->accessor$KClassImpl$lambda0(Lkotlin/reflect/jvm/internal/KClassImpl;)Lkotlin/reflect/jvm/internal/KClassImpl$Data;
 SPLkotlin/reflect/jvm/internal/KClassImpl;->data$lambda$0(Lkotlin/reflect/jvm/internal/KClassImpl;)Lkotlin/reflect/jvm/internal/KClassImpl$Data;
-SPLkotlin/reflect/jvm/internal/KClassImpl;->getClassId()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/KClassImpl;->equals(Ljava/lang/Object;)Z
+SPLkotlin/reflect/jvm/internal/KClassImpl;->getClassId$kotlin_reflection()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 SPLkotlin/reflect/jvm/internal/KClassImpl;->getJClass()Ljava/lang/Class;
 SPLkotlin/reflect/jvm/internal/KClassImpl;->getQualifiedName()Ljava/lang/String;
 SPLkotlin/reflect/jvm/internal/KClassImpl;->getSimpleName()Ljava/lang/String;
@@ -10363,23 +12506,13 @@ SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$10;-><init>(Lkotlin/refle
 Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$11;
 SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$11;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;Lkotlin/reflect/jvm/internal/KClassImpl$Data;)V
 Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$12;
-SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$12;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;)V
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$12;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl$Data;Lkotlin/reflect/jvm/internal/KClassImpl;)V
 Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$13;
 SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$13;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;)V
 Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$14;
-SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$14;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;)V
-Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$15;
-SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$15;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;)V
-Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$16;
-SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$16;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl$Data;)V
-Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$17;
-SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$17;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl$Data;)V
-Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$18;
-SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$18;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl$Data;)V
-Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$19;
-SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$19;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl$Data;)V
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$14;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;Lkotlin/reflect/jvm/internal/KClassImpl$Data;)V
 Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$2;
-SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$2;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;)V
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$2;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;Lkotlin/reflect/jvm/internal/KClassImpl$Data;)V
 Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$3;
 SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$3;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;Lkotlin/reflect/jvm/internal/KClassImpl$Data;)V
 SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$3;->invoke()Ljava/lang/Object;
@@ -10387,7 +12520,7 @@ Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$4;
 SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$4;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;)V
 SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$4;->invoke()Ljava/lang/Object;
 Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$5;
-SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$5;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;)V
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$5;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;Lkotlin/reflect/jvm/internal/KClassImpl$Data;)V
 Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$6;
 SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$6;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl$Data;Lkotlin/reflect/jvm/internal/KClassImpl;)V
 Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$7;
@@ -10396,6 +12529,11 @@ Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$8;
 SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$8;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl$Data;Lkotlin/reflect/jvm/internal/KClassImpl;)V
 Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$9;
 SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$9;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl$Data;Lkotlin/reflect/jvm/internal/KClassImpl;)V
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$allMembers$2;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$allMembers$2;-><init>(Ljava/lang/Object;)V
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$declaredMembers$2;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$declaredMembers$2;-><init>(Ljava/lang/Object;)V
+Lkotlin/reflect/jvm/internal/KClassMembersKt;
 Lkotlin/reflect/jvm/internal/KDeclarationContainerImpl;
 SPLkotlin/reflect/jvm/internal/KDeclarationContainerImpl;-><clinit>()V
 SPLkotlin/reflect/jvm/internal/KDeclarationContainerImpl;-><init>()V
@@ -10408,8 +12546,12 @@ SPLkotlin/reflect/jvm/internal/KDeclarationContainerImpl$Data;-><init>(Lkotlin/r
 Lkotlin/reflect/jvm/internal/KDeclarationContainerImpl$Data$$Lambda$0;
 SPLkotlin/reflect/jvm/internal/KDeclarationContainerImpl$Data$$Lambda$0;-><init>(Lkotlin/reflect/jvm/internal/KDeclarationContainerImpl;)V
 Lkotlin/reflect/jvm/internal/KTypeParameterOwnerImpl;
-Lkotlin/reflect/jvm/internal/ReflectKCallable;
-Lkotlin/reflect/jvm/internal/ReflectKProperty;
+Lkotlin/reflect/jvm/internal/LazyKMutableProperty1;
+SPLkotlin/reflect/jvm/internal/LazyKMutableProperty1;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
+Lkotlin/reflect/jvm/internal/LazyKProperty;
+SPLkotlin/reflect/jvm/internal/LazyKProperty;-><init>(Lkotlin/jvm/functions/Function0;)V
+Lkotlin/reflect/jvm/internal/LazyKProperty1;
+SPLkotlin/reflect/jvm/internal/LazyKProperty1;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
 Lkotlin/reflect/jvm/internal/ReflectProperties;
 SPLkotlin/reflect/jvm/internal/ReflectProperties;->lazySoft(Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)Lkotlin/reflect/jvm/internal/ReflectProperties$LazySoftVal;
 SPLkotlin/reflect/jvm/internal/ReflectProperties;->lazySoft(Lkotlin/jvm/functions/Function0;)Lkotlin/reflect/jvm/internal/ReflectProperties$LazySoftVal;
@@ -10429,12 +12571,17 @@ SPLkotlin/reflect/jvm/internal/ReflectionFactoryImpl;-><init>()V
 SPLkotlin/reflect/jvm/internal/ReflectionFactoryImpl;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/KClass;
 SPLkotlin/reflect/jvm/internal/ReflectionFactoryImpl;->getOwner(Lkotlin/jvm/internal/CallableReference;)Lkotlin/reflect/jvm/internal/KDeclarationContainerImpl;
 SPLkotlin/reflect/jvm/internal/ReflectionFactoryImpl;->mutableProperty1(Lkotlin/jvm/internal/MutablePropertyReference1;)Lkotlin/reflect/KMutableProperty1;
-SPLkotlin/reflect/jvm/internal/ReflectionFactoryImpl;->property1(Lkotlin/jvm/internal/PropertyReference1;)Lkotlin/reflect/KProperty1;
+SPLkotlin/reflect/jvm/internal/ReflectionFactoryImpl;->typeOf(Lkotlin/reflect/KClassifier;Ljava/util/List;Z)Lkotlin/reflect/KType;
+Lkotlin/reflect/jvm/internal/ReflectionFactoryImpl$$Lambda$3;
+SPLkotlin/reflect/jvm/internal/ReflectionFactoryImpl$$Lambda$3;-><init>(Lkotlin/reflect/jvm/internal/KDeclarationContainerImpl;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/internal/MutablePropertyReference1;)V
 Lkotlin/reflect/jvm/internal/RuntimeTypeMapper;
 SPLkotlin/reflect/jvm/internal/RuntimeTypeMapper;-><clinit>()V
 SPLkotlin/reflect/jvm/internal/RuntimeTypeMapper;-><init>()V
 SPLkotlin/reflect/jvm/internal/RuntimeTypeMapper;->getPrimitiveType(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType;
 SPLkotlin/reflect/jvm/internal/RuntimeTypeMapper;->mapJvmClassToKotlinClassId(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+Lkotlin/reflect/jvm/internal/SystemPropertiesKt;
+SPLkotlin/reflect/jvm/internal/SystemPropertiesKt;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/SystemPropertiesKt;->getUseK1Implementation()Z
 Lkotlin/reflect/jvm/internal/impl/SpecialJvmAnnotations;
 SPLkotlin/reflect/jvm/internal/impl/SpecialJvmAnnotations;-><clinit>()V
 SPLkotlin/reflect/jvm/internal/impl/SpecialJvmAnnotations;-><init>()V
@@ -10475,9 +12622,15 @@ SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->internalNam
 SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->rangesFqName(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;
 SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->reflect(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;
 Lkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;
-SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;-><init>(Lkotlin/reflect/jvm/internal/impl/name/FqName;Ljava/lang/String;ZLkotlin/reflect/jvm/internal/impl/name/ClassId;Z)V
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;-><init>(Lkotlin/reflect/jvm/internal/impl/name/FqName;Ljava/lang/String;ZLkotlin/reflect/jvm/internal/impl/name/ClassId;ZI)V
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;-><init>(Lkotlin/reflect/jvm/internal/impl/name/FqName;Ljava/lang/String;ZLkotlin/reflect/jvm/internal/impl/name/ClassId;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;->getClassNamePrefix()Ljava/lang/String;
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;->getMaxArity()I
 SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;->getPackageFqName()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+Lkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$Companion;
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$Companion;-><init>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 Lkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$Function;
 SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$Function;-><clinit>()V
 SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$Function;-><init>()V
@@ -10503,9 +12656,9 @@ SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap;->classId(
 SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap;->mapJavaToKotlin(Lkotlin/reflect/jvm/internal/impl/name/FqName;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 Lkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap$PlatformMutabilityMapping;
 SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap$PlatformMutabilityMapping;-><init>(Lkotlin/reflect/jvm/internal/impl/name/ClassId;Lkotlin/reflect/jvm/internal/impl/name/ClassId;Lkotlin/reflect/jvm/internal/impl/name/ClassId;)V
-SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap$PlatformMutabilityMapping;->component1()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
-SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap$PlatformMutabilityMapping;->component2()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
-SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap$PlatformMutabilityMapping;->component3()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap$PlatformMutabilityMapping;->getJavaClass()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap$PlatformMutabilityMapping;->getKotlinMutable()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap$PlatformMutabilityMapping;->getKotlinReadOnly()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 Lkotlin/reflect/jvm/internal/impl/descriptors/runtime/structure/ReflectClassUtilKt;
 SPLkotlin/reflect/jvm/internal/impl/descriptors/runtime/structure/ReflectClassUtilKt;-><clinit>()V
 SPLkotlin/reflect/jvm/internal/impl/descriptors/runtime/structure/ReflectClassUtilKt;->getClassId(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
@@ -10593,6 +12746,7 @@ SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getBASE_ENUMS_PACKAG
 SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getBASE_KOTLIN_PACKAGE()Lkotlin/reflect/jvm/internal/impl/name/FqName;
 SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getBASE_RANGES_PACKAGE()Lkotlin/reflect/jvm/internal/impl/name/FqName;
 SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getBASE_REFLECT_PACKAGE()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getBASE_SEQUENCES_PACKAGE()Lkotlin/reflect/jvm/internal/impl/name/FqName;
 SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getKClass()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getKFunction()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 Lkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;
@@ -10606,6 +12760,7 @@ SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$inverseMap(
 SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$primitiveArrayId(Lkotlin/reflect/jvm/internal/impl/name/Name;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$rangesId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$reflectId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$sequencesId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$unsignedId(Lkotlin/reflect/jvm/internal/impl/name/ClassId;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->annotationId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->atomicsId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
@@ -10617,6 +12772,7 @@ SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->inverseMap(Ljava/u
 SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->primitiveArrayId(Lkotlin/reflect/jvm/internal/impl/name/Name;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->rangesId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->reflectId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->sequencesId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->unsignedId(Lkotlin/reflect/jvm/internal/impl/name/ClassId;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 Lkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmClassName;
 SPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmClassName;-><init>(Ljava/lang/String;)V
@@ -10630,11 +12786,25 @@ SPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmPrimitiveType;->getJavaKeywor
 SPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmPrimitiveType;->getPrimitiveType()Lkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType;
 SPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmPrimitiveType;->getWrapperFqName()Lkotlin/reflect/jvm/internal/impl/name/FqName;
 SPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmPrimitiveType;->values()[Lkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmPrimitiveType;
+Lkotlin/reflect/jvm/internal/impl/types/model/DefinitelyNotNullTypeMarker;
+Lkotlin/reflect/jvm/internal/impl/types/model/FlexibleTypeMarker;
+Lkotlin/reflect/jvm/internal/impl/types/model/KotlinTypeMarker;
+Lkotlin/reflect/jvm/internal/impl/types/model/RigidTypeMarker;
+Lkotlin/reflect/jvm/internal/impl/types/model/SimpleTypeMarker;
+Lkotlin/reflect/jvm/internal/impl/types/model/TypeArgumentListMarker;
 Lkotlin/reflect/jvm/internal/impl/types/model/TypeConstructorMarker;
 Lkotlin/reflect/jvm/internal/impl/utils/CollectionsKt;
 SPLkotlin/reflect/jvm/internal/impl/utils/CollectionsKt;->capacity(I)I
 SPLkotlin/reflect/jvm/internal/impl/utils/CollectionsKt;->newHashMapWithExpectedSize(I)Ljava/util/HashMap;
 SPLkotlin/reflect/jvm/internal/impl/utils/CollectionsKt;->newHashSetWithExpectedSize(I)Ljava/util/HashSet;
+Lkotlin/reflect/jvm/internal/types/AbstractKType;
+SPLkotlin/reflect/jvm/internal/types/AbstractKType;-><init>(Lkotlin/jvm/functions/Function0;)V
+Lkotlin/reflect/jvm/internal/types/SimpleKType;
+SPLkotlin/reflect/jvm/internal/types/SimpleKType;-><init>(Lkotlin/reflect/KClassifier;Ljava/util/List;ZLkotlin/Lazy;Lkotlin/reflect/KType;ZZZLkotlin/reflect/KClass;Lkotlin/jvm/functions/Function0;)V
+SPLkotlin/reflect/jvm/internal/types/SimpleKType;-><init>(Lkotlin/reflect/KClassifier;Ljava/util/List;ZLkotlin/Lazy;Lkotlin/reflect/KType;ZZZLkotlin/reflect/KClass;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlin/reflect/jvm/internal/types/SimpleKType;->getArguments()Ljava/util/List;
+SPLkotlin/reflect/jvm/internal/types/SimpleKType;->getClassifier()Lkotlin/reflect/KClassifier;
+SPLkotlin/reflect/jvm/internal/types/SimpleKType;->isMarkedNullable()Z
 Lkotlin/sequences/ConstrainedOnceSequence;
 SPLkotlin/sequences/ConstrainedOnceSequence;-><init>(Lkotlin/sequences/Sequence;)V
 SPLkotlin/sequences/ConstrainedOnceSequence;->iterator()Ljava/util/Iterator;
@@ -10701,13 +12871,35 @@ SPLkotlin/text/LinesIterator;->next()Ljava/lang/String;
 Lkotlin/text/LinesIterator$State;
 SPLkotlin/text/LinesIterator$State;-><init>()V
 SPLkotlin/text/LinesIterator$State;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/text/MatchGroupCollection;
+Lkotlin/text/MatchNamedGroupCollection;
+Lkotlin/text/MatchResult;
+Lkotlin/text/MatcherMatchResult;
+SPLkotlin/text/MatcherMatchResult;-><init>(Ljava/util/regex/Matcher;Ljava/lang/CharSequence;)V
+SPLkotlin/text/MatcherMatchResult;->access$getMatchResult(Lkotlin/text/MatcherMatchResult;)Ljava/util/regex/MatchResult;
+SPLkotlin/text/MatcherMatchResult;->getGroupValues()Ljava/util/List;
+SPLkotlin/text/MatcherMatchResult;->getMatchResult()Ljava/util/regex/MatchResult;
+Lkotlin/text/MatcherMatchResult$groupValues$1;
+SPLkotlin/text/MatcherMatchResult$groupValues$1;-><init>(Lkotlin/text/MatcherMatchResult;)V
+SPLkotlin/text/MatcherMatchResult$groupValues$1;->get(I)Ljava/lang/Object;
+SPLkotlin/text/MatcherMatchResult$groupValues$1;->get(I)Ljava/lang/String;
+Lkotlin/text/MatcherMatchResult$groups$1;
+SPLkotlin/text/MatcherMatchResult$groups$1;-><init>(Lkotlin/text/MatcherMatchResult;)V
 Lkotlin/text/Regex;
 SPLkotlin/text/Regex;-><clinit>()V
 SPLkotlin/text/Regex;-><init>(Ljava/lang/String;)V
 SPLkotlin/text/Regex;-><init>(Ljava/util/regex/Pattern;)V
+SPLkotlin/text/Regex;->find$default(Lkotlin/text/Regex;Ljava/lang/CharSequence;IILjava/lang/Object;)Lkotlin/text/MatchResult;
+SPLkotlin/text/Regex;->find(Ljava/lang/CharSequence;I)Lkotlin/text/MatchResult;
+SPLkotlin/text/Regex;->matchAt(Ljava/lang/CharSequence;I)Lkotlin/text/MatchResult;
+SPLkotlin/text/Regex;->matches(Ljava/lang/CharSequence;)Z
+SPLkotlin/text/Regex;->split(Ljava/lang/CharSequence;I)Ljava/util/List;
 Lkotlin/text/Regex$Companion;
 SPLkotlin/text/Regex$Companion;-><init>()V
 SPLkotlin/text/Regex$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/text/RegexKt;
+SPLkotlin/text/RegexKt;->access$findNext(Ljava/util/regex/Matcher;ILjava/lang/CharSequence;)Lkotlin/text/MatchResult;
+SPLkotlin/text/RegexKt;->findNext(Ljava/util/regex/Matcher;ILjava/lang/CharSequence;)Lkotlin/text/MatchResult;
 Lkotlin/text/StringsKt;
 Lkotlin/text/StringsKt__AppendableKt;
 SPLkotlin/text/StringsKt__AppendableKt;->appendElement(Ljava/lang/Appendable;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)V
@@ -10739,16 +12931,29 @@ SPLkotlin/text/StringsKt__StringsJVMKt;->replace(Ljava/lang/String;Ljava/lang/St
 SPLkotlin/text/StringsKt__StringsJVMKt;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Z
 SPLkotlin/text/StringsKt__StringsJVMKt;->startsWith(Ljava/lang/String;Ljava/lang/String;Z)Z
 Lkotlin/text/StringsKt__StringsKt;
+SPLkotlin/text/StringsKt__StringsKt;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZILjava/lang/Object;)Z
+SPLkotlin/text/StringsKt__StringsKt;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 SPLkotlin/text/StringsKt__StringsKt;->endsWith$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZILjava/lang/Object;)Z
 SPLkotlin/text/StringsKt__StringsKt;->endsWith(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+SPLkotlin/text/StringsKt__StringsKt;->getLastIndex(Ljava/lang/CharSequence;)I
+SPLkotlin/text/StringsKt__StringsKt;->indexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZILjava/lang/Object;)I
 SPLkotlin/text/StringsKt__StringsKt;->indexOf(Ljava/lang/CharSequence;Ljava/lang/String;IZ)I
 SPLkotlin/text/StringsKt__StringsKt;->isBlank(Ljava/lang/CharSequence;)Z
+SPLkotlin/text/StringsKt__StringsKt;->lastIndexOf$default(Ljava/lang/CharSequence;CIZILjava/lang/Object;)I
+SPLkotlin/text/StringsKt__StringsKt;->lastIndexOf(Ljava/lang/CharSequence;CIZ)I
 SPLkotlin/text/StringsKt__StringsKt;->lineSequence(Ljava/lang/CharSequence;)Lkotlin/sequences/Sequence;
 SPLkotlin/text/StringsKt__StringsKt;->lines(Ljava/lang/CharSequence;)Ljava/util/List;
+SPLkotlin/text/StringsKt__StringsKt;->padStart(Ljava/lang/CharSequence;IC)Ljava/lang/CharSequence;
+SPLkotlin/text/StringsKt__StringsKt;->padStart(Ljava/lang/String;IC)Ljava/lang/String;
 SPLkotlin/text/StringsKt__StringsKt;->removePrefix(Ljava/lang/String;Ljava/lang/CharSequence;)Ljava/lang/String;
 SPLkotlin/text/StringsKt__StringsKt;->removeSuffix(Ljava/lang/String;Ljava/lang/CharSequence;)Ljava/lang/String;
+SPLkotlin/text/StringsKt__StringsKt;->requireNonNegativeLimit(I)V
 SPLkotlin/text/StringsKt__StringsKt;->startsWith$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZILjava/lang/Object;)Z
 SPLkotlin/text/StringsKt__StringsKt;->startsWith(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+SPLkotlin/text/StringsKt__StringsKt;->substringAfterLast$default(Ljava/lang/String;CLjava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
+SPLkotlin/text/StringsKt__StringsKt;->substringAfterLast(Ljava/lang/String;CLjava/lang/String;)Ljava/lang/String;
+SPLkotlin/text/StringsKt__StringsKt;->substringBefore$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
+SPLkotlin/text/StringsKt__StringsKt;->substringBefore(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 SPLkotlin/text/StringsKt__StringsKt;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 Lkotlin/text/StringsKt__StringsKt$lineSequence$$inlined$Sequence$1;
 SPLkotlin/text/StringsKt__StringsKt$lineSequence$$inlined$Sequence$1;-><init>(Ljava/lang/CharSequence;)V
@@ -10756,6 +12961,91 @@ SPLkotlin/text/StringsKt__StringsKt$lineSequence$$inlined$Sequence$1;->iterator(
 Lkotlin/text/StringsKt___StringsJvmKt;
 Lkotlin/text/StringsKt___StringsKt;
 SPLkotlin/text/StringsKt___StringsKt;->drop(Ljava/lang/String;I)Ljava/lang/String;
+Lkotlin/time/ComparableTimeMark;
+Lkotlin/time/Duration;
+SPLkotlin/time/Duration;-><clinit>()V
+SPLkotlin/time/Duration;-><init>(J)V
+SPLkotlin/time/Duration;->appendFractional-impl(JLjava/lang/StringBuilder;IIILjava/lang/String;Z)V
+SPLkotlin/time/Duration;->box-impl(J)Lkotlin/time/Duration;
+SPLkotlin/time/Duration;->constructor-impl(J)J
+SPLkotlin/time/Duration;->getAbsoluteValue-UwyO8pc(J)J
+SPLkotlin/time/Duration;->getHoursComponent-impl(J)I
+SPLkotlin/time/Duration;->getInWholeDays-impl(J)J
+SPLkotlin/time/Duration;->getInWholeHours-impl(J)J
+SPLkotlin/time/Duration;->getInWholeMilliseconds-impl(J)J
+SPLkotlin/time/Duration;->getInWholeMinutes-impl(J)J
+SPLkotlin/time/Duration;->getInWholeSeconds-impl(J)J
+SPLkotlin/time/Duration;->getMinutesComponent-impl(J)I
+SPLkotlin/time/Duration;->getNanosecondsComponent-impl(J)I
+SPLkotlin/time/Duration;->getSecondsComponent-impl(J)I
+SPLkotlin/time/Duration;->getStorageUnit-impl(J)Lkotlin/time/DurationUnit;
+SPLkotlin/time/Duration;->getValue-impl(J)J
+SPLkotlin/time/Duration;->isInMillis-impl(J)Z
+SPLkotlin/time/Duration;->isInNanos-impl(J)Z
+SPLkotlin/time/Duration;->isInfinite-impl(J)Z
+SPLkotlin/time/Duration;->isNegative-impl(J)Z
+SPLkotlin/time/Duration;->isPositive-impl(J)Z
+SPLkotlin/time/Duration;->plus-LRDsOJo(JJ)J
+SPLkotlin/time/Duration;->toLong-impl(JLkotlin/time/DurationUnit;)J
+SPLkotlin/time/Duration;->toString()Ljava/lang/String;
+SPLkotlin/time/Duration;->toString-impl(J)Ljava/lang/String;
+SPLkotlin/time/Duration;->unbox-impl()J
+Lkotlin/time/Duration$Companion;
+SPLkotlin/time/Duration$Companion;-><init>()V
+SPLkotlin/time/Duration$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlin/time/Duration$Companion;->fromRawValue-UwyO8pc$kotlin_stdlib(J)J
+Lkotlin/time/DurationJvmKt;
+SPLkotlin/time/DurationJvmKt;-><clinit>()V
+SPLkotlin/time/DurationJvmKt;->getDurationAssertionsEnabled()Z
+Lkotlin/time/DurationKt;
+SPLkotlin/time/DurationKt;->access$durationOfMillis(J)J
+SPLkotlin/time/DurationKt;->access$durationOfNanosNormalized(J)J
+SPLkotlin/time/DurationKt;->durationOfMillis(J)J
+SPLkotlin/time/DurationKt;->durationOfNanos(J)J
+SPLkotlin/time/DurationKt;->durationOfNanosNormalized(J)J
+SPLkotlin/time/DurationKt;->toDuration(ILkotlin/time/DurationUnit;)J
+SPLkotlin/time/DurationKt;->toDuration(JLkotlin/time/DurationUnit;)J
+Lkotlin/time/DurationUnit;
+SPLkotlin/time/DurationUnit;->$values()[Lkotlin/time/DurationUnit;
+SPLkotlin/time/DurationUnit;-><clinit>()V
+SPLkotlin/time/DurationUnit;-><init>(Ljava/lang/String;ILjava/util/concurrent/TimeUnit;)V
+SPLkotlin/time/DurationUnit;->getTimeUnit$kotlin_stdlib()Ljava/util/concurrent/TimeUnit;
+Lkotlin/time/DurationUnitKt;
+Lkotlin/time/DurationUnitKt__DurationUnitJvmKt;
+SPLkotlin/time/DurationUnitKt__DurationUnitJvmKt;->convertDurationUnit(JLkotlin/time/DurationUnit;Lkotlin/time/DurationUnit;)J
+SPLkotlin/time/DurationUnitKt__DurationUnitJvmKt;->convertDurationUnitOverflow(JLkotlin/time/DurationUnit;Lkotlin/time/DurationUnit;)J
+Lkotlin/time/DurationUnitKt__DurationUnitKt;
+Lkotlin/time/Instant;
+SPLkotlin/time/Instant;-><clinit>()V
+SPLkotlin/time/Instant;-><init>(JI)V
+Lkotlin/time/Instant$Companion;
+SPLkotlin/time/Instant$Companion;-><init>()V
+SPLkotlin/time/Instant$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/time/LongSaturatedMathKt;
+SPLkotlin/time/LongSaturatedMathKt;->saturatingDiff(JJLkotlin/time/DurationUnit;)J
+SPLkotlin/time/LongSaturatedMathKt;->saturatingFiniteDiff(JJLkotlin/time/DurationUnit;)J
+Lkotlin/time/MonotonicTimeSource;
+SPLkotlin/time/MonotonicTimeSource;-><clinit>()V
+SPLkotlin/time/MonotonicTimeSource;-><init>()V
+SPLkotlin/time/MonotonicTimeSource;->elapsedFrom-6eNON_k(J)J
+SPLkotlin/time/MonotonicTimeSource;->markNow-z9LOYto()J
+SPLkotlin/time/MonotonicTimeSource;->read()J
+Lkotlin/time/TimeMark;
+Lkotlin/time/TimeSource;
+Lkotlin/time/TimeSource$Monotonic;
+SPLkotlin/time/TimeSource$Monotonic;-><clinit>()V
+SPLkotlin/time/TimeSource$Monotonic;-><init>()V
+SPLkotlin/time/TimeSource$Monotonic;->markNow-z9LOYto()J
+Lkotlin/time/TimeSource$Monotonic$ValueTimeMark;
+SPLkotlin/time/TimeSource$Monotonic$ValueTimeMark;->constructor-impl(J)J
+SPLkotlin/time/TimeSource$Monotonic$ValueTimeMark;->elapsedNow-UwyO8pc(J)J
+Lkotlin/time/TimeSource$WithComparableMarks;
+Lkotlin/uuid/Uuid;
+SPLkotlin/uuid/Uuid;-><clinit>()V
+SPLkotlin/uuid/Uuid;-><init>(JJ)V
+Lkotlin/uuid/Uuid$Companion;
+SPLkotlin/uuid/Uuid$Companion;-><init>()V
+SPLkotlin/uuid/Uuid$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 Lkotlinx/coroutines/AbstractCoroutine;
 SPLkotlinx/coroutines/AbstractCoroutine;-><init>(Lkotlin/coroutines/CoroutineContext;ZZ)V
 SPLkotlinx/coroutines/AbstractCoroutine;->afterResume(Ljava/lang/Object;)V
@@ -10786,29 +13076,35 @@ SPLkotlinx/coroutines/BuildersKt;->launch$default(Lkotlinx/coroutines/CoroutineS
 SPLkotlinx/coroutines/BuildersKt;->launch(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/CoroutineStart;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
 SPLkotlinx/coroutines/BuildersKt;->runBlocking$default(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Ljava/lang/Object;
 SPLkotlinx/coroutines/BuildersKt;->runBlocking(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+SPLkotlinx/coroutines/BuildersKt;->runBlockingImpl(Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/EventLoop;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+SPLkotlinx/coroutines/BuildersKt;->runBlockingK$default(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/BuildersKt;->runBlockingK(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 SPLkotlinx/coroutines/BuildersKt;->withContext(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Lkotlinx/coroutines/BuildersKt__BuildersKt;
 SPLkotlinx/coroutines/BuildersKt__BuildersKt;->runBlocking$default(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Ljava/lang/Object;
 SPLkotlinx/coroutines/BuildersKt__BuildersKt;->runBlocking(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+SPLkotlinx/coroutines/BuildersKt__BuildersKt;->runBlockingImpl(Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/EventLoop;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 Lkotlinx/coroutines/BuildersKt__Builders_commonKt;
 SPLkotlinx/coroutines/BuildersKt__Builders_commonKt;->launch$default(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/CoroutineStart;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
 SPLkotlinx/coroutines/BuildersKt__Builders_commonKt;->launch(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/CoroutineStart;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
 SPLkotlinx/coroutines/BuildersKt__Builders_commonKt;->withContext(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/BuildersKt__Builders_concurrentKt;
+SPLkotlinx/coroutines/BuildersKt__Builders_concurrentKt;->runBlockingK$default(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/BuildersKt__Builders_concurrentKt;->runBlockingK(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 Lkotlinx/coroutines/CancelHandler;
 Lkotlinx/coroutines/CancelHandler$UserSupplied;
 SPLkotlinx/coroutines/CancelHandler$UserSupplied;-><init>(Lkotlin/jvm/functions/Function1;)V
-SPLkotlinx/coroutines/CancelHandler$UserSupplied;->invoke(Ljava/lang/Throwable;)V
 Lkotlinx/coroutines/CancellableContinuation;
 Lkotlinx/coroutines/CancellableContinuationImpl;
 SPLkotlinx/coroutines/CancellableContinuationImpl;-><clinit>()V
 SPLkotlinx/coroutines/CancellableContinuationImpl;-><init>(Lkotlin/coroutines/Continuation;I)V
-SPLkotlinx/coroutines/CancellableContinuationImpl;->callCancelHandler(Lkotlinx/coroutines/CancelHandler;Ljava/lang/Throwable;)V
 SPLkotlinx/coroutines/CancellableContinuationImpl;->callSegmentOnCancellation(Lkotlinx/coroutines/internal/Segment;Ljava/lang/Throwable;)V
 SPLkotlinx/coroutines/CancellableContinuationImpl;->cancel(Ljava/lang/Throwable;)Z
+SPLkotlinx/coroutines/CancellableContinuationImpl;->cancelCompletedResult$kotlinx_coroutines_core(Ljava/lang/Object;Ljava/lang/Throwable;)V
 SPLkotlinx/coroutines/CancellableContinuationImpl;->cancelLater(Ljava/lang/Throwable;)Z
 SPLkotlinx/coroutines/CancellableContinuationImpl;->completeResume(Ljava/lang/Object;)V
 SPLkotlinx/coroutines/CancellableContinuationImpl;->detachChild$kotlinx_coroutines_core()V
-SPLkotlinx/coroutines/CancellableContinuationImpl;->detachChildIfNonResuable()V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->detachChildIfNonReusable()V
 SPLkotlinx/coroutines/CancellableContinuationImpl;->dispatchResume(I)V
 SPLkotlinx/coroutines/CancellableContinuationImpl;->getContext()Lkotlin/coroutines/CoroutineContext;
 SPLkotlinx/coroutines/CancellableContinuationImpl;->getContinuationCancellationCause(Lkotlinx/coroutines/Job;)Ljava/lang/Throwable;
@@ -10851,8 +13147,6 @@ SPLkotlinx/coroutines/CancellableContinuationKt;->invokeOnCancellation(Lkotlinx/
 Lkotlinx/coroutines/CancelledContinuation;
 SPLkotlinx/coroutines/CancelledContinuation;-><clinit>()V
 SPLkotlinx/coroutines/CancelledContinuation;-><init>(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;Z)V
-SPLkotlinx/coroutines/CancelledContinuation;->get_resumed$volatile$FU()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
-SPLkotlinx/coroutines/CancelledContinuation;->makeResumed()Z
 Lkotlinx/coroutines/ChildContinuation;
 SPLkotlinx/coroutines/ChildContinuation;-><init>(Lkotlinx/coroutines/CancellableContinuationImpl;)V
 SPLkotlinx/coroutines/ChildContinuation;->getOnCancelling()Z
@@ -10891,7 +13185,6 @@ SPLkotlinx/coroutines/CompletionStateKt;->toState(Ljava/lang/Object;Lkotlinx/cor
 Lkotlinx/coroutines/CopyableThreadContextElement;
 Lkotlinx/coroutines/CopyableThrowable;
 Lkotlinx/coroutines/CoroutineContextKt;
-SPLkotlinx/coroutines/CoroutineContextKt;->$r8$lambda$as3AdS3orsv2Ts0OahuRhLd1z7g(ZLkotlin/coroutines/CoroutineContext$Element;)Z
 SPLkotlinx/coroutines/CoroutineContextKt;->foldCopies(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;Z)Lkotlin/coroutines/CoroutineContext;
 SPLkotlinx/coroutines/CoroutineContextKt;->hasCopyableElements$lambda$0(ZLkotlin/coroutines/CoroutineContext$Element;)Z
 SPLkotlinx/coroutines/CoroutineContextKt;->hasCopyableElements(Lkotlin/coroutines/CoroutineContext;)Z
@@ -10926,7 +13219,11 @@ SPLkotlinx/coroutines/CoroutineName$Key;-><init>(Lkotlin/jvm/internal/DefaultCon
 Lkotlinx/coroutines/CoroutineScope;
 Lkotlinx/coroutines/CoroutineScopeKt;
 SPLkotlinx/coroutines/CoroutineScopeKt;->CoroutineScope(Lkotlin/coroutines/CoroutineContext;)Lkotlinx/coroutines/CoroutineScope;
+SPLkotlinx/coroutines/CoroutineScopeKt;->MainScope()Lkotlinx/coroutines/CoroutineScope;
+SPLkotlinx/coroutines/CoroutineScopeKt;->cancel$default(Lkotlinx/coroutines/CoroutineScope;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+SPLkotlinx/coroutines/CoroutineScopeKt;->cancel(Lkotlinx/coroutines/CoroutineScope;Ljava/util/concurrent/CancellationException;)V
 SPLkotlinx/coroutines/CoroutineScopeKt;->coroutineScope(Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/CoroutineScopeKt;->ensureActive(Lkotlinx/coroutines/CoroutineScope;)V
 Lkotlinx/coroutines/CoroutineStart;
 SPLkotlinx/coroutines/CoroutineStart;->$values()[Lkotlinx/coroutines/CoroutineStart;
 SPLkotlinx/coroutines/CoroutineStart;-><clinit>()V
@@ -10959,8 +13256,14 @@ SPLkotlinx/coroutines/DefaultExecutorKt;->initializeDefaultDelay()Lkotlinx/corou
 Lkotlinx/coroutines/Deferred;
 Lkotlinx/coroutines/Delay;
 Lkotlinx/coroutines/DelayKt;
+SPLkotlinx/coroutines/DelayKt;->awaitCancellation(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLkotlinx/coroutines/DelayKt;->delay(JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/DelayKt;->delay-VtjQ1oo(JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLkotlinx/coroutines/DelayKt;->getDelay(Lkotlin/coroutines/CoroutineContext;)Lkotlinx/coroutines/Delay;
+SPLkotlinx/coroutines/DelayKt;->toDelayMillis-LRDsOJo(J)J
+Lkotlinx/coroutines/DelayKt$awaitCancellation$1;
+SPLkotlinx/coroutines/DelayKt$awaitCancellation$1;-><init>(Lkotlin/coroutines/Continuation;)V
+Lkotlinx/coroutines/DispatchException;
 Lkotlinx/coroutines/DispatchedCoroutine;
 SPLkotlinx/coroutines/DispatchedCoroutine;-><clinit>()V
 SPLkotlinx/coroutines/DispatchedCoroutine;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
@@ -10982,6 +13285,7 @@ SPLkotlinx/coroutines/DispatchedTaskKt;->isReusableMode(I)Z
 SPLkotlinx/coroutines/DispatchedTaskKt;->resume(Lkotlinx/coroutines/DispatchedTask;Lkotlin/coroutines/Continuation;Z)V
 SPLkotlinx/coroutines/DispatchedTaskKt;->resumeUnconfined(Lkotlinx/coroutines/DispatchedTask;)V
 Lkotlinx/coroutines/DispatcherExecutor;
+SPLkotlinx/coroutines/DispatcherExecutor;-><init>(Lkotlinx/coroutines/CoroutineDispatcher;)V
 Lkotlinx/coroutines/Dispatchers;
 SPLkotlinx/coroutines/Dispatchers;-><clinit>()V
 SPLkotlinx/coroutines/Dispatchers;-><init>()V
@@ -11066,6 +13370,7 @@ SPLkotlinx/coroutines/ExecutorCoroutineDispatcherImpl;->dispatch(Lkotlin/corouti
 SPLkotlinx/coroutines/ExecutorCoroutineDispatcherImpl;->equals(Ljava/lang/Object;)Z
 SPLkotlinx/coroutines/ExecutorCoroutineDispatcherImpl;->getExecutor()Ljava/util/concurrent/Executor;
 Lkotlinx/coroutines/ExecutorsKt;
+SPLkotlinx/coroutines/ExecutorsKt;->asExecutor(Lkotlinx/coroutines/CoroutineDispatcher;)Ljava/util/concurrent/Executor;
 SPLkotlinx/coroutines/ExecutorsKt;->from(Ljava/util/concurrent/Executor;)Lkotlinx/coroutines/CoroutineDispatcher;
 Lkotlinx/coroutines/GlobalScope;
 SPLkotlinx/coroutines/GlobalScope;-><clinit>()V
@@ -11076,6 +13381,7 @@ Lkotlinx/coroutines/Incomplete;
 Lkotlinx/coroutines/IncompleteStateBox;
 Lkotlinx/coroutines/Job;
 SPLkotlinx/coroutines/Job;-><clinit>()V
+SPLkotlinx/coroutines/Job;->cancel$default(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 Lkotlinx/coroutines/Job$DefaultImpls;
 SPLkotlinx/coroutines/Job$DefaultImpls;->cancel$default(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
 SPLkotlinx/coroutines/Job$DefaultImpls;->fold(Lkotlinx/coroutines/Job;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
@@ -11091,10 +13397,14 @@ SPLkotlinx/coroutines/JobCancellationException;->equals(Ljava/lang/Object;)Z
 SPLkotlinx/coroutines/JobCancellationException;->fillInStackTrace()Ljava/lang/Throwable;
 Lkotlinx/coroutines/JobImpl;
 SPLkotlinx/coroutines/JobImpl;-><init>(Lkotlinx/coroutines/Job;)V
+SPLkotlinx/coroutines/JobImpl;->complete()Z
+SPLkotlinx/coroutines/JobImpl;->getOnCancelComplete$kotlinx_coroutines_core()Z
 SPLkotlinx/coroutines/JobImpl;->handlesException()Z
 Lkotlinx/coroutines/JobKt;
 SPLkotlinx/coroutines/JobKt;->Job$default(Lkotlinx/coroutines/Job;ILjava/lang/Object;)Lkotlinx/coroutines/CompletableJob;
 SPLkotlinx/coroutines/JobKt;->Job(Lkotlinx/coroutines/Job;)Lkotlinx/coroutines/CompletableJob;
+SPLkotlinx/coroutines/JobKt;->cancel$default(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+SPLkotlinx/coroutines/JobKt;->cancel(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;)V
 SPLkotlinx/coroutines/JobKt;->ensureActive(Lkotlin/coroutines/CoroutineContext;)V
 SPLkotlinx/coroutines/JobKt;->ensureActive(Lkotlinx/coroutines/Job;)V
 SPLkotlinx/coroutines/JobKt;->invokeOnCompletion$default(Lkotlinx/coroutines/Job;ZLkotlinx/coroutines/JobNode;ILjava/lang/Object;)Lkotlinx/coroutines/DisposableHandle;
@@ -11102,6 +13412,8 @@ SPLkotlinx/coroutines/JobKt;->invokeOnCompletion(Lkotlinx/coroutines/Job;ZLkotli
 Lkotlinx/coroutines/JobKt__JobKt;
 SPLkotlinx/coroutines/JobKt__JobKt;->Job$default(Lkotlinx/coroutines/Job;ILjava/lang/Object;)Lkotlinx/coroutines/CompletableJob;
 SPLkotlinx/coroutines/JobKt__JobKt;->Job(Lkotlinx/coroutines/Job;)Lkotlinx/coroutines/CompletableJob;
+SPLkotlinx/coroutines/JobKt__JobKt;->cancel$default(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+SPLkotlinx/coroutines/JobKt__JobKt;->cancel(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;)V
 SPLkotlinx/coroutines/JobKt__JobKt;->ensureActive(Lkotlin/coroutines/CoroutineContext;)V
 SPLkotlinx/coroutines/JobKt__JobKt;->ensureActive(Lkotlinx/coroutines/Job;)V
 SPLkotlinx/coroutines/JobKt__JobKt;->invokeOnCompletion$default(Lkotlinx/coroutines/Job;ZLkotlinx/coroutines/JobNode;ILjava/lang/Object;)Lkotlinx/coroutines/DisposableHandle;
@@ -11124,7 +13436,9 @@ SPLkotlinx/coroutines/JobSupport;->attachChild(Lkotlinx/coroutines/ChildJob;)Lko
 SPLkotlinx/coroutines/JobSupport;->cancel(Ljava/util/concurrent/CancellationException;)V
 SPLkotlinx/coroutines/JobSupport;->cancelImpl$kotlinx_coroutines_core(Ljava/lang/Object;)Z
 SPLkotlinx/coroutines/JobSupport;->cancelInternal(Ljava/lang/Throwable;)V
+SPLkotlinx/coroutines/JobSupport;->cancelMakeCompleting(Ljava/lang/Object;)Ljava/lang/Object;
 SPLkotlinx/coroutines/JobSupport;->cancelParent(Ljava/lang/Throwable;)Z
+SPLkotlinx/coroutines/JobSupport;->cancellationExceptionMessage()Ljava/lang/String;
 SPLkotlinx/coroutines/JobSupport;->childCancelled(Ljava/lang/Throwable;)Z
 SPLkotlinx/coroutines/JobSupport;->completeStateFinalization(Lkotlinx/coroutines/Incomplete;Ljava/lang/Object;)V
 SPLkotlinx/coroutines/JobSupport;->continueCompleting(Lkotlinx/coroutines/JobSupport$Finishing;Lkotlinx/coroutines/ChildHandleNode;Ljava/lang/Object;)V
@@ -11196,12 +13510,14 @@ SPLkotlinx/coroutines/JobSupport$Finishing;->isSealed()Z
 SPLkotlinx/coroutines/JobSupport$Finishing;->sealLocked(Ljava/lang/Throwable;)Ljava/util/List;
 SPLkotlinx/coroutines/JobSupport$Finishing;->setCompleting(Z)V
 SPLkotlinx/coroutines/JobSupport$Finishing;->setExceptionsHolder(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/JobSupport$Finishing;->setRootCause(Ljava/lang/Throwable;)V
 Lkotlinx/coroutines/JobSupportKt;
 SPLkotlinx/coroutines/JobSupportKt;-><clinit>()V
 SPLkotlinx/coroutines/JobSupportKt;->access$getCOMPLETING_ALREADY$p()Lkotlinx/coroutines/internal/Symbol;
 SPLkotlinx/coroutines/JobSupportKt;->access$getCOMPLETING_RETRY$p()Lkotlinx/coroutines/internal/Symbol;
 SPLkotlinx/coroutines/JobSupportKt;->access$getEMPTY_ACTIVE$p()Lkotlinx/coroutines/Empty;
 SPLkotlinx/coroutines/JobSupportKt;->access$getSEALED$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/JobSupportKt;->access$getTOO_LATE_TO_CANCEL$p()Lkotlinx/coroutines/internal/Symbol;
 SPLkotlinx/coroutines/JobSupportKt;->boxIncomplete(Ljava/lang/Object;)Ljava/lang/Object;
 SPLkotlinx/coroutines/JobSupportKt;->unboxState(Ljava/lang/Object;)Ljava/lang/Object;
 Lkotlinx/coroutines/MainCoroutineDispatcher;
@@ -11218,6 +13534,7 @@ Lkotlinx/coroutines/NotCompleted;
 Lkotlinx/coroutines/ParentJob;
 Lkotlinx/coroutines/ResumeOnCompletion;
 SPLkotlinx/coroutines/ResumeOnCompletion;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/ResumeOnCompletion;->getOnCancelling()Z
 SPLkotlinx/coroutines/ResumeOnCompletion;->invoke(Ljava/lang/Throwable;)V
 Lkotlinx/coroutines/StandaloneCoroutine;
 SPLkotlinx/coroutines/StandaloneCoroutine;-><init>(Lkotlin/coroutines/CoroutineContext;Z)V
@@ -11240,7 +13557,9 @@ SPLkotlinx/coroutines/Unconfined;-><clinit>()V
 SPLkotlinx/coroutines/Unconfined;-><init>()V
 Lkotlinx/coroutines/UndispatchedCoroutine;
 SPLkotlinx/coroutines/UndispatchedCoroutine;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/UndispatchedCoroutine;->afterCompletionUndispatched()V
 SPLkotlinx/coroutines/UndispatchedCoroutine;->afterResume(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/UndispatchedCoroutine;->clearThreadLocal()V
 Lkotlinx/coroutines/UndispatchedMarker;
 SPLkotlinx/coroutines/UndispatchedMarker;-><clinit>()V
 SPLkotlinx/coroutines/UndispatchedMarker;-><init>()V
@@ -11260,7 +13579,6 @@ Lkotlinx/coroutines/android/AndroidDispatcherFactory;
 SPLkotlinx/coroutines/android/AndroidDispatcherFactory;-><init>()V
 SPLkotlinx/coroutines/android/AndroidDispatcherFactory;->createDispatcher(Ljava/util/List;)Lkotlinx/coroutines/MainCoroutineDispatcher;
 Lkotlinx/coroutines/android/HandlerContext;
-SPLkotlinx/coroutines/android/HandlerContext;->$r8$lambda$fBQRGWcdO7g7Y_pFpufN5oy9B_I(Lkotlinx/coroutines/android/HandlerContext;Ljava/lang/Runnable;Ljava/lang/Throwable;)Lkotlin/Unit;
 SPLkotlinx/coroutines/android/HandlerContext;-><init>(Landroid/os/Handler;Ljava/lang/String;)V
 SPLkotlinx/coroutines/android/HandlerContext;-><init>(Landroid/os/Handler;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLkotlinx/coroutines/android/HandlerContext;-><init>(Landroid/os/Handler;Ljava/lang/String;Z)V
@@ -11269,13 +13587,6 @@ SPLkotlinx/coroutines/android/HandlerContext;->equals(Ljava/lang/Object;)Z
 SPLkotlinx/coroutines/android/HandlerContext;->getImmediate()Lkotlinx/coroutines/MainCoroutineDispatcher;
 SPLkotlinx/coroutines/android/HandlerContext;->getImmediate()Lkotlinx/coroutines/android/HandlerContext;
 SPLkotlinx/coroutines/android/HandlerContext;->isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
-SPLkotlinx/coroutines/android/HandlerContext;->scheduleResumeAfterDelay$lambda$2(Lkotlinx/coroutines/android/HandlerContext;Ljava/lang/Runnable;Ljava/lang/Throwable;)Lkotlin/Unit;
-SPLkotlinx/coroutines/android/HandlerContext;->scheduleResumeAfterDelay(JLkotlinx/coroutines/CancellableContinuation;)V
-Lkotlinx/coroutines/android/HandlerContext$$ExternalSyntheticLambda1;
-SPLkotlinx/coroutines/android/HandlerContext$$ExternalSyntheticLambda1;-><init>(Lkotlinx/coroutines/android/HandlerContext;Ljava/lang/Runnable;)V
-SPLkotlinx/coroutines/android/HandlerContext$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-Lkotlinx/coroutines/android/HandlerContext$scheduleResumeAfterDelay$$inlined$Runnable$1;
-SPLkotlinx/coroutines/android/HandlerContext$scheduleResumeAfterDelay$$inlined$Runnable$1;-><init>(Lkotlinx/coroutines/CancellableContinuation;Lkotlinx/coroutines/android/HandlerContext;)V
 Lkotlinx/coroutines/android/HandlerDispatcher;
 SPLkotlinx/coroutines/android/HandlerDispatcher;-><init>()V
 SPLkotlinx/coroutines/android/HandlerDispatcher;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -11345,7 +13656,6 @@ SPLkotlinx/coroutines/channels/BufferedChannel;->send$suspendImpl(Lkotlinx/corou
 SPLkotlinx/coroutines/channels/BufferedChannel;->send(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLkotlinx/coroutines/channels/BufferedChannel;->tryReceive-PtdJZtk()Ljava/lang/Object;
 SPLkotlinx/coroutines/channels/BufferedChannel;->tryResumeReceiver(Ljava/lang/Object;Ljava/lang/Object;)Z
-SPLkotlinx/coroutines/channels/BufferedChannel;->trySendDropOldest-JP2dKIU(Ljava/lang/Object;)Ljava/lang/Object;
 SPLkotlinx/coroutines/channels/BufferedChannel;->updateCellReceive(Lkotlinx/coroutines/channels/ChannelSegment;IJLjava/lang/Object;)Ljava/lang/Object;
 SPLkotlinx/coroutines/channels/BufferedChannel;->updateCellSend(Lkotlinx/coroutines/channels/ChannelSegment;ILjava/lang/Object;JLjava/lang/Object;Z)I
 SPLkotlinx/coroutines/channels/BufferedChannel;->waitExpandBufferCompletion$kotlinx_coroutines_core(J)V
@@ -11373,13 +13683,10 @@ SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getDONE_RCV$p()Lkotlin
 SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getEXPAND_BUFFER_COMPLETION_WAIT_ITERATIONS$p()I
 SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getFAILED$p()Lkotlinx/coroutines/internal/Symbol;
 SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getINTERRUPTED_RCV$p()Lkotlinx/coroutines/internal/Symbol;
-SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getINTERRUPTED_SEND$p()Lkotlinx/coroutines/internal/Symbol;
 SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getIN_BUFFER$p()Lkotlinx/coroutines/internal/Symbol;
 SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getNO_CLOSE_CAUSE$p()Lkotlinx/coroutines/internal/Symbol;
 SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getNO_RECEIVE_RESULT$p()Lkotlinx/coroutines/internal/Symbol;
 SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getNULL_SEGMENT$p()Lkotlinx/coroutines/channels/ChannelSegment;
-SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getRESUMING_BY_EB$p()Lkotlinx/coroutines/internal/Symbol;
-SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getRESUMING_BY_RCV$p()Lkotlinx/coroutines/internal/Symbol;
 SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getSUSPEND$p()Lkotlinx/coroutines/internal/Symbol;
 SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getSUSPEND_NO_WAITER$p()Lkotlinx/coroutines/internal/Symbol;
 SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$initialBufferEnd(I)J
@@ -11444,6 +13751,7 @@ SPLkotlinx/coroutines/channels/ConflatedBufferedChannel;-><init>(ILkotlinx/corou
 SPLkotlinx/coroutines/channels/ConflatedBufferedChannel;->isConflatedDropOldest()Z
 SPLkotlinx/coroutines/channels/ConflatedBufferedChannel;->send$suspendImpl(Lkotlinx/coroutines/channels/ConflatedBufferedChannel;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 SPLkotlinx/coroutines/channels/ConflatedBufferedChannel;->send(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/ConflatedBufferedChannel;->trySendDropOldest-JP2dKIU(Ljava/lang/Object;)Ljava/lang/Object;
 SPLkotlinx/coroutines/channels/ConflatedBufferedChannel;->trySendImpl-Mj0NB7M(Ljava/lang/Object;Z)Ljava/lang/Object;
 Lkotlinx/coroutines/channels/ProduceKt;
 SPLkotlinx/coroutines/channels/ProduceKt;->produce$default(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILkotlinx/coroutines/channels/BufferOverflow;Lkotlinx/coroutines/CoroutineStart;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/channels/ReceiveChannel;
@@ -11707,6 +14015,7 @@ Lkotlinx/coroutines/flow/StateFlowImpl;
 SPLkotlinx/coroutines/flow/StateFlowImpl;-><clinit>()V
 SPLkotlinx/coroutines/flow/StateFlowImpl;-><init>(Ljava/lang/Object;)V
 SPLkotlinx/coroutines/flow/StateFlowImpl;->collect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/StateFlowImpl;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
 SPLkotlinx/coroutines/flow/StateFlowImpl;->createSlot()Lkotlinx/coroutines/flow/StateFlowSlot;
 SPLkotlinx/coroutines/flow/StateFlowImpl;->createSlot()Lkotlinx/coroutines/flow/internal/AbstractSharedFlowSlot;
 SPLkotlinx/coroutines/flow/StateFlowImpl;->createSlotArray(I)[Lkotlinx/coroutines/flow/StateFlowSlot;
@@ -11823,8 +14132,7 @@ SPLkotlinx/coroutines/flow/internal/FlowCoroutine;-><init>(Lkotlin/coroutines/Co
 Lkotlinx/coroutines/flow/internal/FlowCoroutineKt;
 SPLkotlinx/coroutines/flow/internal/FlowCoroutineKt;->flowScope(Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Lkotlinx/coroutines/flow/internal/FusibleFlow;
-Lkotlinx/coroutines/flow/internal/FusibleFlow$DefaultImpls;
-SPLkotlinx/coroutines/flow/internal/FusibleFlow$DefaultImpls;->fuse$default(Lkotlinx/coroutines/flow/internal/FusibleFlow;Lkotlin/coroutines/CoroutineContext;ILkotlinx/coroutines/channels/BufferOverflow;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/internal/FusibleFlow;->fuse$default(Lkotlinx/coroutines/flow/internal/FusibleFlow;Lkotlin/coroutines/CoroutineContext;ILkotlinx/coroutines/channels/BufferOverflow;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
 Lkotlinx/coroutines/flow/internal/NoOpContinuation;
 SPLkotlinx/coroutines/flow/internal/NoOpContinuation;-><clinit>()V
 SPLkotlinx/coroutines/flow/internal/NoOpContinuation;-><init>()V
@@ -11835,7 +14143,6 @@ SPLkotlinx/coroutines/flow/internal/NopCollector;->emit(Ljava/lang/Object;Lkotli
 Lkotlinx/coroutines/flow/internal/NullSurrogateKt;
 SPLkotlinx/coroutines/flow/internal/NullSurrogateKt;-><clinit>()V
 Lkotlinx/coroutines/flow/internal/SafeCollector;
-SPLkotlinx/coroutines/flow/internal/SafeCollector;->$r8$lambda$idxg0bEmSgrK6v2pQsR7xybd4HY(ILkotlin/coroutines/CoroutineContext$Element;)I
 SPLkotlinx/coroutines/flow/internal/SafeCollector;-><init>(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/CoroutineContext;)V
 SPLkotlinx/coroutines/flow/internal/SafeCollector;->checkContext(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
 SPLkotlinx/coroutines/flow/internal/SafeCollector;->collectContextSize$lambda$0(ILkotlin/coroutines/CoroutineContext$Element;)I
@@ -11856,7 +14163,6 @@ SPLkotlinx/coroutines/flow/internal/SafeCollectorKt$emitFun$1;-><init>()V
 SPLkotlinx/coroutines/flow/internal/SafeCollectorKt$emitFun$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 SPLkotlinx/coroutines/flow/internal/SafeCollectorKt$emitFun$1;->invoke(Lkotlinx/coroutines/flow/FlowCollector;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 Lkotlinx/coroutines/flow/internal/SafeCollector_commonKt;
-SPLkotlinx/coroutines/flow/internal/SafeCollector_commonKt;->$r8$lambda$0mv-1vIMKs5GqhpegvxZ5k4J09Y(Lkotlinx/coroutines/flow/internal/SafeCollector;ILkotlin/coroutines/CoroutineContext$Element;)I
 SPLkotlinx/coroutines/flow/internal/SafeCollector_commonKt;->checkContext$lambda$0(Lkotlinx/coroutines/flow/internal/SafeCollector;ILkotlin/coroutines/CoroutineContext$Element;)I
 SPLkotlinx/coroutines/flow/internal/SafeCollector_commonKt;->checkContext(Lkotlinx/coroutines/flow/internal/SafeCollector;Lkotlin/coroutines/CoroutineContext;)V
 SPLkotlinx/coroutines/flow/internal/SafeCollector_commonKt;->transitiveCoroutineParent(Lkotlinx/coroutines/Job;Lkotlinx/coroutines/Job;)Lkotlinx/coroutines/Job;
@@ -11866,6 +14172,9 @@ SPLkotlinx/coroutines/flow/internal/SafeCollector_commonKt$$ExternalSyntheticLam
 Lkotlinx/coroutines/flow/internal/SendingCollector;
 SPLkotlinx/coroutines/flow/internal/SendingCollector;-><init>(Lkotlinx/coroutines/channels/SendChannel;)V
 SPLkotlinx/coroutines/flow/internal/SendingCollector;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/internal/ConcurrentKt;
+SPLkotlinx/coroutines/internal/ConcurrentKt;-><clinit>()V
+SPLkotlinx/coroutines/internal/ConcurrentKt;->removeFutureOnCancel(Ljava/util/concurrent/Executor;)Z
 Lkotlinx/coroutines/internal/ConcurrentLinkedListKt;
 SPLkotlinx/coroutines/internal/ConcurrentLinkedListKt;-><clinit>()V
 SPLkotlinx/coroutines/internal/ConcurrentLinkedListKt;->access$getCLOSED$p()Lkotlinx/coroutines/internal/Symbol;
@@ -11877,6 +14186,7 @@ SPLkotlinx/coroutines/internal/ConcurrentLinkedListNode;->access$getNextOrClosed
 SPLkotlinx/coroutines/internal/ConcurrentLinkedListNode;->cleanPrev()V
 SPLkotlinx/coroutines/internal/ConcurrentLinkedListNode;->getNext()Lkotlinx/coroutines/internal/ConcurrentLinkedListNode;
 SPLkotlinx/coroutines/internal/ConcurrentLinkedListNode;->getNextOrClosed()Ljava/lang/Object;
+SPLkotlinx/coroutines/internal/ConcurrentLinkedListNode;->getPrev()Lkotlinx/coroutines/internal/ConcurrentLinkedListNode;
 SPLkotlinx/coroutines/internal/ConcurrentLinkedListNode;->get_next$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 SPLkotlinx/coroutines/internal/ConcurrentLinkedListNode;->get_prev$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 SPLkotlinx/coroutines/internal/ConcurrentLinkedListNode;->markAsClosed()Z
@@ -11905,7 +14215,9 @@ SPLkotlinx/coroutines/internal/DispatchedContinuation;->tryReleaseClaimedContinu
 Lkotlinx/coroutines/internal/DispatchedContinuationKt;
 SPLkotlinx/coroutines/internal/DispatchedContinuationKt;-><clinit>()V
 SPLkotlinx/coroutines/internal/DispatchedContinuationKt;->access$getUNDEFINED$p()Lkotlinx/coroutines/internal/Symbol;
-SPLkotlinx/coroutines/internal/DispatchedContinuationKt;->resumeCancellableWith(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V
+SPLkotlinx/coroutines/internal/DispatchedContinuationKt;->resumeCancellableWithInternal(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V
+SPLkotlinx/coroutines/internal/DispatchedContinuationKt;->safeDispatch(Lkotlinx/coroutines/CoroutineDispatcher;Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+SPLkotlinx/coroutines/internal/DispatchedContinuationKt;->safeIsDispatchNeeded(Lkotlinx/coroutines/CoroutineDispatcher;Lkotlin/coroutines/CoroutineContext;)Z
 Lkotlinx/coroutines/internal/FastServiceLoader;
 SPLkotlinx/coroutines/internal/FastServiceLoader;-><clinit>()V
 SPLkotlinx/coroutines/internal/FastServiceLoader;-><init>()V
@@ -12024,7 +14336,6 @@ SPLkotlinx/coroutines/internal/SystemPropsKt__SystemProps_commonKt;->systemProp(
 SPLkotlinx/coroutines/internal/SystemPropsKt__SystemProps_commonKt;->systemProp(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 SPLkotlinx/coroutines/internal/SystemPropsKt__SystemProps_commonKt;->systemProp(Ljava/lang/String;Z)Z
 Lkotlinx/coroutines/internal/ThreadContextKt;
-SPLkotlinx/coroutines/internal/ThreadContextKt;->$r8$lambda$JV-_KVVI_n23GsB5XC6MwwiLObk(Ljava/lang/Object;Lkotlin/coroutines/CoroutineContext$Element;)Ljava/lang/Object;
 SPLkotlinx/coroutines/internal/ThreadContextKt;-><clinit>()V
 SPLkotlinx/coroutines/internal/ThreadContextKt;->countAll$lambda$0(Ljava/lang/Object;Lkotlin/coroutines/CoroutineContext$Element;)Ljava/lang/Object;
 SPLkotlinx/coroutines/internal/ThreadContextKt;->restoreThreadContext(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
@@ -12057,6 +14368,7 @@ Lkotlinx/coroutines/intrinsics/CancellableKt;
 SPLkotlinx/coroutines/intrinsics/CancellableKt;->startCoroutineCancellable(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
 Lkotlinx/coroutines/intrinsics/UndispatchedKt;
 SPLkotlinx/coroutines/intrinsics/UndispatchedKt;->startCoroutineUndispatched(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/intrinsics/UndispatchedKt;->startUndispatched(Lkotlinx/coroutines/internal/ScopeCoroutine;ZLjava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 SPLkotlinx/coroutines/intrinsics/UndispatchedKt;->startUndispatchedOrReturn(Lkotlinx/coroutines/internal/ScopeCoroutine;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 Lkotlinx/coroutines/scheduling/CoroutineScheduler;
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler;-><clinit>()V
@@ -12066,7 +14378,9 @@ SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->addToGlobalQueue(Lkotlinx/
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->createNewWorker()I
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->createTask(Ljava/lang/Runnable;Z)Lkotlinx/coroutines/scheduling/Task;
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->currentWorker()Lkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->dispatch$default(Lkotlinx/coroutines/scheduling/CoroutineScheduler;Ljava/lang/Runnable;ZZILjava/lang/Object;)V
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->dispatch(Ljava/lang/Runnable;ZZ)V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->execute(Ljava/lang/Runnable;)V
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->getControlState$volatile$FU()Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->getParkedWorkersStack$volatile$FU()Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->get_isTerminated$volatile$FU()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
@@ -12075,7 +14389,7 @@ SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->parkedWorkersStackNextInde
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->parkedWorkersStackPop()Lkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->parkedWorkersStackPush(Lkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;)Z
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->runSafely(Lkotlinx/coroutines/scheduling/Task;)V
-SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->signalBlockingWork(JZ)V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->signalBlockingWork(J)V
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->signalCpuWork()V
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->submitToLocalQueue(Lkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;Lkotlinx/coroutines/scheduling/Task;Z)Lkotlinx/coroutines/scheduling/Task;
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->tryCreateWorker$default(Lkotlinx/coroutines/scheduling/CoroutineScheduler;JILjava/lang/Object;)Z
@@ -12094,7 +14408,7 @@ SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->findAnyTask(Z)Lkotl
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->findTask(Z)Lkotlinx/coroutines/scheduling/Task;
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->getIndexInArray()I
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->getNextParkedWorker()Ljava/lang/Object;
-SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->getWorkerCtl$volatile$FU$kotlinx_coroutines_core()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->getWorkerCtl$volatile$FU()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->inStack()Z
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->nextInt(I)I
 SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->park()V
@@ -12119,6 +14433,7 @@ SPLkotlinx/coroutines/scheduling/DefaultIoScheduler;->limitedParallelism(ILjava/
 Lkotlinx/coroutines/scheduling/DefaultScheduler;
 SPLkotlinx/coroutines/scheduling/DefaultScheduler;-><clinit>()V
 SPLkotlinx/coroutines/scheduling/DefaultScheduler;-><init>()V
+SPLkotlinx/coroutines/scheduling/DefaultScheduler;->limitedParallelism(ILjava/lang/String;)Lkotlinx/coroutines/CoroutineDispatcher;
 Lkotlinx/coroutines/scheduling/GlobalQueue;
 SPLkotlinx/coroutines/scheduling/GlobalQueue;-><init>()V
 Lkotlinx/coroutines/scheduling/NanoTimeSource;
@@ -12129,6 +14444,7 @@ Lkotlinx/coroutines/scheduling/SchedulerCoroutineDispatcher;
 SPLkotlinx/coroutines/scheduling/SchedulerCoroutineDispatcher;-><init>(IIJLjava/lang/String;)V
 SPLkotlinx/coroutines/scheduling/SchedulerCoroutineDispatcher;->createScheduler()Lkotlinx/coroutines/scheduling/CoroutineScheduler;
 SPLkotlinx/coroutines/scheduling/SchedulerCoroutineDispatcher;->dispatchWithContext$kotlinx_coroutines_core(Ljava/lang/Runnable;ZZ)V
+SPLkotlinx/coroutines/scheduling/SchedulerCoroutineDispatcher;->getExecutor()Ljava/util/concurrent/Executor;
 Lkotlinx/coroutines/scheduling/SchedulerTimeSource;
 SPLkotlinx/coroutines/scheduling/SchedulerTimeSource;-><init>()V
 Lkotlinx/coroutines/scheduling/Task;
@@ -12194,117 +14510,430 @@ SPLkotlinx/coroutines/sync/SemaphoreKt;->access$getSEGMENT_SIZE$p()I
 Lkotlinx/coroutines/sync/SemaphoreSegment;
 SPLkotlinx/coroutines/sync/SemaphoreSegment;-><init>(JLkotlinx/coroutines/sync/SemaphoreSegment;I)V
 Lkotlinx/serialization/DeserializationStrategy;
+Lkotlinx/serialization/InternalSerializationApi;
 Lkotlinx/serialization/KSerializer;
 Lkotlinx/serialization/MissingFieldException;
+Lkotlinx/serialization/Polymorphic;
 Lkotlinx/serialization/SerialFormat;
+Lkotlinx/serialization/Serializable;
 Lkotlinx/serialization/SerializationException;
 Lkotlinx/serialization/SerializationStrategy;
+Lkotlinx/serialization/SerializersCacheKt;
+SPLkotlinx/serialization/SerializersCacheKt;-><clinit>()V
+SPLkotlinx/serialization/SerializersCacheKt;->SERIALIZERS_CACHE_NULLABLE$lambda$0(Lkotlin/reflect/KClass;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/SerializersCacheKt;->findCachedSerializer(Lkotlin/reflect/KClass;Z)Lkotlinx/serialization/KSerializer;
+Lkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda0;
+SPLkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda0;-><init>()V
+Lkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda1;
+SPLkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda1;-><init>()V
+SPLkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda2;
+SPLkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda2;-><init>()V
+Lkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda3;
+SPLkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda3;-><init>()V
+Lkotlinx/serialization/SerializersKt;
+SPLkotlinx/serialization/SerializersKt;->serializer(Lkotlinx/serialization/modules/SerializersModule;Lkotlin/reflect/KType;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/SerializersKt;->serializerOrNull(Lkotlin/reflect/KClass;)Lkotlinx/serialization/KSerializer;
+Lkotlinx/serialization/SerializersKt__SerializersKt;
+SPLkotlinx/serialization/SerializersKt__SerializersKt;->serializer(Lkotlinx/serialization/modules/SerializersModule;Lkotlin/reflect/KType;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/SerializersKt__SerializersKt;->serializerByKTypeImpl$SerializersKt__SerializersKt(Lkotlinx/serialization/modules/SerializersModule;Lkotlin/reflect/KType;Z)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/SerializersKt__SerializersKt;->serializerOrNull(Lkotlin/reflect/KClass;)Lkotlinx/serialization/KSerializer;
 Lkotlinx/serialization/StringFormat;
 Lkotlinx/serialization/builtins/BuiltinSerializersKt;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->BooleanArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->ByteArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->CharArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->DoubleArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->FloatArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->IntArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->LongArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->NothingSerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->ShortArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->UByteArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->UIntArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->ULongArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->UShortArraySerializer()Lkotlinx/serialization/KSerializer;
 SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->getNullable(Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/UByte$Companion;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/UInt$Companion;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/ULong$Companion;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/UShort$Companion;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/Unit;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/BooleanCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/ByteCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/CharCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/DoubleCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/FloatCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/IntCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/LongCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/ShortCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/StringCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/time/Duration$Companion;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/time/Instant$Companion;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/uuid/Uuid$Companion;)Lkotlinx/serialization/KSerializer;
 Lkotlinx/serialization/descriptors/PrimitiveKind;
 SPLkotlinx/serialization/descriptors/PrimitiveKind;-><init>()V
 SPLkotlinx/serialization/descriptors/PrimitiveKind;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/descriptors/PrimitiveKind$BOOLEAN;
+SPLkotlinx/serialization/descriptors/PrimitiveKind$BOOLEAN;-><clinit>()V
+SPLkotlinx/serialization/descriptors/PrimitiveKind$BOOLEAN;-><init>()V
+Lkotlinx/serialization/descriptors/PrimitiveKind$BYTE;
+SPLkotlinx/serialization/descriptors/PrimitiveKind$BYTE;-><clinit>()V
+SPLkotlinx/serialization/descriptors/PrimitiveKind$BYTE;-><init>()V
+Lkotlinx/serialization/descriptors/PrimitiveKind$CHAR;
+SPLkotlinx/serialization/descriptors/PrimitiveKind$CHAR;-><clinit>()V
+SPLkotlinx/serialization/descriptors/PrimitiveKind$CHAR;-><init>()V
+Lkotlinx/serialization/descriptors/PrimitiveKind$DOUBLE;
+SPLkotlinx/serialization/descriptors/PrimitiveKind$DOUBLE;-><clinit>()V
+SPLkotlinx/serialization/descriptors/PrimitiveKind$DOUBLE;-><init>()V
+Lkotlinx/serialization/descriptors/PrimitiveKind$FLOAT;
+SPLkotlinx/serialization/descriptors/PrimitiveKind$FLOAT;-><clinit>()V
+SPLkotlinx/serialization/descriptors/PrimitiveKind$FLOAT;-><init>()V
 Lkotlinx/serialization/descriptors/PrimitiveKind$INT;
 SPLkotlinx/serialization/descriptors/PrimitiveKind$INT;-><clinit>()V
 SPLkotlinx/serialization/descriptors/PrimitiveKind$INT;-><init>()V
 Lkotlinx/serialization/descriptors/PrimitiveKind$LONG;
 SPLkotlinx/serialization/descriptors/PrimitiveKind$LONG;-><clinit>()V
 SPLkotlinx/serialization/descriptors/PrimitiveKind$LONG;-><init>()V
+Lkotlinx/serialization/descriptors/PrimitiveKind$SHORT;
+SPLkotlinx/serialization/descriptors/PrimitiveKind$SHORT;-><clinit>()V
+SPLkotlinx/serialization/descriptors/PrimitiveKind$SHORT;-><init>()V
+Lkotlinx/serialization/descriptors/PrimitiveKind$STRING;
+SPLkotlinx/serialization/descriptors/PrimitiveKind$STRING;-><clinit>()V
+SPLkotlinx/serialization/descriptors/PrimitiveKind$STRING;-><init>()V
 Lkotlinx/serialization/descriptors/SerialDescriptor;
 SPLkotlinx/serialization/descriptors/SerialDescriptor;->isNullable()Z
 Lkotlinx/serialization/descriptors/SerialKind;
 SPLkotlinx/serialization/descriptors/SerialKind;-><init>()V
 SPLkotlinx/serialization/descriptors/SerialKind;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/descriptors/StructureKind;
+SPLkotlinx/serialization/descriptors/StructureKind;-><init>()V
+SPLkotlinx/serialization/descriptors/StructureKind;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/descriptors/StructureKind$OBJECT;
+SPLkotlinx/serialization/descriptors/StructureKind$OBJECT;-><clinit>()V
+SPLkotlinx/serialization/descriptors/StructureKind$OBJECT;-><init>()V
 Lkotlinx/serialization/encoding/AbstractDecoder;
 SPLkotlinx/serialization/encoding/AbstractDecoder;-><init>()V
-Lkotlinx/serialization/encoding/AbstractEncoder;
-SPLkotlinx/serialization/encoding/AbstractEncoder;-><init>()V
 Lkotlinx/serialization/encoding/ChunkedDecoder;
 Lkotlinx/serialization/encoding/CompositeDecoder;
 SPLkotlinx/serialization/encoding/CompositeDecoder;-><clinit>()V
 Lkotlinx/serialization/encoding/CompositeDecoder$Companion;
 SPLkotlinx/serialization/encoding/CompositeDecoder$Companion;-><clinit>()V
 SPLkotlinx/serialization/encoding/CompositeDecoder$Companion;-><init>()V
-Lkotlinx/serialization/encoding/CompositeEncoder;
 Lkotlinx/serialization/encoding/Decoder;
-Lkotlinx/serialization/encoding/Encoder;
+Lkotlinx/serialization/internal/AbstractCollectionSerializer;
+SPLkotlinx/serialization/internal/AbstractCollectionSerializer;-><init>()V
+SPLkotlinx/serialization/internal/AbstractCollectionSerializer;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 Lkotlinx/serialization/internal/AbstractPolymorphicSerializer;
+Lkotlinx/serialization/internal/BooleanArraySerializer;
+SPLkotlinx/serialization/internal/BooleanArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/BooleanArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/BooleanSerializer;
+SPLkotlinx/serialization/internal/BooleanSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/BooleanSerializer;-><init>()V
+SPLkotlinx/serialization/internal/BooleanSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/ByteArraySerializer;
+SPLkotlinx/serialization/internal/ByteArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/ByteArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/ByteSerializer;
+SPLkotlinx/serialization/internal/ByteSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/ByteSerializer;-><init>()V
+SPLkotlinx/serialization/internal/ByteSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/CacheEntry;
+SPLkotlinx/serialization/internal/CacheEntry;-><init>(Lkotlinx/serialization/KSerializer;)V
 Lkotlinx/serialization/internal/CachedNames;
+Lkotlinx/serialization/internal/CachingKt;
+SPLkotlinx/serialization/internal/CachingKt;-><clinit>()V
+SPLkotlinx/serialization/internal/CachingKt;->createCache(Lkotlin/jvm/functions/Function1;)Lkotlinx/serialization/internal/SerializerCache;
+SPLkotlinx/serialization/internal/CachingKt;->createParametrizedCache(Lkotlin/jvm/functions/Function2;)Lkotlinx/serialization/internal/ParametrizedSerializerCache;
+Lkotlinx/serialization/internal/CharArraySerializer;
+SPLkotlinx/serialization/internal/CharArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/CharArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/CharSerializer;
+SPLkotlinx/serialization/internal/CharSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/CharSerializer;-><init>()V
+SPLkotlinx/serialization/internal/CharSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/ClassValueCache;
+SPLkotlinx/serialization/internal/ClassValueCache;-><init>(Lkotlin/jvm/functions/Function1;)V
+SPLkotlinx/serialization/internal/ClassValueCache;->get(Lkotlin/reflect/KClass;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/internal/ClassValueCache;->getCompute()Lkotlin/jvm/functions/Function1;
+Lkotlinx/serialization/internal/ClassValueCache$$ExternalSyntheticApiModelOutline0;
+SPLkotlinx/serialization/internal/ClassValueCache$$ExternalSyntheticApiModelOutline0;->m(Lkotlinx/serialization/internal/ClassValueReferences;Ljava/lang/Class;)Ljava/lang/Object;
+Lkotlinx/serialization/internal/ClassValueCache$get$$inlined$getOrSet$1;
+SPLkotlinx/serialization/internal/ClassValueCache$get$$inlined$getOrSet$1;-><init>(Lkotlinx/serialization/internal/ClassValueCache;Lkotlin/reflect/KClass;)V
+SPLkotlinx/serialization/internal/ClassValueCache$get$$inlined$getOrSet$1;->invoke()Ljava/lang/Object;
+Lkotlinx/serialization/internal/ClassValueParametrizedCache;
+SPLkotlinx/serialization/internal/ClassValueParametrizedCache;-><init>(Lkotlin/jvm/functions/Function2;)V
+Lkotlinx/serialization/internal/ClassValueReferences;
+SPLkotlinx/serialization/internal/ClassValueReferences;-><init>()V
+SPLkotlinx/serialization/internal/ClassValueReferences;->computeValue(Ljava/lang/Class;)Ljava/lang/Object;
+SPLkotlinx/serialization/internal/ClassValueReferences;->computeValue(Ljava/lang/Class;)Lkotlinx/serialization/internal/MutableSoftReference;
+Lkotlinx/serialization/internal/CollectionLikeSerializer;
+SPLkotlinx/serialization/internal/CollectionLikeSerializer;-><init>(Lkotlinx/serialization/KSerializer;)V
+SPLkotlinx/serialization/internal/CollectionLikeSerializer;-><init>(Lkotlinx/serialization/KSerializer;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/internal/DoubleArraySerializer;
+SPLkotlinx/serialization/internal/DoubleArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/DoubleArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/DoubleSerializer;
+SPLkotlinx/serialization/internal/DoubleSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/DoubleSerializer;-><init>()V
+SPLkotlinx/serialization/internal/DoubleSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/DurationSerializer;
+SPLkotlinx/serialization/internal/DurationSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/DurationSerializer;-><init>()V
+Lkotlinx/serialization/internal/FloatArraySerializer;
+SPLkotlinx/serialization/internal/FloatArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/FloatArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/FloatSerializer;
+SPLkotlinx/serialization/internal/FloatSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/FloatSerializer;-><init>()V
+SPLkotlinx/serialization/internal/FloatSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/GeneratedSerializer;
+Lkotlinx/serialization/internal/InlineClassDescriptor;
+SPLkotlinx/serialization/internal/InlineClassDescriptor;-><init>(Ljava/lang/String;Lkotlinx/serialization/internal/GeneratedSerializer;)V
+Lkotlinx/serialization/internal/InlineClassDescriptorKt;
+SPLkotlinx/serialization/internal/InlineClassDescriptorKt;->InlinePrimitiveDescriptor(Ljava/lang/String;Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/InlineClassDescriptorKt$InlinePrimitiveDescriptor$1;
+SPLkotlinx/serialization/internal/InlineClassDescriptorKt$InlinePrimitiveDescriptor$1;-><init>(Lkotlinx/serialization/KSerializer;)V
+Lkotlinx/serialization/internal/InstantSerializer;
+SPLkotlinx/serialization/internal/InstantSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/InstantSerializer;-><init>()V
+Lkotlinx/serialization/internal/IntArraySerializer;
+SPLkotlinx/serialization/internal/IntArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/IntArraySerializer;-><init>()V
 Lkotlinx/serialization/internal/IntSerializer;
 SPLkotlinx/serialization/internal/IntSerializer;-><clinit>()V
 SPLkotlinx/serialization/internal/IntSerializer;-><init>()V
 SPLkotlinx/serialization/internal/IntSerializer;->deserialize(Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Integer;
 SPLkotlinx/serialization/internal/IntSerializer;->deserialize(Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
 SPLkotlinx/serialization/internal/IntSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
-SPLkotlinx/serialization/internal/IntSerializer;->serialize(Lkotlinx/serialization/encoding/Encoder;I)V
-SPLkotlinx/serialization/internal/IntSerializer;->serialize(Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
+Lkotlinx/serialization/internal/ListLikeDescriptor;
+SPLkotlinx/serialization/internal/ListLikeDescriptor;-><init>(Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+SPLkotlinx/serialization/internal/ListLikeDescriptor;-><init>(Lkotlinx/serialization/descriptors/SerialDescriptor;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/internal/LongArraySerializer;
+SPLkotlinx/serialization/internal/LongArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/LongArraySerializer;-><init>()V
 Lkotlinx/serialization/internal/LongSerializer;
 SPLkotlinx/serialization/internal/LongSerializer;-><clinit>()V
 SPLkotlinx/serialization/internal/LongSerializer;-><init>()V
 SPLkotlinx/serialization/internal/LongSerializer;->deserialize(Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Long;
 SPLkotlinx/serialization/internal/LongSerializer;->deserialize(Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
 SPLkotlinx/serialization/internal/LongSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/MutableSoftReference;
+SPLkotlinx/serialization/internal/MutableSoftReference;-><init>()V
+SPLkotlinx/serialization/internal/MutableSoftReference;->getOrSetWithLock(Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+Lkotlinx/serialization/internal/NamedCompanion;
+Lkotlinx/serialization/internal/NothingSerialDescriptor;
+SPLkotlinx/serialization/internal/NothingSerialDescriptor;-><clinit>()V
+SPLkotlinx/serialization/internal/NothingSerialDescriptor;-><init>()V
+Lkotlinx/serialization/internal/NothingSerializer;
+SPLkotlinx/serialization/internal/NothingSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/NothingSerializer;-><init>()V
 Lkotlinx/serialization/internal/NullableSerializer;
 SPLkotlinx/serialization/internal/NullableSerializer;-><init>(Lkotlinx/serialization/KSerializer;)V
 SPLkotlinx/serialization/internal/NullableSerializer;->deserialize(Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
 SPLkotlinx/serialization/internal/NullableSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/ObjectSerializer;
+SPLkotlinx/serialization/internal/ObjectSerializer;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lkotlinx/serialization/internal/ObjectSerializer$$ExternalSyntheticLambda1;
+SPLkotlinx/serialization/internal/ObjectSerializer$$ExternalSyntheticLambda1;-><init>(Ljava/lang/String;Lkotlinx/serialization/internal/ObjectSerializer;)V
+Lkotlinx/serialization/internal/ParametrizedSerializerCache;
+Lkotlinx/serialization/internal/PlatformKt;
+SPLkotlinx/serialization/internal/PlatformKt;->companionOrNull(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Object;
+SPLkotlinx/serialization/internal/PlatformKt;->compiledSerializerImpl(Lkotlin/reflect/KClass;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/internal/PlatformKt;->constructSerializerForGivenTypeArgs(Ljava/lang/Class;[Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/internal/PlatformKt;->constructSerializerForGivenTypeArgs(Lkotlin/reflect/KClass;[Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/internal/PlatformKt;->findInNamedCompanion(Ljava/lang/Class;[Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/internal/PlatformKt;->findNamedCompanionByAnnotation(Ljava/lang/Class;)Ljava/lang/Object;
+SPLkotlinx/serialization/internal/PlatformKt;->findObjectSerializer(Ljava/lang/Class;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/internal/PlatformKt;->initBuiltins()Ljava/util/Map;
+SPLkotlinx/serialization/internal/PlatformKt;->invokeSerializerOnDefaultCompanion(Ljava/lang/Class;[Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/internal/PlatformKt;->isInterface(Lkotlin/reflect/KClass;)Z
+SPLkotlinx/serialization/internal/PlatformKt;->isPolymorphicSerializer(Ljava/lang/Class;)Z
 Lkotlinx/serialization/internal/Platform_commonKt;
 SPLkotlinx/serialization/internal/Platform_commonKt;-><clinit>()V
 SPLkotlinx/serialization/internal/Platform_commonKt;->cachedSerialNames(Lkotlinx/serialization/descriptors/SerialDescriptor;)Ljava/util/Set;
+SPLkotlinx/serialization/internal/Platform_commonKt;->kclass(Lkotlin/reflect/KType;)Lkotlin/reflect/KClass;
+Lkotlinx/serialization/internal/PluginGeneratedSerialDescriptor;
+SPLkotlinx/serialization/internal/PluginGeneratedSerialDescriptor;-><init>(Ljava/lang/String;Lkotlinx/serialization/internal/GeneratedSerializer;I)V
+SPLkotlinx/serialization/internal/PluginGeneratedSerialDescriptor;->getSerialName()Ljava/lang/String;
+Lkotlinx/serialization/internal/PluginGeneratedSerialDescriptor$$ExternalSyntheticLambda0;
+SPLkotlinx/serialization/internal/PluginGeneratedSerialDescriptor$$ExternalSyntheticLambda0;-><init>(Lkotlinx/serialization/internal/PluginGeneratedSerialDescriptor;)V
+Lkotlinx/serialization/internal/PluginGeneratedSerialDescriptor$$ExternalSyntheticLambda1;
+SPLkotlinx/serialization/internal/PluginGeneratedSerialDescriptor$$ExternalSyntheticLambda1;-><init>(Lkotlinx/serialization/internal/PluginGeneratedSerialDescriptor;)V
+Lkotlinx/serialization/internal/PluginGeneratedSerialDescriptor$$ExternalSyntheticLambda2;
+SPLkotlinx/serialization/internal/PluginGeneratedSerialDescriptor$$ExternalSyntheticLambda2;-><init>(Lkotlinx/serialization/internal/PluginGeneratedSerialDescriptor;)V
+Lkotlinx/serialization/internal/PrimitiveArrayDescriptor;
+SPLkotlinx/serialization/internal/PrimitiveArrayDescriptor;-><init>(Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+Lkotlinx/serialization/internal/PrimitiveArraySerializer;
+SPLkotlinx/serialization/internal/PrimitiveArraySerializer;-><init>(Lkotlinx/serialization/KSerializer;)V
 Lkotlinx/serialization/internal/PrimitiveSerialDescriptor;
 SPLkotlinx/serialization/internal/PrimitiveSerialDescriptor;-><init>(Ljava/lang/String;Lkotlinx/serialization/descriptors/PrimitiveKind;)V
 SPLkotlinx/serialization/internal/PrimitiveSerialDescriptor;->getElementsCount()I
 SPLkotlinx/serialization/internal/PrimitiveSerialDescriptor;->getSerialName()Ljava/lang/String;
 SPLkotlinx/serialization/internal/PrimitiveSerialDescriptor;->isNullable()Z
+Lkotlinx/serialization/internal/PrimitivesKt;
+SPLkotlinx/serialization/internal/PrimitivesKt;-><clinit>()V
+SPLkotlinx/serialization/internal/PrimitivesKt;->builtinSerializerOrNull(Lkotlin/reflect/KClass;)Lkotlinx/serialization/KSerializer;
 Lkotlinx/serialization/internal/SerialDescriptorForNullable;
 SPLkotlinx/serialization/internal/SerialDescriptorForNullable;-><init>(Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+Lkotlinx/serialization/internal/SerializerCache;
+Lkotlinx/serialization/internal/ShortArraySerializer;
+SPLkotlinx/serialization/internal/ShortArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/ShortArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/ShortSerializer;
+SPLkotlinx/serialization/internal/ShortSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/ShortSerializer;-><init>()V
+SPLkotlinx/serialization/internal/ShortSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/StringSerializer;
+SPLkotlinx/serialization/internal/StringSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/StringSerializer;-><init>()V
+Lkotlinx/serialization/internal/UByteArraySerializer;
+SPLkotlinx/serialization/internal/UByteArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/UByteArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/UByteSerializer;
+SPLkotlinx/serialization/internal/UByteSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/UByteSerializer;-><init>()V
+SPLkotlinx/serialization/internal/UByteSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/UIntArraySerializer;
+SPLkotlinx/serialization/internal/UIntArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/UIntArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/UIntSerializer;
+SPLkotlinx/serialization/internal/UIntSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/UIntSerializer;-><init>()V
+SPLkotlinx/serialization/internal/UIntSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/ULongArraySerializer;
+SPLkotlinx/serialization/internal/ULongArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/ULongArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/ULongSerializer;
+SPLkotlinx/serialization/internal/ULongSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/ULongSerializer;-><init>()V
+SPLkotlinx/serialization/internal/ULongSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/UShortArraySerializer;
+SPLkotlinx/serialization/internal/UShortArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/UShortArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/UShortSerializer;
+SPLkotlinx/serialization/internal/UShortSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/UShortSerializer;-><init>()V
+SPLkotlinx/serialization/internal/UShortSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/UnitSerializer;
+SPLkotlinx/serialization/internal/UnitSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/UnitSerializer;-><init>()V
+Lkotlinx/serialization/internal/UuidSerializer;
+SPLkotlinx/serialization/internal/UuidSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/UuidSerializer;-><init>()V
 Lkotlinx/serialization/json/ClassDiscriminatorMode;
 SPLkotlinx/serialization/json/ClassDiscriminatorMode;->$values()[Lkotlinx/serialization/json/ClassDiscriminatorMode;
 SPLkotlinx/serialization/json/ClassDiscriminatorMode;-><clinit>()V
 SPLkotlinx/serialization/json/ClassDiscriminatorMode;-><init>(Ljava/lang/String;I)V
-SPLkotlinx/serialization/json/ClassDiscriminatorMode;->values()[Lkotlinx/serialization/json/ClassDiscriminatorMode;
 Lkotlinx/serialization/json/Json;
 SPLkotlinx/serialization/json/Json;-><clinit>()V
 SPLkotlinx/serialization/json/Json;-><init>(Lkotlinx/serialization/json/JsonConfiguration;Lkotlinx/serialization/modules/SerializersModule;)V
 SPLkotlinx/serialization/json/Json;-><init>(Lkotlinx/serialization/json/JsonConfiguration;Lkotlinx/serialization/modules/SerializersModule;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLkotlinx/serialization/json/Json;->decodeFromString(Lkotlinx/serialization/DeserializationStrategy;Ljava/lang/String;)Ljava/lang/Object;
-SPLkotlinx/serialization/json/Json;->encodeToString(Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)Ljava/lang/String;
 SPLkotlinx/serialization/json/Json;->getConfiguration()Lkotlinx/serialization/json/JsonConfiguration;
 SPLkotlinx/serialization/json/Json;->getSerializersModule()Lkotlinx/serialization/modules/SerializersModule;
 Lkotlinx/serialization/json/Json$Default;
 SPLkotlinx/serialization/json/Json$Default;-><init>()V
 SPLkotlinx/serialization/json/Json$Default;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/json/JsonArray;
+SPLkotlinx/serialization/json/JsonArray;-><clinit>()V
+SPLkotlinx/serialization/json/JsonArray;-><init>(Ljava/util/List;)V
+SPLkotlinx/serialization/json/JsonArray;->toString()Ljava/lang/String;
+Lkotlinx/serialization/json/JsonArray$Companion;
+SPLkotlinx/serialization/json/JsonArray$Companion;-><init>()V
+SPLkotlinx/serialization/json/JsonArray$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/json/JsonArrayBuilder;
+SPLkotlinx/serialization/json/JsonArrayBuilder;-><init>()V
+SPLkotlinx/serialization/json/JsonArrayBuilder;->build()Lkotlinx/serialization/json/JsonArray;
+Lkotlinx/serialization/json/JsonBuilder;
+SPLkotlinx/serialization/json/JsonBuilder;-><init>(Lkotlinx/serialization/json/Json;)V
+SPLkotlinx/serialization/json/JsonBuilder;->build$kotlinx_serialization_json()Lkotlinx/serialization/json/JsonConfiguration;
+SPLkotlinx/serialization/json/JsonBuilder;->getSerializersModule()Lkotlinx/serialization/modules/SerializersModule;
+SPLkotlinx/serialization/json/JsonBuilder;->setEncodeDefaults(Z)V
+SPLkotlinx/serialization/json/JsonBuilder;->setExplicitNulls(Z)V
 Lkotlinx/serialization/json/JsonConfiguration;
-SPLkotlinx/serialization/json/JsonConfiguration;-><init>(ZZZZZZLjava/lang/String;ZZLjava/lang/String;ZZLkotlinx/serialization/json/JsonNamingStrategy;ZZZLkotlinx/serialization/json/ClassDiscriminatorMode;)V
-SPLkotlinx/serialization/json/JsonConfiguration;-><init>(ZZZZZZLjava/lang/String;ZZLjava/lang/String;ZZLkotlinx/serialization/json/JsonNamingStrategy;ZZZLkotlinx/serialization/json/ClassDiscriminatorMode;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlinx/serialization/json/JsonConfiguration;-><init>(ZZZZZZLjava/lang/String;ZZLjava/lang/String;ZZLkotlinx/serialization/json/JsonNamingStrategy;ZZZLkotlinx/serialization/json/ClassDiscriminatorMode;Z)V
+SPLkotlinx/serialization/json/JsonConfiguration;-><init>(ZZZZZZLjava/lang/String;ZZLjava/lang/String;ZZLkotlinx/serialization/json/JsonNamingStrategy;ZZZLkotlinx/serialization/json/ClassDiscriminatorMode;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLkotlinx/serialization/json/JsonConfiguration;->getAllowComments()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getAllowSpecialFloatingPointValues()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getAllowStructuredMapKeys()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getAllowTrailingComma()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getClassDiscriminator()Ljava/lang/String;
 SPLkotlinx/serialization/json/JsonConfiguration;->getClassDiscriminatorMode()Lkotlinx/serialization/json/ClassDiscriminatorMode;
+SPLkotlinx/serialization/json/JsonConfiguration;->getCoerceInputValues()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getDecodeEnumsCaseInsensitive()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getEncodeDefaults()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getExceptionsWithDebugInfo()Z
 SPLkotlinx/serialization/json/JsonConfiguration;->getExplicitNulls()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getIgnoreUnknownKeys()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getNamingStrategy()Lkotlinx/serialization/json/JsonNamingStrategy;
 SPLkotlinx/serialization/json/JsonConfiguration;->getPrettyPrint()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getPrettyPrintIndent()Ljava/lang/String;
+SPLkotlinx/serialization/json/JsonConfiguration;->getUseAlternativeNames()Z
 SPLkotlinx/serialization/json/JsonConfiguration;->getUseArrayPolymorphism()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->isLenient()Z
 Lkotlinx/serialization/json/JsonDecoder;
-Lkotlinx/serialization/json/JsonEncoder;
+Lkotlinx/serialization/json/JsonDecodingException;
+Lkotlinx/serialization/json/JsonElement;
+SPLkotlinx/serialization/json/JsonElement;-><clinit>()V
+SPLkotlinx/serialization/json/JsonElement;-><init>()V
+SPLkotlinx/serialization/json/JsonElement;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/json/JsonElement$Companion;
+SPLkotlinx/serialization/json/JsonElement$Companion;-><init>()V
+SPLkotlinx/serialization/json/JsonElement$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/json/JsonElementBuildersKt;
+SPLkotlinx/serialization/json/JsonElementBuildersKt;->put(Lkotlinx/serialization/json/JsonObjectBuilder;Ljava/lang/String;Ljava/lang/Boolean;)Lkotlinx/serialization/json/JsonElement;
+SPLkotlinx/serialization/json/JsonElementBuildersKt;->put(Lkotlinx/serialization/json/JsonObjectBuilder;Ljava/lang/String;Ljava/lang/String;)Lkotlinx/serialization/json/JsonElement;
+SPLkotlinx/serialization/json/JsonElementBuildersKt;->putJsonArray(Lkotlinx/serialization/json/JsonObjectBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lkotlinx/serialization/json/JsonElement;
+Lkotlinx/serialization/json/JsonElementKt;
+SPLkotlinx/serialization/json/JsonElementKt;-><clinit>()V
+SPLkotlinx/serialization/json/JsonElementKt;->JsonPrimitive(Ljava/lang/Boolean;)Lkotlinx/serialization/json/JsonPrimitive;
+SPLkotlinx/serialization/json/JsonElementKt;->JsonPrimitive(Ljava/lang/String;)Lkotlinx/serialization/json/JsonPrimitive;
+Lkotlinx/serialization/json/JsonException;
+Lkotlinx/serialization/json/JsonImpl;
+SPLkotlinx/serialization/json/JsonImpl;-><init>(Lkotlinx/serialization/json/JsonConfiguration;Lkotlinx/serialization/modules/SerializersModule;)V
+SPLkotlinx/serialization/json/JsonImpl;->validateConfiguration()V
+Lkotlinx/serialization/json/JsonKt;
+SPLkotlinx/serialization/json/JsonKt;->Json$default(Lkotlinx/serialization/json/Json;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/serialization/json/Json;
+SPLkotlinx/serialization/json/JsonKt;->Json(Lkotlinx/serialization/json/Json;Lkotlin/jvm/functions/Function1;)Lkotlinx/serialization/json/Json;
+Lkotlinx/serialization/json/JsonLiteral;
+SPLkotlinx/serialization/json/JsonLiteral;-><init>(Ljava/lang/Object;ZLkotlinx/serialization/descriptors/SerialDescriptor;)V
+SPLkotlinx/serialization/json/JsonLiteral;-><init>(Ljava/lang/Object;ZLkotlinx/serialization/descriptors/SerialDescriptor;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlinx/serialization/json/JsonLiteral;->getContent()Ljava/lang/String;
+SPLkotlinx/serialization/json/JsonLiteral;->isString()Z
+SPLkotlinx/serialization/json/JsonLiteral;->toString()Ljava/lang/String;
+Lkotlinx/serialization/json/JsonNamingStrategy;
+Lkotlinx/serialization/json/JsonObject;
+SPLkotlinx/serialization/json/JsonObject;-><clinit>()V
+SPLkotlinx/serialization/json/JsonObject;-><init>(Ljava/util/Map;)V
+SPLkotlinx/serialization/json/JsonObject;->toString$lambda$0(Ljava/util/Map$Entry;)Ljava/lang/CharSequence;
+SPLkotlinx/serialization/json/JsonObject;->toString()Ljava/lang/String;
+Lkotlinx/serialization/json/JsonObject$$ExternalSyntheticLambda0;
+SPLkotlinx/serialization/json/JsonObject$$ExternalSyntheticLambda0;-><init>()V
+SPLkotlinx/serialization/json/JsonObject$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/serialization/json/JsonObject$Companion;
+SPLkotlinx/serialization/json/JsonObject$Companion;-><init>()V
+SPLkotlinx/serialization/json/JsonObject$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/json/JsonObjectBuilder;
+SPLkotlinx/serialization/json/JsonObjectBuilder;-><init>()V
+SPLkotlinx/serialization/json/JsonObjectBuilder;->build()Lkotlinx/serialization/json/JsonObject;
+SPLkotlinx/serialization/json/JsonObjectBuilder;->put(Ljava/lang/String;Lkotlinx/serialization/json/JsonElement;)Lkotlinx/serialization/json/JsonElement;
+Lkotlinx/serialization/json/JsonPrimitive;
+SPLkotlinx/serialization/json/JsonPrimitive;-><clinit>()V
+SPLkotlinx/serialization/json/JsonPrimitive;-><init>()V
+SPLkotlinx/serialization/json/JsonPrimitive;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/json/JsonPrimitive$Companion;
+SPLkotlinx/serialization/json/JsonPrimitive$Companion;-><init>()V
+SPLkotlinx/serialization/json/JsonPrimitive$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 Lkotlinx/serialization/json/internal/AbstractJsonLexer;
-SPLkotlinx/serialization/json/internal/AbstractJsonLexer;-><init>()V
+SPLkotlinx/serialization/json/internal/AbstractJsonLexer;-><init>(Lkotlinx/serialization/json/JsonConfiguration;)V
 SPLkotlinx/serialization/json/internal/AbstractJsonLexer;->consumeNumericLiteral()J
 SPLkotlinx/serialization/json/internal/AbstractJsonLexer;->expectEof()V
 SPLkotlinx/serialization/json/internal/AbstractJsonLexer;->tryConsumeNull$default(Lkotlinx/serialization/json/internal/AbstractJsonLexer;ZILjava/lang/Object;)Z
 SPLkotlinx/serialization/json/internal/AbstractJsonLexer;->tryConsumeNull(Z)Z
 Lkotlinx/serialization/json/internal/AbstractJsonLexerKt;
 SPLkotlinx/serialization/json/internal/AbstractJsonLexerKt;->charToTokenClass(C)B
-Lkotlinx/serialization/json/internal/ArrayPoolsKt;
-SPLkotlinx/serialization/json/internal/ArrayPoolsKt;-><clinit>()V
-SPLkotlinx/serialization/json/internal/ArrayPoolsKt;->access$getMAX_CHARS_IN_POOL$p()I
-Lkotlinx/serialization/json/internal/CharArrayPool;
-SPLkotlinx/serialization/json/internal/CharArrayPool;-><clinit>()V
-SPLkotlinx/serialization/json/internal/CharArrayPool;-><init>()V
-SPLkotlinx/serialization/json/internal/CharArrayPool;->release([C)V
-SPLkotlinx/serialization/json/internal/CharArrayPool;->take()[C
-Lkotlinx/serialization/json/internal/CharArrayPoolBase;
-SPLkotlinx/serialization/json/internal/CharArrayPoolBase;-><init>()V
-SPLkotlinx/serialization/json/internal/CharArrayPoolBase;->releaseImpl([C)V
-SPLkotlinx/serialization/json/internal/CharArrayPoolBase;->take(I)[C
 Lkotlinx/serialization/json/internal/CharMappings;
 SPLkotlinx/serialization/json/internal/CharMappings;-><clinit>()V
 SPLkotlinx/serialization/json/internal/CharMappings;-><init>()V
@@ -12314,44 +14943,22 @@ SPLkotlinx/serialization/json/internal/CharMappings;->initC2TC(CB)V
 SPLkotlinx/serialization/json/internal/CharMappings;->initC2TC(IB)V
 SPLkotlinx/serialization/json/internal/CharMappings;->initCharToToken()V
 SPLkotlinx/serialization/json/internal/CharMappings;->initEscape()V
-Lkotlinx/serialization/json/internal/Composer;
-SPLkotlinx/serialization/json/internal/Composer;-><init>(Lkotlinx/serialization/json/internal/InternalJsonWriter;)V
-SPLkotlinx/serialization/json/internal/Composer;->print(I)V
-Lkotlinx/serialization/json/internal/ComposersKt;
-SPLkotlinx/serialization/json/internal/ComposersKt;->Composer(Lkotlinx/serialization/json/internal/InternalJsonWriter;Lkotlinx/serialization/json/Json;)Lkotlinx/serialization/json/internal/Composer;
 Lkotlinx/serialization/json/internal/CreateMapForCacheKt;
 SPLkotlinx/serialization/json/internal/CreateMapForCacheKt;->createMapForCache(I)Ljava/util/Map;
 Lkotlinx/serialization/json/internal/DescriptorSchemaCache;
 SPLkotlinx/serialization/json/internal/DescriptorSchemaCache;-><init>()V
-Lkotlinx/serialization/json/internal/InternalJsonWriter;
+Lkotlinx/serialization/json/internal/JsonElementMarker;
 Lkotlinx/serialization/json/internal/JsonPath;
-SPLkotlinx/serialization/json/internal/JsonPath;-><init>()V
-Lkotlinx/serialization/json/internal/JsonStreamsKt;
-SPLkotlinx/serialization/json/internal/JsonStreamsKt;->encodeByWriter(Lkotlinx/serialization/json/Json;Lkotlinx/serialization/json/internal/InternalJsonWriter;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V
-Lkotlinx/serialization/json/internal/JsonToStringWriter;
-SPLkotlinx/serialization/json/internal/JsonToStringWriter;-><init>()V
-SPLkotlinx/serialization/json/internal/JsonToStringWriter;->ensureAdditionalCapacity(I)V
-SPLkotlinx/serialization/json/internal/JsonToStringWriter;->ensureTotalCapacity(II)I
-SPLkotlinx/serialization/json/internal/JsonToStringWriter;->release()V
-SPLkotlinx/serialization/json/internal/JsonToStringWriter;->toString()Ljava/lang/String;
-SPLkotlinx/serialization/json/internal/JsonToStringWriter;->write(Ljava/lang/String;)V
-SPLkotlinx/serialization/json/internal/JsonToStringWriter;->writeLong(J)V
-Lkotlinx/serialization/json/internal/PolymorphicKt$WhenMappings;
-SPLkotlinx/serialization/json/internal/PolymorphicKt$WhenMappings;-><clinit>()V
+SPLkotlinx/serialization/json/internal/JsonPath;-><init>(Lkotlinx/serialization/json/JsonConfiguration;)V
 Lkotlinx/serialization/json/internal/StreamingJsonDecoder;
 SPLkotlinx/serialization/json/internal/StreamingJsonDecoder;-><init>(Lkotlinx/serialization/json/Json;Lkotlinx/serialization/json/internal/WriteMode;Lkotlinx/serialization/json/internal/AbstractJsonLexer;Lkotlinx/serialization/descriptors/SerialDescriptor;Lkotlinx/serialization/json/internal/StreamingJsonDecoder$DiscriminatorHolder;)V
 SPLkotlinx/serialization/json/internal/StreamingJsonDecoder;->decodeInt()I
 SPLkotlinx/serialization/json/internal/StreamingJsonDecoder;->decodeLong()J
 SPLkotlinx/serialization/json/internal/StreamingJsonDecoder;->decodeNotNullMark()Z
 SPLkotlinx/serialization/json/internal/StreamingJsonDecoder;->decodeSerializableValue(Lkotlinx/serialization/DeserializationStrategy;)Ljava/lang/Object;
-Lkotlinx/serialization/json/internal/StreamingJsonEncoder;
-SPLkotlinx/serialization/json/internal/StreamingJsonEncoder;-><init>(Lkotlinx/serialization/json/internal/Composer;Lkotlinx/serialization/json/Json;Lkotlinx/serialization/json/internal/WriteMode;[Lkotlinx/serialization/json/JsonEncoder;)V
-SPLkotlinx/serialization/json/internal/StreamingJsonEncoder;-><init>(Lkotlinx/serialization/json/internal/InternalJsonWriter;Lkotlinx/serialization/json/Json;Lkotlinx/serialization/json/internal/WriteMode;[Lkotlinx/serialization/json/JsonEncoder;)V
-SPLkotlinx/serialization/json/internal/StreamingJsonEncoder;->encodeInt(I)V
-SPLkotlinx/serialization/json/internal/StreamingJsonEncoder;->encodeSerializableValue(Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V
-SPLkotlinx/serialization/json/internal/StreamingJsonEncoder;->getJson()Lkotlinx/serialization/json/Json;
+Lkotlinx/serialization/json/internal/StreamingJsonDecoder$DiscriminatorHolder;
 Lkotlinx/serialization/json/internal/StringJsonLexer;
-SPLkotlinx/serialization/json/internal/StringJsonLexer;-><init>(Ljava/lang/String;)V
+SPLkotlinx/serialization/json/internal/StringJsonLexer;-><init>(Ljava/lang/String;Lkotlinx/serialization/json/JsonConfiguration;)V
 SPLkotlinx/serialization/json/internal/StringJsonLexer;->consumeNextToken()B
 SPLkotlinx/serialization/json/internal/StringJsonLexer;->getSource()Ljava/lang/CharSequence;
 SPLkotlinx/serialization/json/internal/StringJsonLexer;->getSource()Ljava/lang/String;
@@ -12359,11 +14966,14 @@ SPLkotlinx/serialization/json/internal/StringJsonLexer;->prefetchOrEof(I)I
 SPLkotlinx/serialization/json/internal/StringJsonLexer;->skipWhitespaces()I
 Lkotlinx/serialization/json/internal/StringJsonLexerKt;
 SPLkotlinx/serialization/json/internal/StringJsonLexerKt;->StringJsonLexer(Lkotlinx/serialization/json/Json;Ljava/lang/String;)Lkotlinx/serialization/json/internal/StringJsonLexer;
+Lkotlinx/serialization/json/internal/StringOpsKt;
+SPLkotlinx/serialization/json/internal/StringOpsKt;-><clinit>()V
+SPLkotlinx/serialization/json/internal/StringOpsKt;->printQuoted(Ljava/lang/StringBuilder;Ljava/lang/String;)V
+SPLkotlinx/serialization/json/internal/StringOpsKt;->toHexChar(I)C
 Lkotlinx/serialization/json/internal/WriteMode;
 SPLkotlinx/serialization/json/internal/WriteMode;->$values()[Lkotlinx/serialization/json/internal/WriteMode;
 SPLkotlinx/serialization/json/internal/WriteMode;-><clinit>()V
 SPLkotlinx/serialization/json/internal/WriteMode;-><init>(Ljava/lang/String;ICC)V
-SPLkotlinx/serialization/json/internal/WriteMode;->getEntries()Lkotlin/enums/EnumEntries;
 Lkotlinx/serialization/modules/SerialModuleImpl;
 SPLkotlinx/serialization/modules/SerialModuleImpl;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Z)V
 Lkotlinx/serialization/modules/SerializersModule;
@@ -12573,25 +15183,17 @@ Lleakcanary/internal/LeakCanaryFileProvider$PathStrategy;
 Lleakcanary/internal/LeakCanaryFileProvider$SimplePathStrategy;
 SPLleakcanary/internal/LeakCanaryFileProvider$SimplePathStrategy;-><init>(Ljava/lang/String;)V
 SPLleakcanary/internal/LeakCanaryFileProvider$SimplePathStrategy;->addRoot(Ljava/lang/String;Ljava/io/File;)V
-Lleakcanary/internal/Notifications$$ExternalSyntheticApiModelOutline0;
-SPLleakcanary/internal/Notifications$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/PackageInfo;)J
 Lleakcanary/internal/PlumberInstaller;
 SPLleakcanary/internal/PlumberInstaller;-><init>()V
 SPLleakcanary/internal/PlumberInstaller;->onCreate()Z
 Lnet/ankiweb/rsdroid/Backend;
-SPLnet/ankiweb/rsdroid/Backend;->$r8$lambda$JmyIHcNIqENm31LmKFP63FgKLHI(Lnet/ankiweb/rsdroid/Backend;)Lnet/ankiweb/rsdroid/Translations;
-SPLnet/ankiweb/rsdroid/Backend;->$r8$lambda$rLALQVYPlbbEmpwIB7kwMA6SO_U(II[BJ)[B
 SPLnet/ankiweb/rsdroid/Backend;-><clinit>()V
 SPLnet/ankiweb/rsdroid/Backend;-><init>(Ljava/lang/Iterable;)V
 SPLnet/ankiweb/rsdroid/Backend;->cancelCurrentProtoQuery(I)V
-SPLnet/ankiweb/rsdroid/Backend;->checkMainThreadOp$default(Lnet/ankiweb/rsdroid/Backend;Ljava/lang/String;ILjava/lang/Object;)V
-SPLnet/ankiweb/rsdroid/Backend;->checkMainThreadOp(Ljava/lang/String;)V
-SPLnet/ankiweb/rsdroid/Backend;->checkMainThreadSQL(Ljava/lang/String;)V
 SPLnet/ankiweb/rsdroid/Backend;->fullQueryProto(Ljava/lang/String;[Ljava/lang/Object;)Lanki/ankidroid/DbResponse;
 SPLnet/ankiweb/rsdroid/Backend;->getTr()Lnet/ankiweb/rsdroid/Translations;
 SPLnet/ankiweb/rsdroid/Backend;->openCollection(Ljava/lang/String;)V
-SPLnet/ankiweb/rsdroid/Backend;->openCollection(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-SPLnet/ankiweb/rsdroid/Backend;->runMethodRaw$lambda$1(II[BJ)[B
+SPLnet/ankiweb/rsdroid/Backend;->runMethodRaw$lambda$0(II[BJ)[B
 SPLnet/ankiweb/rsdroid/Backend;->runMethodRaw(II[B)[B
 SPLnet/ankiweb/rsdroid/Backend;->tr_delegate$lambda$0(Lnet/ankiweb/rsdroid/Backend;)Lnet/ankiweb/rsdroid/Translations;
 SPLnet/ankiweb/rsdroid/Backend;->withBackend(Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
@@ -12608,7 +15210,9 @@ Lnet/ankiweb/rsdroid/BackendException;
 SPLnet/ankiweb/rsdroid/BackendException;-><clinit>()V
 SPLnet/ankiweb/rsdroid/BackendException;-><init>(Lanki/backend/BackendError;)V
 Lnet/ankiweb/rsdroid/BackendException$BackendDbException;
+Lnet/ankiweb/rsdroid/BackendException$BackendDbException$BackendDbCorruptException;
 Lnet/ankiweb/rsdroid/BackendException$BackendDbException$BackendDbFileTooNewException;
+Lnet/ankiweb/rsdroid/BackendException$BackendDbException$BackendDbFullException;
 Lnet/ankiweb/rsdroid/BackendException$BackendDbException$BackendDbLockedException;
 Lnet/ankiweb/rsdroid/BackendException$BackendSearchException;
 Lnet/ankiweb/rsdroid/BackendException$Companion;
@@ -12624,18 +15228,30 @@ SPLnet/ankiweb/rsdroid/BackendFactory;->getBackend$default(Ljava/lang/Iterable;I
 SPLnet/ankiweb/rsdroid/BackendFactory;->getBackend(Ljava/lang/Iterable;)Lnet/ankiweb/rsdroid/Backend;
 SPLnet/ankiweb/rsdroid/BackendFactory;->setDefaultLanguages(Ljava/lang/Iterable;)V
 Lnet/ankiweb/rsdroid/BackendKt;
+SPLnet/ankiweb/rsdroid/BackendKt;->$r8$lambda$h6IVCdbvnaDg_XJznVj3rmenO90([Ljava/lang/Object;Lkotlinx/serialization/json/JsonArrayBuilder;)Lkotlin/Unit;
+SPLnet/ankiweb/rsdroid/BackendKt;-><clinit>()V
+SPLnet/ankiweb/rsdroid/BackendKt;->access$getLogger$p()Lorg/slf4j/Logger;
 SPLnet/ankiweb/rsdroid/BackendKt;->access$unpackResult([[B)[B
 SPLnet/ankiweb/rsdroid/BackendKt;->dbRequestJson$default(Ljava/lang/String;[Ljava/lang/Object;ZILjava/lang/Object;)Lcom/google/protobuf/ByteString;
+SPLnet/ankiweb/rsdroid/BackendKt;->dbRequestJson$lambda$0$0([Ljava/lang/Object;Lkotlinx/serialization/json/JsonArrayBuilder;)Lkotlin/Unit;
 SPLnet/ankiweb/rsdroid/BackendKt;->dbRequestJson(Ljava/lang/String;[Ljava/lang/Object;Z)Lcom/google/protobuf/ByteString;
 SPLnet/ankiweb/rsdroid/BackendKt;->unpackResult([[B)[B
+Lnet/ankiweb/rsdroid/BackendKt$$ExternalSyntheticLambda1;
+SPLnet/ankiweb/rsdroid/BackendKt$$ExternalSyntheticLambda1;-><init>([Ljava/lang/Object;)V
+SPLnet/ankiweb/rsdroid/BackendKt$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 Lnet/ankiweb/rsdroid/NativeMethods;
 SPLnet/ankiweb/rsdroid/NativeMethods;-><clinit>()V
 SPLnet/ankiweb/rsdroid/NativeMethods;-><init>()V
 Lnet/ankiweb/rsdroid/Translations;
 SPLnet/ankiweb/rsdroid/Translations;-><init>(Lnet/ankiweb/rsdroid/Backend;)V
+SPLnet/ankiweb/rsdroid/Translations;->actionsDecks()Ljava/lang/String;
+SPLnet/ankiweb/rsdroid/Translations;->actionsEmptyCards()Ljava/lang/String;
 SPLnet/ankiweb/rsdroid/Translations;->actionsExport()Ljava/lang/String;
+SPLnet/ankiweb/rsdroid/Translations;->actionsImport()Ljava/lang/String;
 SPLnet/ankiweb/rsdroid/Translations;->databaseCheckTitle()Ljava/lang/String;
+SPLnet/ankiweb/rsdroid/Translations;->decksCreateDeck()Ljava/lang/String;
 SPLnet/ankiweb/rsdroid/Translations;->mediaCheckCheckMediaAction()Ljava/lang/String;
+SPLnet/ankiweb/rsdroid/Translations;->statisticsTitle()Ljava/lang/String;
 SPLnet/ankiweb/rsdroid/Translations;->translate(IILjava/util/Map;)Ljava/lang/String;
 Lnet/ankiweb/rsdroid/database/AnkiDatabaseCursor;
 SPLnet/ankiweb/rsdroid/database/AnkiDatabaseCursor;-><init>()V
@@ -12649,7 +15265,6 @@ SPLnet/ankiweb/rsdroid/database/AnkiSupportSQLiteDatabase$Companion;->withRustBa
 Lnet/ankiweb/rsdroid/database/RustSupportSQLiteDatabase;
 SPLnet/ankiweb/rsdroid/database/RustSupportSQLiteDatabase;-><clinit>()V
 SPLnet/ankiweb/rsdroid/database/RustSupportSQLiteDatabase;-><init>(Lnet/ankiweb/rsdroid/Backend;)V
-SPLnet/ankiweb/rsdroid/database/RustSupportSQLiteDatabase;->execSQL(Ljava/lang/String;[Ljava/lang/Object;)V
 SPLnet/ankiweb/rsdroid/database/RustSupportSQLiteDatabase;->query(Ljava/lang/String;[Ljava/lang/Object;)Landroid/database/Cursor;
 Lnet/ankiweb/rsdroid/database/RustSupportSQLiteDatabase$Companion;
 SPLnet/ankiweb/rsdroid/database/RustSupportSQLiteDatabase$Companion;-><init>()V
@@ -12679,6 +15294,7 @@ SPLokhttp3/Authenticator$Companion;-><clinit>()V
 SPLokhttp3/Authenticator$Companion;-><init>()V
 Lokhttp3/Authenticator$Companion$AuthenticatorNone;
 SPLokhttp3/Authenticator$Companion$AuthenticatorNone;-><init>()V
+Lokhttp3/Cache;
 Lokhttp3/Call$Factory;
 Lokhttp3/CertificatePinner;
 SPLokhttp3/CertificatePinner;-><clinit>()V
@@ -12738,8 +15354,8 @@ SPLokhttp3/Dns;-><clinit>()V
 Lokhttp3/Dns$Companion;
 SPLokhttp3/Dns$Companion;-><clinit>()V
 SPLokhttp3/Dns$Companion;-><init>()V
-Lokhttp3/Dns$Companion$DnsSystem;
-SPLokhttp3/Dns$Companion$DnsSystem;-><init>()V
+Lokhttp3/Dns$Companion$SYSTEM$1;
+SPLokhttp3/Dns$Companion$SYSTEM$1;-><init>()V
 Lokhttp3/EventListener;
 SPLokhttp3/EventListener;-><clinit>()V
 SPLokhttp3/EventListener;-><init>()V
@@ -12758,6 +15374,7 @@ SPLokhttp3/OkHttpClient;->verifyClientState()V
 Lokhttp3/OkHttpClient$Builder;
 SPLokhttp3/OkHttpClient$Builder;-><init>()V
 SPLokhttp3/OkHttpClient$Builder;->build()Lokhttp3/OkHttpClient;
+SPLokhttp3/OkHttpClient$Builder;->connectTimeout(JLjava/util/concurrent/TimeUnit;)Lokhttp3/OkHttpClient$Builder;
 SPLokhttp3/OkHttpClient$Builder;->getAuthenticator$okhttp()Lokhttp3/Authenticator;
 SPLokhttp3/OkHttpClient$Builder;->getCache$okhttp()Lokhttp3/Cache;
 SPLokhttp3/OkHttpClient$Builder;->getCallTimeout$okhttp()I
@@ -12789,6 +15406,7 @@ SPLokhttp3/OkHttpClient$Builder;->getSslSocketFactoryOrNull$okhttp()Ljavax/net/s
 SPLokhttp3/OkHttpClient$Builder;->getTaskRunner$okhttp()Lokhttp3/internal/concurrent/TaskRunner;
 SPLokhttp3/OkHttpClient$Builder;->getWebSocketCloseTimeout$okhttp()I
 SPLokhttp3/OkHttpClient$Builder;->getWriteTimeout$okhttp()I
+SPLokhttp3/OkHttpClient$Builder;->readTimeout(JLjava/util/concurrent/TimeUnit;)Lokhttp3/OkHttpClient$Builder;
 SPLokhttp3/OkHttpClient$Builder;->setConnectionPool$okhttp(Lokhttp3/ConnectionPool;)V
 Lokhttp3/OkHttpClient$Companion;
 SPLokhttp3/OkHttpClient$Companion;-><init>()V
@@ -12811,9 +15429,18 @@ Lokhttp3/TlsVersion$Companion;
 SPLokhttp3/TlsVersion$Companion;-><init>()V
 SPLokhttp3/TlsVersion$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 Lokhttp3/WebSocket$Factory;
+Lokhttp3/android/AndroidDns$$ExternalSyntheticApiModelOutline0;
+SPLokhttp3/android/AndroidDns$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/ActivityManager;Ljava/lang/String;II)Ljava/util/List;
+SPLokhttp3/android/AndroidDns$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/ApplicationExitInfo;)I
+SPLokhttp3/android/AndroidDns$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/ApplicationExitInfo;)J
+SPLokhttp3/android/AndroidDns$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/job/JobScheduler;Ljava/lang/String;)Landroid/app/job/JobScheduler;
+SPLokhttp3/android/AndroidDns$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/PackageInfo;)J
+SPLokhttp3/android/AndroidDns$$ExternalSyntheticApiModelOutline0;->m(Lcom/google/android/material/navigation/NavigationBarItemView;Z)V
+SPLokhttp3/android/AndroidDns$$ExternalSyntheticApiModelOutline0;->m(Ljava/lang/Object;)Landroid/app/ApplicationExitInfo;
 Lokhttp3/internal/_UtilJvmKt;
 SPLokhttp3/internal/_UtilJvmKt;-><clinit>()V
 SPLokhttp3/internal/_UtilJvmKt;->asFactory(Lokhttp3/EventListener;)Lokhttp3/EventListener$Factory;
+SPLokhttp3/internal/_UtilJvmKt;->checkDuration(Ljava/lang/String;JLjava/util/concurrent/TimeUnit;)I
 SPLokhttp3/internal/_UtilJvmKt;->immutableListOf([Ljava/lang/Object;)Ljava/util/List;
 SPLokhttp3/internal/_UtilJvmKt;->threadFactory(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory;
 SPLokhttp3/internal/_UtilJvmKt;->toImmutableList(Ljava/util/List;)Ljava/util/List;
@@ -12882,6 +15509,7 @@ Lokhttp3/internal/platform/Platform;
 SPLokhttp3/internal/platform/Platform;-><clinit>()V
 SPLokhttp3/internal/platform/Platform;-><init>()V
 SPLokhttp3/internal/platform/Platform;->access$getPlatform$cp()Lokhttp3/internal/platform/Platform;
+SPLokhttp3/internal/platform/Platform;->getSocketFactory()Ljavax/net/SocketFactory;
 SPLokhttp3/internal/platform/Platform;->newSSLContext()Ljavax/net/ssl/SSLContext;
 SPLokhttp3/internal/platform/Platform;->newSslSocketFactory(Ljavax/net/ssl/X509TrustManager;)Ljavax/net/ssl/SSLSocketFactory;
 SPLokhttp3/internal/platform/Platform;->platformTrustManager()Ljavax/net/ssl/X509TrustManager;
@@ -12912,6 +15540,13 @@ SPLokhttp3/internal/platform/android/Android10SocketAdapter$Companion;-><init>()
 SPLokhttp3/internal/platform/android/Android10SocketAdapter$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLokhttp3/internal/platform/android/Android10SocketAdapter$Companion;->buildIfSupported()Lokhttp3/internal/platform/android/SocketAdapter;
 SPLokhttp3/internal/platform/android/Android10SocketAdapter$Companion;->isSupported()Z
+Lokhttp3/internal/platform/android/Android17SocketAdapter;
+SPLokhttp3/internal/platform/android/Android17SocketAdapter;-><clinit>()V
+Lokhttp3/internal/platform/android/Android17SocketAdapter$Companion;
+SPLokhttp3/internal/platform/android/Android17SocketAdapter$Companion;-><init>()V
+SPLokhttp3/internal/platform/android/Android17SocketAdapter$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLokhttp3/internal/platform/android/Android17SocketAdapter$Companion;->buildIfSupported()Lokhttp3/internal/platform/android/SocketAdapter;
+SPLokhttp3/internal/platform/android/Android17SocketAdapter$Companion;->isSupported()Z
 Lokhttp3/internal/platform/android/AndroidCertificateChainCleaner;
 SPLokhttp3/internal/platform/android/AndroidCertificateChainCleaner;-><clinit>()V
 SPLokhttp3/internal/platform/android/AndroidCertificateChainCleaner;-><init>(Ljavax/net/ssl/X509TrustManager;Landroid/net/http/X509TrustManagerExtensions;)V
@@ -13476,7 +16111,6 @@ Lorg/acra/plugins/Plugin;
 SPLorg/acra/plugins/Plugin;->enabled(Lorg/acra/config/CoreConfiguration;)Z
 Lorg/acra/plugins/PluginLoader;
 Lorg/acra/plugins/ServicePluginLoader;
-SPLorg/acra/plugins/ServicePluginLoader;->$r8$lambda$X5rStCy9IDyElcrTUR-B0dHkgMM(Lorg/acra/config/CoreConfiguration;Lorg/acra/plugins/Plugin;)Z
 SPLorg/acra/plugins/ServicePluginLoader;-><init>()V
 SPLorg/acra/plugins/ServicePluginLoader;->loadEnabled$lambda$1(Lorg/acra/config/CoreConfiguration;Lorg/acra/plugins/Plugin;)Z
 SPLorg/acra/plugins/ServicePluginLoader;->loadEnabled(Lorg/acra/config/CoreConfiguration;Ljava/lang/Class;)Ljava/util/List;
@@ -13523,8 +16157,6 @@ SPLorg/acra/startup/LimiterStartupProcessor;->getAppVersion(Landroid/content/Con
 SPLorg/acra/startup/LimiterStartupProcessor;->processReports(Landroid/content/Context;Lorg/acra/config/CoreConfiguration;Ljava/util/List;)V
 Lorg/acra/startup/StartupProcessor;
 Lorg/acra/startup/StartupProcessorExecutor;
-SPLorg/acra/startup/StartupProcessorExecutor;->$r8$lambda$W_8qJ1kpfZSMo-TAJnbbb_8HKG0(Lorg/acra/startup/StartupProcessorExecutor;Ljava/util/Calendar;Z)V
-SPLorg/acra/startup/StartupProcessorExecutor;->$r8$lambda$b6D4DyjR05uSsPw8YS-CzMN464s(Lorg/acra/startup/StartupProcessorExecutor;Ljava/util/Calendar;Z)V
 SPLorg/acra/startup/StartupProcessorExecutor;-><init>(Landroid/content/Context;Lorg/acra/config/CoreConfiguration;Lorg/acra/scheduler/SchedulerStarter;)V
 SPLorg/acra/startup/StartupProcessorExecutor;->processReports$lambda$6$lambda$5(Lorg/acra/startup/StartupProcessorExecutor;Ljava/util/Calendar;Z)V
 SPLorg/acra/startup/StartupProcessorExecutor;->processReports$lambda$6(Lorg/acra/startup/StartupProcessorExecutor;Ljava/util/Calendar;Z)V
@@ -13569,42 +16201,100 @@ Lorg/acra/util/StubCreator$$ExternalSyntheticLambda0;
 SPLorg/acra/util/StubCreator$$ExternalSyntheticLambda0;-><init>()V
 Lorg/acra/util/SystemServices$ServiceNotReachedException;
 Lorg/slf4j/ILoggerFactory;
+Lorg/slf4j/IMarkerFactory;
 Lorg/slf4j/Logger;
 Lorg/slf4j/LoggerFactory;
 SPLorg/slf4j/LoggerFactory;-><clinit>()V
 SPLorg/slf4j/LoggerFactory;->bind()V
+SPLorg/slf4j/LoggerFactory;->earlyBindMDCAdapter()V
+SPLorg/slf4j/LoggerFactory;->findServiceProviders()Ljava/util/List;
 SPLorg/slf4j/LoggerFactory;->fixSubstituteLoggers()V
 SPLorg/slf4j/LoggerFactory;->getILoggerFactory()Lorg/slf4j/ILoggerFactory;
 SPLorg/slf4j/LoggerFactory;->getLogger(Ljava/lang/Class;)Lorg/slf4j/Logger;
 SPLorg/slf4j/LoggerFactory;->getLogger(Ljava/lang/String;)Lorg/slf4j/Logger;
-SPLorg/slf4j/LoggerFactory;->isAndroid()Z
+SPLorg/slf4j/LoggerFactory;->getProvider()Lorg/slf4j/spi/SLF4JServiceProvider;
+SPLorg/slf4j/LoggerFactory;->getServiceLoader(Ljava/lang/ClassLoader;)Ljava/util/ServiceLoader;
+SPLorg/slf4j/LoggerFactory;->isAmbiguousProviderList(Ljava/util/List;)Z
+SPLorg/slf4j/LoggerFactory;->loadExplicitlySpecified(Ljava/lang/ClassLoader;)Lorg/slf4j/spi/SLF4JServiceProvider;
 SPLorg/slf4j/LoggerFactory;->performInitialization()V
 SPLorg/slf4j/LoggerFactory;->postBindCleanUp()V
 SPLorg/slf4j/LoggerFactory;->replayEvents()V
-SPLorg/slf4j/LoggerFactory;->reportActualBinding(Ljava/util/Set;)V
+SPLorg/slf4j/LoggerFactory;->reportActualBinding(Ljava/util/List;)V
+SPLorg/slf4j/LoggerFactory;->reportMultipleBindingAmbiguity(Ljava/util/List;)V
+SPLorg/slf4j/LoggerFactory;->safelyInstantiate(Ljava/util/List;Ljava/util/Iterator;)V
 SPLorg/slf4j/LoggerFactory;->versionSanityCheck()V
-Lorg/slf4j/helpers/MarkerIgnoringBase;
-SPLorg/slf4j/helpers/MarkerIgnoringBase;-><init>()V
+Lorg/slf4j/MDC;
+SPLorg/slf4j/MDC;->setMDCAdapter(Lorg/slf4j/spi/MDCAdapter;)V
+Lorg/slf4j/event/Level;
+SPLorg/slf4j/event/Level;->$values()[Lorg/slf4j/event/Level;
+SPLorg/slf4j/event/Level;-><clinit>()V
+SPLorg/slf4j/event/Level;-><init>(Ljava/lang/String;IILjava/lang/String;)V
+SPLorg/slf4j/event/Level;->values()[Lorg/slf4j/event/Level;
+Lorg/slf4j/helpers/AbstractLogger;
+SPLorg/slf4j/helpers/AbstractLogger;-><init>()V
+SPLorg/slf4j/helpers/AbstractLogger;->debug(Ljava/lang/String;Ljava/lang/Object;)V
+SPLorg/slf4j/helpers/AbstractLogger;->handle_0ArgsCall(Lorg/slf4j/event/Level;Lorg/slf4j/Marker;Ljava/lang/String;Ljava/lang/Throwable;)V
+SPLorg/slf4j/helpers/AbstractLogger;->handle_1ArgsCall(Lorg/slf4j/event/Level;Lorg/slf4j/Marker;Ljava/lang/String;Ljava/lang/Object;)V
+SPLorg/slf4j/helpers/AbstractLogger;->info(Lorg/slf4j/Marker;Ljava/lang/String;Ljava/lang/Throwable;)V
+Lorg/slf4j/helpers/BasicMDCAdapter;
+SPLorg/slf4j/helpers/BasicMDCAdapter;-><init>()V
+Lorg/slf4j/helpers/BasicMDCAdapter$1;
+SPLorg/slf4j/helpers/BasicMDCAdapter$1;-><init>(Lorg/slf4j/helpers/BasicMDCAdapter;)V
+Lorg/slf4j/helpers/BasicMarkerFactory;
+SPLorg/slf4j/helpers/BasicMarkerFactory;-><init>()V
+Lorg/slf4j/helpers/FormattingTuple;
+SPLorg/slf4j/helpers/FormattingTuple;-><clinit>()V
+SPLorg/slf4j/helpers/FormattingTuple;-><init>(Ljava/lang/String;)V
+SPLorg/slf4j/helpers/FormattingTuple;-><init>(Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/Throwable;)V
+SPLorg/slf4j/helpers/FormattingTuple;->getMessage()Ljava/lang/String;
+Lorg/slf4j/helpers/LegacyAbstractLogger;
+SPLorg/slf4j/helpers/LegacyAbstractLogger;-><init>()V
+SPLorg/slf4j/helpers/LegacyAbstractLogger;->isInfoEnabled(Lorg/slf4j/Marker;)Z
+Lorg/slf4j/helpers/MessageFormatter;
+SPLorg/slf4j/helpers/MessageFormatter;->arrayFormat(Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/Throwable;)Lorg/slf4j/helpers/FormattingTuple;
+SPLorg/slf4j/helpers/MessageFormatter;->basicArrayFormat(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+SPLorg/slf4j/helpers/MessageFormatter;->deeplyAppendParameter(Ljava/lang/StringBuilder;Ljava/lang/Object;Ljava/util/Map;)V
+SPLorg/slf4j/helpers/MessageFormatter;->isEscapedDelimeter(Ljava/lang/String;I)Z
+SPLorg/slf4j/helpers/MessageFormatter;->safeObjectAppend(Ljava/lang/StringBuilder;Ljava/lang/Object;)V
 Lorg/slf4j/helpers/NOPLoggerFactory;
 SPLorg/slf4j/helpers/NOPLoggerFactory;-><init>()V
-Lorg/slf4j/helpers/NamedLoggerBase;
-SPLorg/slf4j/helpers/NamedLoggerBase;-><init>()V
+Lorg/slf4j/helpers/NOPMDCAdapter;
+SPLorg/slf4j/helpers/NOPMDCAdapter;-><init>()V
+Lorg/slf4j/helpers/NOP_FallbackServiceProvider;
+SPLorg/slf4j/helpers/NOP_FallbackServiceProvider;-><clinit>()V
+SPLorg/slf4j/helpers/NOP_FallbackServiceProvider;-><init>()V
+Lorg/slf4j/helpers/Reporter;
+SPLorg/slf4j/helpers/Reporter;-><clinit>()V
+SPLorg/slf4j/helpers/Reporter;->debug(Ljava/lang/String;)V
+SPLorg/slf4j/helpers/Reporter;->getTargetChoice()Lorg/slf4j/helpers/Reporter$TargetChoice;
+SPLorg/slf4j/helpers/Reporter;->initVerbosity()Lorg/slf4j/helpers/Reporter$Level;
+SPLorg/slf4j/helpers/Reporter;->isEnabledFor(Lorg/slf4j/helpers/Reporter$Level;)Z
+Lorg/slf4j/helpers/Reporter$Level;
+SPLorg/slf4j/helpers/Reporter$Level;->$values()[Lorg/slf4j/helpers/Reporter$Level;
+SPLorg/slf4j/helpers/Reporter$Level;-><clinit>()V
+SPLorg/slf4j/helpers/Reporter$Level;-><init>(Ljava/lang/String;II)V
+Lorg/slf4j/helpers/Reporter$TargetChoice;
+SPLorg/slf4j/helpers/Reporter$TargetChoice;->$values()[Lorg/slf4j/helpers/Reporter$TargetChoice;
+SPLorg/slf4j/helpers/Reporter$TargetChoice;-><clinit>()V
+SPLorg/slf4j/helpers/Reporter$TargetChoice;-><init>(Ljava/lang/String;I)V
 Lorg/slf4j/helpers/SubstituteLoggerFactory;
 SPLorg/slf4j/helpers/SubstituteLoggerFactory;-><init>()V
 SPLorg/slf4j/helpers/SubstituteLoggerFactory;->clear()V
 SPLorg/slf4j/helpers/SubstituteLoggerFactory;->getEventQueue()Ljava/util/concurrent/LinkedBlockingQueue;
 SPLorg/slf4j/helpers/SubstituteLoggerFactory;->getLoggers()Ljava/util/List;
 SPLorg/slf4j/helpers/SubstituteLoggerFactory;->postInitialization()V
+Lorg/slf4j/helpers/SubstituteServiceProvider;
+SPLorg/slf4j/helpers/SubstituteServiceProvider;-><init>()V
+SPLorg/slf4j/helpers/SubstituteServiceProvider;->getSubstituteLoggerFactory()Lorg/slf4j/helpers/SubstituteLoggerFactory;
+Lorg/slf4j/helpers/ThreadLocalMapOfStacks;
+SPLorg/slf4j/helpers/ThreadLocalMapOfStacks;-><init>()V
 Lorg/slf4j/helpers/Util;
 SPLorg/slf4j/helpers/Util;-><clinit>()V
 SPLorg/slf4j/helpers/Util;->safeGetBooleanSystemProperty(Ljava/lang/String;)Z
 SPLorg/slf4j/helpers/Util;->safeGetSystemProperty(Ljava/lang/String;)Ljava/lang/String;
-Lorg/slf4j/impl/StaticLoggerBinder;
-SPLorg/slf4j/impl/StaticLoggerBinder;-><clinit>()V
-SPLorg/slf4j/impl/StaticLoggerBinder;-><init>()V
-SPLorg/slf4j/impl/StaticLoggerBinder;->getLoggerFactory()Lorg/slf4j/ILoggerFactory;
-SPLorg/slf4j/impl/StaticLoggerBinder;->getSingleton()Lorg/slf4j/impl/StaticLoggerBinder;
-Lorg/slf4j/spi/LoggerFactoryBinder;
+Lorg/slf4j/spi/LocationAwareLogger;
+Lorg/slf4j/spi/MDCAdapter;
+Lorg/slf4j/spi/SLF4JServiceProvider;
 Lshark/AndroidMetadataExtractor;
 SPLshark/AndroidMetadataExtractor;-><clinit>()V
 SPLshark/AndroidMetadataExtractor;-><init>()V
@@ -14384,15 +17074,16 @@ SPLtimber/log/Timber;-><clinit>()V
 SPLtimber/log/Timber;->access$getTreeArray$cp()[Ltimber/log/Timber$Tree;
 SPLtimber/log/Timber;->access$getTrees$cp()Ljava/util/ArrayList;
 SPLtimber/log/Timber;->access$setTreeArray$cp([Ltimber/log/Timber$Tree;)V
-SPLtimber/log/Timber;->tag(Ljava/lang/String;)Ltimber/log/Timber$Tree;
 Ltimber/log/Timber$Forest;
 SPLtimber/log/Timber$Forest;-><init>()V
 SPLtimber/log/Timber$Forest;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 SPLtimber/log/Timber$Forest;->d(Ljava/lang/String;[Ljava/lang/Object;)V
 SPLtimber/log/Timber$Forest;->i(Ljava/lang/String;[Ljava/lang/Object;)V
+SPLtimber/log/Timber$Forest;->log(ILjava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)V
 SPLtimber/log/Timber$Forest;->plant(Ltimber/log/Timber$Tree;)V
 SPLtimber/log/Timber$Forest;->tag(Ljava/lang/String;)Ltimber/log/Timber$Tree;
 SPLtimber/log/Timber$Forest;->v(Ljava/lang/String;[Ljava/lang/Object;)V
+PLtimber/log/Timber$Forest;->w(Ljava/lang/String;[Ljava/lang/Object;)V
 Ltimber/log/Timber$Tree;
 SPLtimber/log/Timber$Tree;-><init>()V
 SPLtimber/log/Timber$Tree;->d(Ljava/lang/String;[Ljava/lang/Object;)V
@@ -14402,5 +17093,7 @@ SPLtimber/log/Timber$Tree;->getTag$timber_release()Ljava/lang/String;
 SPLtimber/log/Timber$Tree;->i(Ljava/lang/String;[Ljava/lang/Object;)V
 SPLtimber/log/Timber$Tree;->isLoggable(I)Z
 SPLtimber/log/Timber$Tree;->isLoggable(Ljava/lang/String;I)Z
+SPLtimber/log/Timber$Tree;->log(ILjava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)V
 SPLtimber/log/Timber$Tree;->prepareLog(ILjava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)V
-SPLtimber/log/Timber$Tree;->v(Ljava/lang/String;[Ljava/lang/Object;)V
\ No newline at end of file
+SPLtimber/log/Timber$Tree;->v(Ljava/lang/String;[Ljava/lang/Object;)V
+PLtimber/log/Timber$Tree;->w(Ljava/lang/String;[Ljava/lang/Object;)V
\ No newline at end of file
diff --git a/AnkiDroid/src/main/generated/baselineProfiles/startup-prof.txt b/AnkiDroid/src/main/generated/baselineProfiles/startup-prof.txt
new file mode 100644
index 000000000000..7fcf022abff2
--- /dev/null
+++ b/AnkiDroid/src/main/generated/baselineProfiles/startup-prof.txt
@@ -0,0 +1,15846 @@
+Landroid/net/ssl/InvalidEchDataException;
+Landroid/support/customtabs/ICustomTabsCallback;
+SPLandroid/support/customtabs/ICustomTabsCallback;-><clinit>()V
+Landroid/support/customtabs/ICustomTabsCallback$Stub;
+SPLandroid/support/customtabs/ICustomTabsCallback$Stub;-><init>()V
+SPLandroid/support/customtabs/ICustomTabsCallback$Stub;->asBinder()Landroid/os/IBinder;
+Landroid/support/customtabs/ICustomTabsService;
+SPLandroid/support/customtabs/ICustomTabsService;-><clinit>()V
+Landroid/support/customtabs/ICustomTabsService$Stub;
+SPLandroid/support/customtabs/ICustomTabsService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/support/customtabs/ICustomTabsService;
+Landroid/support/customtabs/ICustomTabsService$Stub$Proxy;
+SPLandroid/support/customtabs/ICustomTabsService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
+SPLandroid/support/customtabs/ICustomTabsService$Stub$Proxy;->newSession(Landroid/support/customtabs/ICustomTabsCallback;)Z
+SPLandroid/support/customtabs/ICustomTabsService$Stub$Proxy;->warmup(J)Z
+Landroidx/activity/ActivityFlags;
+SPLandroidx/activity/ActivityFlags;-><clinit>()V
+SPLandroidx/activity/ActivityFlags;-><init>()V
+Landroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;
+SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/graphics/Insets;)I
+SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/view/Window;Z)V
+SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m$2(Landroid/graphics/Insets;)I
+SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m$3(Landroid/graphics/Insets;)I
+SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/Activity;)Landroid/window/OnBackInvokedDispatcher;
+SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/graphics/Insets;)I
+SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowManager$LayoutParams;I)V
+SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/window/OnBackInvokedDispatcher;ILandroid/window/OnBackInvokedCallback;)V
+SPLandroidx/activity/BackEventCompat$$ExternalSyntheticApiModelOutline0;->m(Ljava/lang/Object;)Landroid/window/OnBackInvokedCallback;
+Landroidx/activity/ComponentActivity;
+SPLandroidx/activity/ComponentActivity;-><clinit>()V
+SPLandroidx/activity/ComponentActivity;-><init>()V
+SPLandroidx/activity/ComponentActivity;-><init>(I)V
+SPLandroidx/activity/ComponentActivity;->_init_$lambda$1(Landroidx/activity/ComponentActivity;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+SPLandroidx/activity/ComponentActivity;->_init_$lambda$2(Landroidx/activity/ComponentActivity;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+SPLandroidx/activity/ComponentActivity;->_init_$lambda$4(Landroidx/activity/ComponentActivity;Landroid/content/Context;)V
+SPLandroidx/activity/ComponentActivity;->access$ensureViewModelStore(Landroidx/activity/ComponentActivity;)V
+SPLandroidx/activity/ComponentActivity;->addMenuProvider(Landroidx/core/view/MenuProvider;)V
+SPLandroidx/activity/ComponentActivity;->addObserverForBackInvoker$lambda$0(Landroidx/activity/OnBackPressedDispatcher;Landroidx/activity/ComponentActivity;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+SPLandroidx/activity/ComponentActivity;->addObserverForBackInvoker(Landroidx/activity/OnBackPressedDispatcher;)V
+SPLandroidx/activity/ComponentActivity;->addOnConfigurationChangedListener(Landroidx/core/util/Consumer;)V
+SPLandroidx/activity/ComponentActivity;->addOnContextAvailableListener(Landroidx/activity/contextaware/OnContextAvailableListener;)V
+SPLandroidx/activity/ComponentActivity;->addOnMultiWindowModeChangedListener(Landroidx/core/util/Consumer;)V
+SPLandroidx/activity/ComponentActivity;->addOnNewIntentListener(Landroidx/core/util/Consumer;)V
+SPLandroidx/activity/ComponentActivity;->addOnPictureInPictureModeChangedListener(Landroidx/core/util/Consumer;)V
+SPLandroidx/activity/ComponentActivity;->addOnTrimMemoryListener(Landroidx/core/util/Consumer;)V
+SPLandroidx/activity/ComponentActivity;->createFullyDrawnExecutor()Landroidx/activity/ComponentActivity$ReportFullyDrawnExecutor;
+SPLandroidx/activity/ComponentActivity;->defaultViewModelProviderFactory_delegate$lambda$0(Landroidx/activity/ComponentActivity;)Landroidx/lifecycle/SavedStateViewModelFactory;
+SPLandroidx/activity/ComponentActivity;->ensureViewModelStore()V
+SPLandroidx/activity/ComponentActivity;->getActivityResultRegistry()Landroidx/activity/result/ActivityResultRegistry;
+SPLandroidx/activity/ComponentActivity;->getDefaultViewModelCreationExtras()Landroidx/lifecycle/viewmodel/CreationExtras;
+SPLandroidx/activity/ComponentActivity;->getDefaultViewModelProviderFactory()Landroidx/lifecycle/ViewModelProvider$Factory;
+SPLandroidx/activity/ComponentActivity;->getLifecycle()Landroidx/lifecycle/Lifecycle;
+SPLandroidx/activity/ComponentActivity;->getOnBackPressedDispatcher()Landroidx/activity/OnBackPressedDispatcher;
+SPLandroidx/activity/ComponentActivity;->getSavedStateRegistry()Landroidx/savedstate/SavedStateRegistry;
+SPLandroidx/activity/ComponentActivity;->getViewModelStore()Landroidx/lifecycle/ViewModelStore;
+SPLandroidx/activity/ComponentActivity;->initializeViewTreeOwners()V
+SPLandroidx/activity/ComponentActivity;->invalidateMenu()V
+SPLandroidx/activity/ComponentActivity;->menuHostHelper$lambda$0(Landroidx/activity/ComponentActivity;)V
+SPLandroidx/activity/ComponentActivity;->onBackPressedDispatcher_delegate$lambda$0(Landroidx/activity/ComponentActivity;)Landroidx/activity/OnBackPressedDispatcher;
+SPLandroidx/activity/ComponentActivity;->onCreate(Landroid/os/Bundle;)V
+SPLandroidx/activity/ComponentActivity;->onCreatePanelMenu(ILandroid/view/Menu;)Z
+SPLandroidx/activity/ComponentActivity;->onPreparePanel(ILandroid/view/View;Landroid/view/Menu;)Z
+SPLandroidx/activity/ComponentActivity;->registerForActivityResult(Landroidx/activity/result/contract/ActivityResultContract;Landroidx/activity/result/ActivityResultCallback;)Landroidx/activity/result/ActivityResultLauncher;
+SPLandroidx/activity/ComponentActivity;->registerForActivityResult(Landroidx/activity/result/contract/ActivityResultContract;Landroidx/activity/result/ActivityResultRegistry;Landroidx/activity/result/ActivityResultCallback;)Landroidx/activity/result/ActivityResultLauncher;
+Landroidx/activity/ComponentActivity$$ExternalSyntheticLambda0;
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda0;-><init>(Landroidx/activity/ComponentActivity;)V
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda0;->run()V
+Landroidx/activity/ComponentActivity$$ExternalSyntheticLambda10;
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda10;-><init>(Landroidx/activity/ComponentActivity;)V
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda10;->invoke()Ljava/lang/Object;
+Landroidx/activity/ComponentActivity$$ExternalSyntheticLambda11;
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda11;-><init>(Landroidx/activity/ComponentActivity;)V
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda11;->invoke()Ljava/lang/Object;
+Landroidx/activity/ComponentActivity$$ExternalSyntheticLambda12;
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda12;-><init>(Landroidx/activity/ComponentActivity;)V
+Landroidx/activity/ComponentActivity$$ExternalSyntheticLambda2;
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda2;-><init>(Landroidx/activity/OnBackPressedDispatcher;Landroidx/activity/ComponentActivity;)V
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda2;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+Landroidx/activity/ComponentActivity$$ExternalSyntheticLambda4;
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda4;-><init>(Landroidx/activity/ComponentActivity;)V
+Landroidx/activity/ComponentActivity$$ExternalSyntheticLambda5;
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda5;-><init>(Landroidx/activity/ComponentActivity;)V
+Landroidx/activity/ComponentActivity$$ExternalSyntheticLambda6;
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda6;-><init>(Landroidx/activity/ComponentActivity;)V
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda6;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+Landroidx/activity/ComponentActivity$$ExternalSyntheticLambda7;
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda7;-><init>(Landroidx/activity/ComponentActivity;)V
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda7;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+Landroidx/activity/ComponentActivity$$ExternalSyntheticLambda8;
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda8;-><init>(Landroidx/activity/ComponentActivity;)V
+Landroidx/activity/ComponentActivity$$ExternalSyntheticLambda9;
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda9;-><init>(Landroidx/activity/ComponentActivity;)V
+SPLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda9;->onContextAvailable(Landroid/content/Context;)V
+Landroidx/activity/ComponentActivity$4;
+SPLandroidx/activity/ComponentActivity$4;-><init>(Landroidx/activity/ComponentActivity;)V
+SPLandroidx/activity/ComponentActivity$4;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+Landroidx/activity/ComponentActivity$Companion;
+SPLandroidx/activity/ComponentActivity$Companion;-><init>()V
+SPLandroidx/activity/ComponentActivity$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/activity/ComponentActivity$NonConfigurationInstances;
+Landroidx/activity/ComponentActivity$ReportFullyDrawnExecutor;
+Landroidx/activity/ComponentActivity$ReportFullyDrawnExecutorImpl;
+SPLandroidx/activity/ComponentActivity$ReportFullyDrawnExecutorImpl;-><init>(Landroidx/activity/ComponentActivity;)V
+Landroidx/activity/ComponentActivity$activityResultRegistry$1;
+SPLandroidx/activity/ComponentActivity$activityResultRegistry$1;-><init>(Landroidx/activity/ComponentActivity;)V
+Landroidx/activity/EdgeToEdge;
+SPLandroidx/activity/EdgeToEdge;-><clinit>()V
+SPLandroidx/activity/EdgeToEdge;->enable(Landroidx/activity/ComponentActivity;Landroidx/activity/SystemBarStyle;Landroidx/activity/SystemBarStyle;)V
+Landroidx/activity/EdgeToEdgeApi26;
+SPLandroidx/activity/EdgeToEdgeApi26;-><init>()V
+Landroidx/activity/EdgeToEdgeApi28;
+SPLandroidx/activity/EdgeToEdgeApi28;-><init>()V
+Landroidx/activity/EdgeToEdgeApi29;
+SPLandroidx/activity/EdgeToEdgeApi29;-><init>()V
+Landroidx/activity/EdgeToEdgeApi30;
+SPLandroidx/activity/EdgeToEdgeApi30;-><init>()V
+SPLandroidx/activity/EdgeToEdgeApi30;->adjustLayoutInDisplayCutoutMode(Landroid/view/Window;)V
+Landroidx/activity/EdgeToEdgeApi35;
+SPLandroidx/activity/EdgeToEdgeApi35;-><init>()V
+SPLandroidx/activity/EdgeToEdgeApi35;->setUp(Landroidx/activity/SystemBarStyle;Landroidx/activity/SystemBarStyle;Landroid/view/Window;Landroid/view/View;ZZ)V
+Landroidx/activity/EdgeToEdgeBase;
+SPLandroidx/activity/EdgeToEdgeBase;-><init>()V
+Landroidx/activity/EdgeToEdgeImpl;
+Landroidx/activity/FullyDrawnReporterOwner;
+Landroidx/activity/OnBackPressedCallback;
+SPLandroidx/activity/OnBackPressedCallback;-><init>(Z)V
+SPLandroidx/activity/OnBackPressedCallback;->addCloseable$activity(Ljava/lang/AutoCloseable;)V
+SPLandroidx/activity/OnBackPressedCallback;->createNavigationEventHandler$activity(Landroidx/navigationevent/NavigationEventInfo;)Landroidx/activity/OnBackPressedCallback$OnBackPressedEventHandler;
+SPLandroidx/activity/OnBackPressedCallback;->isEnabled()Z
+SPLandroidx/activity/OnBackPressedCallback;->setEnabled(Z)V
+Landroidx/activity/OnBackPressedCallback$OnBackPressedEventHandler;
+SPLandroidx/activity/OnBackPressedCallback$OnBackPressedEventHandler;-><init>(Landroidx/activity/OnBackPressedCallback;Landroidx/navigationevent/NavigationEventInfo;)V
+SPLandroidx/activity/OnBackPressedCallback$OnBackPressedEventHandler;->isLifecycleActive()Z
+SPLandroidx/activity/OnBackPressedCallback$OnBackPressedEventHandler;->setLifecycleActive(Z)V
+Landroidx/activity/OnBackPressedCallbackInfo;
+SPLandroidx/activity/OnBackPressedCallbackInfo;-><init>(Landroidx/activity/OnBackPressedCallback;Landroidx/lifecycle/LifecycleOwner;)V
+Landroidx/activity/OnBackPressedDispatcher;
+SPLandroidx/activity/OnBackPressedDispatcher;-><init>(Ljava/lang/Runnable;)V
+SPLandroidx/activity/OnBackPressedDispatcher;-><init>(Ljava/lang/Runnable;Landroidx/core/util/Consumer;)V
+SPLandroidx/activity/OnBackPressedDispatcher;->access$getOnHasEnabledCallbacksChanged$p(Landroidx/activity/OnBackPressedDispatcher;)Landroidx/core/util/Consumer;
+SPLandroidx/activity/OnBackPressedDispatcher;->access$setHasEnabledCallbacks$p(Landroidx/activity/OnBackPressedDispatcher;Z)V
+SPLandroidx/activity/OnBackPressedDispatcher;->addCallback(Landroidx/lifecycle/LifecycleOwner;Landroidx/activity/OnBackPressedCallback;)V
+SPLandroidx/activity/OnBackPressedDispatcher;->eventInput_delegate$lambda$0(Landroidx/activity/OnBackPressedDispatcher;)Landroidx/activity/OnBackPressedDispatcher$OnBackPressedEventInput;
+SPLandroidx/activity/OnBackPressedDispatcher;->getEventDispatcher$activity()Landroidx/navigationevent/NavigationEventDispatcher;
+SPLandroidx/activity/OnBackPressedDispatcher;->getEventInput()Landroidx/activity/OnBackPressedDispatcher$OnBackPressedEventInput;
+SPLandroidx/activity/OnBackPressedDispatcher;->setOnBackInvokedDispatcher(Landroid/window/OnBackInvokedDispatcher;)V
+Landroidx/activity/OnBackPressedDispatcher$$ExternalSyntheticLambda0;
+SPLandroidx/activity/OnBackPressedDispatcher$$ExternalSyntheticLambda0;-><init>(Landroidx/activity/OnBackPressedDispatcher;)V
+SPLandroidx/activity/OnBackPressedDispatcher$$ExternalSyntheticLambda0;->invoke()Ljava/lang/Object;
+Landroidx/activity/OnBackPressedDispatcher$OnBackPressedEventInput;
+SPLandroidx/activity/OnBackPressedDispatcher$OnBackPressedEventInput;-><init>(Landroidx/activity/OnBackPressedDispatcher;)V
+SPLandroidx/activity/OnBackPressedDispatcher$OnBackPressedEventInput;->getDispatcher()Landroidx/navigationevent/NavigationEventDispatcher;
+SPLandroidx/activity/OnBackPressedDispatcher$OnBackPressedEventInput;->onHasEnabledHandlersChanged(Z)V
+Landroidx/activity/OnBackPressedDispatcher$OnBackPressedEventInput$$ExternalSyntheticLambda0;
+SPLandroidx/activity/OnBackPressedDispatcher$OnBackPressedEventInput$$ExternalSyntheticLambda0;-><init>(Landroidx/activity/OnBackPressedDispatcher;)V
+Landroidx/activity/OnBackPressedDispatcher$addCallback$lifecycleObserver$1;
+SPLandroidx/activity/OnBackPressedDispatcher$addCallback$lifecycleObserver$1;-><init>(Landroidx/activity/OnBackPressedCallback$OnBackPressedEventHandler;Landroidx/activity/OnBackPressedDispatcher;Landroidx/lifecycle/Lifecycle;)V
+SPLandroidx/activity/OnBackPressedDispatcher$addCallback$lifecycleObserver$1;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+Landroidx/activity/OnBackPressedDispatcherOwner;
+Landroidx/activity/R$id;
+Landroidx/activity/SystemBarStyle;
+SPLandroidx/activity/SystemBarStyle;-><clinit>()V
+SPLandroidx/activity/SystemBarStyle;-><init>(IIILkotlin/jvm/functions/Function1;)V
+SPLandroidx/activity/SystemBarStyle;-><init>(IIILkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/activity/SystemBarStyle;->getDetectDarkMode$activity()Lkotlin/jvm/functions/Function1;
+SPLandroidx/activity/SystemBarStyle;->getNightMode$activity()I
+SPLandroidx/activity/SystemBarStyle;->getScrimWithEnforcedContrast$activity(Z)I
+Landroidx/activity/SystemBarStyle$Companion;
+SPLandroidx/activity/SystemBarStyle$Companion;-><init>()V
+SPLandroidx/activity/SystemBarStyle$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/activity/SystemBarStyle$Companion;->auto(IILkotlin/jvm/functions/Function1;)Landroidx/activity/SystemBarStyle;
+Landroidx/activity/ViewTreeFullyDrawnReporterOwner;
+SPLandroidx/activity/ViewTreeFullyDrawnReporterOwner;->set(Landroid/view/View;Landroidx/activity/FullyDrawnReporterOwner;)V
+Landroidx/activity/ViewTreeOnBackPressedDispatcherOwner;
+SPLandroidx/activity/ViewTreeOnBackPressedDispatcherOwner;->set(Landroid/view/View;Landroidx/activity/OnBackPressedDispatcherOwner;)V
+Landroidx/activity/contextaware/ContextAware;
+Landroidx/activity/contextaware/ContextAwareHelper;
+SPLandroidx/activity/contextaware/ContextAwareHelper;-><init>()V
+SPLandroidx/activity/contextaware/ContextAwareHelper;->addOnContextAvailableListener(Landroidx/activity/contextaware/OnContextAvailableListener;)V
+SPLandroidx/activity/contextaware/ContextAwareHelper;->dispatchOnContextAvailable(Landroid/content/Context;)V
+Landroidx/activity/contextaware/OnContextAvailableListener;
+Landroidx/activity/result/ActivityResult;
+Landroidx/activity/result/ActivityResultCallback;
+Landroidx/activity/result/ActivityResultCaller;
+Landroidx/activity/result/ActivityResultLauncher;
+SPLandroidx/activity/result/ActivityResultLauncher;-><init>()V
+Landroidx/activity/result/ActivityResultRegistry;
+SPLandroidx/activity/result/ActivityResultRegistry;-><clinit>()V
+SPLandroidx/activity/result/ActivityResultRegistry;-><init>()V
+SPLandroidx/activity/result/ActivityResultRegistry;->bindRcKey(ILjava/lang/String;)V
+SPLandroidx/activity/result/ActivityResultRegistry;->generateRandomNumber$lambda$0()Ljava/lang/Integer;
+SPLandroidx/activity/result/ActivityResultRegistry;->generateRandomNumber()I
+SPLandroidx/activity/result/ActivityResultRegistry;->register$lambda$1(Landroidx/activity/result/ActivityResultRegistry;Ljava/lang/String;Landroidx/activity/result/ActivityResultCallback;Landroidx/activity/result/contract/ActivityResultContract;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+SPLandroidx/activity/result/ActivityResultRegistry;->register(Ljava/lang/String;Landroidx/activity/result/contract/ActivityResultContract;Landroidx/activity/result/ActivityResultCallback;)Landroidx/activity/result/ActivityResultLauncher;
+SPLandroidx/activity/result/ActivityResultRegistry;->register(Ljava/lang/String;Landroidx/lifecycle/LifecycleOwner;Landroidx/activity/result/contract/ActivityResultContract;Landroidx/activity/result/ActivityResultCallback;)Landroidx/activity/result/ActivityResultLauncher;
+SPLandroidx/activity/result/ActivityResultRegistry;->registerKey(Ljava/lang/String;)V
+Landroidx/activity/result/ActivityResultRegistry$$ExternalSyntheticLambda0;
+SPLandroidx/activity/result/ActivityResultRegistry$$ExternalSyntheticLambda0;-><init>(Landroidx/activity/result/ActivityResultRegistry;Ljava/lang/String;Landroidx/activity/result/ActivityResultCallback;Landroidx/activity/result/contract/ActivityResultContract;)V
+SPLandroidx/activity/result/ActivityResultRegistry$$ExternalSyntheticLambda0;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+Landroidx/activity/result/ActivityResultRegistry$$ExternalSyntheticLambda1;
+SPLandroidx/activity/result/ActivityResultRegistry$$ExternalSyntheticLambda1;-><init>()V
+SPLandroidx/activity/result/ActivityResultRegistry$$ExternalSyntheticLambda1;->invoke()Ljava/lang/Object;
+Landroidx/activity/result/ActivityResultRegistry$CallbackAndContract;
+SPLandroidx/activity/result/ActivityResultRegistry$CallbackAndContract;-><init>(Landroidx/activity/result/ActivityResultCallback;Landroidx/activity/result/contract/ActivityResultContract;)V
+Landroidx/activity/result/ActivityResultRegistry$Companion;
+SPLandroidx/activity/result/ActivityResultRegistry$Companion;-><init>()V
+SPLandroidx/activity/result/ActivityResultRegistry$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/activity/result/ActivityResultRegistry$LifecycleContainer;
+SPLandroidx/activity/result/ActivityResultRegistry$LifecycleContainer;-><init>(Landroidx/lifecycle/Lifecycle;)V
+SPLandroidx/activity/result/ActivityResultRegistry$LifecycleContainer;->addObserver(Landroidx/lifecycle/LifecycleEventObserver;)V
+Landroidx/activity/result/ActivityResultRegistry$register$2;
+SPLandroidx/activity/result/ActivityResultRegistry$register$2;-><init>(Landroidx/activity/result/ActivityResultRegistry;Ljava/lang/String;Landroidx/activity/result/contract/ActivityResultContract;)V
+Landroidx/activity/result/ActivityResultRegistry$register$3;
+SPLandroidx/activity/result/ActivityResultRegistry$register$3;-><init>(Landroidx/activity/result/ActivityResultRegistry;Ljava/lang/String;Landroidx/activity/result/contract/ActivityResultContract;)V
+Landroidx/activity/result/ActivityResultRegistryOwner;
+Landroidx/activity/result/contract/ActivityResultContract;
+SPLandroidx/activity/result/contract/ActivityResultContract;-><init>()V
+Landroidx/activity/result/contract/ActivityResultContracts$RequestMultiplePermissions;
+SPLandroidx/activity/result/contract/ActivityResultContracts$RequestMultiplePermissions;-><clinit>()V
+SPLandroidx/activity/result/contract/ActivityResultContracts$RequestMultiplePermissions;-><init>()V
+Landroidx/activity/result/contract/ActivityResultContracts$RequestMultiplePermissions$Companion;
+SPLandroidx/activity/result/contract/ActivityResultContracts$RequestMultiplePermissions$Companion;-><init>()V
+SPLandroidx/activity/result/contract/ActivityResultContracts$RequestMultiplePermissions$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/activity/result/contract/ActivityResultContracts$StartActivityForResult;
+SPLandroidx/activity/result/contract/ActivityResultContracts$StartActivityForResult;-><clinit>()V
+SPLandroidx/activity/result/contract/ActivityResultContracts$StartActivityForResult;-><init>()V
+Landroidx/activity/result/contract/ActivityResultContracts$StartActivityForResult$Companion;
+SPLandroidx/activity/result/contract/ActivityResultContracts$StartActivityForResult$Companion;-><init>()V
+SPLandroidx/activity/result/contract/ActivityResultContracts$StartActivityForResult$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/appcompat/R$attr;
+Landroidx/appcompat/R$drawable;
+Landroidx/appcompat/R$id;
+Landroidx/appcompat/R$layout;
+Landroidx/appcompat/R$string;
+Landroidx/appcompat/R$style;
+Landroidx/appcompat/R$styleable;
+SPLandroidx/appcompat/R$styleable;-><clinit>()V
+Landroidx/appcompat/app/ActionBar;
+SPLandroidx/appcompat/app/ActionBar;-><init>()V
+Landroidx/appcompat/app/ActionBar$LayoutParams;
+SPLandroidx/appcompat/app/ActionBar$LayoutParams;-><init>(II)V
+SPLandroidx/appcompat/app/ActionBar$LayoutParams;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+Landroidx/appcompat/app/ActionBarDrawerToggle;
+SPLandroidx/appcompat/app/ActionBarDrawerToggle;-><init>(Landroid/app/Activity;Landroidx/appcompat/widget/Toolbar;Landroidx/drawerlayout/widget/DrawerLayout;Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;II)V
+SPLandroidx/appcompat/app/ActionBarDrawerToggle;-><init>(Landroid/app/Activity;Landroidx/drawerlayout/widget/DrawerLayout;II)V
+SPLandroidx/appcompat/app/ActionBarDrawerToggle;->getThemeUpIndicator()Landroid/graphics/drawable/Drawable;
+SPLandroidx/appcompat/app/ActionBarDrawerToggle;->setActionBarUpIndicator(Landroid/graphics/drawable/Drawable;I)V
+SPLandroidx/appcompat/app/ActionBarDrawerToggle;->setDrawerSlideAnimationEnabled(Z)V
+SPLandroidx/appcompat/app/ActionBarDrawerToggle;->setPosition(F)V
+SPLandroidx/appcompat/app/ActionBarDrawerToggle;->syncState()V
+Landroidx/appcompat/app/ActionBarDrawerToggle$Delegate;
+Landroidx/appcompat/app/ActionBarDrawerToggle$DelegateProvider;
+Landroidx/appcompat/app/AppCompatActivity;
+SPLandroidx/appcompat/app/AppCompatActivity;-><init>(I)V
+SPLandroidx/appcompat/app/AppCompatActivity;->attachBaseContext(Landroid/content/Context;)V
+SPLandroidx/appcompat/app/AppCompatActivity;->findViewById(I)Landroid/view/View;
+SPLandroidx/appcompat/app/AppCompatActivity;->getDelegate()Landroidx/appcompat/app/AppCompatDelegate;
+SPLandroidx/appcompat/app/AppCompatActivity;->getDrawerToggleDelegate()Landroidx/appcompat/app/ActionBarDrawerToggle$Delegate;
+SPLandroidx/appcompat/app/AppCompatActivity;->getMenuInflater()Landroid/view/MenuInflater;
+SPLandroidx/appcompat/app/AppCompatActivity;->getResources()Landroid/content/res/Resources;
+SPLandroidx/appcompat/app/AppCompatActivity;->getSupportActionBar()Landroidx/appcompat/app/ActionBar;
+SPLandroidx/appcompat/app/AppCompatActivity;->initDelegate()V
+SPLandroidx/appcompat/app/AppCompatActivity;->invalidateOptionsMenu()V
+SPLandroidx/appcompat/app/AppCompatActivity;->onContentChanged()V
+SPLandroidx/appcompat/app/AppCompatActivity;->onPostCreate(Landroid/os/Bundle;)V
+SPLandroidx/appcompat/app/AppCompatActivity;->onPostResume()V
+SPLandroidx/appcompat/app/AppCompatActivity;->onStart()V
+SPLandroidx/appcompat/app/AppCompatActivity;->onSupportContentChanged()V
+SPLandroidx/appcompat/app/AppCompatActivity;->onTitleChanged(Ljava/lang/CharSequence;I)V
+SPLandroidx/appcompat/app/AppCompatActivity;->setContentView(Landroid/view/View;)V
+SPLandroidx/appcompat/app/AppCompatActivity;->setSupportActionBar(Landroidx/appcompat/widget/Toolbar;)V
+SPLandroidx/appcompat/app/AppCompatActivity;->setTheme(I)V
+Landroidx/appcompat/app/AppCompatActivity$1;
+SPLandroidx/appcompat/app/AppCompatActivity$1;-><init>(Landroidx/appcompat/app/AppCompatActivity;)V
+Landroidx/appcompat/app/AppCompatActivity$2;
+SPLandroidx/appcompat/app/AppCompatActivity$2;-><init>(Landroidx/appcompat/app/AppCompatActivity;)V
+SPLandroidx/appcompat/app/AppCompatActivity$2;->onContextAvailable(Landroid/content/Context;)V
+Landroidx/appcompat/app/AppCompatCallback;
+Landroidx/appcompat/app/AppCompatDelegate;
+SPLandroidx/appcompat/app/AppCompatDelegate;-><clinit>()V
+SPLandroidx/appcompat/app/AppCompatDelegate;-><init>()V
+SPLandroidx/appcompat/app/AppCompatDelegate;->addActiveDelegate(Landroidx/appcompat/app/AppCompatDelegate;)V
+SPLandroidx/appcompat/app/AppCompatDelegate;->applyDayNightToActiveDelegates()V
+SPLandroidx/appcompat/app/AppCompatDelegate;->attachBaseContext(Landroid/content/Context;)V
+SPLandroidx/appcompat/app/AppCompatDelegate;->attachBaseContext2(Landroid/content/Context;)Landroid/content/Context;
+SPLandroidx/appcompat/app/AppCompatDelegate;->create(Landroid/app/Activity;Landroidx/appcompat/app/AppCompatCallback;)Landroidx/appcompat/app/AppCompatDelegate;
+SPLandroidx/appcompat/app/AppCompatDelegate;->getApplicationLocales()Landroidx/core/os/LocaleListCompat;
+SPLandroidx/appcompat/app/AppCompatDelegate;->getDefaultNightMode()I
+SPLandroidx/appcompat/app/AppCompatDelegate;->getLocaleManagerForApplication()Ljava/lang/Object;
+SPLandroidx/appcompat/app/AppCompatDelegate;->isAutoStorageOptedIn(Landroid/content/Context;)Z
+SPLandroidx/appcompat/app/AppCompatDelegate;->lambda$syncRequestedAndStoredLocales$1(Landroid/content/Context;)V
+SPLandroidx/appcompat/app/AppCompatDelegate;->removeDelegateFromActives(Landroidx/appcompat/app/AppCompatDelegate;)V
+SPLandroidx/appcompat/app/AppCompatDelegate;->setDefaultNightMode(I)V
+SPLandroidx/appcompat/app/AppCompatDelegate;->setOnBackInvokedDispatcher(Landroid/window/OnBackInvokedDispatcher;)V
+SPLandroidx/appcompat/app/AppCompatDelegate;->syncLocalesToFramework(Landroid/content/Context;)V
+SPLandroidx/appcompat/app/AppCompatDelegate;->syncRequestedAndStoredLocales(Landroid/content/Context;)V
+Landroidx/appcompat/app/AppCompatDelegate$$ExternalSyntheticLambda0;
+SPLandroidx/appcompat/app/AppCompatDelegate$$ExternalSyntheticLambda0;-><init>(Landroid/content/Context;)V
+SPLandroidx/appcompat/app/AppCompatDelegate$$ExternalSyntheticLambda0;->run()V
+Landroidx/appcompat/app/AppCompatDelegate$Api33Impl;
+SPLandroidx/appcompat/app/AppCompatDelegate$Api33Impl;->localeManagerGetApplicationLocales(Ljava/lang/Object;)Landroid/os/LocaleList;
+Landroidx/appcompat/app/AppCompatDelegate$SerialExecutor;
+SPLandroidx/appcompat/app/AppCompatDelegate$SerialExecutor;-><init>(Ljava/util/concurrent/Executor;)V
+SPLandroidx/appcompat/app/AppCompatDelegate$SerialExecutor;->execute(Ljava/lang/Runnable;)V
+SPLandroidx/appcompat/app/AppCompatDelegate$SerialExecutor;->lambda$execute$0$androidx-appcompat-app-AppCompatDelegate$SerialExecutor(Ljava/lang/Runnable;)V
+SPLandroidx/appcompat/app/AppCompatDelegate$SerialExecutor;->scheduleNext()V
+Landroidx/appcompat/app/AppCompatDelegate$SerialExecutor$$ExternalSyntheticLambda0;
+SPLandroidx/appcompat/app/AppCompatDelegate$SerialExecutor$$ExternalSyntheticLambda0;-><init>(Landroidx/appcompat/app/AppCompatDelegate$SerialExecutor;Ljava/lang/Runnable;)V
+SPLandroidx/appcompat/app/AppCompatDelegate$SerialExecutor$$ExternalSyntheticLambda0;->run()V
+Landroidx/appcompat/app/AppCompatDelegate$ThreadPerTaskExecutor;
+SPLandroidx/appcompat/app/AppCompatDelegate$ThreadPerTaskExecutor;-><init>()V
+SPLandroidx/appcompat/app/AppCompatDelegate$ThreadPerTaskExecutor;->execute(Ljava/lang/Runnable;)V
+Landroidx/appcompat/app/AppCompatDelegateImpl;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;-><clinit>()V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;-><init>(Landroid/app/Activity;Landroidx/appcompat/app/AppCompatCallback;)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;-><init>(Landroid/content/Context;Landroid/view/Window;Landroidx/appcompat/app/AppCompatCallback;Ljava/lang/Object;)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->applyApplicationSpecificConfig(Z)Z
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->applyApplicationSpecificConfig(ZZ)Z
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->applyFixedSizeWindow()V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->attachBaseContext2(Landroid/content/Context;)Landroid/content/Context;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->attachToWindow(Landroid/view/Window;)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->calculateApplicationLocales(Landroid/content/Context;)Landroidx/core/os/LocaleListCompat;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->calculateNightMode()I
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->createOverrideAppConfiguration(Landroid/content/Context;ILandroidx/core/os/LocaleListCompat;Landroid/content/res/Configuration;Z)Landroid/content/res/Configuration;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->createSubDecor()Landroid/view/ViewGroup;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->createView(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->doInvalidatePanelMenu(I)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->ensureSubDecor()V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->ensureWindow()V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->findViewById(I)Landroid/view/View;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->getActionBarThemedContext()Landroid/content/Context;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->getActivityHandlesConfigChangesFlags(Landroid/content/Context;)I
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->getConfigurationLocales(Landroid/content/res/Configuration;)Landroidx/core/os/LocaleListCompat;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->getContextForDelegate()Landroid/content/Context;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->getDrawerToggleDelegate()Landroidx/appcompat/app/ActionBarDrawerToggle$Delegate;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->getMenuInflater()Landroid/view/MenuInflater;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->getPanelState(IZ)Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->getSupportActionBar()Landroidx/appcompat/app/ActionBar;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->getTitle()Ljava/lang/CharSequence;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->initWindowDecorActionBar()V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->installViewFactory()V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->invalidateOptionsMenu()V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->invalidatePanelMenu(I)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->mapNightMode(Landroid/content/Context;I)I
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->onCreate(Landroid/os/Bundle;)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->onCreateView(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->onPostCreate(Landroid/os/Bundle;)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->onPostResume()V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->onStart()V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->onSubDecorInstalled(Landroid/view/ViewGroup;)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->peekSupportActionBar()Landroidx/appcompat/app/ActionBar;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->requestWindowFeature(I)Z
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->sanitizeWindowFeatureId(I)I
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->setContentView(Landroid/view/View;)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->setOnBackInvokedDispatcher(Landroid/window/OnBackInvokedDispatcher;)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->setSupportActionBar(Landroidx/appcompat/widget/Toolbar;)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->setTheme(I)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->setTitle(Ljava/lang/CharSequence;)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->shouldRegisterBackInvokedCallback()Z
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->throwFeatureRequestIfSubDecorInstalled()V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->updateActionModeInsets(Landroidx/core/view/WindowInsetsCompat;Landroid/graphics/Rect;)I
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->updateAppConfiguration(ILandroidx/core/os/LocaleListCompat;Z)Z
+SPLandroidx/appcompat/app/AppCompatDelegateImpl;->updateBackInvokedCallbackState()V
+Landroidx/appcompat/app/AppCompatDelegateImpl$1;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$1;-><init>(Landroidx/appcompat/app/AppCompatDelegateImpl;)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$1;->run()V
+Landroidx/appcompat/app/AppCompatDelegateImpl$2;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$2;-><init>(Landroidx/appcompat/app/AppCompatDelegateImpl;)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$2;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+Landroidx/appcompat/app/AppCompatDelegateImpl$3;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$3;-><init>(Landroidx/appcompat/app/AppCompatDelegateImpl;)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$3;->onAttachedFromWindow()V
+Landroidx/appcompat/app/AppCompatDelegateImpl$ActionBarDrawableToggleImpl;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$ActionBarDrawableToggleImpl;-><init>(Landroidx/appcompat/app/AppCompatDelegateImpl;)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$ActionBarDrawableToggleImpl;->getActionBarThemedContext()Landroid/content/Context;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$ActionBarDrawableToggleImpl;->getThemeUpIndicator()Landroid/graphics/drawable/Drawable;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$ActionBarDrawableToggleImpl;->isNavigationVisible()Z
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$ActionBarDrawableToggleImpl;->setActionBarUpIndicator(Landroid/graphics/drawable/Drawable;I)V
+Landroidx/appcompat/app/AppCompatDelegateImpl$ActionBarMenuCallback;
+Landroidx/appcompat/app/AppCompatDelegateImpl$Api24Impl;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$Api24Impl;->getLocales(Landroid/content/res/Configuration;)Landroidx/core/os/LocaleListCompat;
+Landroidx/appcompat/app/AppCompatDelegateImpl$Api33Impl;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$Api33Impl;->getOnBackInvokedDispatcher(Landroid/app/Activity;)Landroid/window/OnBackInvokedDispatcher;
+Landroidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback;-><init>(Landroidx/appcompat/app/AppCompatDelegateImpl;Landroid/view/Window$Callback;)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback;->bypassOnContentChanged(Landroid/view/Window$Callback;)V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback;->onContentChanged()V
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback;->onCreatePanelMenu(ILandroid/view/Menu;)Z
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback;->onPreparePanel(ILandroid/view/View;Landroid/view/Menu;)Z
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback;->setActionBarCallback(Landroidx/appcompat/app/AppCompatDelegateImpl$ActionBarMenuCallback;)V
+Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;
+SPLandroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;-><init>(I)V
+Landroidx/appcompat/app/AppCompatViewInflater;
+SPLandroidx/appcompat/app/AppCompatViewInflater;-><clinit>()V
+SPLandroidx/appcompat/app/AppCompatViewInflater;-><init>()V
+SPLandroidx/appcompat/app/AppCompatViewInflater;->backportAccessibilityAttributes(Landroid/content/Context;Landroid/view/View;Landroid/util/AttributeSet;)V
+SPLandroidx/appcompat/app/AppCompatViewInflater;->checkOnClickListener(Landroid/view/View;Landroid/util/AttributeSet;)V
+SPLandroidx/appcompat/app/AppCompatViewInflater;->createCheckedTextView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroidx/appcompat/widget/AppCompatCheckedTextView;
+SPLandroidx/appcompat/app/AppCompatViewInflater;->createImageButton(Landroid/content/Context;Landroid/util/AttributeSet;)Landroidx/appcompat/widget/AppCompatImageButton;
+SPLandroidx/appcompat/app/AppCompatViewInflater;->createImageView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroidx/appcompat/widget/AppCompatImageView;
+SPLandroidx/appcompat/app/AppCompatViewInflater;->createSpinner(Landroid/content/Context;Landroid/util/AttributeSet;)Landroidx/appcompat/widget/AppCompatSpinner;
+SPLandroidx/appcompat/app/AppCompatViewInflater;->createView(Landroid/content/Context;Ljava/lang/String;Landroid/util/AttributeSet;)Landroid/view/View;
+SPLandroidx/appcompat/app/AppCompatViewInflater;->createView(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;ZZZZ)Landroid/view/View;
+SPLandroidx/appcompat/app/AppCompatViewInflater;->themifyContext(Landroid/content/Context;Landroid/util/AttributeSet;ZZ)Landroid/content/Context;
+SPLandroidx/appcompat/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V
+Landroidx/appcompat/app/AppLocalesMetadataHolderService;
+SPLandroidx/appcompat/app/AppLocalesMetadataHolderService;->getServiceInfo(Landroid/content/Context;)Landroid/content/pm/ServiceInfo;
+Landroidx/appcompat/app/AppLocalesMetadataHolderService$Api24Impl;
+SPLandroidx/appcompat/app/AppLocalesMetadataHolderService$Api24Impl;->getDisabledComponentFlag()I
+Landroidx/appcompat/app/ToolbarActionBar;
+SPLandroidx/appcompat/app/ToolbarActionBar;-><init>(Landroidx/appcompat/widget/Toolbar;Ljava/lang/CharSequence;Landroid/view/Window$Callback;)V
+SPLandroidx/appcompat/app/ToolbarActionBar;->getDisplayOptions()I
+SPLandroidx/appcompat/app/ToolbarActionBar;->getMenu()Landroid/view/Menu;
+SPLandroidx/appcompat/app/ToolbarActionBar;->getThemedContext()Landroid/content/Context;
+SPLandroidx/appcompat/app/ToolbarActionBar;->invalidateOptionsMenu()Z
+SPLandroidx/appcompat/app/ToolbarActionBar;->onDestroy()V
+SPLandroidx/appcompat/app/ToolbarActionBar;->populateOptionsMenu()V
+SPLandroidx/appcompat/app/ToolbarActionBar;->setDisplayHomeAsUpEnabled(Z)V
+SPLandroidx/appcompat/app/ToolbarActionBar;->setDisplayOptions(II)V
+SPLandroidx/appcompat/app/ToolbarActionBar;->setHomeActionContentDescription(I)V
+SPLandroidx/appcompat/app/ToolbarActionBar;->setHomeAsUpIndicator(Landroid/graphics/drawable/Drawable;)V
+SPLandroidx/appcompat/app/ToolbarActionBar;->setHomeButtonEnabled(Z)V
+SPLandroidx/appcompat/app/ToolbarActionBar;->setShowHideAnimationEnabled(Z)V
+SPLandroidx/appcompat/app/ToolbarActionBar;->setSubtitle(Ljava/lang/CharSequence;)V
+SPLandroidx/appcompat/app/ToolbarActionBar;->setTitle(Ljava/lang/CharSequence;)V
+SPLandroidx/appcompat/app/ToolbarActionBar;->setWindowTitle(Ljava/lang/CharSequence;)V
+Landroidx/appcompat/app/ToolbarActionBar$1;
+SPLandroidx/appcompat/app/ToolbarActionBar$1;-><init>(Landroidx/appcompat/app/ToolbarActionBar;)V
+SPLandroidx/appcompat/app/ToolbarActionBar$1;->run()V
+Landroidx/appcompat/app/ToolbarActionBar$2;
+SPLandroidx/appcompat/app/ToolbarActionBar$2;-><init>(Landroidx/appcompat/app/ToolbarActionBar;)V
+Landroidx/appcompat/app/ToolbarActionBar$ActionMenuPresenterCallback;
+SPLandroidx/appcompat/app/ToolbarActionBar$ActionMenuPresenterCallback;-><init>(Landroidx/appcompat/app/ToolbarActionBar;)V
+Landroidx/appcompat/app/ToolbarActionBar$MenuBuilderCallback;
+SPLandroidx/appcompat/app/ToolbarActionBar$MenuBuilderCallback;-><init>(Landroidx/appcompat/app/ToolbarActionBar;)V
+Landroidx/appcompat/app/ToolbarActionBar$ToolbarMenuCallback;
+SPLandroidx/appcompat/app/ToolbarActionBar$ToolbarMenuCallback;-><init>(Landroidx/appcompat/app/ToolbarActionBar;)V
+SPLandroidx/appcompat/app/ToolbarActionBar$ToolbarMenuCallback;->onPreparePanel(I)Z
+Landroidx/appcompat/app/WindowDecorActionBar;
+Landroidx/appcompat/content/res/AppCompatResources;
+SPLandroidx/appcompat/content/res/AppCompatResources;->getColorStateList(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
+SPLandroidx/appcompat/content/res/AppCompatResources;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
+Landroidx/appcompat/graphics/drawable/DrawerArrowDrawable;
+SPLandroidx/appcompat/graphics/drawable/DrawerArrowDrawable;-><clinit>()V
+SPLandroidx/appcompat/graphics/drawable/DrawerArrowDrawable;-><init>(Landroid/content/Context;)V
+SPLandroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->draw(Landroid/graphics/Canvas;)V
+SPLandroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->getIntrinsicHeight()I
+SPLandroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->getIntrinsicWidth()I
+SPLandroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->getOpacity()I
+SPLandroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->lerp(FFF)F
+SPLandroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->setBarThickness(F)V
+SPLandroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->setColor(I)V
+SPLandroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->setGapSize(F)V
+SPLandroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->setProgress(F)V
+SPLandroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->setSpinEnabled(Z)V
+SPLandroidx/appcompat/graphics/drawable/DrawerArrowDrawable;->setVerticalMirror(Z)V
+Landroidx/appcompat/resources/R$drawable;
+Landroidx/appcompat/view/ActionBarPolicy;
+SPLandroidx/appcompat/view/ActionBarPolicy;-><init>(Landroid/content/Context;)V
+SPLandroidx/appcompat/view/ActionBarPolicy;->get(Landroid/content/Context;)Landroidx/appcompat/view/ActionBarPolicy;
+SPLandroidx/appcompat/view/ActionBarPolicy;->getEmbeddedMenuWidthLimit()I
+SPLandroidx/appcompat/view/ActionBarPolicy;->getMaxActionButtons()I
+Landroidx/appcompat/view/CollapsibleActionView;
+Landroidx/appcompat/view/ContextThemeWrapper;
+SPLandroidx/appcompat/view/ContextThemeWrapper;-><init>(Landroid/content/Context;I)V
+SPLandroidx/appcompat/view/ContextThemeWrapper;->applyOverrideConfiguration(Landroid/content/res/Configuration;)V
+SPLandroidx/appcompat/view/ContextThemeWrapper;->getResources()Landroid/content/res/Resources;
+SPLandroidx/appcompat/view/ContextThemeWrapper;->getResourcesInternal()Landroid/content/res/Resources;
+SPLandroidx/appcompat/view/ContextThemeWrapper;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
+SPLandroidx/appcompat/view/ContextThemeWrapper;->getTheme()Landroid/content/res/Resources$Theme;
+SPLandroidx/appcompat/view/ContextThemeWrapper;->getThemeResId()I
+SPLandroidx/appcompat/view/ContextThemeWrapper;->initializeTheme()V
+SPLandroidx/appcompat/view/ContextThemeWrapper;->isEmptyConfiguration(Landroid/content/res/Configuration;)Z
+SPLandroidx/appcompat/view/ContextThemeWrapper;->onApplyThemeResource(Landroid/content/res/Resources$Theme;IZ)V
+Landroidx/appcompat/view/SupportMenuInflater;
+SPLandroidx/appcompat/view/SupportMenuInflater;-><clinit>()V
+SPLandroidx/appcompat/view/SupportMenuInflater;-><init>(Landroid/content/Context;)V
+SPLandroidx/appcompat/view/SupportMenuInflater;->inflate(ILandroid/view/Menu;)V
+SPLandroidx/appcompat/view/SupportMenuInflater;->parseMenu(Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/view/Menu;)V
+Landroidx/appcompat/view/SupportMenuInflater$MenuState;
+SPLandroidx/appcompat/view/SupportMenuInflater$MenuState;-><init>(Landroidx/appcompat/view/SupportMenuInflater;Landroid/view/Menu;)V
+SPLandroidx/appcompat/view/SupportMenuInflater$MenuState;->addItem()V
+SPLandroidx/appcompat/view/SupportMenuInflater$MenuState;->addSubMenuItem()Landroid/view/SubMenu;
+SPLandroidx/appcompat/view/SupportMenuInflater$MenuState;->getShortcut(Ljava/lang/String;)C
+SPLandroidx/appcompat/view/SupportMenuInflater$MenuState;->hasAddedItem()Z
+SPLandroidx/appcompat/view/SupportMenuInflater$MenuState;->newInstance(Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/appcompat/view/SupportMenuInflater$MenuState;->readGroup(Landroid/util/AttributeSet;)V
+SPLandroidx/appcompat/view/SupportMenuInflater$MenuState;->readItem(Landroid/util/AttributeSet;)V
+SPLandroidx/appcompat/view/SupportMenuInflater$MenuState;->resetGroup()V
+SPLandroidx/appcompat/view/SupportMenuInflater$MenuState;->setItem(Landroid/view/MenuItem;)V
+Landroidx/appcompat/view/WindowCallbackWrapper;
+SPLandroidx/appcompat/view/WindowCallbackWrapper;-><init>(Landroid/view/Window$Callback;)V
+SPLandroidx/appcompat/view/WindowCallbackWrapper;->dispatchPopulateAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)Z
+SPLandroidx/appcompat/view/WindowCallbackWrapper;->getWrapped()Landroid/view/Window$Callback;
+SPLandroidx/appcompat/view/WindowCallbackWrapper;->onAttachedToWindow()V
+SPLandroidx/appcompat/view/WindowCallbackWrapper;->onCreatePanelMenu(ILandroid/view/Menu;)Z
+SPLandroidx/appcompat/view/WindowCallbackWrapper;->onPreparePanel(ILandroid/view/View;Landroid/view/Menu;)Z
+SPLandroidx/appcompat/view/WindowCallbackWrapper;->onWindowAttributesChanged(Landroid/view/WindowManager$LayoutParams;)V
+SPLandroidx/appcompat/view/WindowCallbackWrapper;->onWindowFocusChanged(Z)V
+Landroidx/appcompat/view/menu/ActionMenuItem;
+SPLandroidx/appcompat/view/menu/ActionMenuItem;-><init>(Landroid/content/Context;IIIILjava/lang/CharSequence;)V
+Landroidx/appcompat/view/menu/BaseMenuPresenter;
+SPLandroidx/appcompat/view/menu/BaseMenuPresenter;-><init>(Landroid/content/Context;II)V
+SPLandroidx/appcompat/view/menu/BaseMenuPresenter;->addItemView(Landroid/view/View;I)V
+SPLandroidx/appcompat/view/menu/BaseMenuPresenter;->filterLeftoverView(Landroid/view/ViewGroup;I)Z
+SPLandroidx/appcompat/view/menu/BaseMenuPresenter;->initForMenu(Landroid/content/Context;Landroidx/appcompat/view/menu/MenuBuilder;)V
+SPLandroidx/appcompat/view/menu/BaseMenuPresenter;->setCallback(Landroidx/appcompat/view/menu/MenuPresenter$Callback;)V
+SPLandroidx/appcompat/view/menu/BaseMenuPresenter;->updateMenuView(Z)V
+Landroidx/appcompat/view/menu/MenuBuilder;
+SPLandroidx/appcompat/view/menu/MenuBuilder;-><clinit>()V
+SPLandroidx/appcompat/view/menu/MenuBuilder;-><init>(Landroid/content/Context;)V
+SPLandroidx/appcompat/view/menu/MenuBuilder;->add(IIILjava/lang/CharSequence;)Landroid/view/MenuItem;
+SPLandroidx/appcompat/view/menu/MenuBuilder;->addInternal(IIILjava/lang/CharSequence;)Landroid/view/MenuItem;
+SPLandroidx/appcompat/view/menu/MenuBuilder;->addMenuPresenter(Landroidx/appcompat/view/menu/MenuPresenter;)V
+SPLandroidx/appcompat/view/menu/MenuBuilder;->addMenuPresenter(Landroidx/appcompat/view/menu/MenuPresenter;Landroid/content/Context;)V
+SPLandroidx/appcompat/view/menu/MenuBuilder;->addSubMenu(IIILjava/lang/CharSequence;)Landroid/view/SubMenu;
+SPLandroidx/appcompat/view/menu/MenuBuilder;->clear()V
+SPLandroidx/appcompat/view/menu/MenuBuilder;->createNewMenuItem(IIIILjava/lang/CharSequence;I)Landroidx/appcompat/view/menu/MenuItemImpl;
+SPLandroidx/appcompat/view/menu/MenuBuilder;->dispatchPresenterUpdate(Z)V
+SPLandroidx/appcompat/view/menu/MenuBuilder;->findInsertIndex(Ljava/util/ArrayList;I)I
+SPLandroidx/appcompat/view/menu/MenuBuilder;->findItem(I)Landroid/view/MenuItem;
+SPLandroidx/appcompat/view/menu/MenuBuilder;->flagActionItems()V
+SPLandroidx/appcompat/view/menu/MenuBuilder;->getActionItems()Ljava/util/ArrayList;
+SPLandroidx/appcompat/view/menu/MenuBuilder;->getContext()Landroid/content/Context;
+SPLandroidx/appcompat/view/menu/MenuBuilder;->getItem(I)Landroid/view/MenuItem;
+SPLandroidx/appcompat/view/menu/MenuBuilder;->getNonActionItems()Ljava/util/ArrayList;
+SPLandroidx/appcompat/view/menu/MenuBuilder;->getOrdering(I)I
+SPLandroidx/appcompat/view/menu/MenuBuilder;->getResources()Landroid/content/res/Resources;
+SPLandroidx/appcompat/view/menu/MenuBuilder;->getVisibleItems()Ljava/util/ArrayList;
+SPLandroidx/appcompat/view/menu/MenuBuilder;->hasVisibleItems()Z
+SPLandroidx/appcompat/view/menu/MenuBuilder;->isDispatchingItemsChanged()Z
+SPLandroidx/appcompat/view/menu/MenuBuilder;->onItemActionRequestChanged(Landroidx/appcompat/view/menu/MenuItemImpl;)V
+SPLandroidx/appcompat/view/menu/MenuBuilder;->onItemVisibleChanged(Landroidx/appcompat/view/menu/MenuItemImpl;)V
+SPLandroidx/appcompat/view/menu/MenuBuilder;->onItemsChanged(Z)V
+SPLandroidx/appcompat/view/menu/MenuBuilder;->setCallback(Landroidx/appcompat/view/menu/MenuBuilder$Callback;)V
+SPLandroidx/appcompat/view/menu/MenuBuilder;->setHeaderInternal(ILjava/lang/CharSequence;ILandroid/graphics/drawable/Drawable;Landroid/view/View;)V
+SPLandroidx/appcompat/view/menu/MenuBuilder;->setHeaderTitleInt(Ljava/lang/CharSequence;)Landroidx/appcompat/view/menu/MenuBuilder;
+SPLandroidx/appcompat/view/menu/MenuBuilder;->setOverrideVisibleItems(Z)V
+SPLandroidx/appcompat/view/menu/MenuBuilder;->setShortcutsVisibleInner(Z)V
+SPLandroidx/appcompat/view/menu/MenuBuilder;->size()I
+SPLandroidx/appcompat/view/menu/MenuBuilder;->startDispatchingItemsChanged()V
+SPLandroidx/appcompat/view/menu/MenuBuilder;->stopDispatchingItemsChanged()V
+Landroidx/appcompat/view/menu/MenuBuilder$Callback;
+Landroidx/appcompat/view/menu/MenuBuilder$ItemInvoker;
+Landroidx/appcompat/view/menu/MenuItemImpl;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;-><init>(Landroidx/appcompat/view/menu/MenuBuilder;IIIILjava/lang/CharSequence;I)V
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->applyIconTintIfNecessary(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->getActionView()Landroid/view/View;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->getContentDescription()Ljava/lang/CharSequence;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->getGroupId()I
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->getIcon()Landroid/graphics/drawable/Drawable;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->getItemId()I
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->getOrdering()I
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->getSubMenu()Landroid/view/SubMenu;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->getSupportActionProvider()Landroidx/core/view/ActionProvider;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->getTitle()Ljava/lang/CharSequence;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->getTooltipText()Ljava/lang/CharSequence;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->hasCollapsibleActionView()Z
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->hasSubMenu()Z
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->isActionButton()Z
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->isActionViewExpanded()Z
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->isCheckable()Z
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->isChecked()Z
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->isEnabled()Z
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->isVisible()Z
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->requestsActionButton()Z
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->requiresActionButton()Z
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setActionView(Landroid/view/View;)Landroid/view/MenuItem;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setActionView(Landroid/view/View;)Landroidx/core/internal/view/SupportMenuItem;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setAlphabeticShortcut(CI)Landroid/view/MenuItem;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setCheckable(Z)Landroid/view/MenuItem;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setChecked(Z)Landroid/view/MenuItem;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setCheckedInt(Z)V
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setContentDescription(Ljava/lang/CharSequence;)Landroidx/core/internal/view/SupportMenuItem;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setEnabled(Z)Landroid/view/MenuItem;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setExclusiveCheckable(Z)V
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setIcon(I)Landroid/view/MenuItem;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setIsActionButton(Z)V
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setNumericShortcut(CI)Landroid/view/MenuItem;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setOnActionExpandListener(Landroid/view/MenuItem$OnActionExpandListener;)Landroid/view/MenuItem;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setShowAsAction(I)V
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setSubMenu(Landroidx/appcompat/view/menu/SubMenuBuilder;)V
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setSupportActionProvider(Landroidx/core/view/ActionProvider;)Landroidx/core/internal/view/SupportMenuItem;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setTitle(Ljava/lang/CharSequence;)Landroid/view/MenuItem;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setTitleCondensed(Ljava/lang/CharSequence;)Landroid/view/MenuItem;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setTooltipText(Ljava/lang/CharSequence;)Landroidx/core/internal/view/SupportMenuItem;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setVisible(Z)Landroid/view/MenuItem;
+SPLandroidx/appcompat/view/menu/MenuItemImpl;->setVisibleInt(Z)Z
+Landroidx/appcompat/view/menu/MenuItemImpl$1;
+SPLandroidx/appcompat/view/menu/MenuItemImpl$1;-><init>(Landroidx/appcompat/view/menu/MenuItemImpl;)V
+Landroidx/appcompat/view/menu/MenuPresenter;
+Landroidx/appcompat/view/menu/MenuPresenter$Callback;
+Landroidx/appcompat/view/menu/MenuView;
+Landroidx/appcompat/view/menu/MenuView$ItemView;
+Landroidx/appcompat/view/menu/ShowableListMenu;
+Landroidx/appcompat/view/menu/SubMenuBuilder;
+SPLandroidx/appcompat/view/menu/SubMenuBuilder;-><init>(Landroid/content/Context;Landroidx/appcompat/view/menu/MenuBuilder;Landroidx/appcompat/view/menu/MenuItemImpl;)V
+SPLandroidx/appcompat/view/menu/SubMenuBuilder;->getItem()Landroid/view/MenuItem;
+SPLandroidx/appcompat/view/menu/SubMenuBuilder;->setHeaderTitle(Ljava/lang/CharSequence;)Landroid/view/SubMenu;
+Landroidx/appcompat/widget/ActionBarOverlayLayout$ActionBarVisibilityCallback;
+Landroidx/appcompat/widget/ActionMenuPresenter;
+SPLandroidx/appcompat/widget/ActionMenuPresenter;-><init>(Landroid/content/Context;)V
+SPLandroidx/appcompat/widget/ActionMenuPresenter;->filterLeftoverView(Landroid/view/ViewGroup;I)Z
+SPLandroidx/appcompat/widget/ActionMenuPresenter;->flagActionItems()Z
+SPLandroidx/appcompat/widget/ActionMenuPresenter;->getItemView(Landroidx/appcompat/view/menu/MenuItemImpl;Landroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;
+SPLandroidx/appcompat/widget/ActionMenuPresenter;->initForMenu(Landroid/content/Context;Landroidx/appcompat/view/menu/MenuBuilder;)V
+SPLandroidx/appcompat/widget/ActionMenuPresenter;->setExpandedActionViewsExclusive(Z)V
+SPLandroidx/appcompat/widget/ActionMenuPresenter;->setMenuView(Landroidx/appcompat/widget/ActionMenuView;)V
+SPLandroidx/appcompat/widget/ActionMenuPresenter;->setReserveOverflow(Z)V
+SPLandroidx/appcompat/widget/ActionMenuPresenter;->shouldIncludeItem(ILandroidx/appcompat/view/menu/MenuItemImpl;)Z
+SPLandroidx/appcompat/widget/ActionMenuPresenter;->updateMenuView(Z)V
+Landroidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton;
+SPLandroidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton;-><init>(Landroidx/appcompat/widget/ActionMenuPresenter;Landroid/content/Context;)V
+SPLandroidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton;->setFrame(IIII)Z
+Landroidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton$1;
+SPLandroidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton$1;-><init>(Landroidx/appcompat/widget/ActionMenuPresenter$OverflowMenuButton;Landroid/view/View;Landroidx/appcompat/widget/ActionMenuPresenter;)V
+Landroidx/appcompat/widget/ActionMenuPresenter$PopupPresenterCallback;
+SPLandroidx/appcompat/widget/ActionMenuPresenter$PopupPresenterCallback;-><init>(Landroidx/appcompat/widget/ActionMenuPresenter;)V
+Landroidx/appcompat/widget/ActionMenuView;
+SPLandroidx/appcompat/widget/ActionMenuView;-><init>(Landroid/content/Context;)V
+SPLandroidx/appcompat/widget/ActionMenuView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/appcompat/widget/ActionMenuView;->checkLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Z
+SPLandroidx/appcompat/widget/ActionMenuView;->generateDefaultLayoutParams()Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
+SPLandroidx/appcompat/widget/ActionMenuView;->generateLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
+SPLandroidx/appcompat/widget/ActionMenuView;->generateOverflowButtonLayoutParams()Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
+SPLandroidx/appcompat/widget/ActionMenuView;->getMenu()Landroid/view/Menu;
+SPLandroidx/appcompat/widget/ActionMenuView;->initialize(Landroidx/appcompat/view/menu/MenuBuilder;)V
+SPLandroidx/appcompat/widget/ActionMenuView;->onLayout(ZIIII)V
+SPLandroidx/appcompat/widget/ActionMenuView;->onMeasure(II)V
+SPLandroidx/appcompat/widget/ActionMenuView;->peekMenu()Landroidx/appcompat/view/menu/MenuBuilder;
+SPLandroidx/appcompat/widget/ActionMenuView;->setExpandedActionViewsExclusive(Z)V
+SPLandroidx/appcompat/widget/ActionMenuView;->setMenuCallbacks(Landroidx/appcompat/view/menu/MenuPresenter$Callback;Landroidx/appcompat/view/menu/MenuBuilder$Callback;)V
+SPLandroidx/appcompat/widget/ActionMenuView;->setOnMenuItemClickListener(Landroidx/appcompat/widget/ActionMenuView$OnMenuItemClickListener;)V
+SPLandroidx/appcompat/widget/ActionMenuView;->setOverflowReserved(Z)V
+SPLandroidx/appcompat/widget/ActionMenuView;->setPopupTheme(I)V
+Landroidx/appcompat/widget/ActionMenuView$ActionMenuChildView;
+Landroidx/appcompat/widget/ActionMenuView$LayoutParams;
+SPLandroidx/appcompat/widget/ActionMenuView$LayoutParams;-><init>(II)V
+Landroidx/appcompat/widget/ActionMenuView$MenuBuilderCallback;
+SPLandroidx/appcompat/widget/ActionMenuView$MenuBuilderCallback;-><init>(Landroidx/appcompat/widget/ActionMenuView;)V
+Landroidx/appcompat/widget/ActionMenuView$OnMenuItemClickListener;
+Landroidx/appcompat/widget/AppCompatAutoCompleteTextView;
+SPLandroidx/appcompat/widget/AppCompatAutoCompleteTextView;-><clinit>()V
+SPLandroidx/appcompat/widget/AppCompatAutoCompleteTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/AppCompatAutoCompleteTextView;->initEmojiKeyListener(Landroidx/appcompat/widget/AppCompatEmojiEditTextHelper;)V
+SPLandroidx/appcompat/widget/AppCompatAutoCompleteTextView;->setCompoundDrawables(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
+Landroidx/appcompat/widget/AppCompatBackgroundHelper;
+SPLandroidx/appcompat/widget/AppCompatBackgroundHelper;-><init>(Landroid/view/View;)V
+SPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->applySupportBackgroundTint()V
+SPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
+SPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->setInternalBackgroundTint(Landroid/content/res/ColorStateList;)V
+SPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V
+SPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->shouldApplyFrameworkTintUsingColorFilter()Z
+Landroidx/appcompat/widget/AppCompatButton;
+SPLandroidx/appcompat/widget/AppCompatButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/AppCompatButton;->access$001(Landroidx/appcompat/widget/AppCompatButton;Landroid/graphics/Typeface;)V
+SPLandroidx/appcompat/widget/AppCompatButton;->drawableStateChanged()V
+SPLandroidx/appcompat/widget/AppCompatButton;->getEmojiTextViewHelper()Landroidx/appcompat/widget/AppCompatEmojiTextHelper;
+SPLandroidx/appcompat/widget/AppCompatButton;->getFontVariationSettingsManager()Landroidx/appcompat/widget/AppCompatTextHelper$FontVariationSettingsManager;
+SPLandroidx/appcompat/widget/AppCompatButton;->lambda$getFontVariationSettingsManager$0$androidx-appcompat-widget-AppCompatButton(Landroid/graphics/Typeface;)V
+SPLandroidx/appcompat/widget/AppCompatButton;->onInitializeAccessibilityNodeInfo(Landroid/view/accessibility/AccessibilityNodeInfo;)V
+SPLandroidx/appcompat/widget/AppCompatButton;->onLayout(ZIIII)V
+SPLandroidx/appcompat/widget/AppCompatButton;->onTextChanged(Ljava/lang/CharSequence;III)V
+SPLandroidx/appcompat/widget/AppCompatButton;->setAllCaps(Z)V
+SPLandroidx/appcompat/widget/AppCompatButton;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
+SPLandroidx/appcompat/widget/AppCompatButton;->setFilters([Landroid/text/InputFilter;)V
+SPLandroidx/appcompat/widget/AppCompatButton;->setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V
+SPLandroidx/appcompat/widget/AppCompatButton;->setTypeface(Landroid/graphics/Typeface;)V
+Landroidx/appcompat/widget/AppCompatButton$$ExternalSyntheticLambda0;
+SPLandroidx/appcompat/widget/AppCompatButton$$ExternalSyntheticLambda0;-><init>(Landroidx/appcompat/widget/AppCompatButton;)V
+SPLandroidx/appcompat/widget/AppCompatButton$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;)V
+Landroidx/appcompat/widget/AppCompatCheckedTextView;
+SPLandroidx/appcompat/widget/AppCompatCheckedTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/appcompat/widget/AppCompatCheckedTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/AppCompatCheckedTextView;->drawableStateChanged()V
+SPLandroidx/appcompat/widget/AppCompatCheckedTextView;->getEmojiTextViewHelper()Landroidx/appcompat/widget/AppCompatEmojiTextHelper;
+SPLandroidx/appcompat/widget/AppCompatCheckedTextView;->setAllCaps(Z)V
+SPLandroidx/appcompat/widget/AppCompatCheckedTextView;->setCompoundDrawables(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
+SPLandroidx/appcompat/widget/AppCompatCheckedTextView;->setCompoundDrawablesRelative(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
+SPLandroidx/appcompat/widget/AppCompatCheckedTextView;->setTextAppearance(Landroid/content/Context;I)V
+Landroidx/appcompat/widget/AppCompatCheckedTextViewHelper;
+SPLandroidx/appcompat/widget/AppCompatCheckedTextViewHelper;-><init>(Landroid/widget/CheckedTextView;)V
+SPLandroidx/appcompat/widget/AppCompatCheckedTextViewHelper;->applyCheckMarkTint()V
+SPLandroidx/appcompat/widget/AppCompatCheckedTextViewHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V
+Landroidx/appcompat/widget/AppCompatDrawableManager;
+SPLandroidx/appcompat/widget/AppCompatDrawableManager;->-$$Nest$sfgetDEFAULT_MODE()Landroid/graphics/PorterDuff$Mode;
+SPLandroidx/appcompat/widget/AppCompatDrawableManager;-><clinit>()V
+SPLandroidx/appcompat/widget/AppCompatDrawableManager;-><init>()V
+SPLandroidx/appcompat/widget/AppCompatDrawableManager;->get()Landroidx/appcompat/widget/AppCompatDrawableManager;
+SPLandroidx/appcompat/widget/AppCompatDrawableManager;->getDrawable(Landroid/content/Context;IZ)Landroid/graphics/drawable/Drawable;
+SPLandroidx/appcompat/widget/AppCompatDrawableManager;->getTintList(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
+SPLandroidx/appcompat/widget/AppCompatDrawableManager;->preload()V
+SPLandroidx/appcompat/widget/AppCompatDrawableManager;->tintDrawable(Landroid/graphics/drawable/Drawable;Landroidx/appcompat/widget/TintInfo;[I)V
+Landroidx/appcompat/widget/AppCompatDrawableManager$1;
+SPLandroidx/appcompat/widget/AppCompatDrawableManager$1;-><init>()V
+SPLandroidx/appcompat/widget/AppCompatDrawableManager$1;->arrayContains([II)Z
+SPLandroidx/appcompat/widget/AppCompatDrawableManager$1;->createDrawableFor(Landroidx/appcompat/widget/ResourceManagerInternal;Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
+SPLandroidx/appcompat/widget/AppCompatDrawableManager$1;->getTintListForDrawableRes(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
+SPLandroidx/appcompat/widget/AppCompatDrawableManager$1;->tintDrawable(Landroid/content/Context;ILandroid/graphics/drawable/Drawable;)Z
+SPLandroidx/appcompat/widget/AppCompatDrawableManager$1;->tintDrawableUsingColorFilter(Landroid/content/Context;ILandroid/graphics/drawable/Drawable;)Z
+Landroidx/appcompat/widget/AppCompatEditText;
+Landroidx/appcompat/widget/AppCompatEmojiEditTextHelper;
+SPLandroidx/appcompat/widget/AppCompatEmojiEditTextHelper;-><init>(Landroid/widget/EditText;)V
+SPLandroidx/appcompat/widget/AppCompatEmojiEditTextHelper;->getKeyListener(Landroid/text/method/KeyListener;)Landroid/text/method/KeyListener;
+SPLandroidx/appcompat/widget/AppCompatEmojiEditTextHelper;->isEmojiCapableKeyListener(Landroid/text/method/KeyListener;)Z
+SPLandroidx/appcompat/widget/AppCompatEmojiEditTextHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/AppCompatEmojiEditTextHelper;->setEnabled(Z)V
+Landroidx/appcompat/widget/AppCompatEmojiTextHelper;
+SPLandroidx/appcompat/widget/AppCompatEmojiTextHelper;-><init>(Landroid/widget/TextView;)V
+SPLandroidx/appcompat/widget/AppCompatEmojiTextHelper;->getFilters([Landroid/text/InputFilter;)[Landroid/text/InputFilter;
+SPLandroidx/appcompat/widget/AppCompatEmojiTextHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/AppCompatEmojiTextHelper;->setAllCaps(Z)V
+SPLandroidx/appcompat/widget/AppCompatEmojiTextHelper;->setEnabled(Z)V
+Landroidx/appcompat/widget/AppCompatImageButton;
+SPLandroidx/appcompat/widget/AppCompatImageButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/appcompat/widget/AppCompatImageButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/AppCompatImageButton;->drawableStateChanged()V
+SPLandroidx/appcompat/widget/AppCompatImageButton;->hasOverlappingRendering()Z
+SPLandroidx/appcompat/widget/AppCompatImageButton;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
+SPLandroidx/appcompat/widget/AppCompatImageButton;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
+Landroidx/appcompat/widget/AppCompatImageHelper;
+SPLandroidx/appcompat/widget/AppCompatImageHelper;-><init>(Landroid/widget/ImageView;)V
+SPLandroidx/appcompat/widget/AppCompatImageHelper;->applyImageLevel()V
+SPLandroidx/appcompat/widget/AppCompatImageHelper;->applySupportImageTint()V
+SPLandroidx/appcompat/widget/AppCompatImageHelper;->hasOverlappingRendering()Z
+SPLandroidx/appcompat/widget/AppCompatImageHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/AppCompatImageHelper;->obtainLevelFromDrawable(Landroid/graphics/drawable/Drawable;)V
+SPLandroidx/appcompat/widget/AppCompatImageHelper;->shouldApplyFrameworkTintUsingColorFilter()Z
+Landroidx/appcompat/widget/AppCompatImageView;
+SPLandroidx/appcompat/widget/AppCompatImageView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/appcompat/widget/AppCompatImageView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/AppCompatImageView;->drawableStateChanged()V
+SPLandroidx/appcompat/widget/AppCompatImageView;->hasOverlappingRendering()Z
+SPLandroidx/appcompat/widget/AppCompatImageView;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
+SPLandroidx/appcompat/widget/AppCompatImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
+Landroidx/appcompat/widget/AppCompatPopupWindow;
+SPLandroidx/appcompat/widget/AppCompatPopupWindow;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
+SPLandroidx/appcompat/widget/AppCompatPopupWindow;->init(Landroid/content/Context;Landroid/util/AttributeSet;II)V
+Landroidx/appcompat/widget/AppCompatSpinner;
+SPLandroidx/appcompat/widget/AppCompatSpinner;-><clinit>()V
+SPLandroidx/appcompat/widget/AppCompatSpinner;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/appcompat/widget/AppCompatSpinner;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/AppCompatSpinner;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
+SPLandroidx/appcompat/widget/AppCompatSpinner;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILandroid/content/res/Resources$Theme;)V
+SPLandroidx/appcompat/widget/AppCompatSpinner;->drawableStateChanged()V
+SPLandroidx/appcompat/widget/AppCompatSpinner;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
+Landroidx/appcompat/widget/AppCompatSpinner$1;
+SPLandroidx/appcompat/widget/AppCompatSpinner$1;-><init>(Landroidx/appcompat/widget/AppCompatSpinner;Landroid/view/View;Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;)V
+Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;
+SPLandroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;-><init>(Landroidx/appcompat/widget/AppCompatSpinner;Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;->setPromptText(Ljava/lang/CharSequence;)V
+Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup$1;
+SPLandroidx/appcompat/widget/AppCompatSpinner$DropdownPopup$1;-><init>(Landroidx/appcompat/widget/AppCompatSpinner$DropdownPopup;Landroidx/appcompat/widget/AppCompatSpinner;)V
+Landroidx/appcompat/widget/AppCompatSpinner$SpinnerPopup;
+Landroidx/appcompat/widget/AppCompatTextClassifierHelper;
+SPLandroidx/appcompat/widget/AppCompatTextClassifierHelper;-><init>(Landroid/widget/TextView;)V
+Landroidx/appcompat/widget/AppCompatTextHelper;
+SPLandroidx/appcompat/widget/AppCompatTextHelper;-><init>(Landroid/widget/TextView;)V
+SPLandroidx/appcompat/widget/AppCompatTextHelper;->applyCompoundDrawablesTints()V
+SPLandroidx/appcompat/widget/AppCompatTextHelper;->applyFontAndVariationSettings(Z)V
+SPLandroidx/appcompat/widget/AppCompatTextHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/AppCompatTextHelper;->makeFontCallback(II)Landroidx/core/content/res/ResourcesCompat$FontCallback;
+SPLandroidx/appcompat/widget/AppCompatTextHelper;->onLayout(ZIIII)V
+SPLandroidx/appcompat/widget/AppCompatTextHelper;->onSetCompoundDrawables()V
+SPLandroidx/appcompat/widget/AppCompatTextHelper;->onSetTextAppearance(Landroid/content/Context;I)V
+SPLandroidx/appcompat/widget/AppCompatTextHelper;->setAllCaps(Z)V
+SPLandroidx/appcompat/widget/AppCompatTextHelper;->setCompoundDrawables(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
+SPLandroidx/appcompat/widget/AppCompatTextHelper;->updateTypefaceAndStyle(Landroid/content/Context;Landroidx/appcompat/widget/TintTypedArray;)Z
+Landroidx/appcompat/widget/AppCompatTextHelper$1;
+SPLandroidx/appcompat/widget/AppCompatTextHelper$1;-><init>(Landroidx/appcompat/widget/AppCompatTextHelper;IILjava/lang/ref/WeakReference;)V
+SPLandroidx/appcompat/widget/AppCompatTextHelper$1;->onFontRetrievalFailed(I)V
+Landroidx/appcompat/widget/AppCompatTextHelper$FontVariationSettingsManager;
+SPLandroidx/appcompat/widget/AppCompatTextHelper$FontVariationSettingsManager;-><init>(Landroid/widget/TextView;Landroidx/core/util/Consumer;)V
+SPLandroidx/appcompat/widget/AppCompatTextHelper$FontVariationSettingsManager;->getTypeface()Landroid/graphics/Typeface;
+SPLandroidx/appcompat/widget/AppCompatTextHelper$FontVariationSettingsManager;->setTypeface(Landroid/graphics/Typeface;)V
+SPLandroidx/appcompat/widget/AppCompatTextHelper$FontVariationSettingsManager;->setTypefaceInternal(Landroid/graphics/Typeface;)V
+Landroidx/appcompat/widget/AppCompatTextView;
+SPLandroidx/appcompat/widget/AppCompatTextView;-><init>(Landroid/content/Context;)V
+SPLandroidx/appcompat/widget/AppCompatTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/appcompat/widget/AppCompatTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->access$1301(Landroidx/appcompat/widget/AppCompatTextView;Landroid/graphics/Typeface;)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->consumeTextFutureAndSetBlocking()V
+SPLandroidx/appcompat/widget/AppCompatTextView;->drawableStateChanged()V
+SPLandroidx/appcompat/widget/AppCompatTextView;->getEmojiTextViewHelper()Landroidx/appcompat/widget/AppCompatEmojiTextHelper;
+SPLandroidx/appcompat/widget/AppCompatTextView;->getFontVariationSettingsManager()Landroidx/appcompat/widget/AppCompatTextHelper$FontVariationSettingsManager;
+SPLandroidx/appcompat/widget/AppCompatTextView;->getText()Ljava/lang/CharSequence;
+SPLandroidx/appcompat/widget/AppCompatTextView;->getTypeface()Landroid/graphics/Typeface;
+SPLandroidx/appcompat/widget/AppCompatTextView;->lambda$getFontVariationSettingsManager$0$androidx-appcompat-widget-AppCompatTextView(Landroid/graphics/Typeface;)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->onLayout(ZIIII)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->onMeasure(II)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->onTextChanged(Ljava/lang/CharSequence;III)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->setAllCaps(Z)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->setCompoundDrawables(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->setCompoundDrawablesWithIntrinsicBounds(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->setFilters([Landroid/text/InputFilter;)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->setLineHeight(I)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->setTextAppearance(Landroid/content/Context;I)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->setTextSize(IF)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->setTypeface(Landroid/graphics/Typeface;)V
+SPLandroidx/appcompat/widget/AppCompatTextView;->setTypeface(Landroid/graphics/Typeface;I)V
+Landroidx/appcompat/widget/AppCompatTextView$$ExternalSyntheticLambda0;
+SPLandroidx/appcompat/widget/AppCompatTextView$$ExternalSyntheticLambda0;-><init>(Landroidx/appcompat/widget/AppCompatTextView;)V
+SPLandroidx/appcompat/widget/AppCompatTextView$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;)V
+Landroidx/appcompat/widget/AppCompatTextView$SuperCaller;
+Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;
+SPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;-><clinit>()V
+SPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;-><init>(Landroid/widget/TextView;)V
+SPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->getAutoSizeTextType()I
+SPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->supportsAutoSizeText()Z
+Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper$Impl;
+SPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper$Impl;-><init>()V
+Landroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper$Impl29;
+SPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper$Impl29;-><init>()V
+Landroidx/appcompat/widget/ContentFrameLayout;
+SPLandroidx/appcompat/widget/ContentFrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/appcompat/widget/ContentFrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/ContentFrameLayout;->getMinWidthMajor()Landroid/util/TypedValue;
+SPLandroidx/appcompat/widget/ContentFrameLayout;->getMinWidthMinor()Landroid/util/TypedValue;
+SPLandroidx/appcompat/widget/ContentFrameLayout;->onAttachedToWindow()V
+SPLandroidx/appcompat/widget/ContentFrameLayout;->onMeasure(II)V
+SPLandroidx/appcompat/widget/ContentFrameLayout;->setAttachListener(Landroidx/appcompat/widget/ContentFrameLayout$OnAttachListener;)V
+SPLandroidx/appcompat/widget/ContentFrameLayout;->setDecorPadding(IIII)V
+Landroidx/appcompat/widget/ContentFrameLayout$OnAttachListener;
+Landroidx/appcompat/widget/DecorToolbar;
+Landroidx/appcompat/widget/DrawableUtils;
+SPLandroidx/appcompat/widget/DrawableUtils;-><clinit>()V
+SPLandroidx/appcompat/widget/DrawableUtils;->fixDrawable(Landroid/graphics/drawable/Drawable;)V
+Landroidx/appcompat/widget/EmojiCompatConfigurationView;
+Landroidx/appcompat/widget/FitWindowsFrameLayout;
+SPLandroidx/appcompat/widget/FitWindowsFrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/appcompat/widget/FitWindowsFrameLayout;->fitSystemWindows(Landroid/graphics/Rect;)Z
+Landroidx/appcompat/widget/FitWindowsViewGroup;
+Landroidx/appcompat/widget/ForwardingListener;
+SPLandroidx/appcompat/widget/ForwardingListener;-><init>(Landroid/view/View;)V
+SPLandroidx/appcompat/widget/ForwardingListener;->onViewAttachedToWindow(Landroid/view/View;)V
+Landroidx/appcompat/widget/LinearLayoutCompat;
+SPLandroidx/appcompat/widget/LinearLayoutCompat;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/appcompat/widget/LinearLayoutCompat;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->checkLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Z
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->forceUniformHeight(II)V
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->generateLayoutParams(Landroid/util/AttributeSet;)Landroid/view/ViewGroup$LayoutParams;
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->generateLayoutParams(Landroid/util/AttributeSet;)Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->getChildrenSkipCount(Landroid/view/View;I)I
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->getLocationOffset(Landroid/view/View;)I
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->getNextLocationOffset(Landroid/view/View;)I
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View;
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->getVirtualChildCount()I
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->hasDividerBeforeChildAt(I)Z
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->layoutHorizontal(IIII)V
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->measureChildBeforeLayout(Landroid/view/View;IIIII)V
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->measureHorizontal(II)V
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->onInitializeAccessibilityNodeInfo(Landroid/view/accessibility/AccessibilityNodeInfo;)V
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->onLayout(ZIIII)V
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->onMeasure(II)V
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->setBaselineAligned(Z)V
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->setChildFrame(Landroid/view/View;IIII)V
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->setDividerDrawable(Landroid/graphics/drawable/Drawable;)V
+SPLandroidx/appcompat/widget/LinearLayoutCompat;->setOrientation(I)V
+Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;
+SPLandroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;-><init>(II)V
+SPLandroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+Landroidx/appcompat/widget/ListPopupWindow;
+SPLandroidx/appcompat/widget/ListPopupWindow;-><clinit>()V
+SPLandroidx/appcompat/widget/ListPopupWindow;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/ListPopupWindow;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
+SPLandroidx/appcompat/widget/ListPopupWindow;->setAnchorView(Landroid/view/View;)V
+SPLandroidx/appcompat/widget/ListPopupWindow;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
+SPLandroidx/appcompat/widget/ListPopupWindow;->setModal(Z)V
+SPLandroidx/appcompat/widget/ListPopupWindow;->setOnItemClickListener(Landroid/widget/AdapterView$OnItemClickListener;)V
+SPLandroidx/appcompat/widget/ListPopupWindow;->setPromptPosition(I)V
+Landroidx/appcompat/widget/ListPopupWindow$ListSelectorHider;
+SPLandroidx/appcompat/widget/ListPopupWindow$ListSelectorHider;-><init>(Landroidx/appcompat/widget/ListPopupWindow;)V
+Landroidx/appcompat/widget/ListPopupWindow$PopupScrollListener;
+SPLandroidx/appcompat/widget/ListPopupWindow$PopupScrollListener;-><init>(Landroidx/appcompat/widget/ListPopupWindow;)V
+Landroidx/appcompat/widget/ListPopupWindow$PopupTouchInterceptor;
+SPLandroidx/appcompat/widget/ListPopupWindow$PopupTouchInterceptor;-><init>(Landroidx/appcompat/widget/ListPopupWindow;)V
+Landroidx/appcompat/widget/ListPopupWindow$ResizePopupRunnable;
+SPLandroidx/appcompat/widget/ListPopupWindow$ResizePopupRunnable;-><init>(Landroidx/appcompat/widget/ListPopupWindow;)V
+Landroidx/appcompat/widget/ResourceManagerInternal;
+SPLandroidx/appcompat/widget/ResourceManagerInternal;-><clinit>()V
+SPLandroidx/appcompat/widget/ResourceManagerInternal;-><init>()V
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->checkVectorDrawableSetup(Landroid/content/Context;)V
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->createCacheKey(Landroid/util/TypedValue;)J
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->createDrawableIfNeeded(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->createTintFilter(Landroid/content/res/ColorStateList;Landroid/graphics/PorterDuff$Mode;[I)Landroid/graphics/PorterDuffColorFilter;
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->get()Landroidx/appcompat/widget/ResourceManagerInternal;
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->getCachedDrawable(Landroid/content/Context;J)Landroid/graphics/drawable/Drawable;
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->getDrawable(Landroid/content/Context;IZ)Landroid/graphics/drawable/Drawable;
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->getPorterDuffColorFilter(ILandroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuffColorFilter;
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->getTintList(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->getTintListFromCache(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->installDefaultInflateDelegates(Landroidx/appcompat/widget/ResourceManagerInternal;)V
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->isVectorDrawable(Landroid/graphics/drawable/Drawable;)Z
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->loadDrawableFromDelegates(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->setHooks(Landroidx/appcompat/widget/ResourceManagerInternal$ResourceManagerHooks;)V
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->tintDrawable(Landroid/content/Context;IZLandroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->tintDrawable(Landroid/graphics/drawable/Drawable;Landroidx/appcompat/widget/TintInfo;[I)V
+SPLandroidx/appcompat/widget/ResourceManagerInternal;->tintDrawableUsingColorFilter(Landroid/content/Context;ILandroid/graphics/drawable/Drawable;)Z
+Landroidx/appcompat/widget/ResourceManagerInternal$ColorFilterLruCache;
+SPLandroidx/appcompat/widget/ResourceManagerInternal$ColorFilterLruCache;-><init>(I)V
+SPLandroidx/appcompat/widget/ResourceManagerInternal$ColorFilterLruCache;->generateCacheKey(ILandroid/graphics/PorterDuff$Mode;)I
+SPLandroidx/appcompat/widget/ResourceManagerInternal$ColorFilterLruCache;->get(ILandroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuffColorFilter;
+SPLandroidx/appcompat/widget/ResourceManagerInternal$ColorFilterLruCache;->put(ILandroid/graphics/PorterDuff$Mode;Landroid/graphics/PorterDuffColorFilter;)Landroid/graphics/PorterDuffColorFilter;
+Landroidx/appcompat/widget/ResourceManagerInternal$ResourceManagerHooks;
+Landroidx/appcompat/widget/RtlSpacingHelper;
+SPLandroidx/appcompat/widget/RtlSpacingHelper;-><init>()V
+SPLandroidx/appcompat/widget/RtlSpacingHelper;->getEnd()I
+SPLandroidx/appcompat/widget/RtlSpacingHelper;->getStart()I
+SPLandroidx/appcompat/widget/RtlSpacingHelper;->setAbsolute(II)V
+SPLandroidx/appcompat/widget/RtlSpacingHelper;->setDirection(Z)V
+SPLandroidx/appcompat/widget/RtlSpacingHelper;->setRelative(II)V
+Landroidx/appcompat/widget/SearchView;
+SPLandroidx/appcompat/widget/SearchView;-><clinit>()V
+SPLandroidx/appcompat/widget/SearchView;-><init>(Landroid/content/Context;)V
+SPLandroidx/appcompat/widget/SearchView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/appcompat/widget/SearchView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/SearchView;->getDecoratedHint(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+SPLandroidx/appcompat/widget/SearchView;->getQueryHint()Ljava/lang/CharSequence;
+SPLandroidx/appcompat/widget/SearchView;->isSubmitAreaEnabled()Z
+SPLandroidx/appcompat/widget/SearchView;->setIconifiedByDefault(Z)V
+SPLandroidx/appcompat/widget/SearchView;->setMaxWidth(I)V
+SPLandroidx/appcompat/widget/SearchView;->setOnQueryTextListener(Landroidx/appcompat/widget/SearchView$OnQueryTextListener;)V
+SPLandroidx/appcompat/widget/SearchView;->setQueryHint(Ljava/lang/CharSequence;)V
+SPLandroidx/appcompat/widget/SearchView;->updateCloseButton()V
+SPLandroidx/appcompat/widget/SearchView;->updateQueryHint()V
+SPLandroidx/appcompat/widget/SearchView;->updateSubmitArea()V
+SPLandroidx/appcompat/widget/SearchView;->updateSubmitButton(Z)V
+SPLandroidx/appcompat/widget/SearchView;->updateViewsVisibility(Z)V
+SPLandroidx/appcompat/widget/SearchView;->updateVoiceButton(Z)V
+Landroidx/appcompat/widget/SearchView$1;
+SPLandroidx/appcompat/widget/SearchView$1;-><init>(Landroidx/appcompat/widget/SearchView;)V
+Landroidx/appcompat/widget/SearchView$10;
+SPLandroidx/appcompat/widget/SearchView$10;-><init>(Landroidx/appcompat/widget/SearchView;)V
+Landroidx/appcompat/widget/SearchView$2;
+SPLandroidx/appcompat/widget/SearchView$2;-><init>(Landroidx/appcompat/widget/SearchView;)V
+Landroidx/appcompat/widget/SearchView$3;
+SPLandroidx/appcompat/widget/SearchView$3;-><init>(Landroidx/appcompat/widget/SearchView;)V
+Landroidx/appcompat/widget/SearchView$4;
+SPLandroidx/appcompat/widget/SearchView$4;-><init>(Landroidx/appcompat/widget/SearchView;)V
+Landroidx/appcompat/widget/SearchView$5;
+SPLandroidx/appcompat/widget/SearchView$5;-><init>(Landroidx/appcompat/widget/SearchView;)V
+Landroidx/appcompat/widget/SearchView$6;
+SPLandroidx/appcompat/widget/SearchView$6;-><init>(Landroidx/appcompat/widget/SearchView;)V
+Landroidx/appcompat/widget/SearchView$7;
+SPLandroidx/appcompat/widget/SearchView$7;-><init>(Landroidx/appcompat/widget/SearchView;)V
+Landroidx/appcompat/widget/SearchView$8;
+SPLandroidx/appcompat/widget/SearchView$8;-><init>(Landroidx/appcompat/widget/SearchView;)V
+Landroidx/appcompat/widget/SearchView$9;
+SPLandroidx/appcompat/widget/SearchView$9;-><init>(Landroidx/appcompat/widget/SearchView;)V
+Landroidx/appcompat/widget/SearchView$OnQueryTextListener;
+Landroidx/appcompat/widget/SearchView$PreQAutoCompleteTextViewReflector;
+Landroidx/appcompat/widget/SearchView$SearchAutoComplete;
+SPLandroidx/appcompat/widget/SearchView$SearchAutoComplete;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/appcompat/widget/SearchView$SearchAutoComplete;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/SearchView$SearchAutoComplete;->enoughToFilter()Z
+SPLandroidx/appcompat/widget/SearchView$SearchAutoComplete;->getSearchViewTextMinWidthDp()I
+SPLandroidx/appcompat/widget/SearchView$SearchAutoComplete;->onFinishInflate()V
+SPLandroidx/appcompat/widget/SearchView$SearchAutoComplete;->setSearchView(Landroidx/appcompat/widget/SearchView;)V
+Landroidx/appcompat/widget/SearchView$SearchAutoComplete$1;
+SPLandroidx/appcompat/widget/SearchView$SearchAutoComplete$1;-><init>(Landroidx/appcompat/widget/SearchView$SearchAutoComplete;)V
+Landroidx/appcompat/widget/ThemeUtils;
+SPLandroidx/appcompat/widget/ThemeUtils;-><clinit>()V
+SPLandroidx/appcompat/widget/ThemeUtils;->checkAppCompatTheme(Landroid/view/View;Landroid/content/Context;)V
+SPLandroidx/appcompat/widget/ThemeUtils;->getThemeAttrColor(Landroid/content/Context;I)I
+Landroidx/appcompat/widget/TintInfo;
+SPLandroidx/appcompat/widget/TintInfo;-><init>()V
+Landroidx/appcompat/widget/TintTypedArray;
+SPLandroidx/appcompat/widget/TintTypedArray;-><init>(Landroid/content/Context;Landroid/content/res/TypedArray;)V
+SPLandroidx/appcompat/widget/TintTypedArray;->getBoolean(IZ)Z
+SPLandroidx/appcompat/widget/TintTypedArray;->getColor(II)I
+SPLandroidx/appcompat/widget/TintTypedArray;->getColorStateList(I)Landroid/content/res/ColorStateList;
+SPLandroidx/appcompat/widget/TintTypedArray;->getDimensionPixelOffset(II)I
+SPLandroidx/appcompat/widget/TintTypedArray;->getDimensionPixelSize(II)I
+SPLandroidx/appcompat/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable;
+SPLandroidx/appcompat/widget/TintTypedArray;->getDrawableIfKnown(I)Landroid/graphics/drawable/Drawable;
+SPLandroidx/appcompat/widget/TintTypedArray;->getFloat(IF)F
+SPLandroidx/appcompat/widget/TintTypedArray;->getFont(IILandroidx/core/content/res/ResourcesCompat$FontCallback;)Landroid/graphics/Typeface;
+SPLandroidx/appcompat/widget/TintTypedArray;->getInt(II)I
+SPLandroidx/appcompat/widget/TintTypedArray;->getInteger(II)I
+SPLandroidx/appcompat/widget/TintTypedArray;->getLayoutDimension(II)I
+SPLandroidx/appcompat/widget/TintTypedArray;->getResourceId(II)I
+SPLandroidx/appcompat/widget/TintTypedArray;->getString(I)Ljava/lang/String;
+SPLandroidx/appcompat/widget/TintTypedArray;->getText(I)Ljava/lang/CharSequence;
+SPLandroidx/appcompat/widget/TintTypedArray;->getTextArray(I)[Ljava/lang/CharSequence;
+SPLandroidx/appcompat/widget/TintTypedArray;->getWrappedTypeArray()Landroid/content/res/TypedArray;
+SPLandroidx/appcompat/widget/TintTypedArray;->hasValue(I)Z
+SPLandroidx/appcompat/widget/TintTypedArray;->obtainStyledAttributes(Landroid/content/Context;I[I)Landroidx/appcompat/widget/TintTypedArray;
+SPLandroidx/appcompat/widget/TintTypedArray;->obtainStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[I)Landroidx/appcompat/widget/TintTypedArray;
+SPLandroidx/appcompat/widget/TintTypedArray;->obtainStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[III)Landroidx/appcompat/widget/TintTypedArray;
+SPLandroidx/appcompat/widget/TintTypedArray;->recycle()V
+Landroidx/appcompat/widget/Toolbar;
+SPLandroidx/appcompat/widget/Toolbar;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/appcompat/widget/Toolbar;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/Toolbar;->addCustomViewsWithGravity(Ljava/util/List;I)V
+SPLandroidx/appcompat/widget/Toolbar;->addSystemView(Landroid/view/View;Z)V
+SPLandroidx/appcompat/widget/Toolbar;->checkLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Z
+SPLandroidx/appcompat/widget/Toolbar;->ensureContentInsets()V
+SPLandroidx/appcompat/widget/Toolbar;->ensureMenu()V
+SPLandroidx/appcompat/widget/Toolbar;->ensureMenuView()V
+SPLandroidx/appcompat/widget/Toolbar;->ensureNavButtonView()V
+SPLandroidx/appcompat/widget/Toolbar;->generateDefaultLayoutParams()Landroidx/appcompat/widget/Toolbar$LayoutParams;
+SPLandroidx/appcompat/widget/Toolbar;->generateLayoutParams(Landroid/util/AttributeSet;)Landroid/view/ViewGroup$LayoutParams;
+SPLandroidx/appcompat/widget/Toolbar;->generateLayoutParams(Landroid/util/AttributeSet;)Landroidx/appcompat/widget/Toolbar$LayoutParams;
+SPLandroidx/appcompat/widget/Toolbar;->getChildTop(Landroid/view/View;I)I
+SPLandroidx/appcompat/widget/Toolbar;->getChildVerticalGravity(I)I
+SPLandroidx/appcompat/widget/Toolbar;->getContentInsetEnd()I
+SPLandroidx/appcompat/widget/Toolbar;->getContentInsetStart()I
+SPLandroidx/appcompat/widget/Toolbar;->getCurrentContentInsetEnd()I
+SPLandroidx/appcompat/widget/Toolbar;->getCurrentContentInsetLeft()I
+SPLandroidx/appcompat/widget/Toolbar;->getCurrentContentInsetRight()I
+SPLandroidx/appcompat/widget/Toolbar;->getCurrentContentInsetStart()I
+SPLandroidx/appcompat/widget/Toolbar;->getHorizontalMargins(Landroid/view/View;)I
+SPLandroidx/appcompat/widget/Toolbar;->getMenu()Landroid/view/Menu;
+SPLandroidx/appcompat/widget/Toolbar;->getNavigationContentDescription()Ljava/lang/CharSequence;
+SPLandroidx/appcompat/widget/Toolbar;->getNavigationIcon()Landroid/graphics/drawable/Drawable;
+SPLandroidx/appcompat/widget/Toolbar;->getSubtitle()Ljava/lang/CharSequence;
+SPLandroidx/appcompat/widget/Toolbar;->getTitle()Ljava/lang/CharSequence;
+SPLandroidx/appcompat/widget/Toolbar;->getVerticalMargins(Landroid/view/View;)I
+SPLandroidx/appcompat/widget/Toolbar;->getViewListMeasuredWidth(Ljava/util/List;[I)I
+SPLandroidx/appcompat/widget/Toolbar;->hasExpandedActionView()Z
+SPLandroidx/appcompat/widget/Toolbar;->isChildOrHidden(Landroid/view/View;)Z
+SPLandroidx/appcompat/widget/Toolbar;->layoutChildLeft(Landroid/view/View;I[II)I
+SPLandroidx/appcompat/widget/Toolbar;->layoutChildRight(Landroid/view/View;I[II)I
+SPLandroidx/appcompat/widget/Toolbar;->measureChildCollapseMargins(Landroid/view/View;IIII[I)I
+SPLandroidx/appcompat/widget/Toolbar;->measureChildConstrained(Landroid/view/View;IIIII)V
+SPLandroidx/appcompat/widget/Toolbar;->onAttachedToWindow()V
+SPLandroidx/appcompat/widget/Toolbar;->onLayout(ZIIII)V
+SPLandroidx/appcompat/widget/Toolbar;->onMeasure(II)V
+SPLandroidx/appcompat/widget/Toolbar;->onRtlPropertiesChanged(I)V
+SPLandroidx/appcompat/widget/Toolbar;->setBackInvokedCallbackEnabled(Z)V
+SPLandroidx/appcompat/widget/Toolbar;->setMenuCallbacks(Landroidx/appcompat/view/menu/MenuPresenter$Callback;Landroidx/appcompat/view/menu/MenuBuilder$Callback;)V
+SPLandroidx/appcompat/widget/Toolbar;->setNavigationContentDescription(Ljava/lang/CharSequence;)V
+SPLandroidx/appcompat/widget/Toolbar;->setNavigationIcon(Landroid/graphics/drawable/Drawable;)V
+SPLandroidx/appcompat/widget/Toolbar;->setNavigationOnClickListener(Landroid/view/View$OnClickListener;)V
+SPLandroidx/appcompat/widget/Toolbar;->setOnMenuItemClickListener(Landroidx/appcompat/widget/Toolbar$OnMenuItemClickListener;)V
+SPLandroidx/appcompat/widget/Toolbar;->setPopupTheme(I)V
+SPLandroidx/appcompat/widget/Toolbar;->setSubtitle(Ljava/lang/CharSequence;)V
+SPLandroidx/appcompat/widget/Toolbar;->setTitle(Ljava/lang/CharSequence;)V
+SPLandroidx/appcompat/widget/Toolbar;->shouldCollapse()Z
+SPLandroidx/appcompat/widget/Toolbar;->shouldLayout(Landroid/view/View;)Z
+SPLandroidx/appcompat/widget/Toolbar;->updateBackInvokedCallbackState()V
+Landroidx/appcompat/widget/Toolbar$$ExternalSyntheticLambda1;
+SPLandroidx/appcompat/widget/Toolbar$$ExternalSyntheticLambda1;-><init>(Landroidx/appcompat/widget/Toolbar;)V
+Landroidx/appcompat/widget/Toolbar$1;
+SPLandroidx/appcompat/widget/Toolbar$1;-><init>(Landroidx/appcompat/widget/Toolbar;)V
+Landroidx/appcompat/widget/Toolbar$2;
+SPLandroidx/appcompat/widget/Toolbar$2;-><init>(Landroidx/appcompat/widget/Toolbar;)V
+Landroidx/appcompat/widget/Toolbar$3;
+SPLandroidx/appcompat/widget/Toolbar$3;-><init>(Landroidx/appcompat/widget/Toolbar;)V
+Landroidx/appcompat/widget/Toolbar$Api33Impl;
+SPLandroidx/appcompat/widget/Toolbar$Api33Impl;->findOnBackInvokedDispatcher(Landroid/view/View;)Landroid/window/OnBackInvokedDispatcher;
+Landroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;
+SPLandroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;-><init>(Landroidx/appcompat/widget/Toolbar;)V
+SPLandroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->flagActionItems()Z
+SPLandroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->initForMenu(Landroid/content/Context;Landroidx/appcompat/view/menu/MenuBuilder;)V
+SPLandroidx/appcompat/widget/Toolbar$ExpandedActionViewMenuPresenter;->updateMenuView(Z)V
+Landroidx/appcompat/widget/Toolbar$LayoutParams;
+SPLandroidx/appcompat/widget/Toolbar$LayoutParams;-><init>(II)V
+SPLandroidx/appcompat/widget/Toolbar$LayoutParams;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+Landroidx/appcompat/widget/Toolbar$OnMenuItemClickListener;
+Landroidx/appcompat/widget/ToolbarWidgetWrapper;
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;-><init>(Landroidx/appcompat/widget/Toolbar;Z)V
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;-><init>(Landroidx/appcompat/widget/Toolbar;ZII)V
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->detectDisplayOptions()I
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->getContext()Landroid/content/Context;
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->getDisplayOptions()I
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->getMenu()Landroid/view/Menu;
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->getViewGroup()Landroid/view/ViewGroup;
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->setDefaultNavigationContentDescription(I)V
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->setDisplayOptions(I)V
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->setMenuCallbacks(Landroidx/appcompat/view/menu/MenuPresenter$Callback;Landroidx/appcompat/view/menu/MenuBuilder$Callback;)V
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->setMenuPrepared()V
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->setNavigationContentDescription(I)V
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->setNavigationContentDescription(Ljava/lang/CharSequence;)V
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->setNavigationIcon(Landroid/graphics/drawable/Drawable;)V
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->setSubtitle(Ljava/lang/CharSequence;)V
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->setTitle(Ljava/lang/CharSequence;)V
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->setTitleInt(Ljava/lang/CharSequence;)V
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->setWindowCallback(Landroid/view/Window$Callback;)V
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->setWindowTitle(Ljava/lang/CharSequence;)V
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->updateHomeAccessibility()V
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->updateNavigationIcon()V
+Landroidx/appcompat/widget/ToolbarWidgetWrapper$1;
+SPLandroidx/appcompat/widget/ToolbarWidgetWrapper$1;-><init>(Landroidx/appcompat/widget/ToolbarWidgetWrapper;)V
+Landroidx/appcompat/widget/TooltipCompat;
+SPLandroidx/appcompat/widget/TooltipCompat;->setTooltipText(Landroid/view/View;Ljava/lang/CharSequence;)V
+Landroidx/appcompat/widget/TooltipCompat$Api26Impl;
+SPLandroidx/appcompat/widget/TooltipCompat$Api26Impl;->setTooltipText(Landroid/view/View;Ljava/lang/CharSequence;)V
+Landroidx/appcompat/widget/ViewStubCompat;
+SPLandroidx/appcompat/widget/ViewStubCompat;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/appcompat/widget/ViewStubCompat;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/appcompat/widget/ViewStubCompat;->setVisibility(I)V
+Landroidx/appcompat/widget/ViewUtils;
+SPLandroidx/appcompat/widget/ViewUtils;-><clinit>()V
+SPLandroidx/appcompat/widget/ViewUtils;->isLayoutRtl(Landroid/view/View;)Z
+SPLandroidx/appcompat/widget/ViewUtils;->makeOptionalFitsSystemWindows(Landroid/view/View;)V
+Landroidx/arch/core/executor/ArchTaskExecutor;
+SPLandroidx/arch/core/executor/ArchTaskExecutor;-><clinit>()V
+SPLandroidx/arch/core/executor/ArchTaskExecutor;-><init>()V
+SPLandroidx/arch/core/executor/ArchTaskExecutor;->getInstance()Landroidx/arch/core/executor/ArchTaskExecutor;
+SPLandroidx/arch/core/executor/ArchTaskExecutor;->isMainThread()Z
+SPLandroidx/arch/core/executor/ArchTaskExecutor;->postToMainThread(Ljava/lang/Runnable;)V
+Landroidx/arch/core/executor/ArchTaskExecutor$$ExternalSyntheticLambda0;
+SPLandroidx/arch/core/executor/ArchTaskExecutor$$ExternalSyntheticLambda0;-><init>()V
+Landroidx/arch/core/executor/ArchTaskExecutor$$ExternalSyntheticLambda1;
+SPLandroidx/arch/core/executor/ArchTaskExecutor$$ExternalSyntheticLambda1;-><init>()V
+Landroidx/arch/core/executor/DefaultTaskExecutor;
+SPLandroidx/arch/core/executor/DefaultTaskExecutor;-><init>()V
+SPLandroidx/arch/core/executor/DefaultTaskExecutor;->createAsync(Landroid/os/Looper;)Landroid/os/Handler;
+SPLandroidx/arch/core/executor/DefaultTaskExecutor;->isMainThread()Z
+SPLandroidx/arch/core/executor/DefaultTaskExecutor;->postToMainThread(Ljava/lang/Runnable;)V
+Landroidx/arch/core/executor/DefaultTaskExecutor$1;
+SPLandroidx/arch/core/executor/DefaultTaskExecutor$1;-><init>(Landroidx/arch/core/executor/DefaultTaskExecutor;)V
+Landroidx/arch/core/executor/DefaultTaskExecutor$Api28Impl;
+SPLandroidx/arch/core/executor/DefaultTaskExecutor$Api28Impl;->createAsync(Landroid/os/Looper;)Landroid/os/Handler;
+Landroidx/arch/core/executor/TaskExecutor;
+SPLandroidx/arch/core/executor/TaskExecutor;-><init>()V
+Landroidx/arch/core/internal/SafeIterableMap;
+SPLandroidx/arch/core/internal/SafeIterableMap;-><init>()V
+SPLandroidx/arch/core/internal/SafeIterableMap;->get(Ljava/lang/Object;)Landroidx/arch/core/internal/SafeIterableMap$Entry;
+SPLandroidx/arch/core/internal/SafeIterableMap;->iteratorWithAdditions()Landroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;
+SPLandroidx/arch/core/internal/SafeIterableMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Landroidx/arch/core/internal/SafeIterableMap$Entry;
+SPLandroidx/arch/core/internal/SafeIterableMap;->putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/arch/core/internal/SafeIterableMap$Entry;
+SPLandroidx/arch/core/internal/SafeIterableMap$Entry;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+Landroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;
+SPLandroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;-><init>(Landroidx/arch/core/internal/SafeIterableMap;)V
+SPLandroidx/arch/core/internal/SafeIterableMap$IteratorWithAdditions;->hasNext()Z
+Landroidx/arch/core/internal/SafeIterableMap$SupportRemove;
+SPLandroidx/arch/core/internal/SafeIterableMap$SupportRemove;-><init>()V
+Landroidx/browser/customtabs/CustomTabsCallback;
+Landroidx/browser/customtabs/CustomTabsClient;
+SPLandroidx/browser/customtabs/CustomTabsClient;-><init>(Landroid/support/customtabs/ICustomTabsService;Landroid/content/ComponentName;Landroid/content/Context;)V
+SPLandroidx/browser/customtabs/CustomTabsClient;->bindCustomTabsService(Landroid/content/Context;Ljava/lang/String;Landroidx/browser/customtabs/CustomTabsServiceConnection;)Z
+SPLandroidx/browser/customtabs/CustomTabsClient;->createCallbackWrapper(Landroidx/browser/customtabs/CustomTabsCallback;)Landroid/support/customtabs/ICustomTabsCallback$Stub;
+SPLandroidx/browser/customtabs/CustomTabsClient;->newSession(Landroidx/browser/customtabs/CustomTabsCallback;)Landroidx/browser/customtabs/CustomTabsSession;
+SPLandroidx/browser/customtabs/CustomTabsClient;->newSessionInternal(Landroidx/browser/customtabs/CustomTabsCallback;Landroid/app/PendingIntent;)Landroidx/browser/customtabs/CustomTabsSession;
+SPLandroidx/browser/customtabs/CustomTabsClient;->warmup(J)Z
+Landroidx/browser/customtabs/CustomTabsClient$3;
+SPLandroidx/browser/customtabs/CustomTabsClient$3;-><init>(Landroidx/browser/customtabs/CustomTabsClient;Landroidx/browser/customtabs/CustomTabsCallback;)V
+Landroidx/browser/customtabs/CustomTabsServiceConnection;
+SPLandroidx/browser/customtabs/CustomTabsServiceConnection;-><init>()V
+SPLandroidx/browser/customtabs/CustomTabsServiceConnection;->onServiceConnected(Landroid/content/ComponentName;Landroid/os/IBinder;)V
+SPLandroidx/browser/customtabs/CustomTabsServiceConnection;->setApplicationContext(Landroid/content/Context;)V
+Landroidx/browser/customtabs/CustomTabsServiceConnection$1;
+SPLandroidx/browser/customtabs/CustomTabsServiceConnection$1;-><init>(Landroidx/browser/customtabs/CustomTabsServiceConnection;Landroid/support/customtabs/ICustomTabsService;Landroid/content/ComponentName;Landroid/content/Context;)V
+Landroidx/browser/customtabs/CustomTabsSession;
+SPLandroidx/browser/customtabs/CustomTabsSession;-><init>(Landroid/support/customtabs/ICustomTabsService;Landroid/support/customtabs/ICustomTabsCallback;Landroid/content/ComponentName;Landroid/app/PendingIntent;)V
+Landroidx/collection/ArrayMap;
+SPLandroidx/collection/ArrayMap;-><init>()V
+SPLandroidx/collection/ArrayMap;->keySet()Ljava/util/Set;
+Landroidx/collection/ArrayMap$KeySet;
+SPLandroidx/collection/ArrayMap$KeySet;-><init>(Landroidx/collection/ArrayMap;)V
+SPLandroidx/collection/ArrayMap$KeySet;->isEmpty()Z
+Landroidx/collection/ArraySet;
+SPLandroidx/collection/ArraySet;-><init>()V
+SPLandroidx/collection/ArraySet;-><init>(I)V
+SPLandroidx/collection/ArraySet;-><init>(IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/collection/ArraySet;->add(Ljava/lang/Object;)Z
+SPLandroidx/collection/ArraySet;->clear()V
+SPLandroidx/collection/ArraySet;->getArray$collection()[Ljava/lang/Object;
+SPLandroidx/collection/ArraySet;->getHashes$collection()[I
+SPLandroidx/collection/ArraySet;->get_size$collection()I
+SPLandroidx/collection/ArraySet;->iterator()Ljava/util/Iterator;
+SPLandroidx/collection/ArraySet;->setArray$collection([Ljava/lang/Object;)V
+SPLandroidx/collection/ArraySet;->setHashes$collection([I)V
+SPLandroidx/collection/ArraySet;->set_size$collection(I)V
+SPLandroidx/collection/ArraySet;->toArray()[Ljava/lang/Object;
+SPLandroidx/collection/ArraySet;->valueAt(I)Ljava/lang/Object;
+Landroidx/collection/ArraySet$ElementIterator;
+SPLandroidx/collection/ArraySet$ElementIterator;-><init>(Landroidx/collection/ArraySet;)V
+SPLandroidx/collection/ArraySet$ElementIterator;->elementAt(I)Ljava/lang/Object;
+Landroidx/collection/ArraySetKt;
+SPLandroidx/collection/ArraySetKt;->allocArrays(Landroidx/collection/ArraySet;I)V
+SPLandroidx/collection/ArraySetKt;->binarySearchInternal(Landroidx/collection/ArraySet;I)I
+SPLandroidx/collection/ArraySetKt;->indexOf(Landroidx/collection/ArraySet;Ljava/lang/Object;I)I
+Landroidx/collection/IndexBasedArrayIterator;
+SPLandroidx/collection/IndexBasedArrayIterator;-><init>(I)V
+SPLandroidx/collection/IndexBasedArrayIterator;->hasNext()Z
+SPLandroidx/collection/IndexBasedArrayIterator;->next()Ljava/lang/Object;
+Landroidx/collection/LongSparseArray;
+SPLandroidx/collection/LongSparseArray;-><init>()V
+SPLandroidx/collection/LongSparseArray;-><init>(I)V
+SPLandroidx/collection/LongSparseArray;-><init>(IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/collection/LongSparseArray;->clear()V
+SPLandroidx/collection/LongSparseArray;->get(J)Ljava/lang/Object;
+Landroidx/collection/LruCache;
+SPLandroidx/collection/LruCache;-><init>(I)V
+SPLandroidx/collection/LruCache;->create(Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/collection/LruCache;->get(Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/collection/LruCache;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/collection/LruCache;->safeSizeOf(Ljava/lang/Object;Ljava/lang/Object;)I
+SPLandroidx/collection/LruCache;->sizeOf(Ljava/lang/Object;Ljava/lang/Object;)I
+SPLandroidx/collection/LruCache;->trimToSize(I)V
+Landroidx/collection/MutableScatterMap;
+SPLandroidx/collection/MutableScatterMap;-><init>(I)V
+SPLandroidx/collection/MutableScatterMap;-><init>(IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/collection/MutableScatterMap;->adjustStorage$collection()V
+SPLandroidx/collection/MutableScatterMap;->findFirstAvailableSlot(I)I
+SPLandroidx/collection/MutableScatterMap;->findInsertIndex(Ljava/lang/Object;)I
+SPLandroidx/collection/MutableScatterMap;->initializeGrowth()V
+SPLandroidx/collection/MutableScatterMap;->initializeMetadata(I)V
+SPLandroidx/collection/MutableScatterMap;->initializeStorage(I)V
+SPLandroidx/collection/MutableScatterMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/collection/MutableScatterMap;->removeValueAt(I)Ljava/lang/Object;
+SPLandroidx/collection/MutableScatterMap;->resizeStorage$collection(I)V
+SPLandroidx/collection/MutableScatterMap;->set(Ljava/lang/Object;Ljava/lang/Object;)V
+Landroidx/collection/ScatterMap;
+SPLandroidx/collection/ScatterMap;-><init>()V
+SPLandroidx/collection/ScatterMap;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/collection/ScatterMap;->containsKey(Ljava/lang/Object;)Z
+SPLandroidx/collection/ScatterMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/collection/ScatterMap;->getCapacity()I
+SPLandroidx/collection/ScatterMap;->getSize()I
+Landroidx/collection/ScatterMapKt;
+SPLandroidx/collection/ScatterMapKt;-><clinit>()V
+SPLandroidx/collection/ScatterMapKt;->loadedCapacity(I)I
+SPLandroidx/collection/ScatterMapKt;->nextCapacity(I)I
+SPLandroidx/collection/ScatterMapKt;->normalizeCapacity(I)I
+SPLandroidx/collection/ScatterMapKt;->unloadedCapacity(I)I
+Landroidx/collection/SimpleArrayMap;
+SPLandroidx/collection/SimpleArrayMap;-><init>()V
+SPLandroidx/collection/SimpleArrayMap;-><init>(I)V
+SPLandroidx/collection/SimpleArrayMap;-><init>(IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/collection/SimpleArrayMap;->clear()V
+SPLandroidx/collection/SimpleArrayMap;->containsKey(Ljava/lang/Object;)Z
+SPLandroidx/collection/SimpleArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/collection/SimpleArrayMap;->indexOf(Ljava/lang/Object;I)I
+SPLandroidx/collection/SimpleArrayMap;->indexOfKey(Ljava/lang/Object;)I
+SPLandroidx/collection/SimpleArrayMap;->isEmpty()Z
+SPLandroidx/collection/SimpleArrayMap;->keyAt(I)Ljava/lang/Object;
+SPLandroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/collection/SimpleArrayMap;->removeAt(I)Ljava/lang/Object;
+SPLandroidx/collection/SimpleArrayMap;->size()I
+SPLandroidx/collection/SimpleArrayMap;->valueAt(I)Ljava/lang/Object;
+Landroidx/collection/internal/ContainerHelpersKt;
+SPLandroidx/collection/internal/ContainerHelpersKt;-><clinit>()V
+SPLandroidx/collection/internal/ContainerHelpersKt;->binarySearch([III)I
+SPLandroidx/collection/internal/ContainerHelpersKt;->binarySearch([JIJ)I
+SPLandroidx/collection/internal/ContainerHelpersKt;->idealByteArraySize(I)I
+SPLandroidx/collection/internal/ContainerHelpersKt;->idealLongArraySize(I)I
+Landroidx/collection/internal/Lock;
+SPLandroidx/collection/internal/Lock;-><init>()V
+Landroidx/collection/internal/LruHashMap;
+SPLandroidx/collection/internal/LruHashMap;-><init>(IF)V
+SPLandroidx/collection/internal/LruHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/collection/internal/LruHashMap;->isEmpty()Z
+SPLandroidx/collection/internal/LruHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/compose/animation/core/MutatorMutex$$ExternalSyntheticBackportWithForwarding0;
+SPLandroidx/compose/animation/core/MutatorMutex$$ExternalSyntheticBackportWithForwarding0;->m(Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/Object;Ljava/lang/Object;)Z
+Landroidx/compose/ui/platform/HapticDefaults$$ExternalSyntheticApiModelOutline0;
+SPLandroidx/compose/ui/platform/HapticDefaults$$ExternalSyntheticApiModelOutline0;->m(Landroid/graphics/Outline;Landroid/graphics/Path;)V
+Landroidx/concurrent/futures/AbstractResolvableFuture;
+SPLandroidx/concurrent/futures/AbstractResolvableFuture;-><clinit>()V
+SPLandroidx/concurrent/futures/AbstractResolvableFuture;-><init>()V
+SPLandroidx/concurrent/futures/AbstractResolvableFuture;->afterDone()V
+SPLandroidx/concurrent/futures/AbstractResolvableFuture;->clearListeners(Landroidx/concurrent/futures/AbstractResolvableFuture$Listener;)Landroidx/concurrent/futures/AbstractResolvableFuture$Listener;
+SPLandroidx/concurrent/futures/AbstractResolvableFuture;->complete(Landroidx/concurrent/futures/AbstractResolvableFuture;)V
+SPLandroidx/concurrent/futures/AbstractResolvableFuture;->releaseWaiters()V
+SPLandroidx/concurrent/futures/AbstractResolvableFuture;->set(Ljava/lang/Object;)Z
+Landroidx/concurrent/futures/AbstractResolvableFuture$AtomicHelper;
+SPLandroidx/concurrent/futures/AbstractResolvableFuture$AtomicHelper;-><init>()V
+SPLandroidx/concurrent/futures/AbstractResolvableFuture$AtomicHelper;-><init>(Landroidx/concurrent/futures/AbstractResolvableFuture$1;)V
+Landroidx/concurrent/futures/AbstractResolvableFuture$Listener;
+SPLandroidx/concurrent/futures/AbstractResolvableFuture$Listener;-><clinit>()V
+SPLandroidx/concurrent/futures/AbstractResolvableFuture$Listener;-><init>(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
+Landroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper;
+SPLandroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper;-><init>(Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;)V
+SPLandroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper;->casListeners(Landroidx/concurrent/futures/AbstractResolvableFuture;Landroidx/concurrent/futures/AbstractResolvableFuture$Listener;Landroidx/concurrent/futures/AbstractResolvableFuture$Listener;)Z
+SPLandroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper;->casValue(Landroidx/concurrent/futures/AbstractResolvableFuture;Ljava/lang/Object;Ljava/lang/Object;)Z
+SPLandroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper;->casWaiters(Landroidx/concurrent/futures/AbstractResolvableFuture;Landroidx/concurrent/futures/AbstractResolvableFuture$Waiter;Landroidx/concurrent/futures/AbstractResolvableFuture$Waiter;)Z
+Landroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper$$ExternalSyntheticBackportWithForwarding0;
+SPLandroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper$$ExternalSyntheticBackportWithForwarding0;->m(Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+Landroidx/concurrent/futures/AbstractResolvableFuture$Waiter;
+SPLandroidx/concurrent/futures/AbstractResolvableFuture$Waiter;-><clinit>()V
+SPLandroidx/concurrent/futures/AbstractResolvableFuture$Waiter;-><init>(Z)V
+Landroidx/concurrent/futures/CallbackToFutureAdapter;
+SPLandroidx/concurrent/futures/CallbackToFutureAdapter;->getFuture(Landroidx/concurrent/futures/CallbackToFutureAdapter$Resolver;)Lcom/google/common/util/concurrent/ListenableFuture;
+Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;
+SPLandroidx/concurrent/futures/CallbackToFutureAdapter$Completer;-><init>()V
+PLandroidx/concurrent/futures/CallbackToFutureAdapter$Completer;->finalize()V
+SPLandroidx/concurrent/futures/CallbackToFutureAdapter$Completer;->set(Ljava/lang/Object;)Z
+SPLandroidx/concurrent/futures/CallbackToFutureAdapter$Completer;->setCompletedNormally()V
+Landroidx/concurrent/futures/CallbackToFutureAdapter$Resolver;
+Landroidx/concurrent/futures/CallbackToFutureAdapter$SafeFuture;
+SPLandroidx/concurrent/futures/CallbackToFutureAdapter$SafeFuture;-><init>(Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;)V
+SPLandroidx/concurrent/futures/CallbackToFutureAdapter$SafeFuture;->set(Ljava/lang/Object;)Z
+Landroidx/concurrent/futures/CallbackToFutureAdapter$SafeFuture$1;
+SPLandroidx/concurrent/futures/CallbackToFutureAdapter$SafeFuture$1;-><init>(Landroidx/concurrent/futures/CallbackToFutureAdapter$SafeFuture;)V
+Landroidx/concurrent/futures/ResolvableFuture;
+SPLandroidx/concurrent/futures/ResolvableFuture;-><init>()V
+SPLandroidx/concurrent/futures/ResolvableFuture;->create()Landroidx/concurrent/futures/ResolvableFuture;
+PLandroidx/concurrent/futures/ResolvableFuture;->set(Ljava/lang/Object;)Z
+Landroidx/coordinatorlayout/R$attr;
+Landroidx/coordinatorlayout/R$styleable;
+SPLandroidx/coordinatorlayout/R$styleable;-><clinit>()V
+Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;-><clinit>()V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->acquireTempRect()Landroid/graphics/Rect;
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->checkLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Z
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->drawChild(Landroid/graphics/Canvas;Landroid/view/View;J)Z
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->drawableStateChanged()V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->ensurePreDrawListener()V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->generateLayoutParams(Landroid/util/AttributeSet;)Landroid/view/ViewGroup$LayoutParams;
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->generateLayoutParams(Landroid/util/AttributeSet;)Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->getResolvedLayoutParams(Landroid/view/View;)Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->getSuggestedMinimumHeight()I
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->getSuggestedMinimumWidth()I
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->hasDependencies(Landroid/view/View;)Z
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->layoutChild(Landroid/view/View;I)V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->onAttachedToWindow()V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->onLayout(ZIIII)V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->onLayoutChild(Landroid/view/View;I)V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->onMeasure(II)V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->onMeasureChild(Landroid/view/View;IIII)V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->parseBehavior(Landroid/content/Context;Landroid/util/AttributeSet;Ljava/lang/String;)Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->prepareChildren()V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->releaseTempRect(Landroid/graphics/Rect;)V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->resetTouchBehaviors(Z)V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->resolveGravity(I)I
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout;->setupForInsets()V
+Landroidx/coordinatorlayout/widget/CoordinatorLayout$AttachedBehavior;
+Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;->layoutDependsOn(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;)Z
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;->onAttachedToLayoutParams(Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;)V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;->onTouchEvent(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/MotionEvent;)Z
+Landroidx/coordinatorlayout/widget/CoordinatorLayout$DefaultBehavior;
+Landroidx/coordinatorlayout/widget/CoordinatorLayout$HierarchyChangeListener;
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$HierarchyChangeListener;-><init>(Landroidx/coordinatorlayout/widget/CoordinatorLayout;)V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$HierarchyChangeListener;->onChildViewAdded(Landroid/view/View;Landroid/view/View;)V
+Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->checkAnchorChanged()Z
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->dependsOn(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;)Z
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->findAnchorView(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;)Landroid/view/View;
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->getBehavior()Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->resetTouchBehaviorTracking()V
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->shouldDodge(Landroid/view/View;I)Z
+Landroidx/coordinatorlayout/widget/CoordinatorLayout$ViewElevationComparator;
+SPLandroidx/coordinatorlayout/widget/CoordinatorLayout$ViewElevationComparator;-><init>()V
+Landroidx/coordinatorlayout/widget/DirectedAcyclicGraph;
+SPLandroidx/coordinatorlayout/widget/DirectedAcyclicGraph;-><init>()V
+SPLandroidx/coordinatorlayout/widget/DirectedAcyclicGraph;->addNode(Ljava/lang/Object;)V
+SPLandroidx/coordinatorlayout/widget/DirectedAcyclicGraph;->clear()V
+SPLandroidx/coordinatorlayout/widget/DirectedAcyclicGraph;->dfs(Ljava/lang/Object;Ljava/util/ArrayList;Ljava/util/HashSet;)V
+SPLandroidx/coordinatorlayout/widget/DirectedAcyclicGraph;->getSortedList()Ljava/util/ArrayList;
+SPLandroidx/coordinatorlayout/widget/DirectedAcyclicGraph;->hasOutgoingEdges(Ljava/lang/Object;)Z
+Landroidx/core/R$attr;
+Landroidx/core/R$id;
+Landroidx/core/R$styleable;
+SPLandroidx/core/R$styleable;-><clinit>()V
+Landroidx/core/app/ActivityCompat$OnRequestPermissionsResultCallback;
+Landroidx/core/app/ActivityCompat$RequestPermissionsRequestCodeValidator;
+Landroidx/core/app/ComponentActivity;
+SPLandroidx/core/app/ComponentActivity;-><init>()V
+SPLandroidx/core/app/ComponentActivity;->getLifecycle()Landroidx/lifecycle/Lifecycle;
+SPLandroidx/core/app/ComponentActivity;->onCreate(Landroid/os/Bundle;)V
+Landroidx/core/app/CoreComponentFactory;
+SPLandroidx/core/app/CoreComponentFactory;-><init>()V
+SPLandroidx/core/app/CoreComponentFactory;->checkCompatWrapper(Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/core/app/CoreComponentFactory;->instantiateActivity(Ljava/lang/ClassLoader;Ljava/lang/String;Landroid/content/Intent;)Landroid/app/Activity;
+SPLandroidx/core/app/CoreComponentFactory;->instantiateApplication(Ljava/lang/ClassLoader;Ljava/lang/String;)Landroid/app/Application;
+SPLandroidx/core/app/CoreComponentFactory;->instantiateProvider(Ljava/lang/ClassLoader;Ljava/lang/String;)Landroid/content/ContentProvider;
+SPLandroidx/core/app/CoreComponentFactory;->instantiateReceiver(Ljava/lang/ClassLoader;Ljava/lang/String;Landroid/content/Intent;)Landroid/content/BroadcastReceiver;
+Landroidx/core/app/CoreComponentFactory$CompatWrapped;
+Landroidx/core/app/NavUtils;
+SPLandroidx/core/app/NavUtils;->getParentActivityName(Landroid/app/Activity;)Ljava/lang/String;
+SPLandroidx/core/app/NavUtils;->getParentActivityName(Landroid/content/Context;Landroid/content/ComponentName;)Ljava/lang/String;
+Landroidx/core/app/NotificationChannelCompat;
+SPLandroidx/core/app/NotificationChannelCompat;-><init>(Ljava/lang/String;I)V
+SPLandroidx/core/app/NotificationChannelCompat;->getNotificationChannel()Landroid/app/NotificationChannel;
+Landroidx/core/app/NotificationChannelCompat$Api26Impl;
+SPLandroidx/core/app/NotificationChannelCompat$Api26Impl;->createNotificationChannel(Ljava/lang/String;Ljava/lang/CharSequence;I)Landroid/app/NotificationChannel;
+SPLandroidx/core/app/NotificationChannelCompat$Api26Impl;->enableLights(Landroid/app/NotificationChannel;Z)V
+SPLandroidx/core/app/NotificationChannelCompat$Api26Impl;->enableVibration(Landroid/app/NotificationChannel;Z)V
+SPLandroidx/core/app/NotificationChannelCompat$Api26Impl;->setDescription(Landroid/app/NotificationChannel;Ljava/lang/String;)V
+SPLandroidx/core/app/NotificationChannelCompat$Api26Impl;->setGroup(Landroid/app/NotificationChannel;Ljava/lang/String;)V
+SPLandroidx/core/app/NotificationChannelCompat$Api26Impl;->setLightColor(Landroid/app/NotificationChannel;I)V
+SPLandroidx/core/app/NotificationChannelCompat$Api26Impl;->setShowBadge(Landroid/app/NotificationChannel;Z)V
+SPLandroidx/core/app/NotificationChannelCompat$Api26Impl;->setSound(Landroid/app/NotificationChannel;Landroid/net/Uri;Landroid/media/AudioAttributes;)V
+SPLandroidx/core/app/NotificationChannelCompat$Api26Impl;->setVibrationPattern(Landroid/app/NotificationChannel;[J)V
+Landroidx/core/app/NotificationChannelCompat$Builder;
+SPLandroidx/core/app/NotificationChannelCompat$Builder;-><init>(Ljava/lang/String;I)V
+SPLandroidx/core/app/NotificationChannelCompat$Builder;->build()Landroidx/core/app/NotificationChannelCompat;
+SPLandroidx/core/app/NotificationChannelCompat$Builder;->setName(Ljava/lang/CharSequence;)Landroidx/core/app/NotificationChannelCompat$Builder;
+SPLandroidx/core/app/NotificationChannelCompat$Builder;->setShowBadge(Z)Landroidx/core/app/NotificationChannelCompat$Builder;
+SPLandroidx/core/app/NotificationChannelCompat$Builder;->setVibrationEnabled(Z)Landroidx/core/app/NotificationChannelCompat$Builder;
+SPLandroidx/core/app/NotificationChannelCompat$Builder;->setVibrationPattern([J)Landroidx/core/app/NotificationChannelCompat$Builder;
+Landroidx/core/app/NotificationManagerCompat;
+SPLandroidx/core/app/NotificationManagerCompat;-><clinit>()V
+SPLandroidx/core/app/NotificationManagerCompat;-><init>(Landroid/content/Context;)V
+SPLandroidx/core/app/NotificationManagerCompat;->createNotificationChannel(Landroid/app/NotificationChannel;)V
+SPLandroidx/core/app/NotificationManagerCompat;->createNotificationChannel(Landroidx/core/app/NotificationChannelCompat;)V
+SPLandroidx/core/app/NotificationManagerCompat;->from(Landroid/content/Context;)Landroidx/core/app/NotificationManagerCompat;
+Landroidx/core/app/NotificationManagerCompat$Api26Impl;
+SPLandroidx/core/app/NotificationManagerCompat$Api26Impl;->createNotificationChannel(Landroid/app/NotificationManager;Landroid/app/NotificationChannel;)V
+Landroidx/core/app/OnMultiWindowModeChangedProvider;
+Landroidx/core/app/OnNewIntentProvider;
+Landroidx/core/app/OnPictureInPictureModeChangedProvider;
+Landroidx/core/app/OnUserLeaveHintProvider;
+Landroidx/core/app/PendingIntentCompat;
+SPLandroidx/core/app/PendingIntentCompat;->addMutabilityFlags(ZI)I
+SPLandroidx/core/app/PendingIntentCompat;->getActivity(Landroid/content/Context;ILandroid/content/Intent;IZ)Landroid/app/PendingIntent;
+SPLandroidx/core/app/PendingIntentCompat;->getBroadcast(Landroid/content/Context;ILandroid/content/Intent;IZ)Landroid/app/PendingIntent;
+Landroidx/core/app/TaskStackBuilder$SupportParentable;
+Landroidx/core/content/ContextCompat;
+SPLandroidx/core/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I
+SPLandroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
+SPLandroidx/core/content/ContextCompat;->getColorStateList(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
+SPLandroidx/core/content/ContextCompat;->getDataDir(Landroid/content/Context;)Ljava/io/File;
+SPLandroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
+SPLandroidx/core/content/ContextCompat;->getSystemService(Landroid/content/Context;Ljava/lang/Class;)Ljava/lang/Object;
+SPLandroidx/core/content/ContextCompat;->registerReceiver(Landroid/content/Context;Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent;
+SPLandroidx/core/content/ContextCompat;->registerReceiver(Landroid/content/Context;Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;Ljava/lang/String;Landroid/os/Handler;I)Landroid/content/Intent;
+Landroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/content/pm/ShortcutInfo$Builder;Ljava/lang/CharSequence;)Landroid/content/pm/ShortcutInfo$Builder;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m$3()V
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/Context;Ljava/lang/String;)Landroid/content/pm/ShortcutInfo$Builder;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;)Landroid/content/pm/ShortcutInfo;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;I)Landroid/content/pm/ShortcutInfo$Builder;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;Landroid/graphics/drawable/Icon;)Landroid/content/pm/ShortcutInfo$Builder;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;Ljava/lang/CharSequence;)Landroid/content/pm/ShortcutInfo$Builder;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;Z)Landroid/content/pm/ShortcutInfo$Builder;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/ShortcutInfo$Builder;[Landroid/content/Intent;)Landroid/content/pm/ShortcutInfo$Builder;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowManager;)Landroid/view/WindowMetrics;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowMetrics;)Landroid/graphics/Rect;
+SPLandroidx/core/content/ContextCompat$$ExternalSyntheticApiModelOutline0;->m(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/content/Context;[ILandroid/util/AttributeSet;Landroid/content/res/TypedArray;II)V
+Landroidx/core/content/ContextCompat$Api24Impl;
+SPLandroidx/core/content/ContextCompat$Api24Impl;->getDataDir(Landroid/content/Context;)Ljava/io/File;
+Landroidx/core/content/ContextCompat$Api33Impl;
+SPLandroidx/core/content/ContextCompat$Api33Impl;->registerReceiver(Landroid/content/Context;Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;Ljava/lang/String;Landroid/os/Handler;I)Landroid/content/Intent;
+Landroidx/core/content/FileProvider;
+SPLandroidx/core/content/FileProvider;-><clinit>()V
+SPLandroidx/core/content/FileProvider;-><init>()V
+SPLandroidx/core/content/FileProvider;-><init>(I)V
+SPLandroidx/core/content/FileProvider;->attachInfo(Landroid/content/Context;Landroid/content/pm/ProviderInfo;)V
+SPLandroidx/core/content/FileProvider;->onCreate()Z
+Landroidx/core/content/OnConfigurationChangedProvider;
+Landroidx/core/content/OnTrimMemoryProvider;
+Landroidx/core/content/pm/PackageInfoCompat;
+SPLandroidx/core/content/pm/PackageInfoCompat;->getLongVersionCode(Landroid/content/pm/PackageInfo;)J
+Landroidx/core/content/pm/PackageInfoCompat$Api28Impl;
+SPLandroidx/core/content/pm/PackageInfoCompat$Api28Impl;->getLongVersionCode(Landroid/content/pm/PackageInfo;)J
+Landroidx/core/content/pm/ShortcutInfoCompat;
+SPLandroidx/core/content/pm/ShortcutInfoCompat;-><init>()V
+SPLandroidx/core/content/pm/ShortcutInfoCompat;->toShortcutInfo()Landroid/content/pm/ShortcutInfo;
+Landroidx/core/content/pm/ShortcutInfoCompat$Api33Impl;
+SPLandroidx/core/content/pm/ShortcutInfoCompat$Api33Impl;->setExcludedFromSurfaces(Landroid/content/pm/ShortcutInfo$Builder;I)V
+Landroidx/core/content/pm/ShortcutInfoCompat$Builder;
+SPLandroidx/core/content/pm/ShortcutInfoCompat$Builder;-><init>(Landroid/content/Context;Ljava/lang/String;)V
+SPLandroidx/core/content/pm/ShortcutInfoCompat$Builder;->build()Landroidx/core/content/pm/ShortcutInfoCompat;
+SPLandroidx/core/content/pm/ShortcutInfoCompat$Builder;->setIcon(Landroidx/core/graphics/drawable/IconCompat;)Landroidx/core/content/pm/ShortcutInfoCompat$Builder;
+SPLandroidx/core/content/pm/ShortcutInfoCompat$Builder;->setIntent(Landroid/content/Intent;)Landroidx/core/content/pm/ShortcutInfoCompat$Builder;
+SPLandroidx/core/content/pm/ShortcutInfoCompat$Builder;->setIntents([Landroid/content/Intent;)Landroidx/core/content/pm/ShortcutInfoCompat$Builder;
+SPLandroidx/core/content/pm/ShortcutInfoCompat$Builder;->setLongLabel(Ljava/lang/CharSequence;)Landroidx/core/content/pm/ShortcutInfoCompat$Builder;
+SPLandroidx/core/content/pm/ShortcutInfoCompat$Builder;->setShortLabel(Ljava/lang/CharSequence;)Landroidx/core/content/pm/ShortcutInfoCompat$Builder;
+Landroidx/core/content/pm/ShortcutInfoCompatSaver;
+SPLandroidx/core/content/pm/ShortcutInfoCompatSaver;-><init>()V
+Landroidx/core/content/pm/ShortcutInfoCompatSaver$NoopImpl;
+SPLandroidx/core/content/pm/ShortcutInfoCompatSaver$NoopImpl;-><init>()V
+SPLandroidx/core/content/pm/ShortcutInfoCompatSaver$NoopImpl;->addShortcuts(Ljava/util/List;)Ljava/lang/Object;
+SPLandroidx/core/content/pm/ShortcutInfoCompatSaver$NoopImpl;->addShortcuts(Ljava/util/List;)Ljava/lang/Void;
+Landroidx/core/content/pm/ShortcutManagerCompat;
+SPLandroidx/core/content/pm/ShortcutManagerCompat;-><clinit>()V
+SPLandroidx/core/content/pm/ShortcutManagerCompat;->addDynamicShortcuts(Landroid/content/Context;Ljava/util/List;)Z
+SPLandroidx/core/content/pm/ShortcutManagerCompat;->getShortcutInfoListeners(Landroid/content/Context;)Ljava/util/List;
+SPLandroidx/core/content/pm/ShortcutManagerCompat;->getShortcutInfoSaverInstance(Landroid/content/Context;)Landroidx/core/content/pm/ShortcutInfoCompatSaver;
+SPLandroidx/core/content/pm/ShortcutManagerCompat;->removeShortcutsExcludedFromSurface(Ljava/util/List;I)Ljava/util/List;
+Landroidx/core/content/res/ColorStateListInflaterCompat;
+SPLandroidx/core/content/res/ColorStateListInflaterCompat;-><clinit>()V
+SPLandroidx/core/content/res/ColorStateListInflaterCompat;->createFromXml(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/content/res/Resources$Theme;)Landroid/content/res/ColorStateList;
+SPLandroidx/core/content/res/ColorStateListInflaterCompat;->createFromXmlInner(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)Landroid/content/res/ColorStateList;
+SPLandroidx/core/content/res/ColorStateListInflaterCompat;->getTypedValue()Landroid/util/TypedValue;
+SPLandroidx/core/content/res/ColorStateListInflaterCompat;->inflate(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)Landroid/content/res/ColorStateList;
+SPLandroidx/core/content/res/ColorStateListInflaterCompat;->isColorInt(Landroid/content/res/Resources;I)Z
+SPLandroidx/core/content/res/ColorStateListInflaterCompat;->modulateColorAlpha(IFF)I
+SPLandroidx/core/content/res/ColorStateListInflaterCompat;->obtainAttributes(Landroid/content/res/Resources;Landroid/content/res/Resources$Theme;Landroid/util/AttributeSet;[I)Landroid/content/res/TypedArray;
+Landroidx/core/content/res/GrowingArrayUtils;
+SPLandroidx/core/content/res/GrowingArrayUtils;->append([III)[I
+SPLandroidx/core/content/res/GrowingArrayUtils;->append([Ljava/lang/Object;ILjava/lang/Object;)[Ljava/lang/Object;
+Landroidx/core/content/res/ResourcesCompat;
+SPLandroidx/core/content/res/ResourcesCompat;-><clinit>()V
+SPLandroidx/core/content/res/ResourcesCompat;->addColorStateListToCache(Landroidx/core/content/res/ResourcesCompat$ColorStateListCacheKey;ILandroid/content/res/ColorStateList;Landroid/content/res/Resources$Theme;)V
+SPLandroidx/core/content/res/ResourcesCompat;->getCachedColorStateList(Landroidx/core/content/res/ResourcesCompat$ColorStateListCacheKey;I)Landroid/content/res/ColorStateList;
+SPLandroidx/core/content/res/ResourcesCompat;->getColorStateList(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)Landroid/content/res/ColorStateList;
+SPLandroidx/core/content/res/ResourcesCompat;->getFont(Landroid/content/Context;ILandroid/util/TypedValue;ILandroidx/core/content/res/ResourcesCompat$FontCallback;)Landroid/graphics/Typeface;
+SPLandroidx/core/content/res/ResourcesCompat;->getTypedValue()Landroid/util/TypedValue;
+SPLandroidx/core/content/res/ResourcesCompat;->inflateColorStateList(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)Landroid/content/res/ColorStateList;
+SPLandroidx/core/content/res/ResourcesCompat;->isColorInt(Landroid/content/res/Resources;I)Z
+SPLandroidx/core/content/res/ResourcesCompat;->loadFont(Landroid/content/Context;ILandroid/util/TypedValue;ILandroidx/core/content/res/ResourcesCompat$FontCallback;Landroid/os/Handler;ZZ)Landroid/graphics/Typeface;
+SPLandroidx/core/content/res/ResourcesCompat;->loadFont(Landroid/content/Context;Landroid/content/res/Resources;Landroid/util/TypedValue;IILandroidx/core/content/res/ResourcesCompat$FontCallback;Landroid/os/Handler;ZZ)Landroid/graphics/Typeface;
+Landroidx/core/content/res/ResourcesCompat$ColorStateListCacheEntry;
+SPLandroidx/core/content/res/ResourcesCompat$ColorStateListCacheEntry;-><init>(Landroid/content/res/ColorStateList;Landroid/content/res/Configuration;Landroid/content/res/Resources$Theme;)V
+Landroidx/core/content/res/ResourcesCompat$ColorStateListCacheKey;
+SPLandroidx/core/content/res/ResourcesCompat$ColorStateListCacheKey;-><init>(Landroid/content/res/Resources;Landroid/content/res/Resources$Theme;)V
+SPLandroidx/core/content/res/ResourcesCompat$ColorStateListCacheKey;->equals(Ljava/lang/Object;)Z
+SPLandroidx/core/content/res/ResourcesCompat$ColorStateListCacheKey;->hashCode()I
+Landroidx/core/content/res/ResourcesCompat$FontCallback;
+SPLandroidx/core/content/res/ResourcesCompat$FontCallback;-><init>()V
+SPLandroidx/core/content/res/ResourcesCompat$FontCallback;->callbackFailAsync(ILandroid/os/Handler;)V
+SPLandroidx/core/content/res/ResourcesCompat$FontCallback;->getHandler(Landroid/os/Handler;)Landroid/os/Handler;
+SPLandroidx/core/content/res/ResourcesCompat$FontCallback;->lambda$callbackFailAsync$1$androidx-core-content-res-ResourcesCompat$FontCallback(I)V
+Landroidx/core/content/res/ResourcesCompat$FontCallback$$ExternalSyntheticLambda1;
+SPLandroidx/core/content/res/ResourcesCompat$FontCallback$$ExternalSyntheticLambda1;-><init>(Landroidx/core/content/res/ResourcesCompat$FontCallback;I)V
+SPLandroidx/core/content/res/ResourcesCompat$FontCallback$$ExternalSyntheticLambda1;->run()V
+Landroidx/core/content/res/TypedArrayKt;
+SPLandroidx/core/content/res/TypedArrayKt;->checkAttribute(Landroid/content/res/TypedArray;I)V
+SPLandroidx/core/content/res/TypedArrayKt;->getDrawableOrThrow(Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
+Landroidx/core/graphics/ColorUtils;
+SPLandroidx/core/graphics/ColorUtils;-><clinit>()V
+SPLandroidx/core/graphics/ColorUtils;->compositeAlpha(II)I
+SPLandroidx/core/graphics/ColorUtils;->compositeColors(II)I
+SPLandroidx/core/graphics/ColorUtils;->compositeComponent(IIIII)I
+SPLandroidx/core/graphics/ColorUtils;->setAlphaComponent(II)I
+Landroidx/core/graphics/Insets;
+SPLandroidx/core/graphics/Insets;-><clinit>()V
+SPLandroidx/core/graphics/Insets;-><init>(IIII)V
+SPLandroidx/core/graphics/Insets;->equals(Ljava/lang/Object;)Z
+SPLandroidx/core/graphics/Insets;->max(Landroidx/core/graphics/Insets;Landroidx/core/graphics/Insets;)Landroidx/core/graphics/Insets;
+SPLandroidx/core/graphics/Insets;->min(Landroidx/core/graphics/Insets;Landroidx/core/graphics/Insets;)Landroidx/core/graphics/Insets;
+SPLandroidx/core/graphics/Insets;->of(IIII)Landroidx/core/graphics/Insets;
+SPLandroidx/core/graphics/Insets;->toCompatInsets(Landroid/graphics/Insets;)Landroidx/core/graphics/Insets;
+Landroidx/core/graphics/TypefaceCompat;
+SPLandroidx/core/graphics/TypefaceCompat;-><clinit>()V
+SPLandroidx/core/graphics/TypefaceCompat;->create(Landroid/content/Context;Landroid/graphics/Typeface;I)Landroid/graphics/Typeface;
+SPLandroidx/core/graphics/TypefaceCompat;->createFromFontInfo(Landroid/content/Context;Landroid/os/CancellationSignal;[Landroidx/core/provider/FontsContractCompat$FontInfo;I)Landroid/graphics/Typeface;
+SPLandroidx/core/graphics/TypefaceCompat;->getSystemFontFamily(Ljava/lang/String;)Landroid/graphics/Typeface;
+Landroidx/core/graphics/TypefaceCompatApi29Impl;
+SPLandroidx/core/graphics/TypefaceCompatApi29Impl;-><init>()V
+SPLandroidx/core/graphics/TypefaceCompatApi29Impl;->createFromFontInfo(Landroid/content/Context;Landroid/os/CancellationSignal;[Landroidx/core/provider/FontsContractCompat$FontInfo;I)Landroid/graphics/Typeface;
+SPLandroidx/core/graphics/TypefaceCompatApi29Impl;->findBaseFont(Landroid/graphics/fonts/FontFamily;I)Landroid/graphics/fonts/Font;
+SPLandroidx/core/graphics/TypefaceCompatApi29Impl;->getFont(Landroid/os/CancellationSignal;Landroidx/core/provider/FontsContractCompat$FontInfo;Landroid/content/ContentResolver;)Landroid/graphics/fonts/Font;
+SPLandroidx/core/graphics/TypefaceCompatApi29Impl;->getFontFamily(Landroid/os/CancellationSignal;[Landroidx/core/provider/FontsContractCompat$FontInfo;Landroid/content/ContentResolver;)Landroid/graphics/fonts/FontFamily;
+SPLandroidx/core/graphics/TypefaceCompatApi29Impl;->getFontFromProvider(Landroid/os/CancellationSignal;Landroidx/core/provider/FontsContractCompat$FontInfo;Landroid/content/ContentResolver;)Landroid/graphics/fonts/Font;
+SPLandroidx/core/graphics/TypefaceCompatApi29Impl;->getMatchScore(Landroid/graphics/fonts/FontStyle;Landroid/graphics/fonts/FontStyle;)I
+Landroidx/core/graphics/TypefaceCompatApi31Impl;
+SPLandroidx/core/graphics/TypefaceCompatApi31Impl;-><init>()V
+Landroidx/core/graphics/TypefaceCompatBaseImpl;
+SPLandroidx/core/graphics/TypefaceCompatBaseImpl;-><init>()V
+Landroidx/core/graphics/TypefaceCompatUtil;
+SPLandroidx/core/graphics/TypefaceCompatUtil;->mmap(Landroid/content/Context;Landroid/os/CancellationSignal;Landroid/net/Uri;)Ljava/nio/ByteBuffer;
+Landroidx/core/graphics/drawable/DrawableCompat;
+SPLandroidx/core/graphics/drawable/DrawableCompat;->getLayoutDirection(Landroid/graphics/drawable/Drawable;)I
+SPLandroidx/core/graphics/drawable/DrawableCompat;->setHotspotBounds(Landroid/graphics/drawable/Drawable;IIII)V
+SPLandroidx/core/graphics/drawable/DrawableCompat;->wrap(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+Landroidx/core/graphics/drawable/IconCompat;
+SPLandroidx/core/graphics/drawable/IconCompat;-><clinit>()V
+SPLandroidx/core/graphics/drawable/IconCompat;-><init>(I)V
+SPLandroidx/core/graphics/drawable/IconCompat;->createWithResource(Landroid/content/Context;I)Landroidx/core/graphics/drawable/IconCompat;
+SPLandroidx/core/graphics/drawable/IconCompat;->createWithResource(Landroid/content/res/Resources;Ljava/lang/String;I)Landroidx/core/graphics/drawable/IconCompat;
+SPLandroidx/core/graphics/drawable/IconCompat;->getResPackage()Ljava/lang/String;
+SPLandroidx/core/graphics/drawable/IconCompat;->toIcon(Landroid/content/Context;)Landroid/graphics/drawable/Icon;
+Landroidx/core/graphics/drawable/IconCompat$Api23Impl;
+SPLandroidx/core/graphics/drawable/IconCompat$Api23Impl;->toIcon(Landroidx/core/graphics/drawable/IconCompat;Landroid/content/Context;)Landroid/graphics/drawable/Icon;
+Landroidx/core/graphics/drawable/TintAwareDrawable;
+Landroidx/core/internal/view/SupportMenu;
+Landroidx/core/internal/view/SupportMenuItem;
+Landroidx/core/math/MathUtils;
+SPLandroidx/core/math/MathUtils;->clamp(III)I
+Landroidx/core/os/BuildCompat;
+SPLandroidx/core/os/BuildCompat;-><clinit>()V
+SPLandroidx/core/os/BuildCompat;-><init>()V
+SPLandroidx/core/os/BuildCompat;->isAtLeastB_1()Z
+Landroidx/core/os/BuildCompat$Api30Impl;
+SPLandroidx/core/os/BuildCompat$Api30Impl;-><clinit>()V
+SPLandroidx/core/os/BuildCompat$Api30Impl;-><init>()V
+SPLandroidx/core/os/BuildCompat$Api30Impl;->getExtensionVersion(I)I
+Landroidx/core/os/BundleCompat;
+SPLandroidx/core/os/BundleCompat;->getParcelable(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object;
+Landroidx/core/os/BundleCompat$Api33Impl;
+SPLandroidx/core/os/BundleCompat$Api33Impl;->getParcelable(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object;
+Landroidx/core/os/BundleKt;
+SPLandroidx/core/os/BundleKt;->bundleOf([Lkotlin/Pair;)Landroid/os/Bundle;
+Landroidx/core/os/ConfigurationCompat;
+SPLandroidx/core/os/ConfigurationCompat;->getLocales(Landroid/content/res/Configuration;)Landroidx/core/os/LocaleListCompat;
+Landroidx/core/os/ConfigurationCompat$Api24Impl;
+SPLandroidx/core/os/ConfigurationCompat$Api24Impl;->getLocales(Landroid/content/res/Configuration;)Landroid/os/LocaleList;
+Landroidx/core/os/HandlerCompat;
+SPLandroidx/core/os/HandlerCompat;->createAsync(Landroid/os/Looper;)Landroid/os/Handler;
+Landroidx/core/os/HandlerCompat$Api28Impl;
+SPLandroidx/core/os/HandlerCompat$Api28Impl;->createAsync(Landroid/os/Looper;)Landroid/os/Handler;
+Landroidx/core/os/LocaleListCompat;
+SPLandroidx/core/os/LocaleListCompat;-><clinit>()V
+SPLandroidx/core/os/LocaleListCompat;-><init>(Landroidx/core/os/LocaleListInterface;)V
+SPLandroidx/core/os/LocaleListCompat;->create([Ljava/util/Locale;)Landroidx/core/os/LocaleListCompat;
+SPLandroidx/core/os/LocaleListCompat;->forLanguageTags(Ljava/lang/String;)Landroidx/core/os/LocaleListCompat;
+SPLandroidx/core/os/LocaleListCompat;->get(I)Ljava/util/Locale;
+SPLandroidx/core/os/LocaleListCompat;->getEmptyLocaleList()Landroidx/core/os/LocaleListCompat;
+SPLandroidx/core/os/LocaleListCompat;->toLanguageTags()Ljava/lang/String;
+SPLandroidx/core/os/LocaleListCompat;->wrap(Landroid/os/LocaleList;)Landroidx/core/os/LocaleListCompat;
+Landroidx/core/os/LocaleListCompat$Api24Impl;
+SPLandroidx/core/os/LocaleListCompat$Api24Impl;->createLocaleList([Ljava/util/Locale;)Landroid/os/LocaleList;
+Landroidx/core/os/LocaleListInterface;
+Landroidx/core/os/LocaleListPlatformWrapper;
+SPLandroidx/core/os/LocaleListPlatformWrapper;-><init>(Ljava/lang/Object;)V
+SPLandroidx/core/os/LocaleListPlatformWrapper;->get(I)Ljava/util/Locale;
+SPLandroidx/core/os/LocaleListPlatformWrapper;->toLanguageTags()Ljava/lang/String;
+Landroidx/core/os/Profiling$$ExternalSyntheticApiModelOutline0;
+SPLandroidx/core/os/Profiling$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/content/pm/ShortcutManager;Ljava/util/List;)Z
+SPLandroidx/core/os/Profiling$$ExternalSyntheticApiModelOutline0;->m()Ljava/lang/Class;
+SPLandroidx/core/os/Profiling$$ExternalSyntheticApiModelOutline0;->m(Ljava/lang/Object;)Landroid/content/pm/ShortcutManager;
+Landroidx/core/os/TraceCompat;
+SPLandroidx/core/os/TraceCompat;-><clinit>()V
+SPLandroidx/core/os/TraceCompat;->beginSection(Ljava/lang/String;)V
+SPLandroidx/core/os/TraceCompat;->endSection()V
+SPLandroidx/core/os/TraceCompat;->isEnabled()Z
+Landroidx/core/os/TraceCompat$Api29Impl;
+SPLandroidx/core/os/TraceCompat$Api29Impl;->isEnabled()Z
+Landroidx/core/os/UserManagerCompat;
+SPLandroidx/core/os/UserManagerCompat;->isUserUnlocked(Landroid/content/Context;)Z
+Landroidx/core/os/UserManagerCompat$Api24Impl;
+SPLandroidx/core/os/UserManagerCompat$Api24Impl;->isUserUnlocked(Landroid/content/Context;)Z
+Landroidx/core/provider/FontProvider;
+SPLandroidx/core/provider/FontProvider;-><clinit>()V
+SPLandroidx/core/provider/FontProvider;->convertToByteArrayList([Landroid/content/pm/Signature;)Ljava/util/List;
+SPLandroidx/core/provider/FontProvider;->equalsByteArrayList(Ljava/util/List;Ljava/util/List;)Z
+SPLandroidx/core/provider/FontProvider;->getCertificates(Landroidx/core/provider/FontRequest;Landroid/content/res/Resources;)Ljava/util/List;
+SPLandroidx/core/provider/FontProvider;->getFontFamilyResult(Landroid/content/Context;Ljava/util/List;Landroid/os/CancellationSignal;)Landroidx/core/provider/FontsContractCompat$FontFamilyResult;
+SPLandroidx/core/provider/FontProvider;->getProvider(Landroid/content/pm/PackageManager;Landroidx/core/provider/FontRequest;Landroid/content/res/Resources;)Landroid/content/pm/ProviderInfo;
+SPLandroidx/core/provider/FontProvider;->getSelectionArgs(Landroidx/core/provider/FontRequest;)[Ljava/lang/String;
+SPLandroidx/core/provider/FontProvider;->query(Landroid/content/Context;Landroidx/core/provider/FontRequest;Ljava/lang/String;Landroid/os/CancellationSignal;)[Landroidx/core/provider/FontsContractCompat$FontInfo;
+Landroidx/core/provider/FontProvider$$ExternalSyntheticLambda0;
+SPLandroidx/core/provider/FontProvider$$ExternalSyntheticLambda0;-><init>()V
+Landroidx/core/provider/FontProvider$ContentQueryWrapper;
+SPLandroidx/core/provider/FontProvider$ContentQueryWrapper;->make(Landroid/content/Context;Landroid/net/Uri;)Landroidx/core/provider/FontProvider$ContentQueryWrapper;
+Landroidx/core/provider/FontProvider$ContentQueryWrapperApi24Impl;
+SPLandroidx/core/provider/FontProvider$ContentQueryWrapperApi24Impl;-><init>(Landroid/content/Context;Landroid/net/Uri;)V
+SPLandroidx/core/provider/FontProvider$ContentQueryWrapperApi24Impl;->close()V
+SPLandroidx/core/provider/FontProvider$ContentQueryWrapperApi24Impl;->query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Landroid/os/CancellationSignal;)Landroid/database/Cursor;
+Landroidx/core/provider/FontProvider$ProviderCacheKey;
+SPLandroidx/core/provider/FontProvider$ProviderCacheKey;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;)V
+SPLandroidx/core/provider/FontProvider$ProviderCacheKey;->hashCode()I
+Landroidx/core/provider/FontRequest;
+SPLandroidx/core/provider/FontRequest;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;)V
+SPLandroidx/core/provider/FontRequest;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)V
+SPLandroidx/core/provider/FontRequest;->createIdentifier(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+SPLandroidx/core/provider/FontRequest;->getCertificates()Ljava/util/List;
+SPLandroidx/core/provider/FontRequest;->getProviderAuthority()Ljava/lang/String;
+SPLandroidx/core/provider/FontRequest;->getProviderPackage()Ljava/lang/String;
+SPLandroidx/core/provider/FontRequest;->getQuery()Ljava/lang/String;
+SPLandroidx/core/provider/FontRequest;->getSystemFont()Ljava/lang/String;
+SPLandroidx/core/provider/FontRequest;->getVariationSettings()Ljava/lang/String;
+Landroidx/core/provider/FontsContractCompat;
+SPLandroidx/core/provider/FontsContractCompat;->buildTypeface(Landroid/content/Context;Landroid/os/CancellationSignal;[Landroidx/core/provider/FontsContractCompat$FontInfo;)Landroid/graphics/Typeface;
+SPLandroidx/core/provider/FontsContractCompat;->fetchFonts(Landroid/content/Context;Landroid/os/CancellationSignal;Landroidx/core/provider/FontRequest;)Landroidx/core/provider/FontsContractCompat$FontFamilyResult;
+Landroidx/core/provider/FontsContractCompat$FontFamilyResult;
+SPLandroidx/core/provider/FontsContractCompat$FontFamilyResult;-><init>(ILjava/util/List;)V
+SPLandroidx/core/provider/FontsContractCompat$FontFamilyResult;->create(ILjava/util/List;)Landroidx/core/provider/FontsContractCompat$FontFamilyResult;
+SPLandroidx/core/provider/FontsContractCompat$FontFamilyResult;->getFonts()[Landroidx/core/provider/FontsContractCompat$FontInfo;
+SPLandroidx/core/provider/FontsContractCompat$FontFamilyResult;->getStatusCode()I
+Landroidx/core/provider/FontsContractCompat$FontInfo;
+SPLandroidx/core/provider/FontsContractCompat$FontInfo;-><init>(Landroid/net/Uri;IIZLjava/lang/String;I)V
+SPLandroidx/core/provider/FontsContractCompat$FontInfo;->getResultCode()I
+SPLandroidx/core/provider/FontsContractCompat$FontInfo;->getTtcIndex()I
+SPLandroidx/core/provider/FontsContractCompat$FontInfo;->getUri()Landroid/net/Uri;
+SPLandroidx/core/provider/FontsContractCompat$FontInfo;->getVariationSettings()Ljava/lang/String;
+SPLandroidx/core/provider/FontsContractCompat$FontInfo;->getWeight()I
+SPLandroidx/core/provider/FontsContractCompat$FontInfo;->isItalic()Z
+SPLandroidx/core/provider/FontsContractCompat$FontInfo;->isSystemFont()Z
+Landroidx/core/util/Consumer;
+Landroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m$1()I
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/view/WindowInsets;I)Landroid/graphics/Insets;
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m$2()I
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m$2(Landroid/view/WindowInsets;)Landroid/graphics/Insets;
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m$3()I
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m()I
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m()Landroid/view/WindowInsets$Builder;
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m()Landroid/view/WindowInsets;
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/View;Landroid/view/WindowInsetsAnimation$Callback;)V
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowInsets$Builder;)Landroid/view/WindowInsets;
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowInsets;)Landroid/view/WindowInsets;
+SPLandroidx/core/util/HalfKt$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowInsets;I)Landroid/graphics/Insets;
+Landroidx/core/util/ObjectsCompat;
+SPLandroidx/core/util/ObjectsCompat;->equals(Ljava/lang/Object;Ljava/lang/Object;)Z
+SPLandroidx/core/util/ObjectsCompat;->hash([Ljava/lang/Object;)I
+SPLandroidx/core/util/ObjectsCompat;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/core/util/ObjectsCompat;->requireNonNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+Landroidx/core/util/Pools$Pool;
+Landroidx/core/util/Pools$SimplePool;
+SPLandroidx/core/util/Pools$SimplePool;-><init>(I)V
+SPLandroidx/core/util/Pools$SimplePool;->acquire()Ljava/lang/Object;
+SPLandroidx/core/util/Pools$SimplePool;->isInPool(Ljava/lang/Object;)Z
+SPLandroidx/core/util/Pools$SimplePool;->release(Ljava/lang/Object;)Z
+Landroidx/core/util/Pools$SynchronizedPool;
+SPLandroidx/core/util/Pools$SynchronizedPool;-><init>(I)V
+SPLandroidx/core/util/Pools$SynchronizedPool;->acquire()Ljava/lang/Object;
+SPLandroidx/core/util/Pools$SynchronizedPool;->release(Ljava/lang/Object;)Z
+Landroidx/core/util/Preconditions;
+SPLandroidx/core/util/Preconditions;->checkArgument(ZLjava/lang/Object;)V
+SPLandroidx/core/util/Preconditions;->checkArgumentNonnegative(I)I
+SPLandroidx/core/util/Preconditions;->checkArgumentNonnegative(ILjava/lang/String;)I
+SPLandroidx/core/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/core/util/Preconditions;->checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/core/util/Preconditions;->checkState(ZLjava/lang/String;)V
+Landroidx/core/util/Predicate;
+Landroidx/core/view/AccessibilityDelegateCompat;
+SPLandroidx/core/view/AccessibilityDelegateCompat;-><clinit>()V
+SPLandroidx/core/view/AccessibilityDelegateCompat;-><init>()V
+SPLandroidx/core/view/AccessibilityDelegateCompat;-><init>(Landroid/view/View$AccessibilityDelegate;)V
+SPLandroidx/core/view/AccessibilityDelegateCompat;->getAccessibilityNodeProvider(Landroid/view/View;)Landroidx/core/view/accessibility/AccessibilityNodeProviderCompat;
+SPLandroidx/core/view/AccessibilityDelegateCompat;->getActionList(Landroid/view/View;)Ljava/util/List;
+SPLandroidx/core/view/AccessibilityDelegateCompat;->getBridge()Landroid/view/View$AccessibilityDelegate;
+SPLandroidx/core/view/AccessibilityDelegateCompat;->onInitializeAccessibilityEvent(Landroid/view/View;Landroid/view/accessibility/AccessibilityEvent;)V
+SPLandroidx/core/view/AccessibilityDelegateCompat;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
+SPLandroidx/core/view/AccessibilityDelegateCompat;->onRequestSendAccessibilityEvent(Landroid/view/ViewGroup;Landroid/view/View;Landroid/view/accessibility/AccessibilityEvent;)Z
+SPLandroidx/core/view/AccessibilityDelegateCompat;->sendAccessibilityEvent(Landroid/view/View;I)V
+SPLandroidx/core/view/AccessibilityDelegateCompat;->sendAccessibilityEventUnchecked(Landroid/view/View;Landroid/view/accessibility/AccessibilityEvent;)V
+Landroidx/core/view/AccessibilityDelegateCompat$AccessibilityDelegateAdapter;
+SPLandroidx/core/view/AccessibilityDelegateCompat$AccessibilityDelegateAdapter;-><init>(Landroidx/core/view/AccessibilityDelegateCompat;)V
+SPLandroidx/core/view/AccessibilityDelegateCompat$AccessibilityDelegateAdapter;->getAccessibilityNodeProvider(Landroid/view/View;)Landroid/view/accessibility/AccessibilityNodeProvider;
+SPLandroidx/core/view/AccessibilityDelegateCompat$AccessibilityDelegateAdapter;->onInitializeAccessibilityEvent(Landroid/view/View;Landroid/view/accessibility/AccessibilityEvent;)V
+SPLandroidx/core/view/AccessibilityDelegateCompat$AccessibilityDelegateAdapter;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroid/view/accessibility/AccessibilityNodeInfo;)V
+SPLandroidx/core/view/AccessibilityDelegateCompat$AccessibilityDelegateAdapter;->onRequestSendAccessibilityEvent(Landroid/view/ViewGroup;Landroid/view/View;Landroid/view/accessibility/AccessibilityEvent;)Z
+SPLandroidx/core/view/AccessibilityDelegateCompat$AccessibilityDelegateAdapter;->sendAccessibilityEventUnchecked(Landroid/view/View;Landroid/view/accessibility/AccessibilityEvent;)V
+Landroidx/core/view/ActionProvider;
+SPLandroidx/core/view/ActionProvider;-><init>(Landroid/content/Context;)V
+SPLandroidx/core/view/ActionProvider;->getContext()Landroid/content/Context;
+SPLandroidx/core/view/ActionProvider;->hasSubMenu()Z
+SPLandroidx/core/view/ActionProvider;->overridesItemVisibility()Z
+SPLandroidx/core/view/ActionProvider;->setSubUiVisibilityListener(Landroidx/core/view/ActionProvider$SubUiVisibilityListener;)V
+SPLandroidx/core/view/ActionProvider;->setVisibilityListener(Landroidx/core/view/ActionProvider$VisibilityListener;)V
+Landroidx/core/view/ActionProvider$SubUiVisibilityListener;
+Landroidx/core/view/ActionProvider$VisibilityListener;
+Landroidx/core/view/DifferentialMotionFlingController;
+SPLandroidx/core/view/DifferentialMotionFlingController;-><init>(Landroid/content/Context;Landroidx/core/view/DifferentialMotionFlingTarget;)V
+SPLandroidx/core/view/DifferentialMotionFlingController;-><init>(Landroid/content/Context;Landroidx/core/view/DifferentialMotionFlingTarget;Landroidx/core/view/DifferentialMotionFlingController$FlingVelocityThresholdCalculator;Landroidx/core/view/DifferentialMotionFlingController$DifferentialVelocityProvider;)V
+Landroidx/core/view/DifferentialMotionFlingController$$ExternalSyntheticLambda0;
+SPLandroidx/core/view/DifferentialMotionFlingController$$ExternalSyntheticLambda0;-><init>()V
+Landroidx/core/view/DifferentialMotionFlingController$$ExternalSyntheticLambda1;
+SPLandroidx/core/view/DifferentialMotionFlingController$$ExternalSyntheticLambda1;-><init>()V
+Landroidx/core/view/DifferentialMotionFlingController$DifferentialVelocityProvider;
+Landroidx/core/view/DifferentialMotionFlingController$FlingVelocityThresholdCalculator;
+Landroidx/core/view/DifferentialMotionFlingTarget;
+Landroidx/core/view/DisplayShapeCompat;
+Landroidx/core/view/GravityCompat;
+SPLandroidx/core/view/GravityCompat;->apply(IIILandroid/graphics/Rect;Landroid/graphics/Rect;I)V
+SPLandroidx/core/view/GravityCompat;->getAbsoluteGravity(II)I
+Landroidx/core/view/KeyEventDispatcher$Component;
+Landroidx/core/view/LayoutInflaterCompat;
+SPLandroidx/core/view/LayoutInflaterCompat;->setFactory2(Landroid/view/LayoutInflater;Landroid/view/LayoutInflater$Factory2;)V
+Landroidx/core/view/MenuHost;
+Landroidx/core/view/MenuHostHelper;
+SPLandroidx/core/view/MenuHostHelper;-><init>(Ljava/lang/Runnable;)V
+SPLandroidx/core/view/MenuHostHelper;->addMenuProvider(Landroidx/core/view/MenuProvider;)V
+SPLandroidx/core/view/MenuHostHelper;->onCreateMenu(Landroid/view/Menu;Landroid/view/MenuInflater;)V
+SPLandroidx/core/view/MenuHostHelper;->onPrepareMenu(Landroid/view/Menu;)V
+Landroidx/core/view/MenuItemCompat;
+SPLandroidx/core/view/MenuItemCompat;->getActionProvider(Landroid/view/MenuItem;)Landroidx/core/view/ActionProvider;
+SPLandroidx/core/view/MenuItemCompat;->setActionProvider(Landroid/view/MenuItem;Landroidx/core/view/ActionProvider;)Landroid/view/MenuItem;
+SPLandroidx/core/view/MenuItemCompat;->setAlphabeticShortcut(Landroid/view/MenuItem;CI)V
+SPLandroidx/core/view/MenuItemCompat;->setContentDescription(Landroid/view/MenuItem;Ljava/lang/CharSequence;)V
+SPLandroidx/core/view/MenuItemCompat;->setNumericShortcut(Landroid/view/MenuItem;CI)V
+SPLandroidx/core/view/MenuItemCompat;->setTooltipText(Landroid/view/MenuItem;Ljava/lang/CharSequence;)V
+Landroidx/core/view/MenuProvider;
+Landroidx/core/view/NestedScrollingChild;
+Landroidx/core/view/NestedScrollingChild2;
+Landroidx/core/view/NestedScrollingChild3;
+Landroidx/core/view/NestedScrollingChildHelper;
+SPLandroidx/core/view/NestedScrollingChildHelper;-><init>(Landroid/view/View;)V
+SPLandroidx/core/view/NestedScrollingChildHelper;->setNestedScrollingEnabled(Z)V
+Landroidx/core/view/NestedScrollingParent;
+Landroidx/core/view/NestedScrollingParent2;
+Landroidx/core/view/NestedScrollingParent3;
+Landroidx/core/view/NestedScrollingParentHelper;
+SPLandroidx/core/view/NestedScrollingParentHelper;-><init>(Landroid/view/ViewGroup;)V
+Landroidx/core/view/OnApplyWindowInsetsListener;
+Landroidx/core/view/OnReceiveContentListener;
+Landroidx/core/view/OnReceiveContentViewBehavior;
+Landroidx/core/view/ScrollingView;
+Landroidx/core/view/SoftwareKeyboardControllerCompat;
+SPLandroidx/core/view/SoftwareKeyboardControllerCompat;-><init>(Landroid/view/View;)V
+Landroidx/core/view/SoftwareKeyboardControllerCompat$Impl;
+SPLandroidx/core/view/SoftwareKeyboardControllerCompat$Impl;-><init>()V
+Landroidx/core/view/SoftwareKeyboardControllerCompat$Impl20;
+SPLandroidx/core/view/SoftwareKeyboardControllerCompat$Impl20;-><init>(Landroid/view/View;)V
+Landroidx/core/view/SoftwareKeyboardControllerCompat$Impl30;
+SPLandroidx/core/view/SoftwareKeyboardControllerCompat$Impl30;-><init>(Landroid/view/View;)V
+Landroidx/core/view/TintableBackgroundView;
+Landroidx/core/view/ViewCompat;
+SPLandroidx/core/view/ViewCompat;-><clinit>()V
+SPLandroidx/core/view/ViewCompat;->accessibilityHeadingProperty()Landroidx/core/view/ViewCompat$AccessibilityViewProperty;
+SPLandroidx/core/view/ViewCompat;->getAccessibilityDelegate(Landroid/view/View;)Landroidx/core/view/AccessibilityDelegateCompat;
+SPLandroidx/core/view/ViewCompat;->getAccessibilityDelegateInternal(Landroid/view/View;)Landroid/view/View$AccessibilityDelegate;
+SPLandroidx/core/view/ViewCompat;->getAccessibilityPaneTitle(Landroid/view/View;)Ljava/lang/CharSequence;
+SPLandroidx/core/view/ViewCompat;->getDisplay(Landroid/view/View;)Landroid/view/Display;
+SPLandroidx/core/view/ViewCompat;->getElevation(Landroid/view/View;)F
+SPLandroidx/core/view/ViewCompat;->getFitsSystemWindows(Landroid/view/View;)Z
+SPLandroidx/core/view/ViewCompat;->getImportantForAccessibility(Landroid/view/View;)I
+SPLandroidx/core/view/ViewCompat;->getImportantForAutofill(Landroid/view/View;)I
+SPLandroidx/core/view/ViewCompat;->getLayoutDirection(Landroid/view/View;)I
+SPLandroidx/core/view/ViewCompat;->getMinimumHeight(Landroid/view/View;)I
+SPLandroidx/core/view/ViewCompat;->getMinimumWidth(Landroid/view/View;)I
+SPLandroidx/core/view/ViewCompat;->getRootWindowInsets(Landroid/view/View;)Landroidx/core/view/WindowInsetsCompat;
+SPLandroidx/core/view/ViewCompat;->getStateDescription(Landroid/view/View;)Ljava/lang/CharSequence;
+SPLandroidx/core/view/ViewCompat;->isAccessibilityHeading(Landroid/view/View;)Z
+SPLandroidx/core/view/ViewCompat;->isScreenReaderFocusable(Landroid/view/View;)Z
+SPLandroidx/core/view/ViewCompat;->offsetTopAndBottom(Landroid/view/View;I)V
+SPLandroidx/core/view/ViewCompat;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+SPLandroidx/core/view/ViewCompat;->paneTitleProperty()Landroidx/core/view/ViewCompat$AccessibilityViewProperty;
+SPLandroidx/core/view/ViewCompat;->postOnAnimation(Landroid/view/View;Ljava/lang/Runnable;)V
+SPLandroidx/core/view/ViewCompat;->saveAttributeDataForStyleable(Landroid/view/View;Landroid/content/Context;[ILandroid/util/AttributeSet;Landroid/content/res/TypedArray;II)V
+SPLandroidx/core/view/ViewCompat;->screenReaderFocusableProperty()Landroidx/core/view/ViewCompat$AccessibilityViewProperty;
+SPLandroidx/core/view/ViewCompat;->setAccessibilityDelegate(Landroid/view/View;Landroidx/core/view/AccessibilityDelegateCompat;)V
+SPLandroidx/core/view/ViewCompat;->setAccessibilityPaneTitle(Landroid/view/View;Ljava/lang/CharSequence;)V
+SPLandroidx/core/view/ViewCompat;->setBackground(Landroid/view/View;Landroid/graphics/drawable/Drawable;)V
+SPLandroidx/core/view/ViewCompat;->setBackgroundTintList(Landroid/view/View;Landroid/content/res/ColorStateList;)V
+SPLandroidx/core/view/ViewCompat;->setElevation(Landroid/view/View;F)V
+SPLandroidx/core/view/ViewCompat;->setImportantForAccessibility(Landroid/view/View;I)V
+SPLandroidx/core/view/ViewCompat;->setImportantForAccessibilityIfNeeded(Landroid/view/View;)V
+SPLandroidx/core/view/ViewCompat;->setImportantForAutofill(Landroid/view/View;I)V
+SPLandroidx/core/view/ViewCompat;->setOnApplyWindowInsetsListener(Landroid/view/View;Landroidx/core/view/OnApplyWindowInsetsListener;)V
+SPLandroidx/core/view/ViewCompat;->setOnReceiveContentListener(Landroid/view/View;[Ljava/lang/String;Landroidx/core/view/OnReceiveContentListener;)V
+SPLandroidx/core/view/ViewCompat;->setWindowInsetsAnimationCallback(Landroid/view/View;Landroidx/core/view/WindowInsetsAnimationCompat$Callback;)V
+SPLandroidx/core/view/ViewCompat;->stateDescriptionProperty()Landroidx/core/view/ViewCompat$AccessibilityViewProperty;
+Landroidx/core/view/ViewCompat$$ExternalSyntheticLambda0;
+SPLandroidx/core/view/ViewCompat$$ExternalSyntheticLambda0;-><init>()V
+Landroidx/core/view/ViewCompat$1;
+SPLandroidx/core/view/ViewCompat$1;-><init>(ILjava/lang/Class;I)V
+SPLandroidx/core/view/ViewCompat$1;->frameworkGet(Landroid/view/View;)Ljava/lang/Boolean;
+SPLandroidx/core/view/ViewCompat$1;->frameworkGet(Landroid/view/View;)Ljava/lang/Object;
+Landroidx/core/view/ViewCompat$2;
+SPLandroidx/core/view/ViewCompat$2;-><init>(ILjava/lang/Class;II)V
+SPLandroidx/core/view/ViewCompat$2;->frameworkGet(Landroid/view/View;)Ljava/lang/CharSequence;
+SPLandroidx/core/view/ViewCompat$2;->frameworkGet(Landroid/view/View;)Ljava/lang/Object;
+SPLandroidx/core/view/ViewCompat$2;->frameworkSet(Landroid/view/View;Ljava/lang/CharSequence;)V
+SPLandroidx/core/view/ViewCompat$2;->frameworkSet(Landroid/view/View;Ljava/lang/Object;)V
+Landroidx/core/view/ViewCompat$3;
+SPLandroidx/core/view/ViewCompat$3;-><init>(ILjava/lang/Class;II)V
+SPLandroidx/core/view/ViewCompat$3;->frameworkGet(Landroid/view/View;)Ljava/lang/CharSequence;
+SPLandroidx/core/view/ViewCompat$3;->frameworkGet(Landroid/view/View;)Ljava/lang/Object;
+Landroidx/core/view/ViewCompat$4;
+SPLandroidx/core/view/ViewCompat$4;-><init>(ILjava/lang/Class;I)V
+SPLandroidx/core/view/ViewCompat$4;->frameworkGet(Landroid/view/View;)Ljava/lang/Boolean;
+SPLandroidx/core/view/ViewCompat$4;->frameworkGet(Landroid/view/View;)Ljava/lang/Object;
+Landroidx/core/view/ViewCompat$AccessibilityPaneVisibilityManager;
+SPLandroidx/core/view/ViewCompat$AccessibilityPaneVisibilityManager;-><init>()V
+SPLandroidx/core/view/ViewCompat$AccessibilityPaneVisibilityManager;->addAccessibilityPane(Landroid/view/View;)V
+SPLandroidx/core/view/ViewCompat$AccessibilityPaneVisibilityManager;->onGlobalLayout()V
+SPLandroidx/core/view/ViewCompat$AccessibilityPaneVisibilityManager;->onViewAttachedToWindow(Landroid/view/View;)V
+SPLandroidx/core/view/ViewCompat$AccessibilityPaneVisibilityManager;->registerForLayoutCallback(Landroid/view/View;)V
+Landroidx/core/view/ViewCompat$AccessibilityViewProperty;
+SPLandroidx/core/view/ViewCompat$AccessibilityViewProperty;-><init>(ILjava/lang/Class;I)V
+SPLandroidx/core/view/ViewCompat$AccessibilityViewProperty;-><init>(ILjava/lang/Class;II)V
+SPLandroidx/core/view/ViewCompat$AccessibilityViewProperty;->frameworkAvailable()Z
+SPLandroidx/core/view/ViewCompat$AccessibilityViewProperty;->get(Landroid/view/View;)Ljava/lang/Object;
+SPLandroidx/core/view/ViewCompat$AccessibilityViewProperty;->set(Landroid/view/View;Ljava/lang/Object;)V
+Landroidx/core/view/ViewCompat$Api21Impl;
+SPLandroidx/core/view/ViewCompat$Api21Impl;->setOnApplyWindowInsetsListener(Landroid/view/View;Landroidx/core/view/OnApplyWindowInsetsListener;)V
+Landroidx/core/view/ViewCompat$Api21Impl$1;
+SPLandroidx/core/view/ViewCompat$Api21Impl$1;-><init>(Landroid/view/View;Landroidx/core/view/OnApplyWindowInsetsListener;)V
+SPLandroidx/core/view/ViewCompat$Api21Impl$1;->onApplyWindowInsets(Landroid/view/View;Landroid/view/WindowInsets;)Landroid/view/WindowInsets;
+Landroidx/core/view/ViewCompat$Api23Impl;
+SPLandroidx/core/view/ViewCompat$Api23Impl;->getRootWindowInsets(Landroid/view/View;)Landroidx/core/view/WindowInsetsCompat;
+Landroidx/core/view/ViewCompat$Api26Impl;
+SPLandroidx/core/view/ViewCompat$Api26Impl;->getImportantForAutofill(Landroid/view/View;)I
+SPLandroidx/core/view/ViewCompat$Api26Impl;->setImportantForAutofill(Landroid/view/View;I)V
+Landroidx/core/view/ViewCompat$Api28Impl;
+SPLandroidx/core/view/ViewCompat$Api28Impl;->getAccessibilityPaneTitle(Landroid/view/View;)Ljava/lang/CharSequence;
+SPLandroidx/core/view/ViewCompat$Api28Impl;->isAccessibilityHeading(Landroid/view/View;)Z
+SPLandroidx/core/view/ViewCompat$Api28Impl;->isScreenReaderFocusable(Landroid/view/View;)Z
+SPLandroidx/core/view/ViewCompat$Api28Impl;->setAccessibilityPaneTitle(Landroid/view/View;Ljava/lang/CharSequence;)V
+Landroidx/core/view/ViewCompat$Api29Impl;
+SPLandroidx/core/view/ViewCompat$Api29Impl;->getAccessibilityDelegate(Landroid/view/View;)Landroid/view/View$AccessibilityDelegate;
+SPLandroidx/core/view/ViewCompat$Api29Impl;->saveAttributeDataForStyleable(Landroid/view/View;Landroid/content/Context;[ILandroid/util/AttributeSet;Landroid/content/res/TypedArray;II)V
+Landroidx/core/view/ViewCompat$Api30Impl;
+SPLandroidx/core/view/ViewCompat$Api30Impl;->getStateDescription(Landroid/view/View;)Ljava/lang/CharSequence;
+Landroidx/core/view/ViewCompat$Api31Impl;
+SPLandroidx/core/view/ViewCompat$Api31Impl;->setOnReceiveContentListener(Landroid/view/View;[Ljava/lang/String;Landroidx/core/view/OnReceiveContentListener;)V
+Landroidx/core/view/ViewCompat$OnReceiveContentListenerAdapter;
+SPLandroidx/core/view/ViewCompat$OnReceiveContentListenerAdapter;-><init>(Landroidx/core/view/OnReceiveContentListener;)V
+Landroidx/core/view/ViewConfigurationCompat;
+SPLandroidx/core/view/ViewConfigurationCompat;-><clinit>()V
+SPLandroidx/core/view/ViewConfigurationCompat;->getScaledHorizontalScrollFactor(Landroid/view/ViewConfiguration;Landroid/content/Context;)F
+SPLandroidx/core/view/ViewConfigurationCompat;->getScaledVerticalScrollFactor(Landroid/view/ViewConfiguration;Landroid/content/Context;)F
+SPLandroidx/core/view/ViewConfigurationCompat;->shouldShowMenuShortcutsWhenKeyboardPresent(Landroid/view/ViewConfiguration;Landroid/content/Context;)Z
+Landroidx/core/view/ViewConfigurationCompat$Api26Impl;
+SPLandroidx/core/view/ViewConfigurationCompat$Api26Impl;->getScaledHorizontalScrollFactor(Landroid/view/ViewConfiguration;)F
+SPLandroidx/core/view/ViewConfigurationCompat$Api26Impl;->getScaledVerticalScrollFactor(Landroid/view/ViewConfiguration;)F
+Landroidx/core/view/ViewConfigurationCompat$Api28Impl;
+SPLandroidx/core/view/ViewConfigurationCompat$Api28Impl;->shouldShowMenuShortcutsWhenKeyboardPresent(Landroid/view/ViewConfiguration;)Z
+Landroidx/core/view/ViewPropertyAnimatorCompat;
+Landroidx/core/view/WindowCompat;
+SPLandroidx/core/view/WindowCompat;->setDecorFitsSystemWindows(Landroid/view/Window;Z)V
+Landroidx/core/view/WindowCompat$Api35Impl;
+SPLandroidx/core/view/WindowCompat$Api35Impl;->setDecorFitsSystemWindows(Landroid/view/Window;Z)V
+Landroidx/core/view/WindowInsetsAnimationCompat;
+SPLandroidx/core/view/WindowInsetsAnimationCompat;->setCallback(Landroid/view/View;Landroidx/core/view/WindowInsetsAnimationCompat$Callback;)V
+Landroidx/core/view/WindowInsetsAnimationCompat$Callback;
+SPLandroidx/core/view/WindowInsetsAnimationCompat$Callback;-><init>(I)V
+SPLandroidx/core/view/WindowInsetsAnimationCompat$Callback;->getDispatchMode()I
+Landroidx/core/view/WindowInsetsAnimationCompat$Impl;
+Landroidx/core/view/WindowInsetsAnimationCompat$Impl30;
+SPLandroidx/core/view/WindowInsetsAnimationCompat$Impl30;->setCallback(Landroid/view/View;Landroidx/core/view/WindowInsetsAnimationCompat$Callback;)V
+Landroidx/core/view/WindowInsetsAnimationCompat$Impl30$ProxyCallback;
+SPLandroidx/core/view/WindowInsetsAnimationCompat$Impl30$ProxyCallback;-><init>(Landroidx/core/view/WindowInsetsAnimationCompat$Callback;)V
+Landroidx/core/view/WindowInsetsCompat;
+SPLandroidx/core/view/WindowInsetsCompat;-><clinit>()V
+SPLandroidx/core/view/WindowInsetsCompat;-><init>(Landroid/view/WindowInsets;)V
+SPLandroidx/core/view/WindowInsetsCompat;-><init>(Landroidx/core/view/WindowInsetsCompat;)V
+SPLandroidx/core/view/WindowInsetsCompat;->consumeDisplayCutout()Landroidx/core/view/WindowInsetsCompat;
+SPLandroidx/core/view/WindowInsetsCompat;->consumeStableInsets()Landroidx/core/view/WindowInsetsCompat;
+SPLandroidx/core/view/WindowInsetsCompat;->consumeSystemWindowInsets()Landroidx/core/view/WindowInsetsCompat;
+SPLandroidx/core/view/WindowInsetsCompat;->getInsets(I)Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/WindowInsetsCompat;->getInsetsIgnoringVisibility(I)Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/WindowInsetsCompat;->getSystemGestureInsets()Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetBottom()I
+SPLandroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetLeft()I
+SPLandroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetRight()I
+SPLandroidx/core/view/WindowInsetsCompat;->getSystemWindowInsetTop()I
+SPLandroidx/core/view/WindowInsetsCompat;->init(Landroid/view/View;)V
+SPLandroidx/core/view/WindowInsetsCompat;->isConsumed()Z
+SPLandroidx/core/view/WindowInsetsCompat;->setDisplayShape(Landroidx/core/view/DisplayShapeCompat;)V
+SPLandroidx/core/view/WindowInsetsCompat;->setOverriddenInsets([Landroidx/core/graphics/Insets;)V
+SPLandroidx/core/view/WindowInsetsCompat;->setRootWindowInsets(Landroidx/core/view/WindowInsetsCompat;)V
+SPLandroidx/core/view/WindowInsetsCompat;->setSystemUiVisibility(I)V
+SPLandroidx/core/view/WindowInsetsCompat;->setTypeBoundingRectsMap([[Landroid/graphics/Rect;)V
+SPLandroidx/core/view/WindowInsetsCompat;->setTypeMaxBoundingRectsMap([[Landroid/graphics/Rect;)V
+SPLandroidx/core/view/WindowInsetsCompat;->toWindowInsets()Landroid/view/WindowInsets;
+SPLandroidx/core/view/WindowInsetsCompat;->toWindowInsetsCompat(Landroid/view/WindowInsets;)Landroidx/core/view/WindowInsetsCompat;
+SPLandroidx/core/view/WindowInsetsCompat;->toWindowInsetsCompat(Landroid/view/WindowInsets;Landroid/view/View;)Landroidx/core/view/WindowInsetsCompat;
+Landroidx/core/view/WindowInsetsCompat$Builder;
+SPLandroidx/core/view/WindowInsetsCompat$Builder;-><init>()V
+SPLandroidx/core/view/WindowInsetsCompat$Builder;->build()Landroidx/core/view/WindowInsetsCompat;
+Landroidx/core/view/WindowInsetsCompat$BuilderImpl;
+SPLandroidx/core/view/WindowInsetsCompat$BuilderImpl;-><init>()V
+SPLandroidx/core/view/WindowInsetsCompat$BuilderImpl;-><init>(Landroidx/core/view/WindowInsetsCompat;)V
+SPLandroidx/core/view/WindowInsetsCompat$BuilderImpl;->applyInsetTypes()V
+Landroidx/core/view/WindowInsetsCompat$BuilderImpl29;
+SPLandroidx/core/view/WindowInsetsCompat$BuilderImpl29;-><init>()V
+SPLandroidx/core/view/WindowInsetsCompat$BuilderImpl29;->build()Landroidx/core/view/WindowInsetsCompat;
+Landroidx/core/view/WindowInsetsCompat$BuilderImpl30;
+SPLandroidx/core/view/WindowInsetsCompat$BuilderImpl30;-><init>()V
+Landroidx/core/view/WindowInsetsCompat$BuilderImpl31;
+SPLandroidx/core/view/WindowInsetsCompat$BuilderImpl31;-><init>()V
+Landroidx/core/view/WindowInsetsCompat$BuilderImpl34;
+SPLandroidx/core/view/WindowInsetsCompat$BuilderImpl34;-><init>()V
+Landroidx/core/view/WindowInsetsCompat$BuilderImpl35;
+SPLandroidx/core/view/WindowInsetsCompat$BuilderImpl35;-><init>()V
+SPLandroidx/core/view/WindowInsetsCompat$BuilderImpl35;->initTypeBoundingRects(Landroidx/core/view/WindowInsetsCompat;)V
+Landroidx/core/view/WindowInsetsCompat$Impl;
+SPLandroidx/core/view/WindowInsetsCompat$Impl;-><clinit>()V
+SPLandroidx/core/view/WindowInsetsCompat$Impl;-><init>(Landroidx/core/view/WindowInsetsCompat;)V
+Landroidx/core/view/WindowInsetsCompat$Impl20;
+SPLandroidx/core/view/WindowInsetsCompat$Impl20;-><clinit>()V
+SPLandroidx/core/view/WindowInsetsCompat$Impl20;-><init>(Landroidx/core/view/WindowInsetsCompat;Landroid/view/WindowInsets;)V
+SPLandroidx/core/view/WindowInsetsCompat$Impl20;->getSystemWindowInsets()Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/WindowInsetsCompat$Impl20;->setDisplayShape(Landroidx/core/view/DisplayShapeCompat;)V
+SPLandroidx/core/view/WindowInsetsCompat$Impl20;->setOverriddenInsets([Landroidx/core/graphics/Insets;)V
+SPLandroidx/core/view/WindowInsetsCompat$Impl20;->setRootWindowInsets(Landroidx/core/view/WindowInsetsCompat;)V
+SPLandroidx/core/view/WindowInsetsCompat$Impl20;->setSystemUiVisibility(I)V
+SPLandroidx/core/view/WindowInsetsCompat$Impl20;->setTypeBoundingRectsMap([[Landroid/graphics/Rect;)V
+SPLandroidx/core/view/WindowInsetsCompat$Impl20;->setTypeMaxBoundingRectsMap([[Landroid/graphics/Rect;)V
+Landroidx/core/view/WindowInsetsCompat$Impl21;
+SPLandroidx/core/view/WindowInsetsCompat$Impl21;-><init>(Landroidx/core/view/WindowInsetsCompat;Landroid/view/WindowInsets;)V
+SPLandroidx/core/view/WindowInsetsCompat$Impl21;->consumeStableInsets()Landroidx/core/view/WindowInsetsCompat;
+SPLandroidx/core/view/WindowInsetsCompat$Impl21;->consumeSystemWindowInsets()Landroidx/core/view/WindowInsetsCompat;
+SPLandroidx/core/view/WindowInsetsCompat$Impl21;->isConsumed()Z
+Landroidx/core/view/WindowInsetsCompat$Impl28;
+SPLandroidx/core/view/WindowInsetsCompat$Impl28;-><init>(Landroidx/core/view/WindowInsetsCompat;Landroid/view/WindowInsets;)V
+SPLandroidx/core/view/WindowInsetsCompat$Impl28;->consumeDisplayCutout()Landroidx/core/view/WindowInsetsCompat;
+Landroidx/core/view/WindowInsetsCompat$Impl29;
+SPLandroidx/core/view/WindowInsetsCompat$Impl29;-><init>(Landroidx/core/view/WindowInsetsCompat;Landroid/view/WindowInsets;)V
+SPLandroidx/core/view/WindowInsetsCompat$Impl29;->getSystemGestureInsets()Landroidx/core/graphics/Insets;
+Landroidx/core/view/WindowInsetsCompat$Impl30;
+SPLandroidx/core/view/WindowInsetsCompat$Impl30;-><clinit>()V
+SPLandroidx/core/view/WindowInsetsCompat$Impl30;-><init>(Landroidx/core/view/WindowInsetsCompat;Landroid/view/WindowInsets;)V
+SPLandroidx/core/view/WindowInsetsCompat$Impl30;->copyRootViewBounds(Landroid/view/View;)V
+Landroidx/core/view/WindowInsetsCompat$Impl31;
+SPLandroidx/core/view/WindowInsetsCompat$Impl31;-><init>(Landroidx/core/view/WindowInsetsCompat;Landroid/view/WindowInsets;)V
+Landroidx/core/view/WindowInsetsCompat$Impl34;
+SPLandroidx/core/view/WindowInsetsCompat$Impl34;-><clinit>()V
+SPLandroidx/core/view/WindowInsetsCompat$Impl34;-><init>(Landroidx/core/view/WindowInsetsCompat;Landroid/view/WindowInsets;)V
+SPLandroidx/core/view/WindowInsetsCompat$Impl34;->getInsets(I)Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/WindowInsetsCompat$Impl34;->getInsetsIgnoringVisibility(I)Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/WindowInsetsCompat$Impl34;->initDisplayShape(Landroid/view/View;)V
+Landroidx/core/view/WindowInsetsCompat$Impl35;
+SPLandroidx/core/view/WindowInsetsCompat$Impl35;-><init>(Landroidx/core/view/WindowInsetsCompat;Landroid/view/WindowInsets;)V
+SPLandroidx/core/view/WindowInsetsCompat$Impl35;->initTypeBoundingRectsMaps()V
+Landroidx/core/view/WindowInsetsCompat$Type;
+SPLandroidx/core/view/WindowInsetsCompat$Type;->displayCutout()I
+SPLandroidx/core/view/WindowInsetsCompat$Type;->ime()I
+SPLandroidx/core/view/WindowInsetsCompat$Type;->navigationBars()I
+SPLandroidx/core/view/WindowInsetsCompat$Type;->systemBars()I
+SPLandroidx/core/view/WindowInsetsCompat$Type;->tappableElement()I
+Landroidx/core/view/WindowInsetsCompat$TypeImpl34;
+SPLandroidx/core/view/WindowInsetsCompat$TypeImpl34;->toPlatformType(I)I
+Landroidx/core/view/WindowInsetsControllerCompat;
+SPLandroidx/core/view/WindowInsetsControllerCompat;-><init>(Landroid/view/Window;Landroid/view/View;)V
+SPLandroidx/core/view/WindowInsetsControllerCompat;->setAppearanceLightNavigationBars(Z)V
+SPLandroidx/core/view/WindowInsetsControllerCompat;->setAppearanceLightStatusBars(Z)V
+Landroidx/core/view/WindowInsetsControllerCompat$Impl;
+SPLandroidx/core/view/WindowInsetsControllerCompat$Impl;-><init>()V
+Landroidx/core/view/WindowInsetsControllerCompat$Impl30;
+SPLandroidx/core/view/WindowInsetsControllerCompat$Impl30;-><init>(Landroid/view/Window;Landroidx/core/view/WindowInsetsControllerCompat;Landroidx/core/view/SoftwareKeyboardControllerCompat;)V
+SPLandroidx/core/view/WindowInsetsControllerCompat$Impl30;-><init>(Landroid/view/WindowInsetsController;Landroidx/core/view/WindowInsetsControllerCompat;Landroidx/core/view/SoftwareKeyboardControllerCompat;)V
+Landroidx/core/view/WindowInsetsControllerCompat$Impl31;
+SPLandroidx/core/view/WindowInsetsControllerCompat$Impl31;-><init>(Landroid/view/Window;Landroidx/core/view/WindowInsetsControllerCompat;Landroidx/core/view/SoftwareKeyboardControllerCompat;)V
+Landroidx/core/view/WindowInsetsControllerCompat$Impl35;
+SPLandroidx/core/view/WindowInsetsControllerCompat$Impl35;-><init>(Landroid/view/Window;Landroidx/core/view/WindowInsetsControllerCompat;Landroidx/core/view/SoftwareKeyboardControllerCompat;)V
+SPLandroidx/core/view/WindowInsetsControllerCompat$Impl35;->setAppearanceLightNavigationBars(Z)V
+SPLandroidx/core/view/WindowInsetsControllerCompat$Impl35;->setAppearanceLightStatusBars(Z)V
+Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;-><clinit>()V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;-><init>(Landroid/view/accessibility/AccessibilityNodeInfo;)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->addAction(Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->addSpansToExtras(Ljava/lang/CharSequence;Landroid/view/View;)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->removeAction(Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;)Z
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setClassName(Ljava/lang/CharSequence;)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setCollectionInfo(Ljava/lang/Object;)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setCollectionItemInfo(Ljava/lang/Object;)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setFocusable(Z)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setFocused(Z)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setHeading(Z)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setPaneTitle(Ljava/lang/CharSequence;)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setScreenReaderFocusable(Z)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->setStateDescription(Ljava/lang/CharSequence;)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->unwrap()Landroid/view/accessibility/AccessibilityNodeInfo;
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->wrap(Landroid/view/accessibility/AccessibilityNodeInfo;)Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;
+Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;-><clinit>()V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;-><init>(ILjava/lang/CharSequence;)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;-><init>(ILjava/lang/CharSequence;Ljava/lang/Class;)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;-><init>(Ljava/lang/Object;ILjava/lang/CharSequence;Landroidx/core/view/accessibility/AccessibilityViewCommand;Ljava/lang/Class;)V
+Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$Api30Impl;
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$Api30Impl;->setStateDescription(Landroid/view/accessibility/AccessibilityNodeInfo;Ljava/lang/CharSequence;)V
+Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$Api34Impl;
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$Api34Impl;->getActionScrollInDirection()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat;
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat;-><init>(Ljava/lang/Object;)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat;->obtain(IIZI)Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat;
+Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat;
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat;-><init>(Ljava/lang/Object;)V
+SPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat;->obtain(IIIIZZ)Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionItemInfoCompat;
+Landroidx/core/view/accessibility/AccessibilityViewCommand;
+Landroidx/core/view/accessibility/AccessibilityViewCommand$CommandArguments;
+Landroidx/core/view/accessibility/AccessibilityViewCommand$MoveAtGranularityArguments;
+Landroidx/core/view/accessibility/AccessibilityViewCommand$MoveHtmlArguments;
+Landroidx/core/view/accessibility/AccessibilityViewCommand$MoveWindowArguments;
+Landroidx/core/view/accessibility/AccessibilityViewCommand$ScrollToPositionArguments;
+Landroidx/core/view/accessibility/AccessibilityViewCommand$SetProgressArguments;
+Landroidx/core/view/accessibility/AccessibilityViewCommand$SetSelectionArguments;
+Landroidx/core/view/accessibility/AccessibilityViewCommand$SetTextArguments;
+Landroidx/core/view/insets/ColorProtection;
+SPLandroidx/core/view/insets/ColorProtection;-><init>(I)V
+SPLandroidx/core/view/insets/ColorProtection;-><init>(II)V
+SPLandroidx/core/view/insets/ColorProtection;->dispatchColorHint(I)V
+SPLandroidx/core/view/insets/ColorProtection;->occupiesCorners()Z
+SPLandroidx/core/view/insets/ColorProtection;->setColor(I)V
+SPLandroidx/core/view/insets/ColorProtection;->setColorInner(I)V
+Landroidx/core/view/insets/Protection;
+SPLandroidx/core/view/insets/Protection;-><clinit>()V
+SPLandroidx/core/view/insets/Protection;-><init>(I)V
+SPLandroidx/core/view/insets/Protection;->dispatchInsets(Landroidx/core/graphics/Insets;Landroidx/core/graphics/Insets;Landroidx/core/graphics/Insets;)Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/insets/Protection;->getAttributes()Landroidx/core/view/insets/Protection$Attributes;
+SPLandroidx/core/view/insets/Protection;->getController()Ljava/lang/Object;
+SPLandroidx/core/view/insets/Protection;->getSide()I
+SPLandroidx/core/view/insets/Protection;->getThickness(I)I
+SPLandroidx/core/view/insets/Protection;->setController(Ljava/lang/Object;)V
+SPLandroidx/core/view/insets/Protection;->setSystemAlpha(F)V
+SPLandroidx/core/view/insets/Protection;->setSystemInsetAmount(F)V
+SPLandroidx/core/view/insets/Protection;->setSystemVisible(Z)V
+SPLandroidx/core/view/insets/Protection;->updateAlpha()V
+SPLandroidx/core/view/insets/Protection;->updateInsetAmount()V
+SPLandroidx/core/view/insets/Protection;->updateLayout()Landroidx/core/graphics/Insets;
+Landroidx/core/view/insets/Protection$Attributes;
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$fgetmHeight(Landroidx/core/view/insets/Protection$Attributes;)I
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$fgetmWidth(Landroidx/core/view/insets/Protection$Attributes;)I
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$msetAlpha(Landroidx/core/view/insets/Protection$Attributes;F)V
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$msetHeight(Landroidx/core/view/insets/Protection$Attributes;I)V
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$msetMargin(Landroidx/core/view/insets/Protection$Attributes;Landroidx/core/graphics/Insets;)V
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$msetTranslationX(Landroidx/core/view/insets/Protection$Attributes;F)V
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$msetTranslationY(Landroidx/core/view/insets/Protection$Attributes;F)V
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$msetVisible(Landroidx/core/view/insets/Protection$Attributes;Z)V
+SPLandroidx/core/view/insets/Protection$Attributes;->-$$Nest$msetWidth(Landroidx/core/view/insets/Protection$Attributes;I)V
+SPLandroidx/core/view/insets/Protection$Attributes;-><init>()V
+SPLandroidx/core/view/insets/Protection$Attributes;->getAlpha()F
+SPLandroidx/core/view/insets/Protection$Attributes;->getDrawable()Landroid/graphics/drawable/Drawable;
+SPLandroidx/core/view/insets/Protection$Attributes;->getHeight()I
+SPLandroidx/core/view/insets/Protection$Attributes;->getMargin()Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/insets/Protection$Attributes;->getTranslationX()F
+SPLandroidx/core/view/insets/Protection$Attributes;->getTranslationY()F
+SPLandroidx/core/view/insets/Protection$Attributes;->getWidth()I
+SPLandroidx/core/view/insets/Protection$Attributes;->isVisible()Z
+SPLandroidx/core/view/insets/Protection$Attributes;->setAlpha(F)V
+SPLandroidx/core/view/insets/Protection$Attributes;->setCallback(Landroidx/core/view/insets/Protection$Attributes$Callback;)V
+SPLandroidx/core/view/insets/Protection$Attributes;->setHeight(I)V
+SPLandroidx/core/view/insets/Protection$Attributes;->setMargin(Landroidx/core/graphics/Insets;)V
+SPLandroidx/core/view/insets/Protection$Attributes;->setTranslationX(F)V
+SPLandroidx/core/view/insets/Protection$Attributes;->setTranslationY(F)V
+SPLandroidx/core/view/insets/Protection$Attributes;->setVisible(Z)V
+SPLandroidx/core/view/insets/Protection$Attributes;->setWidth(I)V
+Landroidx/core/view/insets/Protection$Attributes$Callback;
+Landroidx/core/view/insets/ProtectionGroup;
+SPLandroidx/core/view/insets/ProtectionGroup;-><init>(Landroidx/core/view/insets/SystemBarStateMonitor;Ljava/util/List;)V
+SPLandroidx/core/view/insets/ProtectionGroup;->addProtections(Ljava/util/List;Z)V
+SPLandroidx/core/view/insets/ProtectionGroup;->getProtection(I)Landroidx/core/view/insets/Protection;
+SPLandroidx/core/view/insets/ProtectionGroup;->onColorHintChanged(I)V
+SPLandroidx/core/view/insets/ProtectionGroup;->onInsetsChanged(Landroidx/core/graphics/Insets;Landroidx/core/graphics/Insets;)V
+SPLandroidx/core/view/insets/ProtectionGroup;->size()I
+SPLandroidx/core/view/insets/ProtectionGroup;->updateInsets()V
+Landroidx/core/view/insets/ProtectionLayout;
+SPLandroidx/core/view/insets/ProtectionLayout;-><clinit>()V
+SPLandroidx/core/view/insets/ProtectionLayout;-><init>(Landroid/content/Context;Ljava/util/List;)V
+SPLandroidx/core/view/insets/ProtectionLayout;->addProtectionView(Landroid/content/Context;ILandroidx/core/view/insets/Protection;)V
+SPLandroidx/core/view/insets/ProtectionLayout;->addProtectionViews()V
+SPLandroidx/core/view/insets/ProtectionLayout;->addView(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V
+SPLandroidx/core/view/insets/ProtectionLayout;->getOrInstallSystemBarStateMonitor()Landroidx/core/view/insets/SystemBarStateMonitor;
+SPLandroidx/core/view/insets/ProtectionLayout;->onAttachedToWindow()V
+SPLandroidx/core/view/insets/ProtectionLayout;->removeProtectionViews()V
+SPLandroidx/core/view/insets/ProtectionLayout;->setProtections(Ljava/util/List;)V
+Landroidx/core/view/insets/ProtectionLayout$1;
+SPLandroidx/core/view/insets/ProtectionLayout$1;-><init>(Landroidx/core/view/insets/ProtectionLayout;Landroid/widget/FrameLayout$LayoutParams;Landroid/view/View;)V
+SPLandroidx/core/view/insets/ProtectionLayout$1;->onAlphaChanged(F)V
+SPLandroidx/core/view/insets/ProtectionLayout$1;->onHeightChanged(I)V
+SPLandroidx/core/view/insets/ProtectionLayout$1;->onVisibilityChanged(Z)V
+Landroidx/core/view/insets/SystemBarStateMonitor;
+SPLandroidx/core/view/insets/SystemBarStateMonitor;-><init>(Landroid/view/ViewGroup;)V
+SPLandroidx/core/view/insets/SystemBarStateMonitor;->addCallback(Landroidx/core/view/insets/SystemBarStateMonitor$Callback;)V
+SPLandroidx/core/view/insets/SystemBarStateMonitor;->addViewWhenReady(Landroid/view/ViewGroup;Landroid/view/View;I)V
+SPLandroidx/core/view/insets/SystemBarStateMonitor;->getInsets(Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/insets/SystemBarStateMonitor;->getInsetsIgnoringVisibility(Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/graphics/Insets;
+SPLandroidx/core/view/insets/SystemBarStateMonitor;->lambda$new$0$androidx-core-view-insets-SystemBarStateMonitor(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+Landroidx/core/view/insets/SystemBarStateMonitor$$ExternalSyntheticLambda0;
+SPLandroidx/core/view/insets/SystemBarStateMonitor$$ExternalSyntheticLambda0;-><init>(Landroidx/core/view/insets/SystemBarStateMonitor;)V
+SPLandroidx/core/view/insets/SystemBarStateMonitor$$ExternalSyntheticLambda0;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+Landroidx/core/view/insets/SystemBarStateMonitor$1;
+SPLandroidx/core/view/insets/SystemBarStateMonitor$1;-><init>(Landroidx/core/view/insets/SystemBarStateMonitor;Landroid/content/Context;Landroid/view/ViewGroup;)V
+Landroidx/core/view/insets/SystemBarStateMonitor$2;
+SPLandroidx/core/view/insets/SystemBarStateMonitor$2;-><init>(Landroidx/core/view/insets/SystemBarStateMonitor;I)V
+Landroidx/core/view/insets/SystemBarStateMonitor$Callback;
+Landroidx/core/widget/AutoSizeableTextView;
+Landroidx/core/widget/CheckedTextViewCompat;
+SPLandroidx/core/widget/CheckedTextViewCompat;->getCheckMarkDrawable(Landroid/widget/CheckedTextView;)Landroid/graphics/drawable/Drawable;
+Landroidx/core/widget/TextViewCompat;
+SPLandroidx/core/widget/TextViewCompat;->setLineHeight(Landroid/widget/TextView;I)V
+SPLandroidx/core/widget/TextViewCompat;->setTextAppearance(Landroid/widget/TextView;I)V
+Landroidx/core/widget/TintableCheckedTextView;
+Landroidx/core/widget/TintableCompoundDrawablesView;
+Landroidx/core/widget/TintableImageSourceView;
+Landroidx/customview/poolingcontainer/PoolingContainer;
+SPLandroidx/customview/poolingcontainer/PoolingContainer;-><clinit>()V
+SPLandroidx/customview/poolingcontainer/PoolingContainer;->setPoolingContainer(Landroid/view/View;Z)V
+Landroidx/customview/poolingcontainer/R$id;
+Landroidx/customview/widget/Openable;
+Landroidx/customview/widget/ViewDragHelper;
+SPLandroidx/customview/widget/ViewDragHelper;-><clinit>()V
+SPLandroidx/customview/widget/ViewDragHelper;-><init>(Landroid/content/Context;Landroid/view/ViewGroup;Landroidx/customview/widget/ViewDragHelper$Callback;)V
+SPLandroidx/customview/widget/ViewDragHelper;->continueSettling(Z)Z
+SPLandroidx/customview/widget/ViewDragHelper;->create(Landroid/view/ViewGroup;FLandroidx/customview/widget/ViewDragHelper$Callback;)Landroidx/customview/widget/ViewDragHelper;
+SPLandroidx/customview/widget/ViewDragHelper;->create(Landroid/view/ViewGroup;Landroidx/customview/widget/ViewDragHelper$Callback;)Landroidx/customview/widget/ViewDragHelper;
+SPLandroidx/customview/widget/ViewDragHelper;->getDefaultEdgeSize()I
+SPLandroidx/customview/widget/ViewDragHelper;->requireNonNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+SPLandroidx/customview/widget/ViewDragHelper;->setEdgeSize(I)V
+SPLandroidx/customview/widget/ViewDragHelper;->setEdgeTrackingEnabled(I)V
+SPLandroidx/customview/widget/ViewDragHelper;->setMinVelocity(F)V
+Landroidx/customview/widget/ViewDragHelper$1;
+SPLandroidx/customview/widget/ViewDragHelper$1;-><init>()V
+Landroidx/customview/widget/ViewDragHelper$2;
+SPLandroidx/customview/widget/ViewDragHelper$2;-><init>(Landroidx/customview/widget/ViewDragHelper;)V
+Landroidx/customview/widget/ViewDragHelper$3;
+SPLandroidx/customview/widget/ViewDragHelper$3;-><init>(Landroidx/customview/widget/ViewDragHelper;)V
+Landroidx/customview/widget/ViewDragHelper$Callback;
+SPLandroidx/customview/widget/ViewDragHelper$Callback;-><init>()V
+Landroidx/draganddrop/DropAffordanceHighlighter;
+SPLandroidx/draganddrop/DropAffordanceHighlighter;-><init>(Landroid/view/View;Landroidx/core/util/Predicate;ZII)V
+SPLandroidx/draganddrop/DropAffordanceHighlighter;->colorWithOpacity(IF)I
+SPLandroidx/draganddrop/DropAffordanceHighlighter;->dpToPx(Landroid/content/Context;I)I
+SPLandroidx/draganddrop/DropAffordanceHighlighter;->forView(Landroid/view/View;Landroidx/core/util/Predicate;)Landroidx/draganddrop/DropAffordanceHighlighter$Builder;
+SPLandroidx/draganddrop/DropAffordanceHighlighter;->makeDrawable(Landroid/content/Context;III)Landroid/graphics/drawable/GradientDrawable;
+Landroidx/draganddrop/DropAffordanceHighlighter$Builder;
+SPLandroidx/draganddrop/DropAffordanceHighlighter$Builder;-><init>(Landroid/view/View;Landroidx/core/util/Predicate;)V
+SPLandroidx/draganddrop/DropAffordanceHighlighter$Builder;->build()Landroidx/draganddrop/DropAffordanceHighlighter;
+SPLandroidx/draganddrop/DropAffordanceHighlighter$Builder;->getHighlightColor()I
+SPLandroidx/draganddrop/DropAffordanceHighlighter$Builder;->setHighlightColor(I)Landroidx/draganddrop/DropAffordanceHighlighter$Builder;
+SPLandroidx/draganddrop/DropAffordanceHighlighter$Builder;->setHighlightCornerRadiusPx(I)Landroidx/draganddrop/DropAffordanceHighlighter$Builder;
+SPLandroidx/draganddrop/DropAffordanceHighlighter$Builder;->shouldAcceptDragsWithLocalState(Z)Landroidx/draganddrop/DropAffordanceHighlighter$Builder;
+Landroidx/draganddrop/DropHelper;
+SPLandroidx/draganddrop/DropHelper;->configureView(Landroid/app/Activity;Landroid/view/View;[Ljava/lang/String;Landroidx/draganddrop/DropHelper$Options;Landroidx/core/view/OnReceiveContentListener;)V
+SPLandroidx/draganddrop/DropHelper;->setHighlightingAndHandling(Landroid/view/View;[Ljava/lang/String;Landroidx/draganddrop/DropAffordanceHighlighter;Landroidx/core/view/OnReceiveContentListener;Landroid/app/Activity;)V
+Landroidx/draganddrop/DropHelper$$ExternalSyntheticLambda0;
+SPLandroidx/draganddrop/DropHelper$$ExternalSyntheticLambda0;-><init>([Ljava/lang/String;)V
+Landroidx/draganddrop/DropHelper$$ExternalSyntheticLambda2;
+SPLandroidx/draganddrop/DropHelper$$ExternalSyntheticLambda2;-><init>(Landroidx/draganddrop/DropAffordanceHighlighter;)V
+Landroidx/draganddrop/DropHelper$CouldNotObtainPermissionsException;
+Landroidx/draganddrop/DropHelper$Options;
+SPLandroidx/draganddrop/DropHelper$Options;-><init>(IZIZZLjava/util/List;)V
+SPLandroidx/draganddrop/DropHelper$Options;->getHighlightColor()I
+SPLandroidx/draganddrop/DropHelper$Options;->getHighlightCornerRadiusPx()I
+SPLandroidx/draganddrop/DropHelper$Options;->getInnerEditTexts()Ljava/util/List;
+SPLandroidx/draganddrop/DropHelper$Options;->hasHighlightColor()Z
+SPLandroidx/draganddrop/DropHelper$Options;->hasHighlightCornerRadiusPx()Z
+SPLandroidx/draganddrop/DropHelper$Options;->shouldAcceptDragsWithLocalState()Z
+Landroidx/draganddrop/DropHelper$Options$Builder;
+SPLandroidx/draganddrop/DropHelper$Options$Builder;-><init>()V
+SPLandroidx/draganddrop/DropHelper$Options$Builder;->build()Landroidx/draganddrop/DropHelper$Options;
+SPLandroidx/draganddrop/DropHelper$Options$Builder;->setHighlightColor(I)Landroidx/draganddrop/DropHelper$Options$Builder;
+SPLandroidx/draganddrop/DropHelper$Options$Builder;->setHighlightCornerRadiusPx(I)Landroidx/draganddrop/DropHelper$Options$Builder;
+Landroidx/drawerlayout/R$attr;
+Landroidx/drawerlayout/R$styleable;
+SPLandroidx/drawerlayout/R$styleable;-><clinit>()V
+Landroidx/drawerlayout/widget/ClosableDrawerLayout;
+SPLandroidx/drawerlayout/widget/ClosableDrawerLayout;-><clinit>()V
+SPLandroidx/drawerlayout/widget/ClosableDrawerLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/drawerlayout/widget/ClosableDrawerLayout;->setAnimationEnabled(Z)V
+Landroidx/drawerlayout/widget/DrawerLayout;
+SPLandroidx/drawerlayout/widget/DrawerLayout;-><clinit>()V
+SPLandroidx/drawerlayout/widget/DrawerLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/drawerlayout/widget/DrawerLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/drawerlayout/widget/DrawerLayout;->addDrawerListener(Landroidx/drawerlayout/widget/DrawerLayout$DrawerListener;)V
+SPLandroidx/drawerlayout/widget/DrawerLayout;->addView(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V
+SPLandroidx/drawerlayout/widget/DrawerLayout;->checkDrawerViewAbsoluteGravity(Landroid/view/View;I)Z
+SPLandroidx/drawerlayout/widget/DrawerLayout;->checkLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Z
+SPLandroidx/drawerlayout/widget/DrawerLayout;->computeScroll()V
+SPLandroidx/drawerlayout/widget/DrawerLayout;->drawChild(Landroid/graphics/Canvas;Landroid/view/View;J)Z
+SPLandroidx/drawerlayout/widget/DrawerLayout;->findDrawerWithGravity(I)Landroid/view/View;
+SPLandroidx/drawerlayout/widget/DrawerLayout;->findOpenDrawer()Landroid/view/View;
+SPLandroidx/drawerlayout/widget/DrawerLayout;->generateDefaultLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+SPLandroidx/drawerlayout/widget/DrawerLayout;->generateLayoutParams(Landroid/util/AttributeSet;)Landroid/view/ViewGroup$LayoutParams;
+SPLandroidx/drawerlayout/widget/DrawerLayout;->getDrawerViewAbsoluteGravity(Landroid/view/View;)I
+SPLandroidx/drawerlayout/widget/DrawerLayout;->isContentView(Landroid/view/View;)Z
+SPLandroidx/drawerlayout/widget/DrawerLayout;->isDrawerOpen(I)Z
+SPLandroidx/drawerlayout/widget/DrawerLayout;->isDrawerOpen(Landroid/view/View;)Z
+SPLandroidx/drawerlayout/widget/DrawerLayout;->isDrawerView(Landroid/view/View;)Z
+SPLandroidx/drawerlayout/widget/DrawerLayout;->onAttachedToWindow()V
+SPLandroidx/drawerlayout/widget/DrawerLayout;->onLayout(ZIIII)V
+SPLandroidx/drawerlayout/widget/DrawerLayout;->onMeasure(II)V
+SPLandroidx/drawerlayout/widget/DrawerLayout;->onRtlPropertiesChanged(I)V
+SPLandroidx/drawerlayout/widget/DrawerLayout;->removeDrawerListener(Landroidx/drawerlayout/widget/DrawerLayout$DrawerListener;)V
+SPLandroidx/drawerlayout/widget/DrawerLayout;->requestLayout()V
+SPLandroidx/drawerlayout/widget/DrawerLayout;->resolveShadowDrawables()V
+SPLandroidx/drawerlayout/widget/DrawerLayout;->setStatusBarBackgroundColor(I)V
+Landroidx/drawerlayout/widget/DrawerLayout$1;
+SPLandroidx/drawerlayout/widget/DrawerLayout$1;-><init>(Landroidx/drawerlayout/widget/DrawerLayout;)V
+Landroidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate;
+SPLandroidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate;-><init>(Landroidx/drawerlayout/widget/DrawerLayout;)V
+SPLandroidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
+SPLandroidx/drawerlayout/widget/DrawerLayout$AccessibilityDelegate;->onRequestSendAccessibilityEvent(Landroid/view/ViewGroup;Landroid/view/View;Landroid/view/accessibility/AccessibilityEvent;)Z
+Landroidx/drawerlayout/widget/DrawerLayout$ChildAccessibilityDelegate;
+SPLandroidx/drawerlayout/widget/DrawerLayout$ChildAccessibilityDelegate;-><init>()V
+Landroidx/drawerlayout/widget/DrawerLayout$DrawerListener;
+Landroidx/drawerlayout/widget/DrawerLayout$LayoutParams;
+SPLandroidx/drawerlayout/widget/DrawerLayout$LayoutParams;-><init>(II)V
+SPLandroidx/drawerlayout/widget/DrawerLayout$LayoutParams;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+Landroidx/drawerlayout/widget/DrawerLayout$SimpleDrawerListener;
+SPLandroidx/drawerlayout/widget/DrawerLayout$SimpleDrawerListener;-><init>()V
+Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;
+SPLandroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;-><init>(Landroidx/drawerlayout/widget/DrawerLayout;I)V
+SPLandroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;->setDragger(Landroidx/customview/widget/ViewDragHelper;)V
+Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback$1;
+SPLandroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback$1;-><init>(Landroidx/drawerlayout/widget/DrawerLayout$ViewDragCallback;)V
+Landroidx/dynamicanimation/animation/AnimationHandler;
+SPLandroidx/dynamicanimation/animation/AnimationHandler;-><clinit>()V
+SPLandroidx/dynamicanimation/animation/AnimationHandler;-><init>(Landroidx/dynamicanimation/animation/FrameCallbackScheduler;)V
+SPLandroidx/dynamicanimation/animation/AnimationHandler;->getInstance()Landroidx/dynamicanimation/animation/AnimationHandler;
+SPLandroidx/dynamicanimation/animation/AnimationHandler;->isCurrentThread()Z
+Landroidx/dynamicanimation/animation/AnimationHandler$$ExternalSyntheticLambda1;
+SPLandroidx/dynamicanimation/animation/AnimationHandler$$ExternalSyntheticLambda1;-><init>(Landroidx/dynamicanimation/animation/AnimationHandler;)V
+Landroidx/dynamicanimation/animation/AnimationHandler$AnimationCallbackDispatcher;
+SPLandroidx/dynamicanimation/animation/AnimationHandler$AnimationCallbackDispatcher;-><init>(Landroidx/dynamicanimation/animation/AnimationHandler;)V
+SPLandroidx/dynamicanimation/animation/AnimationHandler$AnimationCallbackDispatcher;-><init>(Landroidx/dynamicanimation/animation/AnimationHandler;Landroidx/dynamicanimation/animation/AnimationHandler$1;)V
+Landroidx/dynamicanimation/animation/AnimationHandler$AnimationFrameCallback;
+Landroidx/dynamicanimation/animation/AnimationHandler$FrameCallbackScheduler16;
+SPLandroidx/dynamicanimation/animation/AnimationHandler$FrameCallbackScheduler16;-><init>()V
+SPLandroidx/dynamicanimation/animation/AnimationHandler$FrameCallbackScheduler16;->isCurrentThread()Z
+Landroidx/dynamicanimation/animation/DynamicAnimation;
+SPLandroidx/dynamicanimation/animation/DynamicAnimation;-><clinit>()V
+SPLandroidx/dynamicanimation/animation/DynamicAnimation;-><init>(Ljava/lang/Object;Landroidx/dynamicanimation/animation/FloatPropertyCompat;)V
+SPLandroidx/dynamicanimation/animation/DynamicAnimation;->getAnimationHandler()Landroidx/dynamicanimation/animation/AnimationHandler;
+Landroidx/dynamicanimation/animation/DynamicAnimation$1;
+SPLandroidx/dynamicanimation/animation/DynamicAnimation$1;-><init>(Ljava/lang/String;)V
+Landroidx/dynamicanimation/animation/DynamicAnimation$10;
+SPLandroidx/dynamicanimation/animation/DynamicAnimation$10;-><init>(Ljava/lang/String;)V
+Landroidx/dynamicanimation/animation/DynamicAnimation$11;
+SPLandroidx/dynamicanimation/animation/DynamicAnimation$11;-><init>(Ljava/lang/String;)V
+Landroidx/dynamicanimation/animation/DynamicAnimation$12;
+SPLandroidx/dynamicanimation/animation/DynamicAnimation$12;-><init>(Ljava/lang/String;)V
+Landroidx/dynamicanimation/animation/DynamicAnimation$13;
+SPLandroidx/dynamicanimation/animation/DynamicAnimation$13;-><init>(Ljava/lang/String;)V
+Landroidx/dynamicanimation/animation/DynamicAnimation$14;
+SPLandroidx/dynamicanimation/animation/DynamicAnimation$14;-><init>(Ljava/lang/String;)V
+Landroidx/dynamicanimation/animation/DynamicAnimation$2;
+SPLandroidx/dynamicanimation/animation/DynamicAnimation$2;-><init>(Ljava/lang/String;)V
+Landroidx/dynamicanimation/animation/DynamicAnimation$3;
+SPLandroidx/dynamicanimation/animation/DynamicAnimation$3;-><init>(Ljava/lang/String;)V
+Landroidx/dynamicanimation/animation/DynamicAnimation$4;
+SPLandroidx/dynamicanimation/animation/DynamicAnimation$4;-><init>(Ljava/lang/String;)V
+Landroidx/dynamicanimation/animation/DynamicAnimation$5;
+SPLandroidx/dynamicanimation/animation/DynamicAnimation$5;-><init>(Ljava/lang/String;)V
+Landroidx/dynamicanimation/animation/DynamicAnimation$6;
+SPLandroidx/dynamicanimation/animation/DynamicAnimation$6;-><init>(Ljava/lang/String;)V
+Landroidx/dynamicanimation/animation/DynamicAnimation$7;
+SPLandroidx/dynamicanimation/animation/DynamicAnimation$7;-><init>(Ljava/lang/String;)V
+Landroidx/dynamicanimation/animation/DynamicAnimation$8;
+SPLandroidx/dynamicanimation/animation/DynamicAnimation$8;-><init>(Ljava/lang/String;)V
+Landroidx/dynamicanimation/animation/DynamicAnimation$9;
+SPLandroidx/dynamicanimation/animation/DynamicAnimation$9;-><init>(Ljava/lang/String;)V
+Landroidx/dynamicanimation/animation/DynamicAnimation$MassState;
+SPLandroidx/dynamicanimation/animation/DynamicAnimation$MassState;-><init>()V
+Landroidx/dynamicanimation/animation/DynamicAnimation$OnAnimationEndListener;
+Landroidx/dynamicanimation/animation/DynamicAnimation$ViewProperty;
+SPLandroidx/dynamicanimation/animation/DynamicAnimation$ViewProperty;-><init>(Ljava/lang/String;)V
+SPLandroidx/dynamicanimation/animation/DynamicAnimation$ViewProperty;-><init>(Ljava/lang/String;Landroidx/dynamicanimation/animation/DynamicAnimation$1;)V
+Landroidx/dynamicanimation/animation/FloatPropertyCompat;
+SPLandroidx/dynamicanimation/animation/FloatPropertyCompat;-><init>(Ljava/lang/String;)V
+Landroidx/dynamicanimation/animation/Force;
+Landroidx/dynamicanimation/animation/FrameCallbackScheduler;
+Landroidx/dynamicanimation/animation/SpringAnimation;
+SPLandroidx/dynamicanimation/animation/SpringAnimation;-><init>(Ljava/lang/Object;Landroidx/dynamicanimation/animation/FloatPropertyCompat;)V
+SPLandroidx/dynamicanimation/animation/SpringAnimation;->canSkipToEnd()Z
+SPLandroidx/dynamicanimation/animation/SpringAnimation;->getSpring()Landroidx/dynamicanimation/animation/SpringForce;
+SPLandroidx/dynamicanimation/animation/SpringAnimation;->setSpring(Landroidx/dynamicanimation/animation/SpringForce;)Landroidx/dynamicanimation/animation/SpringAnimation;
+SPLandroidx/dynamicanimation/animation/SpringAnimation;->skipToEnd()V
+Landroidx/dynamicanimation/animation/SpringForce;
+SPLandroidx/dynamicanimation/animation/SpringForce;-><init>()V
+SPLandroidx/dynamicanimation/animation/SpringForce;->setDampingRatio(F)Landroidx/dynamicanimation/animation/SpringForce;
+SPLandroidx/dynamicanimation/animation/SpringForce;->setStiffness(F)Landroidx/dynamicanimation/animation/SpringForce;
+Landroidx/emoji2/text/ConcurrencyHelpers;
+SPLandroidx/emoji2/text/ConcurrencyHelpers;->createBackgroundPriorityExecutor(Ljava/lang/String;)Ljava/util/concurrent/ThreadPoolExecutor;
+SPLandroidx/emoji2/text/ConcurrencyHelpers;->lambda$createBackgroundPriorityExecutor$0(Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Thread;
+SPLandroidx/emoji2/text/ConcurrencyHelpers;->mainHandlerAsync()Landroid/os/Handler;
+Landroidx/emoji2/text/ConcurrencyHelpers$$ExternalSyntheticLambda0;
+SPLandroidx/emoji2/text/ConcurrencyHelpers$$ExternalSyntheticLambda0;-><init>(Ljava/lang/String;)V
+SPLandroidx/emoji2/text/ConcurrencyHelpers$$ExternalSyntheticLambda0;->newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
+Landroidx/emoji2/text/ConcurrencyHelpers$Handler28Impl;
+SPLandroidx/emoji2/text/ConcurrencyHelpers$Handler28Impl;->createAsync(Landroid/os/Looper;)Landroid/os/Handler;
+Landroidx/emoji2/text/DefaultEmojiCompatConfig;
+SPLandroidx/emoji2/text/DefaultEmojiCompatConfig;->create(Landroid/content/Context;)Landroidx/emoji2/text/FontRequestEmojiCompatConfig;
+Landroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigFactory;
+SPLandroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigFactory;-><init>(Landroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigHelper;)V
+SPLandroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigFactory;->configOrNull(Landroid/content/Context;Landroidx/core/provider/FontRequest;)Landroidx/emoji2/text/EmojiCompat$Config;
+SPLandroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigFactory;->convertToByteArray([Landroid/content/pm/Signature;)Ljava/util/List;
+SPLandroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigFactory;->create(Landroid/content/Context;)Landroidx/emoji2/text/EmojiCompat$Config;
+SPLandroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigFactory;->generateFontRequestFrom(Landroid/content/pm/ProviderInfo;Landroid/content/pm/PackageManager;)Landroidx/core/provider/FontRequest;
+SPLandroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigFactory;->getHelperForApi()Landroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigHelper;
+SPLandroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigFactory;->hasFlagSystem(Landroid/content/pm/ProviderInfo;)Z
+SPLandroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigFactory;->queryDefaultInstalledContentProvider(Landroid/content/pm/PackageManager;)Landroid/content/pm/ProviderInfo;
+SPLandroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigFactory;->queryForDefaultFontRequest(Landroid/content/Context;)Landroidx/core/provider/FontRequest;
+Landroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigHelper;
+SPLandroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigHelper;-><init>()V
+Landroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigHelper_API19;
+SPLandroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigHelper_API19;-><init>()V
+SPLandroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigHelper_API19;->getProviderInfo(Landroid/content/pm/ResolveInfo;)Landroid/content/pm/ProviderInfo;
+SPLandroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigHelper_API19;->queryIntentContentProviders(Landroid/content/pm/PackageManager;Landroid/content/Intent;I)Ljava/util/List;
+Landroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigHelper_API28;
+SPLandroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigHelper_API28;-><init>()V
+SPLandroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigHelper_API28;->getSigningSignatures(Landroid/content/pm/PackageManager;Ljava/lang/String;)[Landroid/content/pm/Signature;
+Landroidx/emoji2/text/DefaultGlyphChecker;
+SPLandroidx/emoji2/text/DefaultGlyphChecker;-><clinit>()V
+SPLandroidx/emoji2/text/DefaultGlyphChecker;-><init>()V
+Landroidx/emoji2/text/EmojiCompat;
+SPLandroidx/emoji2/text/EmojiCompat;-><clinit>()V
+SPLandroidx/emoji2/text/EmojiCompat;-><init>(Landroidx/emoji2/text/EmojiCompat$Config;)V
+SPLandroidx/emoji2/text/EmojiCompat;->access$000(Landroidx/emoji2/text/EmojiCompat;)Landroidx/emoji2/text/EmojiCompat$SpanFactory;
+SPLandroidx/emoji2/text/EmojiCompat;->access$100(Landroidx/emoji2/text/EmojiCompat;)Landroidx/emoji2/text/EmojiCompat$GlyphChecker;
+SPLandroidx/emoji2/text/EmojiCompat;->get()Landroidx/emoji2/text/EmojiCompat;
+SPLandroidx/emoji2/text/EmojiCompat;->getLoadState()I
+SPLandroidx/emoji2/text/EmojiCompat;->init(Landroidx/emoji2/text/EmojiCompat$Config;)Landroidx/emoji2/text/EmojiCompat;
+SPLandroidx/emoji2/text/EmojiCompat;->isConfigured()Z
+SPLandroidx/emoji2/text/EmojiCompat;->isInitialized()Z
+SPLandroidx/emoji2/text/EmojiCompat;->load()V
+SPLandroidx/emoji2/text/EmojiCompat;->loadMetadata()V
+SPLandroidx/emoji2/text/EmojiCompat;->onMetadataLoadSuccess()V
+SPLandroidx/emoji2/text/EmojiCompat;->process(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+SPLandroidx/emoji2/text/EmojiCompat;->process(Ljava/lang/CharSequence;II)Ljava/lang/CharSequence;
+SPLandroidx/emoji2/text/EmojiCompat;->process(Ljava/lang/CharSequence;III)Ljava/lang/CharSequence;
+SPLandroidx/emoji2/text/EmojiCompat;->process(Ljava/lang/CharSequence;IIII)Ljava/lang/CharSequence;
+SPLandroidx/emoji2/text/EmojiCompat;->registerInitCallback(Landroidx/emoji2/text/EmojiCompat$InitCallback;)V
+Landroidx/emoji2/text/EmojiCompat$CompatInternal;
+SPLandroidx/emoji2/text/EmojiCompat$CompatInternal;-><init>(Landroidx/emoji2/text/EmojiCompat;)V
+Landroidx/emoji2/text/EmojiCompat$CompatInternal19;
+SPLandroidx/emoji2/text/EmojiCompat$CompatInternal19;-><init>(Landroidx/emoji2/text/EmojiCompat;)V
+SPLandroidx/emoji2/text/EmojiCompat$CompatInternal19;->loadMetadata()V
+SPLandroidx/emoji2/text/EmojiCompat$CompatInternal19;->onMetadataLoadSuccess(Landroidx/emoji2/text/MetadataRepo;)V
+SPLandroidx/emoji2/text/EmojiCompat$CompatInternal19;->process(Ljava/lang/CharSequence;IIIZ)Ljava/lang/CharSequence;
+Landroidx/emoji2/text/EmojiCompat$CompatInternal19$1;
+SPLandroidx/emoji2/text/EmojiCompat$CompatInternal19$1;-><init>(Landroidx/emoji2/text/EmojiCompat$CompatInternal19;)V
+SPLandroidx/emoji2/text/EmojiCompat$CompatInternal19$1;->onLoaded(Landroidx/emoji2/text/MetadataRepo;)V
+Landroidx/emoji2/text/EmojiCompat$Config;
+SPLandroidx/emoji2/text/EmojiCompat$Config;-><init>(Landroidx/emoji2/text/EmojiCompat$MetadataRepoLoader;)V
+SPLandroidx/emoji2/text/EmojiCompat$Config;->getMetadataRepoLoader()Landroidx/emoji2/text/EmojiCompat$MetadataRepoLoader;
+SPLandroidx/emoji2/text/EmojiCompat$Config;->setMetadataLoadStrategy(I)Landroidx/emoji2/text/EmojiCompat$Config;
+Landroidx/emoji2/text/EmojiCompat$DefaultSpanFactory;
+SPLandroidx/emoji2/text/EmojiCompat$DefaultSpanFactory;-><init>()V
+Landroidx/emoji2/text/EmojiCompat$GlyphChecker;
+Landroidx/emoji2/text/EmojiCompat$InitCallback;
+SPLandroidx/emoji2/text/EmojiCompat$InitCallback;-><init>()V
+SPLandroidx/emoji2/text/EmojiCompat$InitCallback;->onInitialized()V
+Landroidx/emoji2/text/EmojiCompat$ListenerDispatcher;
+SPLandroidx/emoji2/text/EmojiCompat$ListenerDispatcher;-><init>(Ljava/util/Collection;I)V
+SPLandroidx/emoji2/text/EmojiCompat$ListenerDispatcher;-><init>(Ljava/util/Collection;ILjava/lang/Throwable;)V
+SPLandroidx/emoji2/text/EmojiCompat$ListenerDispatcher;->run()V
+Landroidx/emoji2/text/EmojiCompat$MetadataRepoLoader;
+Landroidx/emoji2/text/EmojiCompat$MetadataRepoLoaderCallback;
+SPLandroidx/emoji2/text/EmojiCompat$MetadataRepoLoaderCallback;-><init>()V
+Landroidx/emoji2/text/EmojiCompat$SpanFactory;
+Landroidx/emoji2/text/EmojiCompatInitializer;
+SPLandroidx/emoji2/text/EmojiCompatInitializer;-><init>()V
+SPLandroidx/emoji2/text/EmojiCompatInitializer;->create(Landroid/content/Context;)Ljava/lang/Boolean;
+SPLandroidx/emoji2/text/EmojiCompatInitializer;->create(Landroid/content/Context;)Ljava/lang/Object;
+SPLandroidx/emoji2/text/EmojiCompatInitializer;->delayUntilFirstResume(Landroid/content/Context;)V
+SPLandroidx/emoji2/text/EmojiCompatInitializer;->dependencies()Ljava/util/List;
+SPLandroidx/emoji2/text/EmojiCompatInitializer;->loadEmojiCompatAfterDelay()V
+Landroidx/emoji2/text/EmojiCompatInitializer$1;
+SPLandroidx/emoji2/text/EmojiCompatInitializer$1;-><init>(Landroidx/emoji2/text/EmojiCompatInitializer;Landroidx/lifecycle/Lifecycle;)V
+SPLandroidx/emoji2/text/EmojiCompatInitializer$1;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
+Landroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultConfig;
+SPLandroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultConfig;-><init>(Landroid/content/Context;)V
+Landroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader;
+SPLandroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader;-><init>(Landroid/content/Context;)V
+SPLandroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader;->doLoad(Landroidx/emoji2/text/EmojiCompat$MetadataRepoLoaderCallback;Ljava/util/concurrent/ThreadPoolExecutor;)V
+SPLandroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader;->lambda$load$0$androidx-emoji2-text-EmojiCompatInitializer$BackgroundDefaultLoader(Landroidx/emoji2/text/EmojiCompat$MetadataRepoLoaderCallback;Ljava/util/concurrent/ThreadPoolExecutor;)V
+SPLandroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader;->load(Landroidx/emoji2/text/EmojiCompat$MetadataRepoLoaderCallback;)V
+Landroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader$$ExternalSyntheticLambda0;
+SPLandroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader$$ExternalSyntheticLambda0;-><init>(Landroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader;Landroidx/emoji2/text/EmojiCompat$MetadataRepoLoaderCallback;Ljava/util/concurrent/ThreadPoolExecutor;)V
+SPLandroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader$$ExternalSyntheticLambda0;->run()V
+Landroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader$1;
+SPLandroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader$1;-><init>(Landroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader;Landroidx/emoji2/text/EmojiCompat$MetadataRepoLoaderCallback;Ljava/util/concurrent/ThreadPoolExecutor;)V
+SPLandroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader$1;->onLoaded(Landroidx/emoji2/text/MetadataRepo;)V
+Landroidx/emoji2/text/EmojiCompatInitializer$LoadEmojiCompatRunnable;
+SPLandroidx/emoji2/text/EmojiCompatInitializer$LoadEmojiCompatRunnable;-><init>()V
+SPLandroidx/emoji2/text/EmojiCompatInitializer$LoadEmojiCompatRunnable;->run()V
+Landroidx/emoji2/text/EmojiExclusions;
+SPLandroidx/emoji2/text/EmojiExclusions;->getEmojiExclusions()Ljava/util/Set;
+Landroidx/emoji2/text/EmojiExclusions$EmojiExclusions_Api34;
+SPLandroidx/emoji2/text/EmojiExclusions$EmojiExclusions_Api34;->getExclusions()Ljava/util/Set;
+Landroidx/emoji2/text/EmojiExclusions$EmojiExclusions_Reflections;
+SPLandroidx/emoji2/text/EmojiExclusions$EmojiExclusions_Reflections;->getExclusions()Ljava/util/Set;
+Landroidx/emoji2/text/EmojiProcessor;
+SPLandroidx/emoji2/text/EmojiProcessor;-><init>(Landroidx/emoji2/text/MetadataRepo;Landroidx/emoji2/text/EmojiCompat$SpanFactory;Landroidx/emoji2/text/EmojiCompat$GlyphChecker;Z[ILjava/util/Set;)V
+SPLandroidx/emoji2/text/EmojiProcessor;->initExclusions(Ljava/util/Set;)V
+SPLandroidx/emoji2/text/EmojiProcessor;->process(Ljava/lang/CharSequence;IIIZ)Ljava/lang/CharSequence;
+SPLandroidx/emoji2/text/EmojiProcessor;->process(Ljava/lang/CharSequence;IIIZLandroidx/emoji2/text/EmojiProcessor$EmojiProcessCallback;)Ljava/lang/Object;
+Landroidx/emoji2/text/EmojiProcessor$EmojiProcessAddSpanCallback;
+SPLandroidx/emoji2/text/EmojiProcessor$EmojiProcessAddSpanCallback;-><init>(Landroidx/emoji2/text/UnprecomputeTextOnModificationSpannable;Landroidx/emoji2/text/EmojiCompat$SpanFactory;)V
+SPLandroidx/emoji2/text/EmojiProcessor$EmojiProcessAddSpanCallback;->getResult()Landroidx/emoji2/text/UnprecomputeTextOnModificationSpannable;
+SPLandroidx/emoji2/text/EmojiProcessor$EmojiProcessAddSpanCallback;->getResult()Ljava/lang/Object;
+Landroidx/emoji2/text/EmojiProcessor$EmojiProcessCallback;
+Landroidx/emoji2/text/EmojiProcessor$ProcessorSm;
+SPLandroidx/emoji2/text/EmojiProcessor$ProcessorSm;-><init>(Landroidx/emoji2/text/MetadataRepo$Node;Z[I)V
+SPLandroidx/emoji2/text/EmojiProcessor$ProcessorSm;->check(I)I
+SPLandroidx/emoji2/text/EmojiProcessor$ProcessorSm;->isEmojiStyle(I)Z
+SPLandroidx/emoji2/text/EmojiProcessor$ProcessorSm;->isInFlushableState()Z
+SPLandroidx/emoji2/text/EmojiProcessor$ProcessorSm;->isTextStyle(I)Z
+SPLandroidx/emoji2/text/EmojiProcessor$ProcessorSm;->reset()I
+SPLandroidx/emoji2/text/EmojiProcessor$ProcessorSm;->shouldUseEmojiPresentationStyleForSingleCodepoint()Z
+Landroidx/emoji2/text/FontRequestEmojiCompatConfig;
+SPLandroidx/emoji2/text/FontRequestEmojiCompatConfig;-><clinit>()V
+SPLandroidx/emoji2/text/FontRequestEmojiCompatConfig;-><init>(Landroid/content/Context;Landroidx/core/provider/FontRequest;)V
+SPLandroidx/emoji2/text/FontRequestEmojiCompatConfig;->setLoadingExecutor(Ljava/util/concurrent/Executor;)Landroidx/emoji2/text/FontRequestEmojiCompatConfig;
+Landroidx/emoji2/text/FontRequestEmojiCompatConfig$FontProviderHelper;
+SPLandroidx/emoji2/text/FontRequestEmojiCompatConfig$FontProviderHelper;-><init>()V
+SPLandroidx/emoji2/text/FontRequestEmojiCompatConfig$FontProviderHelper;->buildTypeface(Landroid/content/Context;Landroidx/core/provider/FontsContractCompat$FontInfo;)Landroid/graphics/Typeface;
+SPLandroidx/emoji2/text/FontRequestEmojiCompatConfig$FontProviderHelper;->fetchFonts(Landroid/content/Context;Landroidx/core/provider/FontRequest;)Landroidx/core/provider/FontsContractCompat$FontFamilyResult;
+Landroidx/emoji2/text/FontRequestEmojiCompatConfig$FontRequestMetadataLoader;
+SPLandroidx/emoji2/text/FontRequestEmojiCompatConfig$FontRequestMetadataLoader;-><init>(Landroid/content/Context;Landroidx/core/provider/FontRequest;Landroidx/emoji2/text/FontRequestEmojiCompatConfig$FontProviderHelper;)V
+SPLandroidx/emoji2/text/FontRequestEmojiCompatConfig$FontRequestMetadataLoader;->cleanUp()V
+SPLandroidx/emoji2/text/FontRequestEmojiCompatConfig$FontRequestMetadataLoader;->createMetadata()V
+SPLandroidx/emoji2/text/FontRequestEmojiCompatConfig$FontRequestMetadataLoader;->load(Landroidx/emoji2/text/EmojiCompat$MetadataRepoLoaderCallback;)V
+SPLandroidx/emoji2/text/FontRequestEmojiCompatConfig$FontRequestMetadataLoader;->loadInternal()V
+SPLandroidx/emoji2/text/FontRequestEmojiCompatConfig$FontRequestMetadataLoader;->retrieveFontInfo()Landroidx/core/provider/FontsContractCompat$FontInfo;
+SPLandroidx/emoji2/text/FontRequestEmojiCompatConfig$FontRequestMetadataLoader;->setExecutor(Ljava/util/concurrent/Executor;)V
+Landroidx/emoji2/text/FontRequestEmojiCompatConfig$FontRequestMetadataLoader$$ExternalSyntheticLambda0;
+SPLandroidx/emoji2/text/FontRequestEmojiCompatConfig$FontRequestMetadataLoader$$ExternalSyntheticLambda0;-><init>(Landroidx/emoji2/text/FontRequestEmojiCompatConfig$FontRequestMetadataLoader;)V
+SPLandroidx/emoji2/text/FontRequestEmojiCompatConfig$FontRequestMetadataLoader$$ExternalSyntheticLambda0;->run()V
+Landroidx/emoji2/text/MetadataListReader;
+SPLandroidx/emoji2/text/MetadataListReader;->findOffsetInfo(Landroidx/emoji2/text/MetadataListReader$OpenTypeReader;)Landroidx/emoji2/text/MetadataListReader$OffsetInfo;
+SPLandroidx/emoji2/text/MetadataListReader;->read(Ljava/nio/ByteBuffer;)Landroidx/emoji2/text/flatbuffer/MetadataList;
+SPLandroidx/emoji2/text/MetadataListReader;->toUnsignedInt(I)J
+SPLandroidx/emoji2/text/MetadataListReader;->toUnsignedShort(S)I
+Landroidx/emoji2/text/MetadataListReader$ByteBufferReader;
+SPLandroidx/emoji2/text/MetadataListReader$ByteBufferReader;-><init>(Ljava/nio/ByteBuffer;)V
+SPLandroidx/emoji2/text/MetadataListReader$ByteBufferReader;->getPosition()J
+SPLandroidx/emoji2/text/MetadataListReader$ByteBufferReader;->readTag()I
+SPLandroidx/emoji2/text/MetadataListReader$ByteBufferReader;->readUnsignedInt()J
+SPLandroidx/emoji2/text/MetadataListReader$ByteBufferReader;->readUnsignedShort()I
+SPLandroidx/emoji2/text/MetadataListReader$ByteBufferReader;->skip(I)V
+Landroidx/emoji2/text/MetadataListReader$OffsetInfo;
+SPLandroidx/emoji2/text/MetadataListReader$OffsetInfo;-><init>(JJ)V
+SPLandroidx/emoji2/text/MetadataListReader$OffsetInfo;->getStartOffset()J
+Landroidx/emoji2/text/MetadataListReader$OpenTypeReader;
+Landroidx/emoji2/text/MetadataRepo;
+SPLandroidx/emoji2/text/MetadataRepo;-><init>(Landroid/graphics/Typeface;Landroidx/emoji2/text/flatbuffer/MetadataList;)V
+SPLandroidx/emoji2/text/MetadataRepo;->constructIndex(Landroidx/emoji2/text/flatbuffer/MetadataList;)V
+SPLandroidx/emoji2/text/MetadataRepo;->create(Landroid/graphics/Typeface;Ljava/nio/ByteBuffer;)Landroidx/emoji2/text/MetadataRepo;
+SPLandroidx/emoji2/text/MetadataRepo;->getMetadataList()Landroidx/emoji2/text/flatbuffer/MetadataList;
+SPLandroidx/emoji2/text/MetadataRepo;->getRootNode()Landroidx/emoji2/text/MetadataRepo$Node;
+SPLandroidx/emoji2/text/MetadataRepo;->put(Landroidx/emoji2/text/TypefaceEmojiRasterizer;)V
+Landroidx/emoji2/text/MetadataRepo$Node;
+SPLandroidx/emoji2/text/MetadataRepo$Node;-><init>()V
+SPLandroidx/emoji2/text/MetadataRepo$Node;-><init>(I)V
+SPLandroidx/emoji2/text/MetadataRepo$Node;->get(I)Landroidx/emoji2/text/MetadataRepo$Node;
+SPLandroidx/emoji2/text/MetadataRepo$Node;->getData()Landroidx/emoji2/text/TypefaceEmojiRasterizer;
+SPLandroidx/emoji2/text/MetadataRepo$Node;->put(Landroidx/emoji2/text/TypefaceEmojiRasterizer;II)V
+Landroidx/emoji2/text/SpannableBuilder;
+SPLandroidx/emoji2/text/SpannableBuilder;-><init>(Ljava/lang/Class;Ljava/lang/CharSequence;)V
+SPLandroidx/emoji2/text/SpannableBuilder;->create(Ljava/lang/Class;Ljava/lang/CharSequence;)Landroidx/emoji2/text/SpannableBuilder;
+SPLandroidx/emoji2/text/SpannableBuilder;->getSpanFlags(Ljava/lang/Object;)I
+SPLandroidx/emoji2/text/SpannableBuilder;->getSpanStart(Ljava/lang/Object;)I
+SPLandroidx/emoji2/text/SpannableBuilder;->getSpans(IILjava/lang/Class;)[Ljava/lang/Object;
+SPLandroidx/emoji2/text/SpannableBuilder;->isWatcher(Ljava/lang/Class;)Z
+SPLandroidx/emoji2/text/SpannableBuilder;->isWatcher(Ljava/lang/Object;)Z
+SPLandroidx/emoji2/text/SpannableBuilder;->removeSpan(Ljava/lang/Object;)V
+SPLandroidx/emoji2/text/SpannableBuilder;->setSpan(Ljava/lang/Object;III)V
+Landroidx/emoji2/text/TypefaceEmojiRasterizer;
+SPLandroidx/emoji2/text/TypefaceEmojiRasterizer;-><clinit>()V
+HSPLandroidx/emoji2/text/TypefaceEmojiRasterizer;-><init>(Landroidx/emoji2/text/MetadataRepo;I)V
+SPLandroidx/emoji2/text/TypefaceEmojiRasterizer;->getCodepointAt(I)I
+SPLandroidx/emoji2/text/TypefaceEmojiRasterizer;->getCodepointsLength()I
+SPLandroidx/emoji2/text/TypefaceEmojiRasterizer;->getId()I
+HSPLandroidx/emoji2/text/TypefaceEmojiRasterizer;->getMetadataItem()Landroidx/emoji2/text/flatbuffer/MetadataItem;
+SPLandroidx/emoji2/text/TypefaceEmojiRasterizer;->isDefaultEmoji()Z
+Landroidx/emoji2/text/UnprecomputeTextOnModificationSpannable;
+Landroidx/emoji2/text/flatbuffer/MetadataItem;
+SPLandroidx/emoji2/text/flatbuffer/MetadataItem;-><init>()V
+HSPLandroidx/emoji2/text/flatbuffer/MetadataItem;->__assign(ILjava/nio/ByteBuffer;)Landroidx/emoji2/text/flatbuffer/MetadataItem;
+HSPLandroidx/emoji2/text/flatbuffer/MetadataItem;->__init(ILjava/nio/ByteBuffer;)V
+SPLandroidx/emoji2/text/flatbuffer/MetadataItem;->codepoints(I)I
+SPLandroidx/emoji2/text/flatbuffer/MetadataItem;->codepointsLength()I
+SPLandroidx/emoji2/text/flatbuffer/MetadataItem;->emojiStyle()Z
+SPLandroidx/emoji2/text/flatbuffer/MetadataItem;->id()I
+Landroidx/emoji2/text/flatbuffer/MetadataList;
+SPLandroidx/emoji2/text/flatbuffer/MetadataList;-><init>()V
+SPLandroidx/emoji2/text/flatbuffer/MetadataList;->__assign(ILjava/nio/ByteBuffer;)Landroidx/emoji2/text/flatbuffer/MetadataList;
+SPLandroidx/emoji2/text/flatbuffer/MetadataList;->__init(ILjava/nio/ByteBuffer;)V
+SPLandroidx/emoji2/text/flatbuffer/MetadataList;->getRootAsMetadataList(Ljava/nio/ByteBuffer;)Landroidx/emoji2/text/flatbuffer/MetadataList;
+SPLandroidx/emoji2/text/flatbuffer/MetadataList;->getRootAsMetadataList(Ljava/nio/ByteBuffer;Landroidx/emoji2/text/flatbuffer/MetadataList;)Landroidx/emoji2/text/flatbuffer/MetadataList;
+SPLandroidx/emoji2/text/flatbuffer/MetadataList;->list(Landroidx/emoji2/text/flatbuffer/MetadataItem;I)Landroidx/emoji2/text/flatbuffer/MetadataItem;
+SPLandroidx/emoji2/text/flatbuffer/MetadataList;->listLength()I
+Landroidx/emoji2/text/flatbuffer/Table;
+SPLandroidx/emoji2/text/flatbuffer/Table;-><init>()V
+HSPLandroidx/emoji2/text/flatbuffer/Table;->__indirect(I)I
+HSPLandroidx/emoji2/text/flatbuffer/Table;->__offset(I)I
+SPLandroidx/emoji2/text/flatbuffer/Table;->__reset(ILjava/nio/ByteBuffer;)V
+HSPLandroidx/emoji2/text/flatbuffer/Table;->__vector(I)I
+SPLandroidx/emoji2/text/flatbuffer/Table;->__vector_len(I)I
+Landroidx/emoji2/text/flatbuffer/Utf8;
+SPLandroidx/emoji2/text/flatbuffer/Utf8;-><init>()V
+SPLandroidx/emoji2/text/flatbuffer/Utf8;->getDefault()Landroidx/emoji2/text/flatbuffer/Utf8;
+Landroidx/emoji2/text/flatbuffer/Utf8Safe;
+SPLandroidx/emoji2/text/flatbuffer/Utf8Safe;-><init>()V
+Landroidx/emoji2/viewsintegration/EmojiEditTextHelper;
+SPLandroidx/emoji2/viewsintegration/EmojiEditTextHelper;-><init>(Landroid/widget/EditText;Z)V
+SPLandroidx/emoji2/viewsintegration/EmojiEditTextHelper;->getKeyListener(Landroid/text/method/KeyListener;)Landroid/text/method/KeyListener;
+SPLandroidx/emoji2/viewsintegration/EmojiEditTextHelper;->setEnabled(Z)V
+Landroidx/emoji2/viewsintegration/EmojiEditTextHelper$HelperInternal;
+SPLandroidx/emoji2/viewsintegration/EmojiEditTextHelper$HelperInternal;-><init>()V
+Landroidx/emoji2/viewsintegration/EmojiEditTextHelper$HelperInternal19;
+SPLandroidx/emoji2/viewsintegration/EmojiEditTextHelper$HelperInternal19;-><init>(Landroid/widget/EditText;Z)V
+SPLandroidx/emoji2/viewsintegration/EmojiEditTextHelper$HelperInternal19;->getKeyListener(Landroid/text/method/KeyListener;)Landroid/text/method/KeyListener;
+SPLandroidx/emoji2/viewsintegration/EmojiEditTextHelper$HelperInternal19;->setEnabled(Z)V
+Landroidx/emoji2/viewsintegration/EmojiEditableFactory;
+SPLandroidx/emoji2/viewsintegration/EmojiEditableFactory;-><clinit>()V
+SPLandroidx/emoji2/viewsintegration/EmojiEditableFactory;-><init>()V
+SPLandroidx/emoji2/viewsintegration/EmojiEditableFactory;->getInstance()Landroid/text/Editable$Factory;
+SPLandroidx/emoji2/viewsintegration/EmojiEditableFactory;->newEditable(Ljava/lang/CharSequence;)Landroid/text/Editable;
+Landroidx/emoji2/viewsintegration/EmojiInputFilter;
+SPLandroidx/emoji2/viewsintegration/EmojiInputFilter;-><init>(Landroid/widget/TextView;)V
+SPLandroidx/emoji2/viewsintegration/EmojiInputFilter;->filter(Ljava/lang/CharSequence;IILandroid/text/Spanned;II)Ljava/lang/CharSequence;
+SPLandroidx/emoji2/viewsintegration/EmojiInputFilter;->getInitCallback()Landroidx/emoji2/text/EmojiCompat$InitCallback;
+Landroidx/emoji2/viewsintegration/EmojiInputFilter$InitCallbackImpl;
+SPLandroidx/emoji2/viewsintegration/EmojiInputFilter$InitCallbackImpl;-><init>(Landroid/widget/TextView;Landroidx/emoji2/viewsintegration/EmojiInputFilter;)V
+SPLandroidx/emoji2/viewsintegration/EmojiInputFilter$InitCallbackImpl;->isInputFilterCurrentlyRegisteredOnTextView(Landroid/widget/TextView;Landroid/text/InputFilter;)Z
+SPLandroidx/emoji2/viewsintegration/EmojiInputFilter$InitCallbackImpl;->onInitialized()V
+SPLandroidx/emoji2/viewsintegration/EmojiInputFilter$InitCallbackImpl;->run()V
+Landroidx/emoji2/viewsintegration/EmojiKeyListener;
+SPLandroidx/emoji2/viewsintegration/EmojiKeyListener;-><init>(Landroid/text/method/KeyListener;)V
+SPLandroidx/emoji2/viewsintegration/EmojiKeyListener;-><init>(Landroid/text/method/KeyListener;Landroidx/emoji2/viewsintegration/EmojiKeyListener$EmojiCompatHandleKeyDownHelper;)V
+SPLandroidx/emoji2/viewsintegration/EmojiKeyListener;->getInputType()I
+Landroidx/emoji2/viewsintegration/EmojiKeyListener$EmojiCompatHandleKeyDownHelper;
+SPLandroidx/emoji2/viewsintegration/EmojiKeyListener$EmojiCompatHandleKeyDownHelper;-><init>()V
+Landroidx/emoji2/viewsintegration/EmojiTextViewHelper;
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper;-><init>(Landroid/widget/TextView;Z)V
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper;->getFilters([Landroid/text/InputFilter;)[Landroid/text/InputFilter;
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper;->setAllCaps(Z)V
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper;->setEnabled(Z)V
+Landroidx/emoji2/viewsintegration/EmojiTextViewHelper$HelperInternal;
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper$HelperInternal;-><init>()V
+Landroidx/emoji2/viewsintegration/EmojiTextViewHelper$HelperInternal19;
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper$HelperInternal19;-><init>(Landroid/widget/TextView;)V
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper$HelperInternal19;->addEmojiInputFilterIfMissing([Landroid/text/InputFilter;)[Landroid/text/InputFilter;
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper$HelperInternal19;->getFilters([Landroid/text/InputFilter;)[Landroid/text/InputFilter;
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper$HelperInternal19;->setAllCaps(Z)V
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper$HelperInternal19;->setEnabled(Z)V
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper$HelperInternal19;->updateFilters()V
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper$HelperInternal19;->updateTransformationMethod()V
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper$HelperInternal19;->wrapForEnabled(Landroid/text/method/TransformationMethod;)Landroid/text/method/TransformationMethod;
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper$HelperInternal19;->wrapTransformationMethod(Landroid/text/method/TransformationMethod;)Landroid/text/method/TransformationMethod;
+Landroidx/emoji2/viewsintegration/EmojiTextViewHelper$SkippingHelper19;
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper$SkippingHelper19;-><init>(Landroid/widget/TextView;)V
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper$SkippingHelper19;->getFilters([Landroid/text/InputFilter;)[Landroid/text/InputFilter;
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper$SkippingHelper19;->setAllCaps(Z)V
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper$SkippingHelper19;->setEnabled(Z)V
+SPLandroidx/emoji2/viewsintegration/EmojiTextViewHelper$SkippingHelper19;->skipBecauseEmojiCompatNotInitialized()Z
+Landroidx/emoji2/viewsintegration/EmojiTextWatcher;
+SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher;-><init>(Landroid/widget/EditText;Z)V
+SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher;->afterTextChanged(Landroid/text/Editable;)V
+SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher;->beforeTextChanged(Ljava/lang/CharSequence;III)V
+SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher;->getInitCallback()Landroidx/emoji2/text/EmojiCompat$InitCallback;
+SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher;->onTextChanged(Ljava/lang/CharSequence;III)V
+SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher;->setEnabled(Z)V
+SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher;->shouldSkipForDisabledOrNotConfigured()Z
+Landroidx/emoji2/viewsintegration/EmojiTextWatcher$InitCallbackImpl;
+SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher$InitCallbackImpl;-><init>(Landroid/widget/EditText;)V
+SPLandroidx/emoji2/viewsintegration/EmojiTextWatcher$InitCallbackImpl;->onInitialized()V
+Landroidx/emoji2/viewsintegration/EmojiTransformationMethod;
+SPLandroidx/emoji2/viewsintegration/EmojiTransformationMethod;-><init>(Landroid/text/method/TransformationMethod;)V
+SPLandroidx/emoji2/viewsintegration/EmojiTransformationMethod;->getTransformation(Ljava/lang/CharSequence;Landroid/view/View;)Ljava/lang/CharSequence;
+Landroidx/fragment/R$styleable;
+SPLandroidx/fragment/R$styleable;-><clinit>()V
+Landroidx/fragment/app/BackStackRecord;
+Landroidx/fragment/app/DialogFragment;
+Landroidx/fragment/app/Fragment;
+SPLandroidx/fragment/app/Fragment;-><clinit>()V
+Landroidx/fragment/app/FragmentActivity;
+SPLandroidx/fragment/app/FragmentActivity;-><init>(I)V
+SPLandroidx/fragment/app/FragmentActivity;->dispatchFragmentsOnCreateView(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;
+SPLandroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
+SPLandroidx/fragment/app/FragmentActivity;->init()V
+SPLandroidx/fragment/app/FragmentActivity;->lambda$init$3$androidx-fragment-app-FragmentActivity(Landroid/content/Context;)V
+SPLandroidx/fragment/app/FragmentActivity;->onCreate(Landroid/os/Bundle;)V
+SPLandroidx/fragment/app/FragmentActivity;->onCreateView(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;
+SPLandroidx/fragment/app/FragmentActivity;->onCreateView(Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;
+SPLandroidx/fragment/app/FragmentActivity;->onPostResume()V
+SPLandroidx/fragment/app/FragmentActivity;->onResume()V
+SPLandroidx/fragment/app/FragmentActivity;->onResumeFragments()V
+SPLandroidx/fragment/app/FragmentActivity;->onStart()V
+SPLandroidx/fragment/app/FragmentActivity;->onStateNotSaved()V
+Landroidx/fragment/app/FragmentActivity$$ExternalSyntheticLambda0;
+SPLandroidx/fragment/app/FragmentActivity$$ExternalSyntheticLambda0;-><init>(Landroidx/fragment/app/FragmentActivity;)V
+Landroidx/fragment/app/FragmentActivity$$ExternalSyntheticLambda1;
+SPLandroidx/fragment/app/FragmentActivity$$ExternalSyntheticLambda1;-><init>(Landroidx/fragment/app/FragmentActivity;)V
+Landroidx/fragment/app/FragmentActivity$$ExternalSyntheticLambda2;
+SPLandroidx/fragment/app/FragmentActivity$$ExternalSyntheticLambda2;-><init>(Landroidx/fragment/app/FragmentActivity;)V
+Landroidx/fragment/app/FragmentActivity$$ExternalSyntheticLambda3;
+SPLandroidx/fragment/app/FragmentActivity$$ExternalSyntheticLambda3;-><init>(Landroidx/fragment/app/FragmentActivity;)V
+SPLandroidx/fragment/app/FragmentActivity$$ExternalSyntheticLambda3;->onContextAvailable(Landroid/content/Context;)V
+Landroidx/fragment/app/FragmentActivity$HostCallbacks;
+SPLandroidx/fragment/app/FragmentActivity$HostCallbacks;-><init>(Landroidx/fragment/app/FragmentActivity;)V
+SPLandroidx/fragment/app/FragmentActivity$HostCallbacks;->addMenuProvider(Landroidx/core/view/MenuProvider;)V
+SPLandroidx/fragment/app/FragmentActivity$HostCallbacks;->addOnConfigurationChangedListener(Landroidx/core/util/Consumer;)V
+SPLandroidx/fragment/app/FragmentActivity$HostCallbacks;->addOnMultiWindowModeChangedListener(Landroidx/core/util/Consumer;)V
+SPLandroidx/fragment/app/FragmentActivity$HostCallbacks;->addOnPictureInPictureModeChangedListener(Landroidx/core/util/Consumer;)V
+SPLandroidx/fragment/app/FragmentActivity$HostCallbacks;->addOnTrimMemoryListener(Landroidx/core/util/Consumer;)V
+SPLandroidx/fragment/app/FragmentActivity$HostCallbacks;->getActivityResultRegistry()Landroidx/activity/result/ActivityResultRegistry;
+SPLandroidx/fragment/app/FragmentActivity$HostCallbacks;->getLifecycle()Landroidx/lifecycle/Lifecycle;
+SPLandroidx/fragment/app/FragmentActivity$HostCallbacks;->getOnBackPressedDispatcher()Landroidx/activity/OnBackPressedDispatcher;
+SPLandroidx/fragment/app/FragmentActivity$HostCallbacks;->getSavedStateRegistry()Landroidx/savedstate/SavedStateRegistry;
+SPLandroidx/fragment/app/FragmentActivity$HostCallbacks;->getViewModelStore()Landroidx/lifecycle/ViewModelStore;
+Landroidx/fragment/app/FragmentContainer;
+SPLandroidx/fragment/app/FragmentContainer;-><init>()V
+Landroidx/fragment/app/FragmentContainerView;
+SPLandroidx/fragment/app/FragmentContainerView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;Landroidx/fragment/app/FragmentManager;)V
+SPLandroidx/fragment/app/FragmentContainerView;->dispatchApplyWindowInsets(Landroid/view/WindowInsets;)Landroid/view/WindowInsets;
+SPLandroidx/fragment/app/FragmentContainerView;->onApplyWindowInsets(Landroid/view/WindowInsets;)Landroid/view/WindowInsets;
+Landroidx/fragment/app/FragmentController;
+SPLandroidx/fragment/app/FragmentController;-><init>(Landroidx/fragment/app/FragmentHostCallback;)V
+SPLandroidx/fragment/app/FragmentController;->attachHost(Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/FragmentController;->createController(Landroidx/fragment/app/FragmentHostCallback;)Landroidx/fragment/app/FragmentController;
+SPLandroidx/fragment/app/FragmentController;->dispatchActivityCreated()V
+SPLandroidx/fragment/app/FragmentController;->dispatchCreate()V
+SPLandroidx/fragment/app/FragmentController;->dispatchResume()V
+SPLandroidx/fragment/app/FragmentController;->dispatchStart()V
+SPLandroidx/fragment/app/FragmentController;->execPendingActions()Z
+SPLandroidx/fragment/app/FragmentController;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
+SPLandroidx/fragment/app/FragmentController;->noteStateNotSaved()V
+SPLandroidx/fragment/app/FragmentController;->onCreateView(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;
+Landroidx/fragment/app/FragmentFactory;
+SPLandroidx/fragment/app/FragmentFactory;-><clinit>()V
+SPLandroidx/fragment/app/FragmentFactory;-><init>()V
+Landroidx/fragment/app/FragmentHostCallback;
+SPLandroidx/fragment/app/FragmentHostCallback;-><init>(Landroid/app/Activity;Landroid/content/Context;Landroid/os/Handler;I)V
+SPLandroidx/fragment/app/FragmentHostCallback;-><init>(Landroidx/fragment/app/FragmentActivity;)V
+SPLandroidx/fragment/app/FragmentHostCallback;->getFragmentManager()Landroidx/fragment/app/FragmentManager;
+SPLandroidx/fragment/app/FragmentHostCallback;->getHandler()Landroid/os/Handler;
+Landroidx/fragment/app/FragmentLayoutInflaterFactory;
+SPLandroidx/fragment/app/FragmentLayoutInflaterFactory;-><init>(Landroidx/fragment/app/FragmentManager;)V
+SPLandroidx/fragment/app/FragmentLayoutInflaterFactory;->onCreateView(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;
+Landroidx/fragment/app/FragmentLifecycleCallbacksDispatcher;
+SPLandroidx/fragment/app/FragmentLifecycleCallbacksDispatcher;-><init>(Landroidx/fragment/app/FragmentManager;)V
+SPLandroidx/fragment/app/FragmentLifecycleCallbacksDispatcher;->registerFragmentLifecycleCallbacks(Landroidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks;Z)V
+Landroidx/fragment/app/FragmentLifecycleCallbacksDispatcher$FragmentLifecycleCallbacksHolder;
+SPLandroidx/fragment/app/FragmentLifecycleCallbacksDispatcher$FragmentLifecycleCallbacksHolder;-><init>(Landroidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks;Z)V
+Landroidx/fragment/app/FragmentManager;
+SPLandroidx/fragment/app/FragmentManager;->-$$Nest$fgetmResults(Landroidx/fragment/app/FragmentManager;)Ljava/util/Map;
+SPLandroidx/fragment/app/FragmentManager;-><clinit>()V
+SPLandroidx/fragment/app/FragmentManager;-><init>()V
+SPLandroidx/fragment/app/FragmentManager;->addFragmentOnAttachListener(Landroidx/fragment/app/FragmentOnAttachListener;)V
+SPLandroidx/fragment/app/FragmentManager;->attachController(Landroidx/fragment/app/FragmentHostCallback;Landroidx/fragment/app/FragmentContainer;Landroidx/fragment/app/Fragment;)V
+SPLandroidx/fragment/app/FragmentManager;->collectAllSpecialEffectsController()Ljava/util/Set;
+SPLandroidx/fragment/app/FragmentManager;->dispatchActivityCreated()V
+SPLandroidx/fragment/app/FragmentManager;->dispatchCreate()V
+SPLandroidx/fragment/app/FragmentManager;->dispatchCreateOptionsMenu(Landroid/view/Menu;Landroid/view/MenuInflater;)Z
+SPLandroidx/fragment/app/FragmentManager;->dispatchPrepareOptionsMenu(Landroid/view/Menu;)Z
+SPLandroidx/fragment/app/FragmentManager;->dispatchResume()V
+SPLandroidx/fragment/app/FragmentManager;->dispatchStart()V
+SPLandroidx/fragment/app/FragmentManager;->dispatchStateChange(I)V
+SPLandroidx/fragment/app/FragmentManager;->doPendingDeferredStart()V
+SPLandroidx/fragment/app/FragmentManager;->ensureExecReady(Z)V
+SPLandroidx/fragment/app/FragmentManager;->execPendingActions(Z)Z
+SPLandroidx/fragment/app/FragmentManager;->findFragmentById(I)Landroidx/fragment/app/Fragment;
+SPLandroidx/fragment/app/FragmentManager;->findFragmentByTag(Ljava/lang/String;)Landroidx/fragment/app/Fragment;
+SPLandroidx/fragment/app/FragmentManager;->generateOpsForPendingActions(Ljava/util/ArrayList;Ljava/util/ArrayList;)Z
+SPLandroidx/fragment/app/FragmentManager;->getBackStackEntryCount()I
+SPLandroidx/fragment/app/FragmentManager;->getLayoutInflaterFactory()Landroid/view/LayoutInflater$Factory2;
+SPLandroidx/fragment/app/FragmentManager;->isLoggingEnabled(I)Z
+SPLandroidx/fragment/app/FragmentManager;->isStateSaved()Z
+SPLandroidx/fragment/app/FragmentManager;->moveToState(IZ)V
+SPLandroidx/fragment/app/FragmentManager;->noteStateNotSaved()V
+SPLandroidx/fragment/app/FragmentManager;->onContainerAvailable(Landroidx/fragment/app/FragmentContainerView;)V
+SPLandroidx/fragment/app/FragmentManager;->registerFragmentLifecycleCallbacks(Landroidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks;Z)V
+SPLandroidx/fragment/app/FragmentManager;->setFragmentResultListener(Ljava/lang/String;Landroidx/lifecycle/LifecycleOwner;Landroidx/fragment/app/FragmentResultListener;)V
+SPLandroidx/fragment/app/FragmentManager;->startPendingDeferredFragments()V
+SPLandroidx/fragment/app/FragmentManager;->updateOnBackPressedCallbackEnabled()V
+Landroidx/fragment/app/FragmentManager$$ExternalSyntheticLambda0;
+SPLandroidx/fragment/app/FragmentManager$$ExternalSyntheticLambda0;-><init>(Landroidx/fragment/app/FragmentManager;)V
+Landroidx/fragment/app/FragmentManager$$ExternalSyntheticLambda1;
+SPLandroidx/fragment/app/FragmentManager$$ExternalSyntheticLambda1;-><init>(Landroidx/fragment/app/FragmentManager;)V
+Landroidx/fragment/app/FragmentManager$$ExternalSyntheticLambda2;
+SPLandroidx/fragment/app/FragmentManager$$ExternalSyntheticLambda2;-><init>(Landroidx/fragment/app/FragmentManager;)V
+Landroidx/fragment/app/FragmentManager$$ExternalSyntheticLambda3;
+SPLandroidx/fragment/app/FragmentManager$$ExternalSyntheticLambda3;-><init>(Landroidx/fragment/app/FragmentManager;)V
+Landroidx/fragment/app/FragmentManager$$ExternalSyntheticLambda4;
+SPLandroidx/fragment/app/FragmentManager$$ExternalSyntheticLambda4;-><init>(Landroidx/fragment/app/FragmentManager;)V
+Landroidx/fragment/app/FragmentManager$1;
+SPLandroidx/fragment/app/FragmentManager$1;-><init>(Landroidx/fragment/app/FragmentManager;Z)V
+Landroidx/fragment/app/FragmentManager$10;
+SPLandroidx/fragment/app/FragmentManager$10;-><init>(Landroidx/fragment/app/FragmentManager;)V
+Landroidx/fragment/app/FragmentManager$2;
+SPLandroidx/fragment/app/FragmentManager$2;-><init>(Landroidx/fragment/app/FragmentManager;)V
+SPLandroidx/fragment/app/FragmentManager$2;->onCreateMenu(Landroid/view/Menu;Landroid/view/MenuInflater;)V
+SPLandroidx/fragment/app/FragmentManager$2;->onPrepareMenu(Landroid/view/Menu;)V
+Landroidx/fragment/app/FragmentManager$3;
+SPLandroidx/fragment/app/FragmentManager$3;-><init>(Landroidx/fragment/app/FragmentManager;)V
+Landroidx/fragment/app/FragmentManager$4;
+SPLandroidx/fragment/app/FragmentManager$4;-><init>(Landroidx/fragment/app/FragmentManager;)V
+Landroidx/fragment/app/FragmentManager$5;
+SPLandroidx/fragment/app/FragmentManager$5;-><init>(Landroidx/fragment/app/FragmentManager;)V
+Landroidx/fragment/app/FragmentManager$6;
+SPLandroidx/fragment/app/FragmentManager$6;-><init>(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;Landroidx/fragment/app/FragmentResultListener;Landroidx/lifecycle/Lifecycle;)V
+SPLandroidx/fragment/app/FragmentManager$6;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+Landroidx/fragment/app/FragmentManager$8;
+SPLandroidx/fragment/app/FragmentManager$8;-><init>(Landroidx/fragment/app/FragmentManager;)V
+Landroidx/fragment/app/FragmentManager$9;
+SPLandroidx/fragment/app/FragmentManager$9;-><init>(Landroidx/fragment/app/FragmentManager;)V
+Landroidx/fragment/app/FragmentManager$BackStackEntry;
+Landroidx/fragment/app/FragmentManager$FragmentIntentSenderContract;
+SPLandroidx/fragment/app/FragmentManager$FragmentIntentSenderContract;-><init>()V
+Landroidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks;
+SPLandroidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks;-><init>()V
+Landroidx/fragment/app/FragmentManager$LifecycleAwareResultListener;
+SPLandroidx/fragment/app/FragmentManager$LifecycleAwareResultListener;-><init>(Landroidx/lifecycle/Lifecycle;Landroidx/fragment/app/FragmentResultListener;Landroidx/lifecycle/LifecycleEventObserver;)V
+Landroidx/fragment/app/FragmentManager$OpGenerator;
+Landroidx/fragment/app/FragmentManagerImpl;
+SPLandroidx/fragment/app/FragmentManagerImpl;-><init>()V
+Landroidx/fragment/app/FragmentManagerViewModel;
+SPLandroidx/fragment/app/FragmentManagerViewModel;-><clinit>()V
+SPLandroidx/fragment/app/FragmentManagerViewModel;-><init>(Z)V
+SPLandroidx/fragment/app/FragmentManagerViewModel;->getInstance(Landroidx/lifecycle/ViewModelStore;)Landroidx/fragment/app/FragmentManagerViewModel;
+SPLandroidx/fragment/app/FragmentManagerViewModel;->setIsStateSaved(Z)V
+Landroidx/fragment/app/FragmentManagerViewModel$1;
+SPLandroidx/fragment/app/FragmentManagerViewModel$1;-><init>()V
+SPLandroidx/fragment/app/FragmentManagerViewModel$1;->create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+Landroidx/fragment/app/FragmentOnAttachListener;
+Landroidx/fragment/app/FragmentResultListener;
+Landroidx/fragment/app/FragmentResultOwner;
+Landroidx/fragment/app/FragmentStore;
+SPLandroidx/fragment/app/FragmentStore;-><init>()V
+SPLandroidx/fragment/app/FragmentStore;->burpActive()V
+SPLandroidx/fragment/app/FragmentStore;->dispatchStateChange(I)V
+SPLandroidx/fragment/app/FragmentStore;->findFragmentById(I)Landroidx/fragment/app/Fragment;
+SPLandroidx/fragment/app/FragmentStore;->findFragmentByTag(Ljava/lang/String;)Landroidx/fragment/app/Fragment;
+SPLandroidx/fragment/app/FragmentStore;->getActiveFragmentStateManagers()Ljava/util/List;
+SPLandroidx/fragment/app/FragmentStore;->getFragments()Ljava/util/List;
+SPLandroidx/fragment/app/FragmentStore;->moveToExpectedState()V
+SPLandroidx/fragment/app/FragmentStore;->setNonConfig(Landroidx/fragment/app/FragmentManagerViewModel;)V
+Landroidx/fragment/app/FragmentTransaction;
+Landroidx/fragment/app/SpecialEffectsControllerFactory;
+Landroidx/interpolator/view/animation/FastOutLinearInInterpolator;
+SPLandroidx/interpolator/view/animation/FastOutLinearInInterpolator;-><clinit>()V
+SPLandroidx/interpolator/view/animation/FastOutLinearInInterpolator;-><init>()V
+Landroidx/interpolator/view/animation/FastOutSlowInInterpolator;
+SPLandroidx/interpolator/view/animation/FastOutSlowInInterpolator;-><clinit>()V
+SPLandroidx/interpolator/view/animation/FastOutSlowInInterpolator;-><init>()V
+SPLandroidx/interpolator/view/animation/FastOutSlowInInterpolator;->getInterpolation(F)F
+Landroidx/interpolator/view/animation/LinearOutSlowInInterpolator;
+SPLandroidx/interpolator/view/animation/LinearOutSlowInInterpolator;-><clinit>()V
+SPLandroidx/interpolator/view/animation/LinearOutSlowInInterpolator;-><init>()V
+Landroidx/interpolator/view/animation/LookupTableInterpolator;
+SPLandroidx/interpolator/view/animation/LookupTableInterpolator;-><init>([F)V
+SPLandroidx/interpolator/view/animation/LookupTableInterpolator;->getInterpolation(F)F
+Landroidx/lifecycle/AndroidViewModel;
+Landroidx/lifecycle/AtomicReference;
+SPLandroidx/lifecycle/AtomicReference;-><init>(Ljava/lang/Object;)V
+SPLandroidx/lifecycle/AtomicReference;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+SPLandroidx/lifecycle/AtomicReference;->get()Ljava/lang/Object;
+Landroidx/lifecycle/DefaultLifecycleObserver;
+SPLandroidx/lifecycle/DefaultLifecycleObserver;->onCreate(Landroidx/lifecycle/LifecycleOwner;)V
+SPLandroidx/lifecycle/DefaultLifecycleObserver;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
+SPLandroidx/lifecycle/DefaultLifecycleObserver;->onStart(Landroidx/lifecycle/LifecycleOwner;)V
+Landroidx/lifecycle/DefaultLifecycleObserverAdapter;
+SPLandroidx/lifecycle/DefaultLifecycleObserverAdapter;-><init>(Landroidx/lifecycle/DefaultLifecycleObserver;Landroidx/lifecycle/LifecycleEventObserver;)V
+SPLandroidx/lifecycle/DefaultLifecycleObserverAdapter;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+Landroidx/lifecycle/DefaultLifecycleObserverAdapter$WhenMappings;
+SPLandroidx/lifecycle/DefaultLifecycleObserverAdapter$WhenMappings;-><clinit>()V
+Landroidx/lifecycle/EmptyActivityLifecycleCallbacks;
+SPLandroidx/lifecycle/EmptyActivityLifecycleCallbacks;-><init>()V
+SPLandroidx/lifecycle/EmptyActivityLifecycleCallbacks;->onActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
+SPLandroidx/lifecycle/EmptyActivityLifecycleCallbacks;->onActivityDestroyed(Landroid/app/Activity;)V
+SPLandroidx/lifecycle/EmptyActivityLifecycleCallbacks;->onActivityResumed(Landroid/app/Activity;)V
+SPLandroidx/lifecycle/EmptyActivityLifecycleCallbacks;->onActivityStarted(Landroid/app/Activity;)V
+Landroidx/lifecycle/FastSafeIterableMap;
+SPLandroidx/lifecycle/FastSafeIterableMap;-><init>()V
+SPLandroidx/lifecycle/FastSafeIterableMap;->ceil(Ljava/lang/Object;)Ljava/util/Map$Entry;
+SPLandroidx/lifecycle/FastSafeIterableMap;->contains(Ljava/lang/Object;)Z
+SPLandroidx/lifecycle/FastSafeIterableMap;->first()Ljava/util/Map$Entry;
+SPLandroidx/lifecycle/FastSafeIterableMap;->forEachWithAdditions(Lkotlin/jvm/functions/Function1;)V
+SPLandroidx/lifecycle/FastSafeIterableMap;->last()Ljava/util/Map$Entry;
+SPLandroidx/lifecycle/FastSafeIterableMap;->lastOrNull()Ljava/util/Map$Entry;
+SPLandroidx/lifecycle/FastSafeIterableMap;->putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/lifecycle/FastSafeIterableMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/lifecycle/FastSafeIterableMap;->size()I
+Landroidx/lifecycle/FastSafeIterableMap$Entry;
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;->getKey()Ljava/lang/Object;
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;->getNext()Landroidx/lifecycle/FastSafeIterableMap$Entry;
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;->getPrev()Landroidx/lifecycle/FastSafeIterableMap$Entry;
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;->getValue()Ljava/lang/Object;
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;->isRemoved()Z
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;->markRemoved()V
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;->setNext(Landroidx/lifecycle/FastSafeIterableMap$Entry;)V
+SPLandroidx/lifecycle/FastSafeIterableMap$Entry;->setPrev(Landroidx/lifecycle/FastSafeIterableMap$Entry;)V
+Landroidx/lifecycle/FlowExtKt;
+SPLandroidx/lifecycle/FlowExtKt;->flowWithLifecycle$default(Lkotlinx/coroutines/flow/Flow;Landroidx/lifecycle/Lifecycle;Landroidx/lifecycle/Lifecycle$State;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
+SPLandroidx/lifecycle/FlowExtKt;->flowWithLifecycle(Lkotlinx/coroutines/flow/Flow;Landroidx/lifecycle/Lifecycle;Landroidx/lifecycle/Lifecycle$State;)Lkotlinx/coroutines/flow/Flow;
+Landroidx/lifecycle/FlowExtKt$flowWithLifecycle$1;
+SPLandroidx/lifecycle/FlowExtKt$flowWithLifecycle$1;-><init>(Landroidx/lifecycle/Lifecycle;Landroidx/lifecycle/Lifecycle$State;Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/lifecycle/FlowExtKt$flowWithLifecycle$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/lifecycle/FlowExtKt$flowWithLifecycle$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/lifecycle/FlowExtKt$flowWithLifecycle$1;->invoke(Lkotlinx/coroutines/channels/ProducerScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/lifecycle/FlowExtKt$flowWithLifecycle$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/lifecycle/FlowExtKt$flowWithLifecycle$1$1;
+SPLandroidx/lifecycle/FlowExtKt$flowWithLifecycle$1$1;-><init>(Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/channels/ProducerScope;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/lifecycle/FlowExtKt$flowWithLifecycle$1$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/lifecycle/FlowExtKt$flowWithLifecycle$1$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/lifecycle/FlowExtKt$flowWithLifecycle$1$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/lifecycle/FlowExtKt$flowWithLifecycle$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/lifecycle/FlowExtKt$flowWithLifecycle$1$1$1;
+SPLandroidx/lifecycle/FlowExtKt$flowWithLifecycle$1$1$1;-><init>(Lkotlinx/coroutines/channels/ProducerScope;)V
+SPLandroidx/lifecycle/FlowExtKt$flowWithLifecycle$1$1$1;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Landroidx/lifecycle/HasDefaultViewModelProviderFactory;
+Landroidx/lifecycle/Lifecycle;
+SPLandroidx/lifecycle/Lifecycle;-><init>()V
+SPLandroidx/lifecycle/Lifecycle;->getInternalScopeRef()Landroidx/lifecycle/AtomicReference;
+Landroidx/lifecycle/Lifecycle$Event;
+SPLandroidx/lifecycle/Lifecycle$Event;->$values()[Landroidx/lifecycle/Lifecycle$Event;
+SPLandroidx/lifecycle/Lifecycle$Event;-><clinit>()V
+SPLandroidx/lifecycle/Lifecycle$Event;-><init>(Ljava/lang/String;I)V
+SPLandroidx/lifecycle/Lifecycle$Event;->getTargetState()Landroidx/lifecycle/Lifecycle$State;
+SPLandroidx/lifecycle/Lifecycle$Event;->values()[Landroidx/lifecycle/Lifecycle$Event;
+Landroidx/lifecycle/Lifecycle$Event$Companion;
+SPLandroidx/lifecycle/Lifecycle$Event$Companion;-><init>()V
+SPLandroidx/lifecycle/Lifecycle$Event$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/lifecycle/Lifecycle$Event$Companion;->downFrom(Landroidx/lifecycle/Lifecycle$State;)Landroidx/lifecycle/Lifecycle$Event;
+SPLandroidx/lifecycle/Lifecycle$Event$Companion;->upFrom(Landroidx/lifecycle/Lifecycle$State;)Landroidx/lifecycle/Lifecycle$Event;
+SPLandroidx/lifecycle/Lifecycle$Event$Companion;->upTo(Landroidx/lifecycle/Lifecycle$State;)Landroidx/lifecycle/Lifecycle$Event;
+Landroidx/lifecycle/Lifecycle$Event$Companion$WhenMappings;
+SPLandroidx/lifecycle/Lifecycle$Event$Companion$WhenMappings;-><clinit>()V
+Landroidx/lifecycle/Lifecycle$Event$WhenMappings;
+SPLandroidx/lifecycle/Lifecycle$Event$WhenMappings;-><clinit>()V
+Landroidx/lifecycle/Lifecycle$State;
+SPLandroidx/lifecycle/Lifecycle$State;->$values()[Landroidx/lifecycle/Lifecycle$State;
+SPLandroidx/lifecycle/Lifecycle$State;-><clinit>()V
+SPLandroidx/lifecycle/Lifecycle$State;-><init>(Ljava/lang/String;I)V
+SPLandroidx/lifecycle/Lifecycle$State;->isAtLeast(Landroidx/lifecycle/Lifecycle$State;)Z
+SPLandroidx/lifecycle/Lifecycle$State;->values()[Landroidx/lifecycle/Lifecycle$State;
+Landroidx/lifecycle/LifecycleCoroutineScope;
+SPLandroidx/lifecycle/LifecycleCoroutineScope;-><init>()V
+Landroidx/lifecycle/LifecycleCoroutineScopeImpl;
+SPLandroidx/lifecycle/LifecycleCoroutineScopeImpl;-><init>(Landroidx/lifecycle/Lifecycle;Lkotlin/coroutines/CoroutineContext;)V
+SPLandroidx/lifecycle/LifecycleCoroutineScopeImpl;->getCoroutineContext()Lkotlin/coroutines/CoroutineContext;
+SPLandroidx/lifecycle/LifecycleCoroutineScopeImpl;->getLifecycle$lifecycle_common()Landroidx/lifecycle/Lifecycle;
+SPLandroidx/lifecycle/LifecycleCoroutineScopeImpl;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+SPLandroidx/lifecycle/LifecycleCoroutineScopeImpl;->register()V
+Landroidx/lifecycle/LifecycleCoroutineScopeImpl$register$1;
+SPLandroidx/lifecycle/LifecycleCoroutineScopeImpl$register$1;-><init>(Landroidx/lifecycle/LifecycleCoroutineScopeImpl;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/lifecycle/LifecycleCoroutineScopeImpl$register$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/lifecycle/LifecycleCoroutineScopeImpl$register$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/lifecycle/LifecycleDispatcher;
+SPLandroidx/lifecycle/LifecycleDispatcher;-><clinit>()V
+SPLandroidx/lifecycle/LifecycleDispatcher;-><init>()V
+SPLandroidx/lifecycle/LifecycleDispatcher;->init(Landroid/content/Context;)V
+Landroidx/lifecycle/LifecycleDispatcher$DispatcherActivityCallback;
+SPLandroidx/lifecycle/LifecycleDispatcher$DispatcherActivityCallback;-><init>()V
+SPLandroidx/lifecycle/LifecycleDispatcher$DispatcherActivityCallback;->onActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
+Landroidx/lifecycle/LifecycleEventObserver;
+Landroidx/lifecycle/LifecycleKt;
+SPLandroidx/lifecycle/LifecycleKt;->getCoroutineScope(Landroidx/lifecycle/Lifecycle;)Landroidx/lifecycle/LifecycleCoroutineScope;
+Landroidx/lifecycle/LifecycleObserver;
+Landroidx/lifecycle/LifecycleOwner;
+Landroidx/lifecycle/LifecycleOwnerKt;
+SPLandroidx/lifecycle/LifecycleOwnerKt;->getLifecycleScope(Landroidx/lifecycle/LifecycleOwner;)Landroidx/lifecycle/LifecycleCoroutineScope;
+Landroidx/lifecycle/LifecycleRegistry;
+SPLandroidx/lifecycle/LifecycleRegistry;-><clinit>()V
+SPLandroidx/lifecycle/LifecycleRegistry;-><init>(Landroidx/lifecycle/LifecycleOwner;)V
+SPLandroidx/lifecycle/LifecycleRegistry;-><init>(Landroidx/lifecycle/LifecycleOwner;Z)V
+SPLandroidx/lifecycle/LifecycleRegistry;->addObserver(Landroidx/lifecycle/LifecycleObserver;)V
+SPLandroidx/lifecycle/LifecycleRegistry;->calculateTargetState(Landroidx/lifecycle/LifecycleObserver;)Landroidx/lifecycle/Lifecycle$State;
+SPLandroidx/lifecycle/LifecycleRegistry;->enforceMainThreadIfNeeded(Ljava/lang/String;)V
+SPLandroidx/lifecycle/LifecycleRegistry;->forwardPass$lambda$0(Landroidx/lifecycle/LifecycleRegistry;Landroidx/lifecycle/LifecycleOwner;Ljava/util/Map$Entry;)Lkotlin/Unit;
+SPLandroidx/lifecycle/LifecycleRegistry;->forwardPass(Landroidx/lifecycle/LifecycleOwner;)V
+SPLandroidx/lifecycle/LifecycleRegistry;->getCurrentState()Landroidx/lifecycle/Lifecycle$State;
+SPLandroidx/lifecycle/LifecycleRegistry;->handleLifecycleEvent(Landroidx/lifecycle/Lifecycle$Event;)V
+SPLandroidx/lifecycle/LifecycleRegistry;->isSynced()Z
+SPLandroidx/lifecycle/LifecycleRegistry;->moveToState(Landroidx/lifecycle/Lifecycle$State;)V
+SPLandroidx/lifecycle/LifecycleRegistry;->removeObserver(Landroidx/lifecycle/LifecycleObserver;)V
+SPLandroidx/lifecycle/LifecycleRegistry;->sync()V
+Landroidx/lifecycle/LifecycleRegistry$$ExternalSyntheticLambda1;
+SPLandroidx/lifecycle/LifecycleRegistry$$ExternalSyntheticLambda1;-><init>(Landroidx/lifecycle/LifecycleRegistry;Landroidx/lifecycle/LifecycleOwner;)V
+SPLandroidx/lifecycle/LifecycleRegistry$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/lifecycle/LifecycleRegistry$Companion;
+SPLandroidx/lifecycle/LifecycleRegistry$Companion;-><init>()V
+SPLandroidx/lifecycle/LifecycleRegistry$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/lifecycle/LifecycleRegistry$ObserverWithState;
+SPLandroidx/lifecycle/LifecycleRegistry$ObserverWithState;-><init>(Landroidx/lifecycle/LifecycleObserver;Landroidx/lifecycle/Lifecycle$State;)V
+SPLandroidx/lifecycle/LifecycleRegistry$ObserverWithState;->dispatchEvent(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+SPLandroidx/lifecycle/LifecycleRegistry$ObserverWithState;->getState()Landroidx/lifecycle/Lifecycle$State;
+Landroidx/lifecycle/LifecycleRegistryKt;
+SPLandroidx/lifecycle/LifecycleRegistryKt;->access$checkLifecycleStateTransition(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$State;Landroidx/lifecycle/Lifecycle$State;)V
+SPLandroidx/lifecycle/LifecycleRegistryKt;->access$min(Landroidx/lifecycle/Lifecycle$State;Landroidx/lifecycle/Lifecycle$State;)Landroidx/lifecycle/Lifecycle$State;
+SPLandroidx/lifecycle/LifecycleRegistryKt;->checkLifecycleStateTransition(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$State;Landroidx/lifecycle/Lifecycle$State;)V
+SPLandroidx/lifecycle/LifecycleRegistryKt;->min(Landroidx/lifecycle/Lifecycle$State;Landroidx/lifecycle/Lifecycle$State;)Landroidx/lifecycle/Lifecycle$State;
+Landroidx/lifecycle/LifecycleRegistryOwner;
+Landroidx/lifecycle/LifecycleRegistry_androidKt;
+SPLandroidx/lifecycle/LifecycleRegistry_androidKt;->isMainThread()Z
+Landroidx/lifecycle/Lifecycling;
+SPLandroidx/lifecycle/Lifecycling;-><clinit>()V
+SPLandroidx/lifecycle/Lifecycling;-><init>()V
+SPLandroidx/lifecycle/Lifecycling;->lifecycleEventObserver(Ljava/lang/Object;)Landroidx/lifecycle/LifecycleEventObserver;
+Landroidx/lifecycle/LiveData;
+SPLandroidx/lifecycle/LiveData;-><clinit>()V
+SPLandroidx/lifecycle/LiveData;-><init>()V
+SPLandroidx/lifecycle/LiveData;-><init>(Ljava/lang/Object;)V
+SPLandroidx/lifecycle/LiveData;->assertMainThread(Ljava/lang/String;)V
+SPLandroidx/lifecycle/LiveData;->changeActiveCounter(I)V
+SPLandroidx/lifecycle/LiveData;->considerNotify(Landroidx/lifecycle/LiveData$ObserverWrapper;)V
+SPLandroidx/lifecycle/LiveData;->dispatchingValue(Landroidx/lifecycle/LiveData$ObserverWrapper;)V
+SPLandroidx/lifecycle/LiveData;->observeForever(Landroidx/lifecycle/Observer;)V
+SPLandroidx/lifecycle/LiveData;->onActive()V
+SPLandroidx/lifecycle/LiveData;->postValue(Ljava/lang/Object;)V
+SPLandroidx/lifecycle/LiveData;->setValue(Ljava/lang/Object;)V
+Landroidx/lifecycle/LiveData$1;
+SPLandroidx/lifecycle/LiveData$1;-><init>(Landroidx/lifecycle/LiveData;)V
+SPLandroidx/lifecycle/LiveData$1;->run()V
+Landroidx/lifecycle/LiveData$AlwaysActiveObserver;
+SPLandroidx/lifecycle/LiveData$AlwaysActiveObserver;-><init>(Landroidx/lifecycle/LiveData;Landroidx/lifecycle/Observer;)V
+SPLandroidx/lifecycle/LiveData$AlwaysActiveObserver;->shouldBeActive()Z
+Landroidx/lifecycle/LiveData$LifecycleBoundObserver;
+Landroidx/lifecycle/LiveData$ObserverWrapper;
+SPLandroidx/lifecycle/LiveData$ObserverWrapper;-><init>(Landroidx/lifecycle/LiveData;Landroidx/lifecycle/Observer;)V
+SPLandroidx/lifecycle/LiveData$ObserverWrapper;->activeStateChanged(Z)V
+Landroidx/lifecycle/MutableLiveData;
+SPLandroidx/lifecycle/MutableLiveData;-><init>()V
+SPLandroidx/lifecycle/MutableLiveData;-><init>(Ljava/lang/Object;)V
+SPLandroidx/lifecycle/MutableLiveData;->postValue(Ljava/lang/Object;)V
+SPLandroidx/lifecycle/MutableLiveData;->setValue(Ljava/lang/Object;)V
+Landroidx/lifecycle/Observer;
+Landroidx/lifecycle/ProcessLifecycleInitializer;
+SPLandroidx/lifecycle/ProcessLifecycleInitializer;-><init>()V
+SPLandroidx/lifecycle/ProcessLifecycleInitializer;->create(Landroid/content/Context;)Landroidx/lifecycle/LifecycleOwner;
+SPLandroidx/lifecycle/ProcessLifecycleInitializer;->create(Landroid/content/Context;)Ljava/lang/Object;
+SPLandroidx/lifecycle/ProcessLifecycleInitializer;->dependencies()Ljava/util/List;
+Landroidx/lifecycle/ProcessLifecycleOwner;
+SPLandroidx/lifecycle/ProcessLifecycleOwner;-><clinit>()V
+SPLandroidx/lifecycle/ProcessLifecycleOwner;-><init>()V
+SPLandroidx/lifecycle/ProcessLifecycleOwner;->access$getNewInstance$cp()Landroidx/lifecycle/ProcessLifecycleOwner;
+SPLandroidx/lifecycle/ProcessLifecycleOwner;->activityResumed$lifecycle_process()V
+SPLandroidx/lifecycle/ProcessLifecycleOwner;->activityStarted$lifecycle_process()V
+SPLandroidx/lifecycle/ProcessLifecycleOwner;->attach$lifecycle_process(Landroid/content/Context;)V
+SPLandroidx/lifecycle/ProcessLifecycleOwner;->getLifecycle()Landroidx/lifecycle/Lifecycle;
+Landroidx/lifecycle/ProcessLifecycleOwner$$ExternalSyntheticLambda0;
+SPLandroidx/lifecycle/ProcessLifecycleOwner$$ExternalSyntheticLambda0;-><init>(Landroidx/lifecycle/ProcessLifecycleOwner;)V
+Landroidx/lifecycle/ProcessLifecycleOwner$Api29Impl;
+SPLandroidx/lifecycle/ProcessLifecycleOwner$Api29Impl;-><clinit>()V
+SPLandroidx/lifecycle/ProcessLifecycleOwner$Api29Impl;-><init>()V
+SPLandroidx/lifecycle/ProcessLifecycleOwner$Api29Impl;->registerActivityLifecycleCallbacks(Landroid/app/Activity;Landroid/app/Application$ActivityLifecycleCallbacks;)V
+Landroidx/lifecycle/ProcessLifecycleOwner$Companion;
+SPLandroidx/lifecycle/ProcessLifecycleOwner$Companion;-><init>()V
+SPLandroidx/lifecycle/ProcessLifecycleOwner$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/lifecycle/ProcessLifecycleOwner$Companion;->get()Landroidx/lifecycle/LifecycleOwner;
+SPLandroidx/lifecycle/ProcessLifecycleOwner$Companion;->init$lifecycle_process(Landroid/content/Context;)V
+Landroidx/lifecycle/ProcessLifecycleOwner$attach$1;
+SPLandroidx/lifecycle/ProcessLifecycleOwner$attach$1;-><init>(Landroidx/lifecycle/ProcessLifecycleOwner;)V
+SPLandroidx/lifecycle/ProcessLifecycleOwner$attach$1;->onActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
+SPLandroidx/lifecycle/ProcessLifecycleOwner$attach$1;->onActivityPreCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
+Landroidx/lifecycle/ProcessLifecycleOwner$attach$1$onActivityPreCreated$1;
+SPLandroidx/lifecycle/ProcessLifecycleOwner$attach$1$onActivityPreCreated$1;-><init>(Landroidx/lifecycle/ProcessLifecycleOwner;)V
+SPLandroidx/lifecycle/ProcessLifecycleOwner$attach$1$onActivityPreCreated$1;->onActivityPostResumed(Landroid/app/Activity;)V
+SPLandroidx/lifecycle/ProcessLifecycleOwner$attach$1$onActivityPreCreated$1;->onActivityPostStarted(Landroid/app/Activity;)V
+Landroidx/lifecycle/ProcessLifecycleOwner$initializationListener$1;
+SPLandroidx/lifecycle/ProcessLifecycleOwner$initializationListener$1;-><init>(Landroidx/lifecycle/ProcessLifecycleOwner;)V
+Landroidx/lifecycle/RepeatOnLifecycleKt;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt;->repeatOnLifecycle(Landroidx/lifecycle/Lifecycle;Landroidx/lifecycle/Lifecycle$State;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt;->repeatOnLifecycle(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$State;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Landroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3;-><init>(Landroidx/lifecycle/Lifecycle;Landroidx/lifecycle/Lifecycle$State;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1;-><init>(Landroidx/lifecycle/Lifecycle;Landroidx/lifecycle/Lifecycle$State;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1$1$1;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1$1$1;-><init>(Landroidx/lifecycle/Lifecycle$Event;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlinx/coroutines/CoroutineScope;Landroidx/lifecycle/Lifecycle$Event;Lkotlinx/coroutines/CancellableContinuation;Lkotlinx/coroutines/sync/Mutex;Lkotlin/jvm/functions/Function2;)V
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1$1$1;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+Landroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1$1$1$1;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1$1$1$1;-><init>(Lkotlinx/coroutines/sync/Mutex;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1$1$1$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1$1$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1$1$1$1$1$1;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1$1$1$1$1$1;-><init>(Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1$1$1$1$1$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1$1$1$1$1$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1$1$1$1$1$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/lifecycle/RepeatOnLifecycleKt$repeatOnLifecycle$3$1$1$1$1$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/lifecycle/ReportFragment;
+SPLandroidx/lifecycle/ReportFragment;-><clinit>()V
+SPLandroidx/lifecycle/ReportFragment;-><init>()V
+SPLandroidx/lifecycle/ReportFragment;->dispatch(Landroidx/lifecycle/Lifecycle$Event;)V
+SPLandroidx/lifecycle/ReportFragment;->dispatchCreate(Landroidx/lifecycle/ReportFragment$ActivityInitializationListener;)V
+SPLandroidx/lifecycle/ReportFragment;->dispatchResume(Landroidx/lifecycle/ReportFragment$ActivityInitializationListener;)V
+SPLandroidx/lifecycle/ReportFragment;->dispatchStart(Landroidx/lifecycle/ReportFragment$ActivityInitializationListener;)V
+SPLandroidx/lifecycle/ReportFragment;->onActivityCreated(Landroid/os/Bundle;)V
+SPLandroidx/lifecycle/ReportFragment;->onDestroy()V
+SPLandroidx/lifecycle/ReportFragment;->onResume()V
+SPLandroidx/lifecycle/ReportFragment;->onStart()V
+Landroidx/lifecycle/ReportFragment$ActivityInitializationListener;
+Landroidx/lifecycle/ReportFragment$Companion;
+SPLandroidx/lifecycle/ReportFragment$Companion;-><init>()V
+SPLandroidx/lifecycle/ReportFragment$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/lifecycle/ReportFragment$Companion;->dispatch$lifecycle_runtime(Landroid/app/Activity;Landroidx/lifecycle/Lifecycle$Event;)V
+SPLandroidx/lifecycle/ReportFragment$Companion;->injectIfNeededIn(Landroid/app/Activity;)V
+Landroidx/lifecycle/ReportFragment$LifecycleCallbacks;
+SPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks;-><clinit>()V
+SPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks;-><init>()V
+SPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks;->onActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
+SPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks;->onActivityDestroyed(Landroid/app/Activity;)V
+SPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks;->onActivityPostCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
+SPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks;->onActivityPostResumed(Landroid/app/Activity;)V
+SPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks;->onActivityPostStarted(Landroid/app/Activity;)V
+SPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks;->onActivityPreDestroyed(Landroid/app/Activity;)V
+SPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks;->onActivityResumed(Landroid/app/Activity;)V
+SPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks;->onActivityStarted(Landroid/app/Activity;)V
+Landroidx/lifecycle/ReportFragment$LifecycleCallbacks$Companion;
+SPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks$Companion;-><init>()V
+SPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks$Companion;->registerIn(Landroid/app/Activity;)V
+Landroidx/lifecycle/SavedStateHandle;
+SPLandroidx/lifecycle/SavedStateHandle;-><clinit>()V
+SPLandroidx/lifecycle/SavedStateHandle;-><init>(Ljava/util/Map;)V
+SPLandroidx/lifecycle/SavedStateHandle;->getMutableStateFlow(Ljava/lang/String;Ljava/lang/Object;)Lkotlinx/coroutines/flow/MutableStateFlow;
+Landroidx/lifecycle/SavedStateHandle$Companion;
+SPLandroidx/lifecycle/SavedStateHandle$Companion;-><init>()V
+SPLandroidx/lifecycle/SavedStateHandle$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/lifecycle/SavedStateHandle$Companion;->createHandle(Landroid/os/Bundle;Landroid/os/Bundle;)Landroidx/lifecycle/SavedStateHandle;
+Landroidx/lifecycle/SavedStateHandleAttacher;
+SPLandroidx/lifecycle/SavedStateHandleAttacher;-><init>(Landroidx/lifecycle/SavedStateHandlesProvider;)V
+SPLandroidx/lifecycle/SavedStateHandleAttacher;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+Landroidx/lifecycle/SavedStateHandleSupport;
+SPLandroidx/lifecycle/SavedStateHandleSupport;-><clinit>()V
+SPLandroidx/lifecycle/SavedStateHandleSupport;->createSavedStateHandle(Landroidx/lifecycle/viewmodel/CreationExtras;)Landroidx/lifecycle/SavedStateHandle;
+SPLandroidx/lifecycle/SavedStateHandleSupport;->createSavedStateHandle(Landroidx/savedstate/SavedStateRegistryOwner;Landroidx/lifecycle/ViewModelStoreOwner;Ljava/lang/String;Landroid/os/Bundle;)Landroidx/lifecycle/SavedStateHandle;
+SPLandroidx/lifecycle/SavedStateHandleSupport;->enableSavedStateHandles(Landroidx/savedstate/SavedStateRegistryOwner;)V
+SPLandroidx/lifecycle/SavedStateHandleSupport;->getSavedStateHandlesProvider(Landroidx/savedstate/SavedStateRegistryOwner;)Landroidx/lifecycle/SavedStateHandlesProvider;
+SPLandroidx/lifecycle/SavedStateHandleSupport;->getSavedStateHandlesVM(Landroidx/lifecycle/ViewModelStoreOwner;)Landroidx/lifecycle/SavedStateHandlesVM;
+Landroidx/lifecycle/SavedStateHandleSupport$savedStateHandlesVM$1;
+SPLandroidx/lifecycle/SavedStateHandleSupport$savedStateHandlesVM$1;-><init>()V
+SPLandroidx/lifecycle/SavedStateHandleSupport$savedStateHandlesVM$1;->create(Lkotlin/reflect/KClass;Landroidx/lifecycle/viewmodel/CreationExtras;)Landroidx/lifecycle/ViewModel;
+Landroidx/lifecycle/SavedStateHandleSupport$special$$inlined$Key$1;
+SPLandroidx/lifecycle/SavedStateHandleSupport$special$$inlined$Key$1;-><init>()V
+Landroidx/lifecycle/SavedStateHandleSupport$special$$inlined$Key$2;
+SPLandroidx/lifecycle/SavedStateHandleSupport$special$$inlined$Key$2;-><init>()V
+Landroidx/lifecycle/SavedStateHandleSupport$special$$inlined$Key$3;
+SPLandroidx/lifecycle/SavedStateHandleSupport$special$$inlined$Key$3;-><init>()V
+Landroidx/lifecycle/SavedStateHandlesProvider;
+SPLandroidx/lifecycle/SavedStateHandlesProvider;-><init>(Landroidx/savedstate/SavedStateRegistry;Landroidx/lifecycle/ViewModelStoreOwner;)V
+SPLandroidx/lifecycle/SavedStateHandlesProvider;->consumeRestoredStateForKey(Ljava/lang/String;)Landroid/os/Bundle;
+SPLandroidx/lifecycle/SavedStateHandlesProvider;->getViewModel()Landroidx/lifecycle/SavedStateHandlesVM;
+SPLandroidx/lifecycle/SavedStateHandlesProvider;->performRestore()V
+SPLandroidx/lifecycle/SavedStateHandlesProvider;->viewModel_delegate$lambda$0(Landroidx/lifecycle/ViewModelStoreOwner;)Landroidx/lifecycle/SavedStateHandlesVM;
+Landroidx/lifecycle/SavedStateHandlesProvider$$ExternalSyntheticLambda0;
+SPLandroidx/lifecycle/SavedStateHandlesProvider$$ExternalSyntheticLambda0;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;)V
+SPLandroidx/lifecycle/SavedStateHandlesProvider$$ExternalSyntheticLambda0;->invoke()Ljava/lang/Object;
+Landroidx/lifecycle/SavedStateHandlesVM;
+SPLandroidx/lifecycle/SavedStateHandlesVM;-><init>()V
+SPLandroidx/lifecycle/SavedStateHandlesVM;->getHandles()Ljava/util/Map;
+Landroidx/lifecycle/SavedStateViewModelFactory;
+SPLandroidx/lifecycle/SavedStateViewModelFactory;-><init>(Landroid/app/Application;Landroidx/savedstate/SavedStateRegistryOwner;Landroid/os/Bundle;)V
+SPLandroidx/lifecycle/SavedStateViewModelFactory;->create(Ljava/lang/Class;Landroidx/lifecycle/viewmodel/CreationExtras;)Landroidx/lifecycle/ViewModel;
+SPLandroidx/lifecycle/SavedStateViewModelFactory;->create(Lkotlin/reflect/KClass;Landroidx/lifecycle/viewmodel/CreationExtras;)Landroidx/lifecycle/ViewModel;
+Landroidx/lifecycle/SavedStateViewModelFactory_androidKt;
+SPLandroidx/lifecycle/SavedStateViewModelFactory_androidKt;-><clinit>()V
+SPLandroidx/lifecycle/SavedStateViewModelFactory_androidKt;->access$getVIEWMODEL_SIGNATURE$p()Ljava/util/List;
+SPLandroidx/lifecycle/SavedStateViewModelFactory_androidKt;->findMatchingConstructor(Ljava/lang/Class;Ljava/util/List;)Ljava/lang/reflect/Constructor;
+Landroidx/lifecycle/ViewModel;
+SPLandroidx/lifecycle/ViewModel;-><init>()V
+SPLandroidx/lifecycle/ViewModel;->addCloseable(Ljava/lang/String;Ljava/lang/AutoCloseable;)V
+SPLandroidx/lifecycle/ViewModel;->getCloseable(Ljava/lang/String;)Ljava/lang/AutoCloseable;
+Landroidx/lifecycle/ViewModelKt;
+SPLandroidx/lifecycle/ViewModelKt;-><clinit>()V
+SPLandroidx/lifecycle/ViewModelKt;->getViewModelScope(Landroidx/lifecycle/ViewModel;)Lkotlinx/coroutines/CoroutineScope;
+Landroidx/lifecycle/ViewModelLazy;
+SPLandroidx/lifecycle/ViewModelLazy;-><init>(Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+SPLandroidx/lifecycle/ViewModelLazy;->getValue()Landroidx/lifecycle/ViewModel;
+SPLandroidx/lifecycle/ViewModelLazy;->getValue()Ljava/lang/Object;
+Landroidx/lifecycle/ViewModelProvider;
+SPLandroidx/lifecycle/ViewModelProvider;-><clinit>()V
+SPLandroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStore;Landroidx/lifecycle/ViewModelProvider$Factory;)V
+SPLandroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStore;Landroidx/lifecycle/ViewModelProvider$Factory;Landroidx/lifecycle/viewmodel/CreationExtras;)V
+SPLandroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStore;Landroidx/lifecycle/ViewModelProvider$Factory;Landroidx/lifecycle/viewmodel/CreationExtras;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/viewmodel/internal/ViewModelProviderImpl;)V
+SPLandroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+SPLandroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/String;Lkotlin/reflect/KClass;)Landroidx/lifecycle/ViewModel;
+SPLandroidx/lifecycle/ViewModelProvider;->get(Lkotlin/reflect/KClass;)Landroidx/lifecycle/ViewModel;
+Landroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory;
+SPLandroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory;-><clinit>()V
+SPLandroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory;-><init>(Landroid/app/Application;)V
+SPLandroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory;-><init>(Landroid/app/Application;I)V
+SPLandroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory;->access$get_instance$cp()Landroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory;
+SPLandroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory;->access$set_instance$cp(Landroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory;)V
+SPLandroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory;->create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+SPLandroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory;->create(Ljava/lang/Class;Landroid/app/Application;)Landroidx/lifecycle/ViewModel;
+SPLandroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory;->create(Ljava/lang/Class;Landroidx/lifecycle/viewmodel/CreationExtras;)Landroidx/lifecycle/ViewModel;
+Landroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory$Companion;
+SPLandroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory$Companion;-><init>()V
+SPLandroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory$Companion;->getInstance(Landroid/app/Application;)Landroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory;
+Landroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory$special$$inlined$Key$1;
+SPLandroidx/lifecycle/ViewModelProvider$AndroidViewModelFactory$special$$inlined$Key$1;-><init>()V
+Landroidx/lifecycle/ViewModelProvider$Companion;
+SPLandroidx/lifecycle/ViewModelProvider$Companion;-><init>()V
+SPLandroidx/lifecycle/ViewModelProvider$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/lifecycle/ViewModelProvider$Companion;->create$default(Landroidx/lifecycle/ViewModelProvider$Companion;Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;Landroidx/lifecycle/viewmodel/CreationExtras;ILjava/lang/Object;)Landroidx/lifecycle/ViewModelProvider;
+SPLandroidx/lifecycle/ViewModelProvider$Companion;->create(Landroidx/lifecycle/ViewModelStore;Landroidx/lifecycle/ViewModelProvider$Factory;Landroidx/lifecycle/viewmodel/CreationExtras;)Landroidx/lifecycle/ViewModelProvider;
+SPLandroidx/lifecycle/ViewModelProvider$Companion;->create(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;Landroidx/lifecycle/viewmodel/CreationExtras;)Landroidx/lifecycle/ViewModelProvider;
+Landroidx/lifecycle/ViewModelProvider$Factory;
+SPLandroidx/lifecycle/ViewModelProvider$Factory;-><clinit>()V
+SPLandroidx/lifecycle/ViewModelProvider$Factory;->create(Ljava/lang/Class;Landroidx/lifecycle/viewmodel/CreationExtras;)Landroidx/lifecycle/ViewModel;
+SPLandroidx/lifecycle/ViewModelProvider$Factory;->create(Lkotlin/reflect/KClass;Landroidx/lifecycle/viewmodel/CreationExtras;)Landroidx/lifecycle/ViewModel;
+Landroidx/lifecycle/ViewModelProvider$Factory$Companion;
+SPLandroidx/lifecycle/ViewModelProvider$Factory$Companion;-><clinit>()V
+SPLandroidx/lifecycle/ViewModelProvider$Factory$Companion;-><init>()V
+Landroidx/lifecycle/ViewModelProvider$NewInstanceFactory;
+SPLandroidx/lifecycle/ViewModelProvider$NewInstanceFactory;-><clinit>()V
+SPLandroidx/lifecycle/ViewModelProvider$NewInstanceFactory;-><init>()V
+SPLandroidx/lifecycle/ViewModelProvider$NewInstanceFactory;->create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+Landroidx/lifecycle/ViewModelProvider$NewInstanceFactory$Companion;
+SPLandroidx/lifecycle/ViewModelProvider$NewInstanceFactory$Companion;-><init>()V
+SPLandroidx/lifecycle/ViewModelProvider$NewInstanceFactory$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/lifecycle/ViewModelProvider$OnRequeryFactory;
+SPLandroidx/lifecycle/ViewModelProvider$OnRequeryFactory;-><init>()V
+Landroidx/lifecycle/ViewModelProvider$special$$inlined$Key$1;
+SPLandroidx/lifecycle/ViewModelProvider$special$$inlined$Key$1;-><init>()V
+Landroidx/lifecycle/ViewModelStore;
+SPLandroidx/lifecycle/ViewModelStore;-><init>()V
+SPLandroidx/lifecycle/ViewModelStore;->get(Ljava/lang/Object;)Landroidx/lifecycle/ViewModel;
+SPLandroidx/lifecycle/ViewModelStore;->put(Ljava/lang/Object;Landroidx/lifecycle/ViewModel;)V
+Landroidx/lifecycle/ViewModelStoreOwner;
+Landroidx/lifecycle/ViewModelStoreOwnerDefaults;
+SPLandroidx/lifecycle/ViewModelStoreOwnerDefaults;->getViewModelCreationExtras(Landroidx/lifecycle/ViewModelStoreOwner;)Landroidx/lifecycle/viewmodel/CreationExtras;
+Landroidx/lifecycle/ViewTreeLifecycleOwner;
+SPLandroidx/lifecycle/ViewTreeLifecycleOwner;->set(Landroid/view/View;Landroidx/lifecycle/LifecycleOwner;)V
+Landroidx/lifecycle/ViewTreeViewModelStoreOwner;
+SPLandroidx/lifecycle/ViewTreeViewModelStoreOwner;->set(Landroid/view/View;Landroidx/lifecycle/ViewModelStoreOwner;)V
+Landroidx/lifecycle/WeakReference;
+SPLandroidx/lifecycle/WeakReference;-><init>(Ljava/lang/Object;)V
+SPLandroidx/lifecycle/WeakReference;->get()Ljava/lang/Object;
+Landroidx/lifecycle/internal/SavedStateHandleImpl;
+SPLandroidx/lifecycle/internal/SavedStateHandleImpl;-><init>(Ljava/util/Map;)V
+SPLandroidx/lifecycle/internal/SavedStateHandleImpl;->getMutableStateFlow(Ljava/lang/String;Ljava/lang/Object;)Lkotlinx/coroutines/flow/MutableStateFlow;
+Landroidx/lifecycle/internal/SavedStateHandleImpl$$ExternalSyntheticLambda0;
+SPLandroidx/lifecycle/internal/SavedStateHandleImpl$$ExternalSyntheticLambda0;-><init>(Landroidx/lifecycle/internal/SavedStateHandleImpl;)V
+Landroidx/lifecycle/runtime/R$id;
+Landroidx/lifecycle/viewmodel/CreationExtras;
+SPLandroidx/lifecycle/viewmodel/CreationExtras;-><clinit>()V
+SPLandroidx/lifecycle/viewmodel/CreationExtras;-><init>()V
+SPLandroidx/lifecycle/viewmodel/CreationExtras;->getExtras$lifecycle_viewmodel()Ljava/util/Map;
+Landroidx/lifecycle/viewmodel/CreationExtras$Companion;
+SPLandroidx/lifecycle/viewmodel/CreationExtras$Companion;-><init>()V
+SPLandroidx/lifecycle/viewmodel/CreationExtras$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/lifecycle/viewmodel/CreationExtras$Empty;
+SPLandroidx/lifecycle/viewmodel/CreationExtras$Empty;-><clinit>()V
+SPLandroidx/lifecycle/viewmodel/CreationExtras$Empty;-><init>()V
+Landroidx/lifecycle/viewmodel/CreationExtras$Key;
+Landroidx/lifecycle/viewmodel/InitializerViewModelFactory;
+SPLandroidx/lifecycle/viewmodel/InitializerViewModelFactory;-><init>([Landroidx/lifecycle/viewmodel/ViewModelInitializer;)V
+SPLandroidx/lifecycle/viewmodel/InitializerViewModelFactory;->create(Ljava/lang/Class;Landroidx/lifecycle/viewmodel/CreationExtras;)Landroidx/lifecycle/ViewModel;
+Landroidx/lifecycle/viewmodel/InitializerViewModelFactoryBuilder;
+SPLandroidx/lifecycle/viewmodel/InitializerViewModelFactoryBuilder;-><init>()V
+SPLandroidx/lifecycle/viewmodel/InitializerViewModelFactoryBuilder;->addInitializer(Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function1;)V
+SPLandroidx/lifecycle/viewmodel/InitializerViewModelFactoryBuilder;->build()Landroidx/lifecycle/ViewModelProvider$Factory;
+Landroidx/lifecycle/viewmodel/MutableCreationExtras;
+SPLandroidx/lifecycle/viewmodel/MutableCreationExtras;-><init>(Landroidx/lifecycle/viewmodel/CreationExtras;)V
+SPLandroidx/lifecycle/viewmodel/MutableCreationExtras;-><init>(Landroidx/lifecycle/viewmodel/CreationExtras;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/lifecycle/viewmodel/MutableCreationExtras;-><init>(Ljava/util/Map;)V
+SPLandroidx/lifecycle/viewmodel/MutableCreationExtras;->get(Landroidx/lifecycle/viewmodel/CreationExtras$Key;)Ljava/lang/Object;
+SPLandroidx/lifecycle/viewmodel/MutableCreationExtras;->set(Landroidx/lifecycle/viewmodel/CreationExtras$Key;Ljava/lang/Object;)V
+Landroidx/lifecycle/viewmodel/R$id;
+Landroidx/lifecycle/viewmodel/ViewModelInitializer;
+SPLandroidx/lifecycle/viewmodel/ViewModelInitializer;-><init>(Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function1;)V
+SPLandroidx/lifecycle/viewmodel/ViewModelInitializer;->getClazz$lifecycle_viewmodel()Lkotlin/reflect/KClass;
+SPLandroidx/lifecycle/viewmodel/ViewModelInitializer;->getInitializer$lifecycle_viewmodel()Lkotlin/jvm/functions/Function1;
+Landroidx/lifecycle/viewmodel/internal/CanonicalName_jvmKt;
+SPLandroidx/lifecycle/viewmodel/internal/CanonicalName_jvmKt;->getCanonicalName(Lkotlin/reflect/KClass;)Ljava/lang/String;
+Landroidx/lifecycle/viewmodel/internal/CloseableCoroutineScope;
+SPLandroidx/lifecycle/viewmodel/internal/CloseableCoroutineScope;-><init>(Lkotlin/coroutines/CoroutineContext;)V
+SPLandroidx/lifecycle/viewmodel/internal/CloseableCoroutineScope;->getCoroutineContext()Lkotlin/coroutines/CoroutineContext;
+Landroidx/lifecycle/viewmodel/internal/CloseableCoroutineScopeKt;
+SPLandroidx/lifecycle/viewmodel/internal/CloseableCoroutineScopeKt;->createViewModelScope()Landroidx/lifecycle/viewmodel/internal/CloseableCoroutineScope;
+Landroidx/lifecycle/viewmodel/internal/JvmViewModelProviders;
+SPLandroidx/lifecycle/viewmodel/internal/JvmViewModelProviders;-><clinit>()V
+SPLandroidx/lifecycle/viewmodel/internal/JvmViewModelProviders;-><init>()V
+SPLandroidx/lifecycle/viewmodel/internal/JvmViewModelProviders;->createViewModel(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+Landroidx/lifecycle/viewmodel/internal/SynchronizedObject;
+SPLandroidx/lifecycle/viewmodel/internal/SynchronizedObject;-><init>()V
+Landroidx/lifecycle/viewmodel/internal/ViewModelImpl;
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelImpl;-><init>()V
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelImpl;->access$getKeyToCloseables$p(Landroidx/lifecycle/viewmodel/internal/ViewModelImpl;)Ljava/util/Map;
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelImpl;->addCloseable(Ljava/lang/String;Ljava/lang/AutoCloseable;)V
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelImpl;->closeWithRuntimeException(Ljava/lang/AutoCloseable;)V
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelImpl;->getCloseable(Ljava/lang/String;)Ljava/lang/AutoCloseable;
+Landroidx/lifecycle/viewmodel/internal/ViewModelProviderImpl;
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviderImpl;-><init>(Landroidx/lifecycle/ViewModelStore;Landroidx/lifecycle/ViewModelProvider$Factory;Landroidx/lifecycle/viewmodel/CreationExtras;)V
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviderImpl;->access$getDefaultExtras$p(Landroidx/lifecycle/viewmodel/internal/ViewModelProviderImpl;)Landroidx/lifecycle/viewmodel/CreationExtras;
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviderImpl;->access$getFactory$p(Landroidx/lifecycle/viewmodel/internal/ViewModelProviderImpl;)Landroidx/lifecycle/ViewModelProvider$Factory;
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviderImpl;->access$getStore$p(Landroidx/lifecycle/viewmodel/internal/ViewModelProviderImpl;)Landroidx/lifecycle/ViewModelStore;
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviderImpl;->getViewModel$lifecycle_viewmodel$default(Landroidx/lifecycle/viewmodel/internal/ViewModelProviderImpl;Lkotlin/reflect/KClass;Ljava/lang/String;ILjava/lang/Object;)Landroidx/lifecycle/ViewModel;
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviderImpl;->getViewModel$lifecycle_viewmodel(Lkotlin/reflect/KClass;Ljava/lang/String;)Landroidx/lifecycle/ViewModel;
+Landroidx/lifecycle/viewmodel/internal/ViewModelProviderImpl_androidKt;
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviderImpl_androidKt;->createViewModel(Landroidx/lifecycle/ViewModelProvider$Factory;Lkotlin/reflect/KClass;Landroidx/lifecycle/viewmodel/CreationExtras;)Landroidx/lifecycle/ViewModel;
+Landroidx/lifecycle/viewmodel/internal/ViewModelProviders;
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviders;-><clinit>()V
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviders;-><init>()V
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviders;->createInitializerFactory$lifecycle_viewmodel(Ljava/util/Collection;)Landroidx/lifecycle/ViewModelProvider$Factory;
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviders;->createViewModelFromInitializers$lifecycle_viewmodel(Lkotlin/reflect/KClass;Landroidx/lifecycle/viewmodel/CreationExtras;[Landroidx/lifecycle/viewmodel/ViewModelInitializer;)Landroidx/lifecycle/ViewModel;
+SPLandroidx/lifecycle/viewmodel/internal/ViewModelProviders;->getDefaultKey$lifecycle_viewmodel(Lkotlin/reflect/KClass;)Ljava/lang/String;
+Landroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$1()I
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$1()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/view/accessibility/AccessibilityNodeInfo;Ljava/lang/CharSequence;)V
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/view/accessibility/AccessibilityNodeInfo;Z)V
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$10()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$11()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$12()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$2()I
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$2()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$2(Landroid/view/accessibility/AccessibilityNodeInfo;Z)V
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$3()I
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$3()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$4()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$5()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$6()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$7()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$8()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m$9()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/Activity;Landroid/app/Application$ActivityLifecycleCallbacks;)V
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m(Landroid/os/Looper;)Landroid/os/Handler;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/Window;)Landroid/view/WindowInsetsController;
+SPLandroidx/media3/common/AudioAttributes$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/WindowInsetsController;II)V
+PLandroidx/media3/exoplayer/dash/offline/DashDownloader$$ExternalSyntheticLambda1;-><init>()V
+Landroidx/navigationevent/NavigationEventDispatcher;
+SPLandroidx/navigationevent/NavigationEventDispatcher;-><clinit>()V
+SPLandroidx/navigationevent/NavigationEventDispatcher;-><init>(Landroidx/navigationevent/NavigationEventDispatcher;Landroidx/navigationevent/OnBackCompletedFallback;)V
+SPLandroidx/navigationevent/NavigationEventDispatcher;-><init>(Landroidx/navigationevent/OnBackCompletedFallback;)V
+SPLandroidx/navigationevent/NavigationEventDispatcher;->addHandler$default(Landroidx/navigationevent/NavigationEventDispatcher;Landroidx/navigationevent/NavigationEventHandler;IILjava/lang/Object;)V
+SPLandroidx/navigationevent/NavigationEventDispatcher;->addHandler(Landroidx/navigationevent/NavigationEventHandler;I)V
+SPLandroidx/navigationevent/NavigationEventDispatcher;->addInput(Landroidx/navigationevent/NavigationEventInput;)V
+SPLandroidx/navigationevent/NavigationEventDispatcher;->addInput(Landroidx/navigationevent/NavigationEventInput;I)V
+SPLandroidx/navigationevent/NavigationEventDispatcher;->checkInvariants()V
+SPLandroidx/navigationevent/NavigationEventDispatcher;->getSharedProcessor$navigationevent()Landroidx/navigationevent/NavigationEventProcessor;
+SPLandroidx/navigationevent/NavigationEventDispatcher;->isDisposed()Z
+SPLandroidx/navigationevent/NavigationEventDispatcher;->isEnabled()Z
+Landroidx/navigationevent/NavigationEventDispatcher$Companion;
+SPLandroidx/navigationevent/NavigationEventDispatcher$Companion;-><init>()V
+SPLandroidx/navigationevent/NavigationEventDispatcher$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/navigationevent/NavigationEventDispatcherOwner;
+Landroidx/navigationevent/NavigationEventHandler;
+SPLandroidx/navigationevent/NavigationEventHandler;-><init>(Landroidx/navigationevent/NavigationEventInfo;Z)V
+SPLandroidx/navigationevent/NavigationEventHandler;-><init>(Landroidx/navigationevent/NavigationEventInfo;ZZ)V
+SPLandroidx/navigationevent/NavigationEventHandler;->getBackInfo()Ljava/util/List;
+SPLandroidx/navigationevent/NavigationEventHandler;->getCurrentInfo()Landroidx/navigationevent/NavigationEventInfo;
+SPLandroidx/navigationevent/NavigationEventHandler;->getDispatcher$navigationevent()Landroidx/navigationevent/NavigationEventDispatcher;
+SPLandroidx/navigationevent/NavigationEventHandler;->getForwardInfo()Ljava/util/List;
+SPLandroidx/navigationevent/NavigationEventHandler;->isBackEnabled()Z
+SPLandroidx/navigationevent/NavigationEventHandler;->isForwardEnabled()Z
+SPLandroidx/navigationevent/NavigationEventHandler;->setBackEnabled(Z)V
+SPLandroidx/navigationevent/NavigationEventHandler;->setDispatcher$navigationevent(Landroidx/navigationevent/NavigationEventDispatcher;)V
+Landroidx/navigationevent/NavigationEventHistory;
+SPLandroidx/navigationevent/NavigationEventHistory;-><init>()V
+SPLandroidx/navigationevent/NavigationEventHistory;-><init>(Landroidx/navigationevent/NavigationEventInfo;Ljava/util/List;Ljava/util/List;)V
+SPLandroidx/navigationevent/NavigationEventHistory;-><init>(Ljava/util/List;I)V
+SPLandroidx/navigationevent/NavigationEventHistory;->equals(Ljava/lang/Object;)Z
+Landroidx/navigationevent/NavigationEventInfo;
+SPLandroidx/navigationevent/NavigationEventInfo;-><init>()V
+Landroidx/navigationevent/NavigationEventInput;
+SPLandroidx/navigationevent/NavigationEventInput;-><init>()V
+SPLandroidx/navigationevent/NavigationEventInput;->doOnAdded$navigationevent(Landroidx/navigationevent/NavigationEventDispatcher;)V
+SPLandroidx/navigationevent/NavigationEventInput;->doOnHasEnabledHandlersChanged$navigationevent(Z)V
+SPLandroidx/navigationevent/NavigationEventInput;->doOnHistoryChanged$navigationevent(Landroidx/navigationevent/NavigationEventHistory;)V
+SPLandroidx/navigationevent/NavigationEventInput;->getDispatcher$navigationevent()Landroidx/navigationevent/NavigationEventDispatcher;
+SPLandroidx/navigationevent/NavigationEventInput;->onAdded(Landroidx/navigationevent/NavigationEventDispatcher;)V
+SPLandroidx/navigationevent/NavigationEventInput;->onHistoryChanged(Landroidx/navigationevent/NavigationEventHistory;)V
+SPLandroidx/navigationevent/NavigationEventInput;->setDispatcher$navigationevent(Landroidx/navigationevent/NavigationEventDispatcher;)V
+Landroidx/navigationevent/NavigationEventProcessor;
+SPLandroidx/navigationevent/NavigationEventProcessor;-><init>()V
+SPLandroidx/navigationevent/NavigationEventProcessor;->addHandler(Landroidx/navigationevent/NavigationEventDispatcher;Landroidx/navigationevent/NavigationEventHandler;I)V
+SPLandroidx/navigationevent/NavigationEventProcessor;->addInput(Landroidx/navigationevent/NavigationEventDispatcher;Landroidx/navigationevent/NavigationEventInput;I)V
+SPLandroidx/navigationevent/NavigationEventProcessor;->refreshEnabledHandlers()V
+SPLandroidx/navigationevent/NavigationEventProcessor;->resolveCombinedBackInfo()Ljava/util/List;
+SPLandroidx/navigationevent/NavigationEventProcessor;->resolveEnabledHandler$default(Landroidx/navigationevent/NavigationEventProcessor;IILjava/lang/Object;)Landroidx/navigationevent/NavigationEventHandler;
+SPLandroidx/navigationevent/NavigationEventProcessor;->resolveEnabledHandler(I)Landroidx/navigationevent/NavigationEventHandler;
+SPLandroidx/navigationevent/NavigationEventProcessor;->updateEnabledHandlerInfo$navigationevent(Landroidx/navigationevent/NavigationEventHandler;)V
+Landroidx/navigationevent/NavigationEventTransitionState;
+SPLandroidx/navigationevent/NavigationEventTransitionState;-><clinit>()V
+SPLandroidx/navigationevent/NavigationEventTransitionState;-><init>()V
+SPLandroidx/navigationevent/NavigationEventTransitionState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/navigationevent/NavigationEventTransitionState$Companion;
+SPLandroidx/navigationevent/NavigationEventTransitionState$Companion;-><init>()V
+SPLandroidx/navigationevent/NavigationEventTransitionState$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/navigationevent/NavigationEventTransitionState$Idle;
+SPLandroidx/navigationevent/NavigationEventTransitionState$Idle;-><clinit>()V
+SPLandroidx/navigationevent/NavigationEventTransitionState$Idle;-><init>()V
+Landroidx/navigationevent/OnBackCompletedFallback;
+Landroidx/navigationevent/OnBackInvokedDefaultInput;
+SPLandroidx/navigationevent/OnBackInvokedDefaultInput;-><init>(Landroid/window/OnBackInvokedDispatcher;)V
+Landroidx/navigationevent/OnBackInvokedInput;
+SPLandroidx/navigationevent/OnBackInvokedInput;-><init>(Landroid/window/OnBackInvokedDispatcher;I)V
+SPLandroidx/navigationevent/OnBackInvokedInput;-><init>(Landroid/window/OnBackInvokedDispatcher;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/navigationevent/OnBackInvokedInput;->createOnBackAnimationCallback()Landroid/window/OnBackInvokedCallback;
+SPLandroidx/navigationevent/OnBackInvokedInput;->onHasEnabledHandlersChanged(Z)V
+SPLandroidx/navigationevent/OnBackInvokedInput;->updateBackInvokedCallbackState(Z)V
+Landroidx/navigationevent/OnBackInvokedInput$createOnBackAnimationCallback$1;
+SPLandroidx/navigationevent/OnBackInvokedInput$createOnBackAnimationCallback$1;-><init>(Landroidx/navigationevent/OnBackInvokedInput;)V
+Landroidx/navigationevent/OnBackInvokedOverlayInput;
+SPLandroidx/navigationevent/OnBackInvokedOverlayInput;-><init>(Landroid/window/OnBackInvokedDispatcher;)V
+Landroidx/navigationevent/R$id;
+Landroidx/navigationevent/ViewTreeNavigationEventDispatcherOwner;
+SPLandroidx/navigationevent/ViewTreeNavigationEventDispatcherOwner;->set(Landroid/view/View;Landroidx/navigationevent/NavigationEventDispatcherOwner;)V
+Landroidx/preference/PreferenceManager;
+SPLandroidx/preference/PreferenceManager;->getDefaultSharedPreferences(Landroid/content/Context;)Landroid/content/SharedPreferences;
+SPLandroidx/preference/PreferenceManager;->getDefaultSharedPreferencesMode()I
+SPLandroidx/preference/PreferenceManager;->getDefaultSharedPreferencesName(Landroid/content/Context;)Ljava/lang/String;
+PLandroidx/profileinstaller/ProfileInstallReceiver;-><init>()V
+PLandroidx/profileinstaller/ProfileInstallReceiver;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V
+PLandroidx/profileinstaller/ProfileInstallReceiver;->saveProfile(ILandroidx/profileinstaller/ProfileInstaller$DiagnosticsCallback;)V
+PLandroidx/profileinstaller/ProfileInstallReceiver;->saveProfile(Landroidx/profileinstaller/ProfileInstaller$DiagnosticsCallback;)V
+PLandroidx/profileinstaller/ProfileInstallReceiver$ResultDiagnostics;-><init>(Landroidx/profileinstaller/ProfileInstallReceiver;)V
+PLandroidx/profileinstaller/ProfileInstallReceiver$ResultDiagnostics;->onResultReceived(ILjava/lang/Object;)V
+PLandroidx/profileinstaller/ProfileInstaller;-><clinit>()V
+PLandroidx/profileinstaller/ProfileInstaller;->hasAlreadyWrittenProfileForThisInstall(Landroid/content/pm/PackageInfo;Ljava/io/File;Landroidx/profileinstaller/ProfileInstaller$DiagnosticsCallback;)Z
+PLandroidx/profileinstaller/ProfileInstaller;->writeProfile(Landroid/content/Context;)V
+PLandroidx/profileinstaller/ProfileInstaller;->writeProfile(Landroid/content/Context;Ljava/util/concurrent/Executor;Landroidx/profileinstaller/ProfileInstaller$DiagnosticsCallback;)V
+PLandroidx/profileinstaller/ProfileInstaller;->writeProfile(Landroid/content/Context;Ljava/util/concurrent/Executor;Landroidx/profileinstaller/ProfileInstaller$DiagnosticsCallback;Z)V
+PLandroidx/profileinstaller/ProfileInstaller$1;-><init>()V
+PLandroidx/profileinstaller/ProfileInstaller$1;->onResultReceived(ILjava/lang/Object;)V
+PLandroidx/profileinstaller/ProfileInstaller$2;-><init>()V
+PLandroidx/profileinstaller/ProfileInstaller$2;->onResultReceived(ILjava/lang/Object;)V
+Landroidx/profileinstaller/ProfileInstallerInitializer;
+SPLandroidx/profileinstaller/ProfileInstallerInitializer;-><init>()V
+SPLandroidx/profileinstaller/ProfileInstallerInitializer;->create(Landroid/content/Context;)Landroidx/profileinstaller/ProfileInstallerInitializer$Result;
+SPLandroidx/profileinstaller/ProfileInstallerInitializer;->create(Landroid/content/Context;)Ljava/lang/Object;
+SPLandroidx/profileinstaller/ProfileInstallerInitializer;->dependencies()Ljava/util/List;
+SPLandroidx/profileinstaller/ProfileInstallerInitializer;->installAfterDelay(Landroid/content/Context;)V
+SPLandroidx/profileinstaller/ProfileInstallerInitializer;->lambda$create$0$androidx-profileinstaller-ProfileInstallerInitializer(Landroid/content/Context;J)V
+PLandroidx/profileinstaller/ProfileInstallerInitializer;->lambda$installAfterDelay$1(Landroid/content/Context;)V
+PLandroidx/profileinstaller/ProfileInstallerInitializer;->lambda$writeInBackground$2(Landroid/content/Context;)V
+PLandroidx/profileinstaller/ProfileInstallerInitializer;->writeInBackground(Landroid/content/Context;)V
+Landroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda0;
+SPLandroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda0;-><init>(Landroidx/profileinstaller/ProfileInstallerInitializer;Landroid/content/Context;)V
+SPLandroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda0;->doFrame(J)V
+Landroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda1;
+SPLandroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda1;-><init>(Landroid/content/Context;)V
+PLandroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda1;->run()V
+PLandroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda2;-><init>(Landroid/content/Context;)V
+PLandroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda2;->run()V
+Landroidx/profileinstaller/ProfileInstallerInitializer$Handler28Impl;
+SPLandroidx/profileinstaller/ProfileInstallerInitializer$Handler28Impl;->createAsync(Landroid/os/Looper;)Landroid/os/Handler;
+Landroidx/profileinstaller/ProfileInstallerInitializer$Result;
+SPLandroidx/profileinstaller/ProfileInstallerInitializer$Result;-><init>()V
+PLandroidx/profileinstaller/ProfileVerifier;-><clinit>()V
+PLandroidx/profileinstaller/ProfileVerifier;->getPackageLastUpdateTime(Landroid/content/Context;)J
+PLandroidx/profileinstaller/ProfileVerifier;->setCompilationStatus(IZZZ)Landroidx/profileinstaller/ProfileVerifier$CompilationStatus;
+PLandroidx/profileinstaller/ProfileVerifier;->writeProfileVerification(Landroid/content/Context;Z)Landroidx/profileinstaller/ProfileVerifier$CompilationStatus;
+PLandroidx/profileinstaller/ProfileVerifier$Api33Impl;->getPackageInfo(Landroid/content/pm/PackageManager;Landroid/content/Context;)Landroid/content/pm/PackageInfo;
+PLandroidx/profileinstaller/ProfileVerifier$Cache;-><init>(IIJJ)V
+PLandroidx/profileinstaller/ProfileVerifier$Cache;->equals(Ljava/lang/Object;)Z
+PLandroidx/profileinstaller/ProfileVerifier$Cache;->readFromFile(Ljava/io/File;)Landroidx/profileinstaller/ProfileVerifier$Cache;
+PLandroidx/profileinstaller/ProfileVerifier$Cache;->writeOnFile(Ljava/io/File;)V
+PLandroidx/profileinstaller/ProfileVerifier$CompilationStatus;-><init>(IZZZ)V
+Landroidx/recyclerview/R$attr;
+Landroidx/recyclerview/R$styleable;
+SPLandroidx/recyclerview/R$styleable;-><clinit>()V
+Landroidx/recyclerview/widget/AdapterHelper;
+SPLandroidx/recyclerview/widget/AdapterHelper;-><init>(Landroidx/recyclerview/widget/AdapterHelper$Callback;)V
+SPLandroidx/recyclerview/widget/AdapterHelper;-><init>(Landroidx/recyclerview/widget/AdapterHelper$Callback;Z)V
+SPLandroidx/recyclerview/widget/AdapterHelper;->applyAdd(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
+SPLandroidx/recyclerview/widget/AdapterHelper;->consumePostponedUpdates()V
+SPLandroidx/recyclerview/widget/AdapterHelper;->consumeUpdatesInOnePass()V
+SPLandroidx/recyclerview/widget/AdapterHelper;->findPositionOffset(I)I
+SPLandroidx/recyclerview/widget/AdapterHelper;->findPositionOffset(II)I
+SPLandroidx/recyclerview/widget/AdapterHelper;->hasPendingUpdates()Z
+SPLandroidx/recyclerview/widget/AdapterHelper;->obtainUpdateOp(IIILjava/lang/Object;)Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;
+SPLandroidx/recyclerview/widget/AdapterHelper;->onItemRangeChanged(IILjava/lang/Object;)Z
+SPLandroidx/recyclerview/widget/AdapterHelper;->onItemRangeInserted(II)Z
+SPLandroidx/recyclerview/widget/AdapterHelper;->postponeAndUpdateViewHolders(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
+SPLandroidx/recyclerview/widget/AdapterHelper;->preProcess()V
+SPLandroidx/recyclerview/widget/AdapterHelper;->recycleUpdateOp(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
+SPLandroidx/recyclerview/widget/AdapterHelper;->recycleUpdateOpsAndClearList(Ljava/util/List;)V
+SPLandroidx/recyclerview/widget/AdapterHelper;->reset()V
+Landroidx/recyclerview/widget/AdapterHelper$Callback;
+Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;
+SPLandroidx/recyclerview/widget/AdapterHelper$UpdateOp;-><init>(IIILjava/lang/Object;)V
+Landroidx/recyclerview/widget/AdapterListUpdateCallback;
+SPLandroidx/recyclerview/widget/AdapterListUpdateCallback;-><init>(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+SPLandroidx/recyclerview/widget/AdapterListUpdateCallback;->onInserted(II)V
+Landroidx/recyclerview/widget/AsyncDifferConfig;
+SPLandroidx/recyclerview/widget/AsyncDifferConfig;-><init>(Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Landroidx/recyclerview/widget/DiffUtil$ItemCallback;)V
+SPLandroidx/recyclerview/widget/AsyncDifferConfig;->getBackgroundThreadExecutor()Ljava/util/concurrent/Executor;
+SPLandroidx/recyclerview/widget/AsyncDifferConfig;->getMainThreadExecutor()Ljava/util/concurrent/Executor;
+Landroidx/recyclerview/widget/AsyncDifferConfig$Builder;
+SPLandroidx/recyclerview/widget/AsyncDifferConfig$Builder;-><clinit>()V
+SPLandroidx/recyclerview/widget/AsyncDifferConfig$Builder;-><init>(Landroidx/recyclerview/widget/DiffUtil$ItemCallback;)V
+SPLandroidx/recyclerview/widget/AsyncDifferConfig$Builder;->build()Landroidx/recyclerview/widget/AsyncDifferConfig;
+Landroidx/recyclerview/widget/AsyncListDiffer;
+SPLandroidx/recyclerview/widget/AsyncListDiffer;-><clinit>()V
+SPLandroidx/recyclerview/widget/AsyncListDiffer;-><init>(Landroidx/recyclerview/widget/ListUpdateCallback;Landroidx/recyclerview/widget/AsyncDifferConfig;)V
+SPLandroidx/recyclerview/widget/AsyncListDiffer;->addListListener(Landroidx/recyclerview/widget/AsyncListDiffer$ListListener;)V
+SPLandroidx/recyclerview/widget/AsyncListDiffer;->getCurrentList()Ljava/util/List;
+SPLandroidx/recyclerview/widget/AsyncListDiffer;->latchList(Ljava/util/List;Landroidx/recyclerview/widget/DiffUtil$DiffResult;Ljava/lang/Runnable;)V
+SPLandroidx/recyclerview/widget/AsyncListDiffer;->onCurrentListChanged(Ljava/util/List;Ljava/lang/Runnable;)V
+SPLandroidx/recyclerview/widget/AsyncListDiffer;->submitList(Ljava/util/List;)V
+SPLandroidx/recyclerview/widget/AsyncListDiffer;->submitList(Ljava/util/List;Ljava/lang/Runnable;)V
+Landroidx/recyclerview/widget/AsyncListDiffer$1;
+SPLandroidx/recyclerview/widget/AsyncListDiffer$1;-><init>(Landroidx/recyclerview/widget/AsyncListDiffer;Ljava/util/List;Ljava/util/List;ILjava/lang/Runnable;)V
+SPLandroidx/recyclerview/widget/AsyncListDiffer$1;->run()V
+Landroidx/recyclerview/widget/AsyncListDiffer$1$1;
+SPLandroidx/recyclerview/widget/AsyncListDiffer$1$1;-><init>(Landroidx/recyclerview/widget/AsyncListDiffer$1;)V
+SPLandroidx/recyclerview/widget/AsyncListDiffer$1$1;->getNewListSize()I
+SPLandroidx/recyclerview/widget/AsyncListDiffer$1$1;->getOldListSize()I
+Landroidx/recyclerview/widget/AsyncListDiffer$1$2;
+SPLandroidx/recyclerview/widget/AsyncListDiffer$1$2;-><init>(Landroidx/recyclerview/widget/AsyncListDiffer$1;Landroidx/recyclerview/widget/DiffUtil$DiffResult;)V
+SPLandroidx/recyclerview/widget/AsyncListDiffer$1$2;->run()V
+Landroidx/recyclerview/widget/AsyncListDiffer$ListListener;
+Landroidx/recyclerview/widget/AsyncListDiffer$MainThreadExecutor;
+SPLandroidx/recyclerview/widget/AsyncListDiffer$MainThreadExecutor;-><init>()V
+SPLandroidx/recyclerview/widget/AsyncListDiffer$MainThreadExecutor;->execute(Ljava/lang/Runnable;)V
+Landroidx/recyclerview/widget/BatchingListUpdateCallback;
+SPLandroidx/recyclerview/widget/BatchingListUpdateCallback;-><init>(Landroidx/recyclerview/widget/ListUpdateCallback;)V
+SPLandroidx/recyclerview/widget/BatchingListUpdateCallback;->dispatchLastEvent()V
+SPLandroidx/recyclerview/widget/BatchingListUpdateCallback;->onInserted(II)V
+Landroidx/recyclerview/widget/ChildHelper;
+SPLandroidx/recyclerview/widget/ChildHelper;-><init>(Landroidx/recyclerview/widget/ChildHelper$Callback;)V
+SPLandroidx/recyclerview/widget/ChildHelper;->addView(Landroid/view/View;IZ)V
+SPLandroidx/recyclerview/widget/ChildHelper;->attachViewToParent(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;Z)V
+SPLandroidx/recyclerview/widget/ChildHelper;->detachViewFromParent(I)V
+SPLandroidx/recyclerview/widget/ChildHelper;->findHiddenNonRemovedView(I)Landroid/view/View;
+SPLandroidx/recyclerview/widget/ChildHelper;->getChildAt(I)Landroid/view/View;
+SPLandroidx/recyclerview/widget/ChildHelper;->getChildCount()I
+SPLandroidx/recyclerview/widget/ChildHelper;->getOffset(I)I
+SPLandroidx/recyclerview/widget/ChildHelper;->getUnfilteredChildAt(I)Landroid/view/View;
+SPLandroidx/recyclerview/widget/ChildHelper;->getUnfilteredChildCount()I
+SPLandroidx/recyclerview/widget/ChildHelper;->isHidden(Landroid/view/View;)Z
+SPLandroidx/recyclerview/widget/ChildHelper;->removeAllViewsUnfiltered()V
+SPLandroidx/recyclerview/widget/ChildHelper;->removeViewIfHidden(Landroid/view/View;)Z
+Landroidx/recyclerview/widget/ChildHelper$Bucket;
+SPLandroidx/recyclerview/widget/ChildHelper$Bucket;-><init>()V
+SPLandroidx/recyclerview/widget/ChildHelper$Bucket;->clear(I)V
+SPLandroidx/recyclerview/widget/ChildHelper$Bucket;->countOnesBefore(I)I
+SPLandroidx/recyclerview/widget/ChildHelper$Bucket;->get(I)Z
+SPLandroidx/recyclerview/widget/ChildHelper$Bucket;->insert(IZ)V
+SPLandroidx/recyclerview/widget/ChildHelper$Bucket;->remove(I)Z
+SPLandroidx/recyclerview/widget/ChildHelper$Bucket;->reset()V
+Landroidx/recyclerview/widget/ChildHelper$Callback;
+Landroidx/recyclerview/widget/DefaultItemAnimator;
+SPLandroidx/recyclerview/widget/DefaultItemAnimator;-><init>()V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator;->animateAdd(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Z
+SPLandroidx/recyclerview/widget/DefaultItemAnimator;->animateAddImpl(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator;->dispatchFinishedWhenDone()V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator;->endAnimation(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator;->endAnimations()V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator;->endChangeAnimation(Ljava/util/List;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator;->isRunning()Z
+SPLandroidx/recyclerview/widget/DefaultItemAnimator;->resetAnimation(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator;->runPendingAnimations()V
+Landroidx/recyclerview/widget/DefaultItemAnimator$3;
+SPLandroidx/recyclerview/widget/DefaultItemAnimator$3;-><init>(Landroidx/recyclerview/widget/DefaultItemAnimator;Ljava/util/ArrayList;)V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator$3;->run()V
+Landroidx/recyclerview/widget/DefaultItemAnimator$5;
+SPLandroidx/recyclerview/widget/DefaultItemAnimator$5;-><init>(Landroidx/recyclerview/widget/DefaultItemAnimator;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroid/view/View;Landroid/view/ViewPropertyAnimator;)V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator$5;->onAnimationEnd(Landroid/animation/Animator;)V
+SPLandroidx/recyclerview/widget/DefaultItemAnimator$5;->onAnimationStart(Landroid/animation/Animator;)V
+Landroidx/recyclerview/widget/DiffUtil;
+SPLandroidx/recyclerview/widget/DiffUtil;-><clinit>()V
+SPLandroidx/recyclerview/widget/DiffUtil;->calculateDiff(Landroidx/recyclerview/widget/DiffUtil$Callback;)Landroidx/recyclerview/widget/DiffUtil$DiffResult;
+SPLandroidx/recyclerview/widget/DiffUtil;->calculateDiff(Landroidx/recyclerview/widget/DiffUtil$Callback;Z)Landroidx/recyclerview/widget/DiffUtil$DiffResult;
+SPLandroidx/recyclerview/widget/DiffUtil;->midPoint(Landroidx/recyclerview/widget/DiffUtil$Range;Landroidx/recyclerview/widget/DiffUtil$Callback;Landroidx/recyclerview/widget/DiffUtil$CenteredArray;Landroidx/recyclerview/widget/DiffUtil$CenteredArray;)Landroidx/recyclerview/widget/DiffUtil$Snake;
+Landroidx/recyclerview/widget/DiffUtil$1;
+SPLandroidx/recyclerview/widget/DiffUtil$1;-><init>()V
+Landroidx/recyclerview/widget/DiffUtil$Callback;
+SPLandroidx/recyclerview/widget/DiffUtil$Callback;-><init>()V
+Landroidx/recyclerview/widget/DiffUtil$CenteredArray;
+SPLandroidx/recyclerview/widget/DiffUtil$CenteredArray;-><init>(I)V
+SPLandroidx/recyclerview/widget/DiffUtil$CenteredArray;->backingData()[I
+Landroidx/recyclerview/widget/DiffUtil$Diagonal;
+SPLandroidx/recyclerview/widget/DiffUtil$Diagonal;-><init>(III)V
+SPLandroidx/recyclerview/widget/DiffUtil$Diagonal;->endX()I
+SPLandroidx/recyclerview/widget/DiffUtil$Diagonal;->endY()I
+Landroidx/recyclerview/widget/DiffUtil$DiffResult;
+SPLandroidx/recyclerview/widget/DiffUtil$DiffResult;-><init>(Landroidx/recyclerview/widget/DiffUtil$Callback;Ljava/util/List;[I[IZ)V
+SPLandroidx/recyclerview/widget/DiffUtil$DiffResult;->addEdgeDiagonals()V
+SPLandroidx/recyclerview/widget/DiffUtil$DiffResult;->dispatchUpdatesTo(Landroidx/recyclerview/widget/ListUpdateCallback;)V
+SPLandroidx/recyclerview/widget/DiffUtil$DiffResult;->findMatchingItems()V
+SPLandroidx/recyclerview/widget/DiffUtil$DiffResult;->findMoveMatches()V
+Landroidx/recyclerview/widget/DiffUtil$ItemCallback;
+SPLandroidx/recyclerview/widget/DiffUtil$ItemCallback;-><init>()V
+Landroidx/recyclerview/widget/DiffUtil$Range;
+SPLandroidx/recyclerview/widget/DiffUtil$Range;-><init>(IIII)V
+SPLandroidx/recyclerview/widget/DiffUtil$Range;->oldSize()I
+Landroidx/recyclerview/widget/GapWorker;
+SPLandroidx/recyclerview/widget/GapWorker;-><clinit>()V
+SPLandroidx/recyclerview/widget/GapWorker;-><init>()V
+SPLandroidx/recyclerview/widget/GapWorker;->add(Landroidx/recyclerview/widget/RecyclerView;)V
+Landroidx/recyclerview/widget/GapWorker$1;
+SPLandroidx/recyclerview/widget/GapWorker$1;-><init>()V
+Landroidx/recyclerview/widget/GapWorker$LayoutPrefetchRegistryImpl;
+SPLandroidx/recyclerview/widget/GapWorker$LayoutPrefetchRegistryImpl;-><init>()V
+SPLandroidx/recyclerview/widget/GapWorker$LayoutPrefetchRegistryImpl;->clearPrefetchPositions()V
+Landroidx/recyclerview/widget/ItemTouchHelper$ViewDropHandler;
+Landroidx/recyclerview/widget/LinearLayoutManager;
+SPLandroidx/recyclerview/widget/LinearLayoutManager;-><init>(Landroid/content/Context;)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;-><init>(Landroid/content/Context;IZ)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->assertNotInLayoutOrScroll(Ljava/lang/String;)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->calculateExtraLayoutSpace(Landroidx/recyclerview/widget/RecyclerView$State;[I)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->canScrollHorizontally()Z
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->canScrollVertically()Z
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->computeScrollExtent(Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->computeScrollOffset(Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->computeScrollRange(Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->computeVerticalScrollExtent(Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->computeVerticalScrollOffset(Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->computeVerticalScrollRange(Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->createLayoutState()Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->ensureLayoutState()V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->fill(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->findFirstCompletelyVisibleItemPosition()I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->findFirstVisibleChildClosestToEnd(ZZ)Landroid/view/View;
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->findFirstVisibleChildClosestToStart(ZZ)Landroid/view/View;
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->findFirstVisibleItemPosition()I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->findLastVisibleItemPosition()I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->findOneVisibleChild(IIZZ)Landroid/view/View;
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->findReferenceChild(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;ZZ)Landroid/view/View;
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->fixLayoutEndGap(ILandroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->fixLayoutStartGap(ILandroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Z)I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->getChildClosestToEnd()Landroid/view/View;
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->getChildClosestToStart()Landroid/view/View;
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->getExtraLayoutSpace(Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->isAutoMeasureEnabled()Z
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->isLayoutRTL()Z
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->layoutChunk(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutChunkResult;)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->layoutForPredictiveAnimations(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;II)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->onAnchorReady(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;I)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->onInitializeAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->onInitializeAccessibilityNodeInfo(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->onLayoutChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->onLayoutCompleted(Landroidx/recyclerview/widget/RecyclerView$State;)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->recycleByLayoutState(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->recycleChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;II)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->recycleViewsFromEnd(Landroidx/recyclerview/widget/RecyclerView$Recycler;II)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->recycleViewsFromStart(Landroidx/recyclerview/widget/RecyclerView$Recycler;II)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->resolveIsInfinite()Z
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->resolveShouldLayoutReverse()V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->scrollBy(ILandroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->scrollToPositionWithOffset(II)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->setOrientation(I)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->setReverseLayout(Z)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->supportsPredictiveItemAnimations()Z
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->updateAnchorFromChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;)Z
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->updateAnchorFromPendingData(Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;)Z
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->updateAnchorInfoForLayout(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->updateLayoutState(IIZLandroidx/recyclerview/widget/RecyclerView$State;)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->updateLayoutStateToFillEnd(II)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->updateLayoutStateToFillEnd(Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->updateLayoutStateToFillStart(II)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager;->updateLayoutStateToFillStart(Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;)V
+Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;
+SPLandroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;-><init>()V
+SPLandroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->assignCoordinateFromPadding()V
+SPLandroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->assignFromView(Landroid/view/View;I)V
+SPLandroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;->reset()V
+Landroidx/recyclerview/widget/LinearLayoutManager$LayoutChunkResult;
+SPLandroidx/recyclerview/widget/LinearLayoutManager$LayoutChunkResult;-><init>()V
+SPLandroidx/recyclerview/widget/LinearLayoutManager$LayoutChunkResult;->resetInternal()V
+Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;
+SPLandroidx/recyclerview/widget/LinearLayoutManager$LayoutState;-><init>()V
+SPLandroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->hasMore(Landroidx/recyclerview/widget/RecyclerView$State;)Z
+SPLandroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->next(Landroidx/recyclerview/widget/RecyclerView$Recycler;)Landroid/view/View;
+Landroidx/recyclerview/widget/LinearLayoutManager$SavedState;
+Landroidx/recyclerview/widget/ListAdapter;
+SPLandroidx/recyclerview/widget/ListAdapter;-><init>(Landroidx/recyclerview/widget/DiffUtil$ItemCallback;)V
+SPLandroidx/recyclerview/widget/ListAdapter;->getItem(I)Ljava/lang/Object;
+SPLandroidx/recyclerview/widget/ListAdapter;->getItemCount()I
+SPLandroidx/recyclerview/widget/ListAdapter;->onCurrentListChanged(Ljava/util/List;Ljava/util/List;)V
+SPLandroidx/recyclerview/widget/ListAdapter;->submitList(Ljava/util/List;)V
+Landroidx/recyclerview/widget/ListAdapter$1;
+SPLandroidx/recyclerview/widget/ListAdapter$1;-><init>(Landroidx/recyclerview/widget/ListAdapter;)V
+SPLandroidx/recyclerview/widget/ListAdapter$1;->onCurrentListChanged(Ljava/util/List;Ljava/util/List;)V
+Landroidx/recyclerview/widget/ListUpdateCallback;
+Landroidx/recyclerview/widget/OpReorderer;
+SPLandroidx/recyclerview/widget/OpReorderer;-><init>(Landroidx/recyclerview/widget/OpReorderer$Callback;)V
+SPLandroidx/recyclerview/widget/OpReorderer;->getLastMoveOutOfOrder(Ljava/util/List;)I
+SPLandroidx/recyclerview/widget/OpReorderer;->reorderOps(Ljava/util/List;)V
+Landroidx/recyclerview/widget/OpReorderer$Callback;
+Landroidx/recyclerview/widget/OrientationHelper;
+SPLandroidx/recyclerview/widget/OrientationHelper;-><init>(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
+SPLandroidx/recyclerview/widget/OrientationHelper;-><init>(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;Landroidx/recyclerview/widget/OrientationHelper$1;)V
+SPLandroidx/recyclerview/widget/OrientationHelper;->createOrientationHelper(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;I)Landroidx/recyclerview/widget/OrientationHelper;
+SPLandroidx/recyclerview/widget/OrientationHelper;->createVerticalHelper(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)Landroidx/recyclerview/widget/OrientationHelper;
+SPLandroidx/recyclerview/widget/OrientationHelper;->onLayoutComplete()V
+Landroidx/recyclerview/widget/OrientationHelper$2;
+SPLandroidx/recyclerview/widget/OrientationHelper$2;-><init>(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
+SPLandroidx/recyclerview/widget/OrientationHelper$2;->getDecoratedEnd(Landroid/view/View;)I
+SPLandroidx/recyclerview/widget/OrientationHelper$2;->getDecoratedMeasurement(Landroid/view/View;)I
+SPLandroidx/recyclerview/widget/OrientationHelper$2;->getDecoratedMeasurementInOther(Landroid/view/View;)I
+SPLandroidx/recyclerview/widget/OrientationHelper$2;->getDecoratedStart(Landroid/view/View;)I
+SPLandroidx/recyclerview/widget/OrientationHelper$2;->getEnd()I
+SPLandroidx/recyclerview/widget/OrientationHelper$2;->getEndAfterPadding()I
+SPLandroidx/recyclerview/widget/OrientationHelper$2;->getEndPadding()I
+SPLandroidx/recyclerview/widget/OrientationHelper$2;->getMode()I
+SPLandroidx/recyclerview/widget/OrientationHelper$2;->getStartAfterPadding()I
+SPLandroidx/recyclerview/widget/OrientationHelper$2;->getTotalSpace()I
+SPLandroidx/recyclerview/widget/OrientationHelper$2;->offsetChildren(I)V
+Landroidx/recyclerview/widget/RecyclerView;
+SPLandroidx/recyclerview/widget/RecyclerView;-><clinit>()V
+SPLandroidx/recyclerview/widget/RecyclerView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/recyclerview/widget/RecyclerView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLandroidx/recyclerview/widget/RecyclerView;->access$000(Landroidx/recyclerview/widget/RecyclerView;Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V
+SPLandroidx/recyclerview/widget/RecyclerView;->access$100(Landroidx/recyclerview/widget/RecyclerView;I)V
+SPLandroidx/recyclerview/widget/RecyclerView;->addOnScrollListener(Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;)V
+SPLandroidx/recyclerview/widget/RecyclerView;->animateAppearance(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)V
+SPLandroidx/recyclerview/widget/RecyclerView;->assertNotInLayoutOrScroll(Ljava/lang/String;)V
+SPLandroidx/recyclerview/widget/RecyclerView;->checkLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Z
+SPLandroidx/recyclerview/widget/RecyclerView;->clearOldPositions()V
+SPLandroidx/recyclerview/widget/RecyclerView;->computeHorizontalScrollExtent()I
+SPLandroidx/recyclerview/widget/RecyclerView;->computeHorizontalScrollOffset()I
+SPLandroidx/recyclerview/widget/RecyclerView;->computeHorizontalScrollRange()I
+SPLandroidx/recyclerview/widget/RecyclerView;->computeVerticalScrollExtent()I
+SPLandroidx/recyclerview/widget/RecyclerView;->computeVerticalScrollOffset()I
+SPLandroidx/recyclerview/widget/RecyclerView;->computeVerticalScrollRange()I
+SPLandroidx/recyclerview/widget/RecyclerView;->createLayoutManager(Landroid/content/Context;Ljava/lang/String;Landroid/util/AttributeSet;II)V
+SPLandroidx/recyclerview/widget/RecyclerView;->defaultOnMeasure(II)V
+SPLandroidx/recyclerview/widget/RecyclerView;->didChildRangeChange(II)Z
+SPLandroidx/recyclerview/widget/RecyclerView;->dispatchChildAttached(Landroid/view/View;)V
+SPLandroidx/recyclerview/widget/RecyclerView;->dispatchContentChangedIfNecessary()V
+SPLandroidx/recyclerview/widget/RecyclerView;->dispatchLayout()V
+SPLandroidx/recyclerview/widget/RecyclerView;->dispatchLayoutStep1()V
+SPLandroidx/recyclerview/widget/RecyclerView;->dispatchLayoutStep2()V
+SPLandroidx/recyclerview/widget/RecyclerView;->dispatchLayoutStep3()V
+SPLandroidx/recyclerview/widget/RecyclerView;->dispatchOnScrolled(II)V
+SPLandroidx/recyclerview/widget/RecyclerView;->dispatchPendingImportantForAccessibilityChanges()V
+SPLandroidx/recyclerview/widget/RecyclerView;->draw(Landroid/graphics/Canvas;)V
+SPLandroidx/recyclerview/widget/RecyclerView;->drawChild(Landroid/graphics/Canvas;Landroid/view/View;J)Z
+SPLandroidx/recyclerview/widget/RecyclerView;->fillRemainingScrollValues(Landroidx/recyclerview/widget/RecyclerView$State;)V
+SPLandroidx/recyclerview/widget/RecyclerView;->findMinMaxChildLayoutPositions([I)V
+SPLandroidx/recyclerview/widget/RecyclerView;->findNestedRecyclerView(Landroid/view/View;)Landroidx/recyclerview/widget/RecyclerView;
+SPLandroidx/recyclerview/widget/RecyclerView;->generateLayoutParams(Landroid/util/AttributeSet;)Landroid/view/ViewGroup$LayoutParams;
+SPLandroidx/recyclerview/widget/RecyclerView;->getAccessibilityClassName()Ljava/lang/CharSequence;
+SPLandroidx/recyclerview/widget/RecyclerView;->getChangedHolderKey(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)J
+SPLandroidx/recyclerview/widget/RecyclerView;->getChildViewHolderInt(Landroid/view/View;)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+SPLandroidx/recyclerview/widget/RecyclerView;->getItemDecorInsetsForChild(Landroid/view/View;)Landroid/graphics/Rect;
+SPLandroidx/recyclerview/widget/RecyclerView;->getLayoutManager()Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
+SPLandroidx/recyclerview/widget/RecyclerView;->getNanoTime()J
+SPLandroidx/recyclerview/widget/RecyclerView;->getScrollState()I
+SPLandroidx/recyclerview/widget/RecyclerView;->getScrollingChildHelper()Landroidx/core/view/NestedScrollingChildHelper;
+SPLandroidx/recyclerview/widget/RecyclerView;->hasPendingAdapterUpdates()Z
+SPLandroidx/recyclerview/widget/RecyclerView;->initAdapterManager()V
+SPLandroidx/recyclerview/widget/RecyclerView;->initAutofill()V
+SPLandroidx/recyclerview/widget/RecyclerView;->initChildrenHelper()V
+SPLandroidx/recyclerview/widget/RecyclerView;->invalidateGlows()V
+SPLandroidx/recyclerview/widget/RecyclerView;->isAccessibilityEnabled()Z
+SPLandroidx/recyclerview/widget/RecyclerView;->isAttachedToWindow()Z
+SPLandroidx/recyclerview/widget/RecyclerView;->isComputingLayout()Z
+SPLandroidx/recyclerview/widget/RecyclerView;->markItemDecorInsetsDirty()V
+SPLandroidx/recyclerview/widget/RecyclerView;->markKnownViewsInvalid()V
+SPLandroidx/recyclerview/widget/RecyclerView;->offsetChildrenVertical(I)V
+SPLandroidx/recyclerview/widget/RecyclerView;->offsetPositionRecordsForInsert(II)V
+SPLandroidx/recyclerview/widget/RecyclerView;->onAttachedToWindow()V
+SPLandroidx/recyclerview/widget/RecyclerView;->onChildAttachedToWindow(Landroid/view/View;)V
+SPLandroidx/recyclerview/widget/RecyclerView;->onDraw(Landroid/graphics/Canvas;)V
+SPLandroidx/recyclerview/widget/RecyclerView;->onEnterLayoutOrScroll()V
+SPLandroidx/recyclerview/widget/RecyclerView;->onExitLayoutOrScroll()V
+SPLandroidx/recyclerview/widget/RecyclerView;->onExitLayoutOrScroll(Z)V
+SPLandroidx/recyclerview/widget/RecyclerView;->onLayout(ZIIII)V
+SPLandroidx/recyclerview/widget/RecyclerView;->onMeasure(II)V
+SPLandroidx/recyclerview/widget/RecyclerView;->onScrolled(II)V
+SPLandroidx/recyclerview/widget/RecyclerView;->onSizeChanged(IIII)V
+SPLandroidx/recyclerview/widget/RecyclerView;->postAnimationRunner()V
+SPLandroidx/recyclerview/widget/RecyclerView;->predictiveItemAnimationsEnabled()Z
+SPLandroidx/recyclerview/widget/RecyclerView;->processAdapterUpdatesAndSetAnimationFlags()V
+SPLandroidx/recyclerview/widget/RecyclerView;->processDataSetCompletelyChanged(Z)V
+SPLandroidx/recyclerview/widget/RecyclerView;->recoverFocusFromState()V
+SPLandroidx/recyclerview/widget/RecyclerView;->removeAndRecycleViews()V
+SPLandroidx/recyclerview/widget/RecyclerView;->removeAnimatingView(Landroid/view/View;)Z
+SPLandroidx/recyclerview/widget/RecyclerView;->requestLayout()V
+SPLandroidx/recyclerview/widget/RecyclerView;->resetFocusInfo()V
+SPLandroidx/recyclerview/widget/RecyclerView;->saveFocusInfo()V
+SPLandroidx/recyclerview/widget/RecyclerView;->saveOldPositions()V
+SPLandroidx/recyclerview/widget/RecyclerView;->sendAccessibilityEventUnchecked(Landroid/view/accessibility/AccessibilityEvent;)V
+SPLandroidx/recyclerview/widget/RecyclerView;->setAccessibilityDelegateCompat(Landroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate;)V
+SPLandroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+SPLandroidx/recyclerview/widget/RecyclerView;->setAdapterInternal(Landroidx/recyclerview/widget/RecyclerView$Adapter;ZZ)V
+SPLandroidx/recyclerview/widget/RecyclerView;->setClipToPadding(Z)V
+SPLandroidx/recyclerview/widget/RecyclerView;->setLayoutFrozen(Z)V
+SPLandroidx/recyclerview/widget/RecyclerView;->setLayoutManager(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
+SPLandroidx/recyclerview/widget/RecyclerView;->setNestedScrollingEnabled(Z)V
+SPLandroidx/recyclerview/widget/RecyclerView;->setScrollState(I)V
+SPLandroidx/recyclerview/widget/RecyclerView;->shouldDeferAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)Z
+SPLandroidx/recyclerview/widget/RecyclerView;->startInterceptRequestLayout()V
+SPLandroidx/recyclerview/widget/RecyclerView;->stopInterceptRequestLayout(Z)V
+SPLandroidx/recyclerview/widget/RecyclerView;->stopScroll()V
+SPLandroidx/recyclerview/widget/RecyclerView;->stopScrollersInternal()V
+SPLandroidx/recyclerview/widget/RecyclerView;->suppressLayout(Z)V
+Landroidx/recyclerview/widget/RecyclerView$1;
+SPLandroidx/recyclerview/widget/RecyclerView$1;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+Landroidx/recyclerview/widget/RecyclerView$2;
+SPLandroidx/recyclerview/widget/RecyclerView$2;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$2;->run()V
+Landroidx/recyclerview/widget/RecyclerView$3;
+SPLandroidx/recyclerview/widget/RecyclerView$3;-><init>()V
+Landroidx/recyclerview/widget/RecyclerView$4;
+SPLandroidx/recyclerview/widget/RecyclerView$4;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$4;->processAppeared(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)V
+Landroidx/recyclerview/widget/RecyclerView$5;
+SPLandroidx/recyclerview/widget/RecyclerView$5;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+Landroidx/recyclerview/widget/RecyclerView$6;
+SPLandroidx/recyclerview/widget/RecyclerView$6;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$6;->addView(Landroid/view/View;I)V
+SPLandroidx/recyclerview/widget/RecyclerView$6;->attachViewToParent(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V
+SPLandroidx/recyclerview/widget/RecyclerView$6;->detachViewFromParent(I)V
+SPLandroidx/recyclerview/widget/RecyclerView$6;->getChildAt(I)Landroid/view/View;
+SPLandroidx/recyclerview/widget/RecyclerView$6;->getChildCount()I
+SPLandroidx/recyclerview/widget/RecyclerView$6;->indexOfChild(Landroid/view/View;)I
+SPLandroidx/recyclerview/widget/RecyclerView$6;->removeAllViews()V
+Landroidx/recyclerview/widget/RecyclerView$7;
+SPLandroidx/recyclerview/widget/RecyclerView$7;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$7;->dispatchUpdate(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
+SPLandroidx/recyclerview/widget/RecyclerView$7;->offsetPositionsForAdd(II)V
+SPLandroidx/recyclerview/widget/RecyclerView$7;->onDispatchSecondPass(Landroidx/recyclerview/widget/AdapterHelper$UpdateOp;)V
+Landroidx/recyclerview/widget/RecyclerView$Adapter;
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->bindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->createViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->getItemViewType(I)I
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->hasObservers()Z
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->hasStableIds()Z
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->notifyDataSetChanged()V
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->notifyItemChanged(I)V
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->notifyItemRangeChanged(II)V
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->notifyItemRangeInserted(II)V
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->onAttachedToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;ILjava/util/List;)V
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->onViewAttachedToWindow(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->registerAdapterDataObserver(Landroidx/recyclerview/widget/RecyclerView$AdapterDataObserver;)V
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter;->setHasStableIds(Z)V
+Landroidx/recyclerview/widget/RecyclerView$Adapter$StateRestorationPolicy;
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter$StateRestorationPolicy;->$values()[Landroidx/recyclerview/widget/RecyclerView$Adapter$StateRestorationPolicy;
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter$StateRestorationPolicy;-><clinit>()V
+SPLandroidx/recyclerview/widget/RecyclerView$Adapter$StateRestorationPolicy;-><init>(Ljava/lang/String;I)V
+Landroidx/recyclerview/widget/RecyclerView$AdapterDataObservable;
+SPLandroidx/recyclerview/widget/RecyclerView$AdapterDataObservable;-><init>()V
+SPLandroidx/recyclerview/widget/RecyclerView$AdapterDataObservable;->hasObservers()Z
+SPLandroidx/recyclerview/widget/RecyclerView$AdapterDataObservable;->notifyChanged()V
+SPLandroidx/recyclerview/widget/RecyclerView$AdapterDataObservable;->notifyItemRangeChanged(II)V
+SPLandroidx/recyclerview/widget/RecyclerView$AdapterDataObservable;->notifyItemRangeChanged(IILjava/lang/Object;)V
+SPLandroidx/recyclerview/widget/RecyclerView$AdapterDataObservable;->notifyItemRangeInserted(II)V
+Landroidx/recyclerview/widget/RecyclerView$AdapterDataObserver;
+SPLandroidx/recyclerview/widget/RecyclerView$AdapterDataObserver;-><init>()V
+Landroidx/recyclerview/widget/RecyclerView$EdgeEffectFactory;
+SPLandroidx/recyclerview/widget/RecyclerView$EdgeEffectFactory;-><init>()V
+Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;-><init>()V
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->dispatchAnimationFinished(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->dispatchAnimationsFinished()V
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->getAddDuration()J
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->obtainHolderInfo()Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->onAnimationFinished(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->recordPostLayoutInformation(Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->setListener(Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorListener;)V
+Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemAnimatorListener;
+Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;-><init>()V
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;->setFrom(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;->setFrom(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
+Landroidx/recyclerview/widget/RecyclerView$ItemAnimatorRestoreListener;
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimatorRestoreListener;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$ItemAnimatorRestoreListener;->onAnimationFinished(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;-><init>()V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->addView(Landroid/view/View;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->addView(Landroid/view/View;I)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->addViewInt(Landroid/view/View;IZ)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->assertNotInLayoutOrScroll(Ljava/lang/String;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->checkLayoutParams(Landroidx/recyclerview/widget/RecyclerView$LayoutParams;)Z
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->chooseSize(III)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->detachAndScrapAttachedViews(Landroidx/recyclerview/widget/RecyclerView$Recycler;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->detachViewAt(I)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->detachViewInternal(ILandroid/view/View;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->dispatchAttachedToWindow(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->generateLayoutParams(Landroid/content/Context;Landroid/util/AttributeSet;)Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getBottomDecorationHeight(Landroid/view/View;)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildAt(I)Landroid/view/View;
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildCount()I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildMeasureSpec(IIIIZ)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getColumnCountForAccessibility(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getDecoratedBottom(Landroid/view/View;)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getDecoratedMeasuredHeight(Landroid/view/View;)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getDecoratedMeasuredWidth(Landroid/view/View;)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getDecoratedTop(Landroid/view/View;)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getFocusedChild()Landroid/view/View;
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getHeight()I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getHeightMode()I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getLayoutDirection()I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPaddingBottom()I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPaddingLeft()I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPaddingRight()I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPaddingTop()I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPosition(Landroid/view/View;)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getRowCountForAccessibility(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getSelectionModeForAccessibility(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getTopDecorationHeight(Landroid/view/View;)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getWidth()I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getWidthMode()I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->isLayoutHierarchical(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)Z
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->isMeasurementUpToDate(III)Z
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->layoutDecoratedWithMargins(Landroid/view/View;IIII)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->measureChildWithMargins(Landroid/view/View;II)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->offsetChildrenVertical(I)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onAdapterChanged(Landroidx/recyclerview/widget/RecyclerView$Adapter;Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onAttachedToWindow(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onInitializeAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onInitializeAccessibilityEvent(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroid/view/accessibility/AccessibilityEvent;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onInitializeAccessibilityNodeInfo(Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onInitializeAccessibilityNodeInfo(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onInitializeAccessibilityNodeInfoForItem(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onInitializeAccessibilityNodeInfoForItem(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onItemsAdded(Landroidx/recyclerview/widget/RecyclerView;II)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onItemsChanged(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onLayoutCompleted(Landroidx/recyclerview/widget/RecyclerView$State;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onMeasure(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;II)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->removeAndRecycleAllViews(Landroidx/recyclerview/widget/RecyclerView$Recycler;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->removeAndRecycleScrapInt(Landroidx/recyclerview/widget/RecyclerView$Recycler;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->requestLayout()V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->scrapOrRecycleView(Landroidx/recyclerview/widget/RecyclerView$Recycler;ILandroid/view/View;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->setExactMeasureSpecsFrom(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->setMeasureSpecs(II)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->setRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->shouldMeasureChild(Landroid/view/View;IILandroidx/recyclerview/widget/RecyclerView$LayoutParams;)Z
+Landroidx/recyclerview/widget/RecyclerView$LayoutManager$1;
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$1;-><init>(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
+Landroidx/recyclerview/widget/RecyclerView$LayoutManager$2;
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$2;-><init>(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$2;->getChildAt(I)Landroid/view/View;
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$2;->getChildEnd(Landroid/view/View;)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$2;->getChildStart(Landroid/view/View;)I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$2;->getParentEnd()I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$2;->getParentStart()I
+Landroidx/recyclerview/widget/RecyclerView$LayoutManager$LayoutPrefetchRegistry;
+Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutParams;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutParams;->getViewLayoutPosition()I
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutParams;->isItemChanged()Z
+SPLandroidx/recyclerview/widget/RecyclerView$LayoutParams;->isItemRemoved()Z
+Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;
+SPLandroidx/recyclerview/widget/RecyclerView$OnScrollListener;-><init>()V
+Landroidx/recyclerview/widget/RecyclerView$RecycledViewPool;
+SPLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool;-><init>()V
+SPLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool;->attach()V
+SPLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool;->attachForPoolingContainer(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+SPLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool;->clear()V
+SPLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool;->factorInBindTime(IJ)V
+SPLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool;->factorInCreateTime(IJ)V
+SPLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool;->getRecycledView(I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+SPLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool;->getScrapDataForType(I)Landroidx/recyclerview/widget/RecyclerView$RecycledViewPool$ScrapData;
+SPLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool;->onAdapterChanged(Landroidx/recyclerview/widget/RecyclerView$Adapter;Landroidx/recyclerview/widget/RecyclerView$Adapter;Z)V
+SPLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool;->runningAverage(JJ)J
+Landroidx/recyclerview/widget/RecyclerView$RecycledViewPool$ScrapData;
+SPLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool$ScrapData;-><init>()V
+Landroidx/recyclerview/widget/RecyclerView$Recycler;
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->attachAccessibilityDelegateOnBind(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->clear()V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->clearOldPositions()V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->clearScrap()V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getRecycledViewPool()Landroidx/recyclerview/widget/RecyclerView$RecycledViewPool;
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getScrapCount()I
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getScrapList()Ljava/util/List;
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getScrapOrCachedViewForId(JIZ)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getScrapOrHiddenOrCachedHolderForPosition(IZ)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getViewForPosition(I)Landroid/view/View;
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getViewForPosition(IZ)Landroid/view/View;
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->markItemDecorInsetsDirty()V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->markKnownViewsInvalid()V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->maybeSendPoolingContainerAttach()V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->offsetPositionRecordsForInsert(II)V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->onAdapterChanged(Landroidx/recyclerview/widget/RecyclerView$Adapter;Landroidx/recyclerview/widget/RecyclerView$Adapter;Z)V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->onAttachedToWindow()V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->poolingContainerDetach(Landroidx/recyclerview/widget/RecyclerView$Adapter;Z)V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->recycleAndClearCachedViews()V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->scrapView(Landroid/view/View;)V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->tryBindViewHolderByDeadline(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;IIJ)Z
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->tryGetViewHolderForPositionByDeadline(IZJ)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->unscrapView(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->updateViewCacheSize()V
+SPLandroidx/recyclerview/widget/RecyclerView$Recycler;->validateViewHolderForOffsetPosition(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Z
+Landroidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver;
+SPLandroidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver;->onChanged()V
+SPLandroidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver;->onItemRangeChanged(IILjava/lang/Object;)V
+SPLandroidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver;->onItemRangeInserted(II)V
+SPLandroidx/recyclerview/widget/RecyclerView$RecyclerViewDataObserver;->triggerUpdateProcessor()V
+Landroidx/recyclerview/widget/RecyclerView$SmoothScroller$ScrollVectorProvider;
+Landroidx/recyclerview/widget/RecyclerView$State;
+SPLandroidx/recyclerview/widget/RecyclerView$State;-><init>()V
+SPLandroidx/recyclerview/widget/RecyclerView$State;->assertLayoutStep(I)V
+SPLandroidx/recyclerview/widget/RecyclerView$State;->getItemCount()I
+SPLandroidx/recyclerview/widget/RecyclerView$State;->hasTargetScrollPosition()Z
+SPLandroidx/recyclerview/widget/RecyclerView$State;->isPreLayout()Z
+SPLandroidx/recyclerview/widget/RecyclerView$State;->willRunPredictiveAnimations()Z
+Landroidx/recyclerview/widget/RecyclerView$StretchEdgeEffectFactory;
+SPLandroidx/recyclerview/widget/RecyclerView$StretchEdgeEffectFactory;-><init>()V
+Landroidx/recyclerview/widget/RecyclerView$ViewFlinger;
+SPLandroidx/recyclerview/widget/RecyclerView$ViewFlinger;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewFlinger;->stop()V
+Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;-><clinit>()V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;-><init>(Landroid/view/View;)V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->addFlags(I)V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->clearOldPosition()V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->clearPayload()V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->clearReturnedFromScrapFlag()V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->clearTmpDetachFlag()V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->getItemViewType()I
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->getLayoutPosition()I
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->getUnmodifiedPayloads()Ljava/util/List;
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->hasAnyOfTheFlags(I)Z
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->isBound()Z
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->isInvalid()Z
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->isRemoved()Z
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->isScrap()Z
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->isTmpDetached()Z
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->isUpdated()Z
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->needsUpdate()Z
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->setFlags(II)V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->setIsRecyclable(Z)V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->setScrapContainer(Landroidx/recyclerview/widget/RecyclerView$Recycler;Z)V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->shouldBeKeptAsChild()Z
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->shouldIgnore()Z
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->unScrap()V
+SPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->wasReturnedFromScrap()Z
+Landroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate;
+SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate;->getItemDelegate()Landroidx/core/view/AccessibilityDelegateCompat;
+SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate;->onInitializeAccessibilityEvent(Landroid/view/View;Landroid/view/accessibility/AccessibilityEvent;)V
+SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
+SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate;->shouldIgnore()Z
+Landroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate$ItemDelegate;
+SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate$ItemDelegate;-><init>(Landroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate;)V
+SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate$ItemDelegate;->getAccessibilityNodeProvider(Landroid/view/View;)Landroidx/core/view/accessibility/AccessibilityNodeProviderCompat;
+SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate$ItemDelegate;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
+SPLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate$ItemDelegate;->saveOriginalDelegate(Landroid/view/View;)V
+Landroidx/recyclerview/widget/ScrollbarHelper;
+SPLandroidx/recyclerview/widget/ScrollbarHelper;->computeScrollExtent(Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/OrientationHelper;Landroid/view/View;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView$LayoutManager;Z)I
+SPLandroidx/recyclerview/widget/ScrollbarHelper;->computeScrollOffset(Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/OrientationHelper;Landroid/view/View;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView$LayoutManager;ZZ)I
+SPLandroidx/recyclerview/widget/ScrollbarHelper;->computeScrollRange(Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/OrientationHelper;Landroid/view/View;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView$LayoutManager;Z)I
+Landroidx/recyclerview/widget/SimpleItemAnimator;
+SPLandroidx/recyclerview/widget/SimpleItemAnimator;-><init>()V
+SPLandroidx/recyclerview/widget/SimpleItemAnimator;->animateAppearance(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)Z
+SPLandroidx/recyclerview/widget/SimpleItemAnimator;->dispatchAddFinished(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/SimpleItemAnimator;->dispatchAddStarting(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/SimpleItemAnimator;->onAddFinished(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/SimpleItemAnimator;->onAddStarting(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+Landroidx/recyclerview/widget/ViewBoundsCheck;
+SPLandroidx/recyclerview/widget/ViewBoundsCheck;-><init>(Landroidx/recyclerview/widget/ViewBoundsCheck$Callback;)V
+SPLandroidx/recyclerview/widget/ViewBoundsCheck;->findOneViewWithinBoundFlags(IIII)Landroid/view/View;
+Landroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;
+SPLandroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;-><init>()V
+SPLandroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->addFlags(I)V
+SPLandroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->boundsMatch()Z
+SPLandroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->compare(II)I
+SPLandroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->resetFlags()V
+SPLandroidx/recyclerview/widget/ViewBoundsCheck$BoundFlags;->setBounds(IIII)V
+Landroidx/recyclerview/widget/ViewBoundsCheck$Callback;
+Landroidx/recyclerview/widget/ViewInfoStore;
+SPLandroidx/recyclerview/widget/ViewInfoStore;-><init>()V
+SPLandroidx/recyclerview/widget/ViewInfoStore;->addToPostLayout(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)V
+SPLandroidx/recyclerview/widget/ViewInfoStore;->clear()V
+SPLandroidx/recyclerview/widget/ViewInfoStore;->getFromOldChangeHolders(J)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+SPLandroidx/recyclerview/widget/ViewInfoStore;->onViewDetached(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+SPLandroidx/recyclerview/widget/ViewInfoStore;->process(Landroidx/recyclerview/widget/ViewInfoStore$ProcessCallback;)V
+SPLandroidx/recyclerview/widget/ViewInfoStore;->removeFromDisappearedInLayout(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;
+SPLandroidx/recyclerview/widget/ViewInfoStore$InfoRecord;-><clinit>()V
+SPLandroidx/recyclerview/widget/ViewInfoStore$InfoRecord;-><init>()V
+SPLandroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->obtain()Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;
+SPLandroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->recycle(Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;)V
+Landroidx/recyclerview/widget/ViewInfoStore$ProcessCallback;
+Landroidx/room/BaseRoomConnectionManager;
+SPLandroidx/room/BaseRoomConnectionManager;-><clinit>()V
+SPLandroidx/room/BaseRoomConnectionManager;-><init>()V
+SPLandroidx/room/BaseRoomConnectionManager;->checkIdentity(Landroidx/sqlite/SQLiteConnection;)V
+SPLandroidx/room/BaseRoomConnectionManager;->hasRoomMasterTable(Landroidx/sqlite/SQLiteConnection;)Z
+SPLandroidx/room/BaseRoomConnectionManager;->invokeOpenCallback(Landroidx/sqlite/SQLiteConnection;)V
+SPLandroidx/room/BaseRoomConnectionManager;->onOpen(Landroidx/sqlite/SQLiteConnection;)V
+Landroidx/room/BaseRoomConnectionManager$Companion;
+SPLandroidx/room/BaseRoomConnectionManager$Companion;-><init>()V
+SPLandroidx/room/BaseRoomConnectionManager$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/room/DatabaseConfiguration;
+SPLandroidx/room/DatabaseConfiguration;-><init>(Landroid/content/Context;Ljava/lang/String;Landroidx/sqlite/db/SupportSQLiteOpenHelper$Factory;Landroidx/room/RoomDatabase$MigrationContainer;Ljava/util/List;ZLandroidx/room/RoomDatabase$JournalMode;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Landroid/content/Intent;ZZLjava/util/Set;Ljava/lang/String;Ljava/io/File;Ljava/util/concurrent/Callable;Landroidx/room/RoomDatabase$PrepackagedDatabaseCallback;Ljava/util/List;Ljava/util/List;ZLandroidx/sqlite/SQLiteDriver;Lkotlin/coroutines/CoroutineContext;)V
+SPLandroidx/room/DatabaseConfiguration;->getUseTempTrackingTable$room_runtime_release()Z
+SPLandroidx/room/DatabaseConfiguration;->setUseTempTrackingTable$room_runtime_release(Z)V
+Landroidx/room/DelegatingOpenHelper;
+Landroidx/room/EntityDeleteOrUpdateAdapter;
+SPLandroidx/room/EntityDeleteOrUpdateAdapter;-><init>()V
+Landroidx/room/EntityInsertAdapter;
+SPLandroidx/room/EntityInsertAdapter;-><init>()V
+SPLandroidx/room/EntityInsertAdapter;->insert(Landroidx/sqlite/SQLiteConnection;Ljava/lang/Object;)V
+Landroidx/room/InvalidationLiveDataContainer;
+SPLandroidx/room/InvalidationLiveDataContainer;-><init>(Landroidx/room/RoomDatabase;)V
+Landroidx/room/InvalidationTracker;
+SPLandroidx/room/InvalidationTracker;-><clinit>()V
+SPLandroidx/room/InvalidationTracker;-><init>(Landroidx/room/RoomDatabase;Ljava/util/Map;Ljava/util/Map;[Ljava/lang/String;)V
+SPLandroidx/room/InvalidationTracker;->_init_$lambda$2(Landroidx/room/InvalidationTracker;)Z
+SPLandroidx/room/InvalidationTracker;->createFlow([Ljava/lang/String;Z)Lkotlinx/coroutines/flow/Flow;
+SPLandroidx/room/InvalidationTracker;->internalInit$room_runtime_release(Landroidx/sqlite/SQLiteConnection;)V
+SPLandroidx/room/InvalidationTracker;->onRefreshCompleted$lambda$1(Landroidx/room/InvalidationTracker;)Lkotlin/Unit;
+SPLandroidx/room/InvalidationTracker;->onRefreshScheduled$lambda$0(Landroidx/room/InvalidationTracker;)Lkotlin/Unit;
+SPLandroidx/room/InvalidationTracker;->refreshAsync()V
+SPLandroidx/room/InvalidationTracker;->refreshVersionsAsync()V
+SPLandroidx/room/InvalidationTracker;->sync$room_runtime_release(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/InvalidationTracker;->syncBlocking$room_runtime_release()V
+Landroidx/room/InvalidationTracker$$ExternalSyntheticLambda0;
+SPLandroidx/room/InvalidationTracker$$ExternalSyntheticLambda0;-><init>(Landroidx/room/InvalidationTracker;)V
+SPLandroidx/room/InvalidationTracker$$ExternalSyntheticLambda0;->invoke()Ljava/lang/Object;
+Landroidx/room/InvalidationTracker$$ExternalSyntheticLambda1;
+SPLandroidx/room/InvalidationTracker$$ExternalSyntheticLambda1;-><init>(Landroidx/room/InvalidationTracker;)V
+SPLandroidx/room/InvalidationTracker$$ExternalSyntheticLambda1;->invoke()Ljava/lang/Object;
+Landroidx/room/InvalidationTracker$$ExternalSyntheticLambda2;
+SPLandroidx/room/InvalidationTracker$$ExternalSyntheticLambda2;-><init>(Landroidx/room/InvalidationTracker;)V
+SPLandroidx/room/InvalidationTracker$$ExternalSyntheticLambda2;->invoke()Ljava/lang/Object;
+Landroidx/room/InvalidationTracker$Companion;
+SPLandroidx/room/InvalidationTracker$Companion;-><init>()V
+SPLandroidx/room/InvalidationTracker$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/room/InvalidationTracker$implementation$1;
+SPLandroidx/room/InvalidationTracker$implementation$1;-><init>(Ljava/lang/Object;)V
+Landroidx/room/InvalidationTracker$syncBlocking$1;
+SPLandroidx/room/InvalidationTracker$syncBlocking$1;-><init>(Landroidx/room/InvalidationTracker;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/room/InvalidationTracker$syncBlocking$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/room/InvalidationTracker$syncBlocking$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/room/InvalidationTracker$syncBlocking$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/InvalidationTracker$syncBlocking$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/ObservedTableStates;
+SPLandroidx/room/ObservedTableStates;-><init>(I)V
+SPLandroidx/room/ObservedTableStates;->forceNeedSync$room_runtime_release()V
+SPLandroidx/room/ObservedTableStates;->getTablesToSync$room_runtime_release()[Landroidx/room/ObservedTableStates$ObserveOp;
+SPLandroidx/room/ObservedTableStates;->onObserverAdded$room_runtime_release([I)Z
+SPLandroidx/room/ObservedTableStates;->onObserverRemoved$room_runtime_release([I)Z
+Landroidx/room/ObservedTableStates$ObserveOp;
+SPLandroidx/room/ObservedTableStates$ObserveOp;->$values()[Landroidx/room/ObservedTableStates$ObserveOp;
+SPLandroidx/room/ObservedTableStates$ObserveOp;-><clinit>()V
+SPLandroidx/room/ObservedTableStates$ObserveOp;-><init>(Ljava/lang/String;I)V
+SPLandroidx/room/ObservedTableStates$ObserveOp;->values()[Landroidx/room/ObservedTableStates$ObserveOp;
+Landroidx/room/ObservedTableVersions;
+SPLandroidx/room/ObservedTableVersions;-><init>(I)V
+SPLandroidx/room/ObservedTableVersions;->collect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Landroidx/room/ObservedTableVersions$collect$1;
+SPLandroidx/room/ObservedTableVersions$collect$1;-><init>(Landroidx/room/ObservedTableVersions;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/room/ObservedTableVersions$collect$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/PooledConnection;
+Landroidx/room/Room;
+SPLandroidx/room/Room;-><clinit>()V
+SPLandroidx/room/Room;-><init>()V
+SPLandroidx/room/Room;->databaseBuilder(Landroid/content/Context;Ljava/lang/Class;Ljava/lang/String;)Landroidx/room/RoomDatabase$Builder;
+Landroidx/room/RoomConnectionManager;
+SPLandroidx/room/RoomConnectionManager;-><init>(Landroidx/room/DatabaseConfiguration;Landroidx/room/RoomOpenDelegate;)V
+SPLandroidx/room/RoomConnectionManager;->access$setSupportDatabase$p(Landroidx/room/RoomConnectionManager;Landroidx/sqlite/db/SupportSQLiteDatabase;)V
+SPLandroidx/room/RoomConnectionManager;->getCallbacks()Ljava/util/List;
+SPLandroidx/room/RoomConnectionManager;->getConfiguration()Landroidx/room/DatabaseConfiguration;
+SPLandroidx/room/RoomConnectionManager;->getOpenDelegate()Landroidx/room/RoomOpenDelegate;
+SPLandroidx/room/RoomConnectionManager;->getSupportOpenHelper$room_runtime_release()Landroidx/sqlite/db/SupportSQLiteOpenHelper;
+SPLandroidx/room/RoomConnectionManager;->init()V
+SPLandroidx/room/RoomConnectionManager;->isSupportDatabaseOpen()Z
+SPLandroidx/room/RoomConnectionManager;->useConnection(ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Landroidx/room/RoomConnectionManager$SupportOpenHelperCallback;
+SPLandroidx/room/RoomConnectionManager$SupportOpenHelperCallback;-><init>(Landroidx/room/RoomConnectionManager;I)V
+SPLandroidx/room/RoomConnectionManager$SupportOpenHelperCallback;->onOpen(Landroidx/sqlite/db/SupportSQLiteDatabase;)V
+Landroidx/room/RoomDatabase;
+SPLandroidx/room/RoomDatabase;-><clinit>()V
+SPLandroidx/room/RoomDatabase;-><init>()V
+SPLandroidx/room/RoomDatabase;->assertNotMainThread()V
+SPLandroidx/room/RoomDatabase;->assertNotSuspendingTransaction()V
+SPLandroidx/room/RoomDatabase;->beginTransaction()V
+SPLandroidx/room/RoomDatabase;->createConnectionManager$room_runtime_release(Landroidx/room/DatabaseConfiguration;)Landroidx/room/RoomConnectionManager;
+SPLandroidx/room/RoomDatabase;->endTransaction()V
+SPLandroidx/room/RoomDatabase;->getCloseBarrier$room_runtime_release()Landroidx/room/concurrent/CloseBarrier;
+SPLandroidx/room/RoomDatabase;->getCoroutineScope()Lkotlinx/coroutines/CoroutineScope;
+SPLandroidx/room/RoomDatabase;->getInvalidationTracker()Landroidx/room/InvalidationTracker;
+SPLandroidx/room/RoomDatabase;->getOpenHelper()Landroidx/sqlite/db/SupportSQLiteOpenHelper;
+SPLandroidx/room/RoomDatabase;->getQueryContext()Lkotlin/coroutines/CoroutineContext;
+SPLandroidx/room/RoomDatabase;->getRequiredTypeConverterClassesMap$room_runtime_release()Ljava/util/Map;
+SPLandroidx/room/RoomDatabase;->getTransactionContext$room_runtime_release()Lkotlin/coroutines/CoroutineContext;
+SPLandroidx/room/RoomDatabase;->getUseTempTrackingTable$room_runtime_release()Z
+SPLandroidx/room/RoomDatabase;->inCompatibilityMode$room_runtime_release()Z
+SPLandroidx/room/RoomDatabase;->inTransaction()Z
+SPLandroidx/room/RoomDatabase;->init(Landroidx/room/DatabaseConfiguration;)V
+SPLandroidx/room/RoomDatabase;->internalBeginTransaction()V
+SPLandroidx/room/RoomDatabase;->internalEndTransaction()V
+SPLandroidx/room/RoomDatabase;->internalInitInvalidationTracker(Landroidx/sqlite/SQLiteConnection;)V
+SPLandroidx/room/RoomDatabase;->isMainThread$room_runtime_release()Z
+SPLandroidx/room/RoomDatabase;->isOpenInternal()Z
+SPLandroidx/room/RoomDatabase;->runInTransaction(Ljava/lang/Runnable;)V
+SPLandroidx/room/RoomDatabase;->setTransactionSuccessful()V
+SPLandroidx/room/RoomDatabase;->useConnection$room_runtime_release(ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Landroidx/room/RoomDatabase$Builder;
+SPLandroidx/room/RoomDatabase$Builder;-><init>(Landroid/content/Context;Ljava/lang/Class;Ljava/lang/String;)V
+SPLandroidx/room/RoomDatabase$Builder;->addCallback(Landroidx/room/RoomDatabase$Callback;)Landroidx/room/RoomDatabase$Builder;
+SPLandroidx/room/RoomDatabase$Builder;->addMigrations([Landroidx/room/migration/Migration;)Landroidx/room/RoomDatabase$Builder;
+SPLandroidx/room/RoomDatabase$Builder;->build()Landroidx/room/RoomDatabase;
+SPLandroidx/room/RoomDatabase$Builder;->fallbackToDestructiveMigration(Z)Landroidx/room/RoomDatabase$Builder;
+SPLandroidx/room/RoomDatabase$Builder;->openHelperFactory(Landroidx/sqlite/db/SupportSQLiteOpenHelper$Factory;)Landroidx/room/RoomDatabase$Builder;
+SPLandroidx/room/RoomDatabase$Builder;->setQueryExecutor(Ljava/util/concurrent/Executor;)Landroidx/room/RoomDatabase$Builder;
+Landroidx/room/RoomDatabase$Callback;
+SPLandroidx/room/RoomDatabase$Callback;-><init>()V
+SPLandroidx/room/RoomDatabase$Callback;->onOpen(Landroidx/sqlite/SQLiteConnection;)V
+SPLandroidx/room/RoomDatabase$Callback;->onOpen(Landroidx/sqlite/db/SupportSQLiteDatabase;)V
+Landroidx/room/RoomDatabase$Companion;
+SPLandroidx/room/RoomDatabase$Companion;-><init>()V
+SPLandroidx/room/RoomDatabase$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/room/RoomDatabase$JournalMode;
+SPLandroidx/room/RoomDatabase$JournalMode;->$values()[Landroidx/room/RoomDatabase$JournalMode;
+SPLandroidx/room/RoomDatabase$JournalMode;-><clinit>()V
+SPLandroidx/room/RoomDatabase$JournalMode;-><init>(Ljava/lang/String;I)V
+SPLandroidx/room/RoomDatabase$JournalMode;->resolve$room_runtime_release(Landroid/content/Context;)Landroidx/room/RoomDatabase$JournalMode;
+Landroidx/room/RoomDatabase$MigrationContainer;
+SPLandroidx/room/RoomDatabase$MigrationContainer;-><init>()V
+SPLandroidx/room/RoomDatabase$MigrationContainer;->addMigration(Landroidx/room/migration/Migration;)V
+SPLandroidx/room/RoomDatabase$MigrationContainer;->addMigrations([Landroidx/room/migration/Migration;)V
+SPLandroidx/room/RoomDatabase$MigrationContainer;->contains(II)Z
+SPLandroidx/room/RoomDatabase$MigrationContainer;->getMigrations()Ljava/util/Map;
+Landroidx/room/RoomDatabase$PrepackagedDatabaseCallback;
+Landroidx/room/RoomDatabase$closeBarrier$1;
+SPLandroidx/room/RoomDatabase$closeBarrier$1;-><init>(Ljava/lang/Object;)V
+Landroidx/room/RoomDatabaseKt;
+SPLandroidx/room/RoomDatabaseKt;->validateAutoMigrations(Landroidx/room/RoomDatabase;Landroidx/room/DatabaseConfiguration;)V
+SPLandroidx/room/RoomDatabaseKt;->validateMigrationsNotRequired(Ljava/util/Set;Ljava/util/Set;)V
+SPLandroidx/room/RoomDatabaseKt;->validateTypeConverters(Landroidx/room/RoomDatabase;Landroidx/room/DatabaseConfiguration;)V
+Landroidx/room/RoomDatabaseKt__RoomDatabaseKt;
+SPLandroidx/room/RoomDatabaseKt__RoomDatabaseKt;->validateAutoMigrations(Landroidx/room/RoomDatabase;Landroidx/room/DatabaseConfiguration;)V
+SPLandroidx/room/RoomDatabaseKt__RoomDatabaseKt;->validateMigrationsNotRequired(Ljava/util/Set;Ljava/util/Set;)V
+SPLandroidx/room/RoomDatabaseKt__RoomDatabaseKt;->validateTypeConverters(Landroidx/room/RoomDatabase;Landroidx/room/DatabaseConfiguration;)V
+Landroidx/room/RoomOpenDelegate;
+SPLandroidx/room/RoomOpenDelegate;-><init>(ILjava/lang/String;Ljava/lang/String;)V
+SPLandroidx/room/RoomOpenDelegate;->getIdentityHash()Ljava/lang/String;
+SPLandroidx/room/RoomOpenDelegate;->getVersion()I
+Landroidx/room/RoomOpenDelegateMarker;
+Landroidx/room/TransactionElement;
+SPLandroidx/room/TransactionElement;-><clinit>()V
+Landroidx/room/TransactionElement$Key;
+SPLandroidx/room/TransactionElement$Key;-><init>()V
+SPLandroidx/room/TransactionElement$Key;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/room/TransactionExecutor;
+SPLandroidx/room/TransactionExecutor;-><init>(Ljava/util/concurrent/Executor;)V
+SPLandroidx/room/TransactionExecutor;->execute$lambda$1$lambda$0(Ljava/lang/Runnable;Landroidx/room/TransactionExecutor;)V
+SPLandroidx/room/TransactionExecutor;->execute(Ljava/lang/Runnable;)V
+SPLandroidx/room/TransactionExecutor;->scheduleNext()V
+Landroidx/room/TransactionExecutor$$ExternalSyntheticLambda0;
+SPLandroidx/room/TransactionExecutor$$ExternalSyntheticLambda0;-><init>(Ljava/lang/Runnable;Landroidx/room/TransactionExecutor;)V
+SPLandroidx/room/TransactionExecutor$$ExternalSyntheticLambda0;->run()V
+Landroidx/room/TransactionScope;
+Landroidx/room/Transactor;
+Landroidx/room/Transactor$SQLiteTransactionType;
+SPLandroidx/room/Transactor$SQLiteTransactionType;->$values()[Landroidx/room/Transactor$SQLiteTransactionType;
+SPLandroidx/room/Transactor$SQLiteTransactionType;-><clinit>()V
+SPLandroidx/room/Transactor$SQLiteTransactionType;-><init>(Ljava/lang/String;I)V
+SPLandroidx/room/Transactor$SQLiteTransactionType;->values()[Landroidx/room/Transactor$SQLiteTransactionType;
+Landroidx/room/TransactorKt;
+SPLandroidx/room/TransactorKt;->execSQL$lambda$0(Landroidx/sqlite/SQLiteStatement;)Z
+SPLandroidx/room/TransactorKt;->execSQL(Landroidx/room/PooledConnection;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Landroidx/room/TransactorKt$$ExternalSyntheticLambda0;
+SPLandroidx/room/TransactorKt$$ExternalSyntheticLambda0;-><init>()V
+SPLandroidx/room/TransactorKt$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/TriggerBasedInvalidationTracker;
+SPLandroidx/room/TriggerBasedInvalidationTracker;-><clinit>()V
+SPLandroidx/room/TriggerBasedInvalidationTracker;-><init>(Landroidx/room/RoomDatabase;Ljava/util/Map;Ljava/util/Map;[Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)V
+SPLandroidx/room/TriggerBasedInvalidationTracker;->access$checkInvalidatedTables(Landroidx/room/TriggerBasedInvalidationTracker;Landroidx/room/PooledConnection;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker;->access$getDatabase$p(Landroidx/room/TriggerBasedInvalidationTracker;)Landroidx/room/RoomDatabase;
+SPLandroidx/room/TriggerBasedInvalidationTracker;->access$getObservedTableStates$p(Landroidx/room/TriggerBasedInvalidationTracker;)Landroidx/room/ObservedTableStates;
+SPLandroidx/room/TriggerBasedInvalidationTracker;->access$getObservedTableVersions$p(Landroidx/room/TriggerBasedInvalidationTracker;)Landroidx/room/ObservedTableVersions;
+SPLandroidx/room/TriggerBasedInvalidationTracker;->access$notifyInvalidation(Landroidx/room/TriggerBasedInvalidationTracker;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker;->access$startTrackingTable(Landroidx/room/TriggerBasedInvalidationTracker;Landroidx/room/PooledConnection;ILkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker;->checkInvalidatedTables$lambda$14(Landroidx/sqlite/SQLiteStatement;)Ljava/util/Set;
+SPLandroidx/room/TriggerBasedInvalidationTracker;->checkInvalidatedTables(Landroidx/room/PooledConnection;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker;->configureConnection(Landroidx/sqlite/SQLiteConnection;)V
+SPLandroidx/room/TriggerBasedInvalidationTracker;->createFlow$room_runtime_release([Ljava/lang/String;[IZ)Lkotlinx/coroutines/flow/Flow;
+SPLandroidx/room/TriggerBasedInvalidationTracker;->notifyInvalidation(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker;->refreshInvalidationAsync$room_runtime_release(Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+SPLandroidx/room/TriggerBasedInvalidationTracker;->resolveViews([Ljava/lang/String;)[Ljava/lang/String;
+SPLandroidx/room/TriggerBasedInvalidationTracker;->setOnAllowRefresh$room_runtime_release(Lkotlin/jvm/functions/Function0;)V
+SPLandroidx/room/TriggerBasedInvalidationTracker;->startTrackingTable(Landroidx/room/PooledConnection;ILkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker;->syncTriggers$room_runtime_release(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker;->validateTableNames$room_runtime_release([Ljava/lang/String;)Lkotlin/Pair;
+Landroidx/room/TriggerBasedInvalidationTracker$$ExternalSyntheticLambda2;
+SPLandroidx/room/TriggerBasedInvalidationTracker$$ExternalSyntheticLambda2;-><init>()V
+SPLandroidx/room/TriggerBasedInvalidationTracker$$ExternalSyntheticLambda2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/TriggerBasedInvalidationTracker$$ExternalSyntheticLambda5;
+SPLandroidx/room/TriggerBasedInvalidationTracker$$ExternalSyntheticLambda5;-><init>()V
+Landroidx/room/TriggerBasedInvalidationTracker$Companion;
+SPLandroidx/room/TriggerBasedInvalidationTracker$Companion;-><init>()V
+SPLandroidx/room/TriggerBasedInvalidationTracker$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/room/TriggerBasedInvalidationTracker$Companion;->access$getTriggerName(Landroidx/room/TriggerBasedInvalidationTracker$Companion;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+SPLandroidx/room/TriggerBasedInvalidationTracker$Companion;->getTriggerName(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+Landroidx/room/TriggerBasedInvalidationTracker$checkInvalidatedTables$1;
+SPLandroidx/room/TriggerBasedInvalidationTracker$checkInvalidatedTables$1;-><init>(Landroidx/room/TriggerBasedInvalidationTracker;Lkotlin/coroutines/Continuation;)V
+Landroidx/room/TriggerBasedInvalidationTracker$createFlow$1;
+SPLandroidx/room/TriggerBasedInvalidationTracker$createFlow$1;-><init>(Landroidx/room/TriggerBasedInvalidationTracker;[IZ[Ljava/lang/String;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/room/TriggerBasedInvalidationTracker$createFlow$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/room/TriggerBasedInvalidationTracker$createFlow$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker$createFlow$1;->invoke(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker$createFlow$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/TriggerBasedInvalidationTracker$createFlow$1$1;
+SPLandroidx/room/TriggerBasedInvalidationTracker$createFlow$1$1;-><init>(Landroidx/room/TriggerBasedInvalidationTracker;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/room/TriggerBasedInvalidationTracker$createFlow$1$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/room/TriggerBasedInvalidationTracker$createFlow$1$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker$createFlow$1$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker$createFlow$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/TriggerBasedInvalidationTracker$createFlow$1$2;
+SPLandroidx/room/TriggerBasedInvalidationTracker$createFlow$1$2;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;ZLkotlinx/coroutines/flow/FlowCollector;[Ljava/lang/String;[I)V
+SPLandroidx/room/TriggerBasedInvalidationTracker$createFlow$1$2;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker$createFlow$1$2;->emit([ILkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Landroidx/room/TriggerBasedInvalidationTracker$createFlow$1$2$emit$1;
+SPLandroidx/room/TriggerBasedInvalidationTracker$createFlow$1$2$emit$1;-><init>(Landroidx/room/TriggerBasedInvalidationTracker$createFlow$1$2;Lkotlin/coroutines/Continuation;)V
+Landroidx/room/TriggerBasedInvalidationTracker$notifyInvalidation$1;
+SPLandroidx/room/TriggerBasedInvalidationTracker$notifyInvalidation$1;-><init>(Landroidx/room/TriggerBasedInvalidationTracker;Lkotlin/coroutines/Continuation;)V
+Landroidx/room/TriggerBasedInvalidationTracker$notifyInvalidation$2$invalidatedTableIds$1;
+SPLandroidx/room/TriggerBasedInvalidationTracker$notifyInvalidation$2$invalidatedTableIds$1;-><init>(Landroidx/room/TriggerBasedInvalidationTracker;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/room/TriggerBasedInvalidationTracker$notifyInvalidation$2$invalidatedTableIds$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/room/TriggerBasedInvalidationTracker$notifyInvalidation$2$invalidatedTableIds$1;->invoke(Landroidx/room/Transactor;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker$notifyInvalidation$2$invalidatedTableIds$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker$notifyInvalidation$2$invalidatedTableIds$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/TriggerBasedInvalidationTracker$notifyInvalidation$2$invalidatedTableIds$1$1;
+SPLandroidx/room/TriggerBasedInvalidationTracker$notifyInvalidation$2$invalidatedTableIds$1$1;-><init>(Landroidx/room/TriggerBasedInvalidationTracker;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/room/TriggerBasedInvalidationTracker$notifyInvalidation$2$invalidatedTableIds$1$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/room/TriggerBasedInvalidationTracker$notifyInvalidation$2$invalidatedTableIds$1$1;->invoke(Landroidx/room/TransactionScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker$notifyInvalidation$2$invalidatedTableIds$1$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker$notifyInvalidation$2$invalidatedTableIds$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/TriggerBasedInvalidationTracker$refreshInvalidationAsync$3;
+SPLandroidx/room/TriggerBasedInvalidationTracker$refreshInvalidationAsync$3;-><init>(Landroidx/room/TriggerBasedInvalidationTracker;Lkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/room/TriggerBasedInvalidationTracker$refreshInvalidationAsync$3;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/room/TriggerBasedInvalidationTracker$refreshInvalidationAsync$3;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/TriggerBasedInvalidationTracker$startTrackingTable$1;
+SPLandroidx/room/TriggerBasedInvalidationTracker$startTrackingTable$1;-><init>(Landroidx/room/TriggerBasedInvalidationTracker;Lkotlin/coroutines/Continuation;)V
+Landroidx/room/TriggerBasedInvalidationTracker$syncTriggers$1;
+SPLandroidx/room/TriggerBasedInvalidationTracker$syncTriggers$1;-><init>(Landroidx/room/TriggerBasedInvalidationTracker;Lkotlin/coroutines/Continuation;)V
+Landroidx/room/TriggerBasedInvalidationTracker$syncTriggers$2$1;
+SPLandroidx/room/TriggerBasedInvalidationTracker$syncTriggers$2$1;-><init>(Landroidx/room/TriggerBasedInvalidationTracker;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/room/TriggerBasedInvalidationTracker$syncTriggers$2$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/room/TriggerBasedInvalidationTracker$syncTriggers$2$1;->invoke(Landroidx/room/Transactor;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker$syncTriggers$2$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker$syncTriggers$2$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/TriggerBasedInvalidationTracker$syncTriggers$2$1$1;
+SPLandroidx/room/TriggerBasedInvalidationTracker$syncTriggers$2$1$1;-><init>([Landroidx/room/ObservedTableStates$ObserveOp;Landroidx/room/TriggerBasedInvalidationTracker;Landroidx/room/Transactor;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/room/TriggerBasedInvalidationTracker$syncTriggers$2$1$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/room/TriggerBasedInvalidationTracker$syncTriggers$2$1$1;->invoke(Landroidx/room/TransactionScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker$syncTriggers$2$1$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/room/TriggerBasedInvalidationTracker$syncTriggers$2$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/TriggerBasedInvalidationTracker$syncTriggers$2$1$1$WhenMappings;
+SPLandroidx/room/TriggerBasedInvalidationTracker$syncTriggers$2$1$1$WhenMappings;-><clinit>()V
+Landroidx/room/concurrent/CloseBarrier;
+SPLandroidx/room/concurrent/CloseBarrier;-><init>(Lkotlin/jvm/functions/Function0;)V
+SPLandroidx/room/concurrent/CloseBarrier;->block$room_runtime_release()Z
+SPLandroidx/room/concurrent/CloseBarrier;->isClosed()Z
+SPLandroidx/room/concurrent/CloseBarrier;->unblock$room_runtime_release()V
+Landroidx/room/coroutines/ConnectionPool;
+Landroidx/room/coroutines/ConnectionPool$RollbackException;
+Landroidx/room/coroutines/FlowUtil;
+SPLandroidx/room/coroutines/FlowUtil;->createFlow(Landroidx/room/RoomDatabase;Z[Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
+Landroidx/room/coroutines/FlowUtil$createFlow$$inlined$map$1;
+SPLandroidx/room/coroutines/FlowUtil$createFlow$$inlined$map$1;-><init>(Lkotlinx/coroutines/flow/Flow;Landroidx/room/RoomDatabase;ZLkotlin/jvm/functions/Function1;)V
+SPLandroidx/room/coroutines/FlowUtil$createFlow$$inlined$map$1;->collect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Landroidx/room/coroutines/FlowUtil$createFlow$$inlined$map$1$2;
+SPLandroidx/room/coroutines/FlowUtil$createFlow$$inlined$map$1$2;-><init>(Lkotlinx/coroutines/flow/FlowCollector;Landroidx/room/RoomDatabase;ZLkotlin/jvm/functions/Function1;)V
+SPLandroidx/room/coroutines/FlowUtil$createFlow$$inlined$map$1$2;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Landroidx/room/coroutines/FlowUtil$createFlow$$inlined$map$1$2$1;
+SPLandroidx/room/coroutines/FlowUtil$createFlow$$inlined$map$1$2$1;-><init>(Landroidx/room/coroutines/FlowUtil$createFlow$$inlined$map$1$2;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/room/coroutines/FlowUtil$createFlow$$inlined$map$1$2$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/coroutines/RawConnectionAccessor;
+Landroidx/room/coroutines/RunBlockingUninterruptible_androidKt;
+SPLandroidx/room/coroutines/RunBlockingUninterruptible_androidKt;->runBlockingUninterruptible(Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+Landroidx/room/coroutines/RunBlockingUninterruptible_androidKt$runBlockingUninterruptible$1;
+SPLandroidx/room/coroutines/RunBlockingUninterruptible_androidKt$runBlockingUninterruptible$1;-><init>(Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/room/coroutines/RunBlockingUninterruptible_androidKt$runBlockingUninterruptible$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/room/coroutines/RunBlockingUninterruptible_androidKt$runBlockingUninterruptible$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/coroutines/RunBlockingUninterruptible_androidKt$runBlockingUninterruptible$1$1;
+SPLandroidx/room/coroutines/RunBlockingUninterruptible_androidKt$runBlockingUninterruptible$1$1;-><init>(Lkotlinx/coroutines/CompletableDeferred;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/room/coroutines/RunBlockingUninterruptible_androidKt$runBlockingUninterruptible$1$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/room/coroutines/RunBlockingUninterruptible_androidKt$runBlockingUninterruptible$1$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/room/coroutines/RunBlockingUninterruptible_androidKt$runBlockingUninterruptible$1$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/coroutines/RunBlockingUninterruptible_androidKt$runBlockingUninterruptible$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/driver/SupportSQLiteConnection;
+SPLandroidx/room/driver/SupportSQLiteConnection;-><init>(Landroidx/sqlite/db/SupportSQLiteDatabase;)V
+SPLandroidx/room/driver/SupportSQLiteConnection;->getDb()Landroidx/sqlite/db/SupportSQLiteDatabase;
+SPLandroidx/room/driver/SupportSQLiteConnection;->prepare(Ljava/lang/String;)Landroidx/room/driver/SupportSQLiteStatement;
+SPLandroidx/room/driver/SupportSQLiteConnection;->prepare(Ljava/lang/String;)Landroidx/sqlite/SQLiteStatement;
+Landroidx/room/driver/SupportSQLiteConnectionPool;
+SPLandroidx/room/driver/SupportSQLiteConnectionPool;-><init>(Landroidx/room/driver/SupportSQLiteDriver;)V
+SPLandroidx/room/driver/SupportSQLiteConnectionPool;->getSupportConnection()Landroidx/room/driver/SupportSQLitePooledConnection;
+SPLandroidx/room/driver/SupportSQLiteConnectionPool;->getSupportDriver$room_runtime_release()Landroidx/room/driver/SupportSQLiteDriver;
+SPLandroidx/room/driver/SupportSQLiteConnectionPool;->useConnection(ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Landroidx/room/driver/SupportSQLiteDriver;
+SPLandroidx/room/driver/SupportSQLiteDriver;-><init>(Landroidx/sqlite/db/SupportSQLiteOpenHelper;)V
+SPLandroidx/room/driver/SupportSQLiteDriver;->getOpenHelper()Landroidx/sqlite/db/SupportSQLiteOpenHelper;
+SPLandroidx/room/driver/SupportSQLiteDriver;->open(Ljava/lang/String;)Landroidx/room/driver/SupportSQLiteConnection;
+Landroidx/room/driver/SupportSQLitePooledConnection;
+SPLandroidx/room/driver/SupportSQLitePooledConnection;-><init>(Landroidx/room/driver/SupportSQLiteConnection;)V
+SPLandroidx/room/driver/SupportSQLitePooledConnection;->getRawConnection()Landroidx/sqlite/SQLiteConnection;
+SPLandroidx/room/driver/SupportSQLitePooledConnection;->inTransaction(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/driver/SupportSQLitePooledConnection;->transaction(Landroidx/room/Transactor$SQLiteTransactionType;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/driver/SupportSQLitePooledConnection;->usePrepared(Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/driver/SupportSQLitePooledConnection;->withTransaction(Landroidx/room/Transactor$SQLiteTransactionType;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Landroidx/room/driver/SupportSQLitePooledConnection$SupportSQLiteTransactor;
+SPLandroidx/room/driver/SupportSQLitePooledConnection$SupportSQLiteTransactor;-><init>(Landroidx/room/driver/SupportSQLitePooledConnection;)V
+SPLandroidx/room/driver/SupportSQLitePooledConnection$SupportSQLiteTransactor;->getRawConnection()Landroidx/sqlite/SQLiteConnection;
+SPLandroidx/room/driver/SupportSQLitePooledConnection$SupportSQLiteTransactor;->usePrepared(Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Landroidx/room/driver/SupportSQLitePooledConnection$WhenMappings;
+SPLandroidx/room/driver/SupportSQLitePooledConnection$WhenMappings;-><clinit>()V
+Landroidx/room/driver/SupportSQLitePooledConnection$transaction$1;
+SPLandroidx/room/driver/SupportSQLitePooledConnection$transaction$1;-><init>(Landroidx/room/driver/SupportSQLitePooledConnection;Lkotlin/coroutines/Continuation;)V
+Landroidx/room/driver/SupportSQLiteStatement;
+SPLandroidx/room/driver/SupportSQLiteStatement;-><clinit>()V
+SPLandroidx/room/driver/SupportSQLiteStatement;-><init>(Landroidx/sqlite/db/SupportSQLiteDatabase;Ljava/lang/String;)V
+SPLandroidx/room/driver/SupportSQLiteStatement;-><init>(Landroidx/sqlite/db/SupportSQLiteDatabase;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/room/driver/SupportSQLiteStatement;->getDb()Landroidx/sqlite/db/SupportSQLiteDatabase;
+SPLandroidx/room/driver/SupportSQLiteStatement;->getSql()Ljava/lang/String;
+SPLandroidx/room/driver/SupportSQLiteStatement;->isClosed()Z
+SPLandroidx/room/driver/SupportSQLiteStatement;->setClosed(Z)V
+SPLandroidx/room/driver/SupportSQLiteStatement;->throwIfClosed()V
+Landroidx/room/driver/SupportSQLiteStatement$Companion;
+SPLandroidx/room/driver/SupportSQLiteStatement$Companion;-><init>()V
+SPLandroidx/room/driver/SupportSQLiteStatement$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/room/driver/SupportSQLiteStatement$Companion;->create(Landroidx/sqlite/db/SupportSQLiteDatabase;Ljava/lang/String;)Landroidx/room/driver/SupportSQLiteStatement;
+SPLandroidx/room/driver/SupportSQLiteStatement$Companion;->isRowStatement(Ljava/lang/String;)Z
+Landroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;-><clinit>()V
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;-><init>(Landroidx/sqlite/db/SupportSQLiteDatabase;Ljava/lang/String;)V
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->access$getBindingTypes$p(Landroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;)[I
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->access$getLongBindings$p(Landroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;)[J
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->access$getStringBindings$p(Landroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;)[Ljava/lang/String;
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->bindLong(IJ)V
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->bindText(ILjava/lang/String;)V
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->clearBindings()V
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->close()V
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->ensureCapacity(II)V
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->ensureCursor()V
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->getColumnCount()I
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->getColumnName(I)Ljava/lang/String;
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->getLong(I)J
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->getText(I)Ljava/lang/String;
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->isNull(I)Z
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->reset()V
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->step()Z
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->throwIfInvalidColumn(Landroid/database/Cursor;I)V
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;->throwIfNoRow()Landroid/database/Cursor;
+Landroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement$Companion;
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement$Companion;-><init>()V
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement$ensureCursor$1;
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement$ensureCursor$1;-><init>(Landroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement;)V
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement$ensureCursor$1;->bindTo(Landroidx/sqlite/db/SupportSQLiteProgram;)V
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportAndroidSQLiteStatement$ensureCursor$1;->getSql()Ljava/lang/String;
+Landroidx/room/driver/SupportSQLiteStatement$SupportOtherAndroidSQLiteStatement;
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportOtherAndroidSQLiteStatement;-><init>(Landroidx/sqlite/db/SupportSQLiteDatabase;Ljava/lang/String;)V
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportOtherAndroidSQLiteStatement;->bindLong(IJ)V
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportOtherAndroidSQLiteStatement;->bindText(ILjava/lang/String;)V
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportOtherAndroidSQLiteStatement;->close()V
+SPLandroidx/room/driver/SupportSQLiteStatement$SupportOtherAndroidSQLiteStatement;->step()Z
+Landroidx/room/migration/AutoMigrationSpec;
+Landroidx/room/migration/Migration;
+SPLandroidx/room/migration/Migration;-><init>(II)V
+Landroidx/room/support/AutoClosingRoomOpenHelper;
+Landroidx/room/support/PrePackagedCopyOpenHelper;
+Landroidx/room/util/DBUtil;
+SPLandroidx/room/util/DBUtil;->getCoroutineContext(Landroidx/room/RoomDatabase;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/util/DBUtil;->performBlocking(Landroidx/room/RoomDatabase;ZZLkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+SPLandroidx/room/util/DBUtil;->performSuspending(Landroidx/room/RoomDatabase;ZZLkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Landroidx/room/util/DBUtil__DBUtil_androidKt;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt;->getCoroutineContext(Landroidx/room/RoomDatabase;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt;->performBlocking(Landroidx/room/RoomDatabase;ZZLkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt;->performSuspending(Landroidx/room/RoomDatabase;ZZLkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Landroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1;-><init>(Landroidx/room/RoomDatabase;ZZLkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1$invokeSuspend$$inlined$internalPerform$1;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1$invokeSuspend$$inlined$internalPerform$1;-><init>(ZZLandroidx/room/RoomDatabase;Lkotlin/coroutines/Continuation;Lkotlin/jvm/functions/Function1;)V
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1$invokeSuspend$$inlined$internalPerform$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1$invokeSuspend$$inlined$internalPerform$1;->invoke(Landroidx/room/Transactor;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1$invokeSuspend$$inlined$internalPerform$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1$invokeSuspend$$inlined$internalPerform$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1$invokeSuspend$$inlined$internalPerform$1$1;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1$invokeSuspend$$inlined$internalPerform$1$1;-><init>(Lkotlin/coroutines/Continuation;Lkotlin/jvm/functions/Function1;)V
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1$invokeSuspend$$inlined$internalPerform$1$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1$invokeSuspend$$inlined$internalPerform$1$1;->invoke(Landroidx/room/TransactionScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1$invokeSuspend$$inlined$internalPerform$1$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performBlocking$1$invokeSuspend$$inlined$internalPerform$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$$inlined$compatCoroutineExecute$DBUtil__DBUtil_androidKt$1;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$$inlined$compatCoroutineExecute$DBUtil__DBUtil_androidKt$1;-><init>(Lkotlin/coroutines/Continuation;Landroidx/room/RoomDatabase;ZZLkotlin/jvm/functions/Function1;)V
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$$inlined$compatCoroutineExecute$DBUtil__DBUtil_androidKt$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$$inlined$compatCoroutineExecute$DBUtil__DBUtil_androidKt$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$$inlined$compatCoroutineExecute$DBUtil__DBUtil_androidKt$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$$inlined$compatCoroutineExecute$DBUtil__DBUtil_androidKt$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$1;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$1;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$lambda$1$$inlined$internalPerform$1;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$lambda$1$$inlined$internalPerform$1;-><init>(ZZLandroidx/room/RoomDatabase;Lkotlin/coroutines/Continuation;Lkotlin/jvm/functions/Function1;)V
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$lambda$1$$inlined$internalPerform$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$lambda$1$$inlined$internalPerform$1;->invoke(Landroidx/room/Transactor;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$lambda$1$$inlined$internalPerform$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$lambda$1$$inlined$internalPerform$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$lambda$1$$inlined$internalPerform$1$1;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$lambda$1$$inlined$internalPerform$1$1;-><init>(Lkotlin/coroutines/Continuation;Lkotlin/jvm/functions/Function1;)V
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$lambda$1$$inlined$internalPerform$1$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$lambda$1$$inlined$internalPerform$1$1;->invoke(Landroidx/room/TransactionScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$lambda$1$$inlined$internalPerform$1$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/room/util/DBUtil__DBUtil_androidKt$performSuspending$lambda$1$$inlined$internalPerform$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/room/util/KClassUtil;
+SPLandroidx/room/util/KClassUtil;->findAndInstantiateDatabaseImpl$default(Ljava/lang/Class;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/room/util/KClassUtil;->findAndInstantiateDatabaseImpl(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Object;
+Landroidx/room/util/MappedColumnsSQLiteStatementWrapper;
+Landroidx/room/util/MigrationUtil;
+SPLandroidx/room/util/MigrationUtil;->contains(Landroidx/room/RoomDatabase$MigrationContainer;II)Z
+Landroidx/room/util/SQLiteConnectionUtil;
+SPLandroidx/room/util/SQLiteConnectionUtil;->getTotalChangedRows(Landroidx/sqlite/SQLiteConnection;)I
+Landroidx/room/util/SQLiteStatementUtil;
+SPLandroidx/room/util/SQLiteStatementUtil;->columnIndexOf(Landroidx/sqlite/SQLiteStatement;Ljava/lang/String;)I
+SPLandroidx/room/util/SQLiteStatementUtil;->columnIndexOfCommon(Landroidx/sqlite/SQLiteStatement;Ljava/lang/String;)I
+SPLandroidx/room/util/SQLiteStatementUtil;->getColumnIndexOrThrow(Landroidx/sqlite/SQLiteStatement;Ljava/lang/String;)I
+Landroidx/room/util/SQLiteStatementUtil__StatementUtilKt;
+SPLandroidx/room/util/SQLiteStatementUtil__StatementUtilKt;->columnIndexOfCommon(Landroidx/sqlite/SQLiteStatement;Ljava/lang/String;)I
+SPLandroidx/room/util/SQLiteStatementUtil__StatementUtilKt;->getColumnIndexOrThrow(Landroidx/sqlite/SQLiteStatement;Ljava/lang/String;)I
+Landroidx/room/util/SQLiteStatementUtil__StatementUtil_androidKt;
+SPLandroidx/room/util/SQLiteStatementUtil__StatementUtil_androidKt;->columnIndexOf(Landroidx/sqlite/SQLiteStatement;Ljava/lang/String;)I
+Landroidx/savedstate/R$id;
+Landroidx/savedstate/Recreator;
+SPLandroidx/savedstate/Recreator;-><clinit>()V
+SPLandroidx/savedstate/Recreator;-><init>(Landroidx/savedstate/SavedStateRegistryOwner;)V
+SPLandroidx/savedstate/Recreator;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+Landroidx/savedstate/Recreator$Companion;
+SPLandroidx/savedstate/Recreator$Companion;-><init>()V
+SPLandroidx/savedstate/Recreator$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/savedstate/SavedStateReader;
+SPLandroidx/savedstate/SavedStateReader;->constructor-impl(Landroid/os/Bundle;)Landroid/os/Bundle;
+SPLandroidx/savedstate/SavedStateReader;->contains-impl(Landroid/os/Bundle;Ljava/lang/String;)Z
+SPLandroidx/savedstate/SavedStateReader;->toMap-impl(Landroid/os/Bundle;)Ljava/util/Map;
+Landroidx/savedstate/SavedStateRegistry;
+SPLandroidx/savedstate/SavedStateRegistry;-><init>(Landroidx/savedstate/internal/SavedStateRegistryImpl;)V
+SPLandroidx/savedstate/SavedStateRegistry;->consumeRestoredStateForKey(Ljava/lang/String;)Landroid/os/Bundle;
+SPLandroidx/savedstate/SavedStateRegistry;->getSavedStateProvider(Ljava/lang/String;)Landroidx/savedstate/SavedStateRegistry$SavedStateProvider;
+SPLandroidx/savedstate/SavedStateRegistry;->registerSavedStateProvider(Ljava/lang/String;Landroidx/savedstate/SavedStateRegistry$SavedStateProvider;)V
+Landroidx/savedstate/SavedStateRegistry$SavedStateProvider;
+Landroidx/savedstate/SavedStateRegistryController;
+SPLandroidx/savedstate/SavedStateRegistryController;-><clinit>()V
+SPLandroidx/savedstate/SavedStateRegistryController;-><init>(Landroidx/savedstate/internal/SavedStateRegistryImpl;)V
+SPLandroidx/savedstate/SavedStateRegistryController;-><init>(Landroidx/savedstate/internal/SavedStateRegistryImpl;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/savedstate/SavedStateRegistryController;->getSavedStateRegistry()Landroidx/savedstate/SavedStateRegistry;
+SPLandroidx/savedstate/SavedStateRegistryController;->performAttach()V
+SPLandroidx/savedstate/SavedStateRegistryController;->performRestore(Landroid/os/Bundle;)V
+Landroidx/savedstate/SavedStateRegistryController$Companion;
+SPLandroidx/savedstate/SavedStateRegistryController$Companion;-><init>()V
+SPLandroidx/savedstate/SavedStateRegistryController$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/savedstate/SavedStateRegistryController$Companion;->create$lambda$0(Landroidx/savedstate/SavedStateRegistryOwner;)Lkotlin/Unit;
+SPLandroidx/savedstate/SavedStateRegistryController$Companion;->create(Landroidx/savedstate/SavedStateRegistryOwner;)Landroidx/savedstate/SavedStateRegistryController;
+Landroidx/savedstate/SavedStateRegistryController$Companion$$ExternalSyntheticLambda0;
+SPLandroidx/savedstate/SavedStateRegistryController$Companion$$ExternalSyntheticLambda0;-><init>(Landroidx/savedstate/SavedStateRegistryOwner;)V
+SPLandroidx/savedstate/SavedStateRegistryController$Companion$$ExternalSyntheticLambda0;->invoke()Ljava/lang/Object;
+Landroidx/savedstate/SavedStateRegistryOwner;
+Landroidx/savedstate/SavedStateWriter;
+SPLandroidx/savedstate/SavedStateWriter;->constructor-impl(Landroid/os/Bundle;)Landroid/os/Bundle;
+Landroidx/savedstate/ViewTreeSavedStateRegistryOwner;
+SPLandroidx/savedstate/ViewTreeSavedStateRegistryOwner;->set(Landroid/view/View;Landroidx/savedstate/SavedStateRegistryOwner;)V
+Landroidx/savedstate/internal/SavedStateRegistryImpl;
+SPLandroidx/savedstate/internal/SavedStateRegistryImpl;-><clinit>()V
+SPLandroidx/savedstate/internal/SavedStateRegistryImpl;-><init>(Landroidx/savedstate/SavedStateRegistryOwner;Lkotlin/jvm/functions/Function0;)V
+SPLandroidx/savedstate/internal/SavedStateRegistryImpl;->access$getKeyToProviders$p(Landroidx/savedstate/internal/SavedStateRegistryImpl;)Ljava/util/Map;
+SPLandroidx/savedstate/internal/SavedStateRegistryImpl;->consumeRestoredStateForKey(Ljava/lang/String;)Landroid/os/Bundle;
+SPLandroidx/savedstate/internal/SavedStateRegistryImpl;->getSavedStateProvider(Ljava/lang/String;)Landroidx/savedstate/SavedStateRegistry$SavedStateProvider;
+SPLandroidx/savedstate/internal/SavedStateRegistryImpl;->performAttach$lambda$12(Landroidx/savedstate/internal/SavedStateRegistryImpl;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+SPLandroidx/savedstate/internal/SavedStateRegistryImpl;->performAttach()V
+SPLandroidx/savedstate/internal/SavedStateRegistryImpl;->performRestore$savedstate(Landroid/os/Bundle;)V
+SPLandroidx/savedstate/internal/SavedStateRegistryImpl;->registerSavedStateProvider(Ljava/lang/String;Landroidx/savedstate/SavedStateRegistry$SavedStateProvider;)V
+Landroidx/savedstate/internal/SavedStateRegistryImpl$$ExternalSyntheticLambda0;
+SPLandroidx/savedstate/internal/SavedStateRegistryImpl$$ExternalSyntheticLambda0;-><init>(Landroidx/savedstate/internal/SavedStateRegistryImpl;)V
+SPLandroidx/savedstate/internal/SavedStateRegistryImpl$$ExternalSyntheticLambda0;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+Landroidx/savedstate/internal/SavedStateRegistryImpl$Companion;
+SPLandroidx/savedstate/internal/SavedStateRegistryImpl$Companion;-><init>()V
+SPLandroidx/savedstate/internal/SavedStateRegistryImpl$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/savedstate/internal/SynchronizedObject;
+SPLandroidx/savedstate/internal/SynchronizedObject;-><init>()V
+Landroidx/sqlite/SQLite;
+SPLandroidx/sqlite/SQLite;->execSQL(Landroidx/sqlite/SQLiteConnection;Ljava/lang/String;)V
+Landroidx/sqlite/SQLiteConnection;
+Landroidx/sqlite/SQLiteDriver;
+Landroidx/sqlite/SQLiteStatement;
+SPLandroidx/sqlite/SQLiteStatement;->getBoolean(I)Z
+Landroidx/sqlite/SQLite__SQLite_nonWebKt;
+SPLandroidx/sqlite/SQLite__SQLite_nonWebKt;->execSQL(Landroidx/sqlite/SQLiteConnection;Ljava/lang/String;)V
+Landroidx/sqlite/db/SupportSQLiteDatabase;
+Landroidx/sqlite/db/SupportSQLiteOpenHelper;
+Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;
+SPLandroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;-><clinit>()V
+SPLandroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;-><init>(I)V
+SPLandroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;->onConfigure(Landroidx/sqlite/db/SupportSQLiteDatabase;)V
+Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback$Companion;
+SPLandroidx/sqlite/db/SupportSQLiteOpenHelper$Callback$Companion;-><init>()V
+SPLandroidx/sqlite/db/SupportSQLiteOpenHelper$Callback$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration;
+SPLandroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration;-><clinit>()V
+SPLandroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration;-><init>(Landroid/content/Context;Ljava/lang/String;Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;ZZ)V
+Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;
+SPLandroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;-><init>(Landroid/content/Context;)V
+SPLandroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;->allowDataLossOnRecovery(Z)Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;
+SPLandroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;->build()Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration;
+SPLandroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;->callback(Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;)Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;
+SPLandroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;->name(Ljava/lang/String;)Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;
+SPLandroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;->noBackupDirectory(Z)Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;
+Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Companion;
+SPLandroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Companion;-><init>()V
+SPLandroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Companion;->builder(Landroid/content/Context;)Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration$Builder;
+Landroidx/sqlite/db/SupportSQLiteOpenHelper$Factory;
+Landroidx/sqlite/db/SupportSQLiteProgram;
+Landroidx/sqlite/db/SupportSQLiteQuery;
+Landroidx/sqlite/db/SupportSQLiteStatement;
+Landroidx/sqlite/db/framework/FrameworkSQLiteDatabase;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;-><clinit>()V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;-><init>(Landroid/database/sqlite/SQLiteDatabase;)V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->access$getBeginTransactionMethod$delegate$cp()Lkotlin/Lazy;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->access$getGetThreadSessionMethod$delegate$cp()Lkotlin/Lazy;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->beginTransaction()V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->beginTransactionMethod_delegate$lambda$0()Ljava/lang/reflect/Method;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->beginTransactionNonExclusive()V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->beginTransactionReadOnly()V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->compileStatement(Ljava/lang/String;)Landroidx/sqlite/db/SupportSQLiteStatement;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->endTransaction()V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->execSQL(Ljava/lang/String;)V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->getThreadSessionMethod_delegate$lambda$0()Ljava/lang/reflect/Method;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->inTransaction()Z
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->internalBeginTransactionWithListenerReadOnly(Landroid/database/sqlite/SQLiteTransactionListener;)V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->isDelegate$sqlite_framework(Landroid/database/sqlite/SQLiteDatabase;)Z
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->isOpen()Z
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->isWriteAheadLoggingEnabled()Z
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->query$lambda$0(Landroidx/sqlite/db/SupportSQLiteQuery;Landroid/database/sqlite/SQLiteDatabase;Landroid/database/sqlite/SQLiteCursorDriver;Ljava/lang/String;Landroid/database/sqlite/SQLiteQuery;)Landroid/database/sqlite/SQLiteCursor;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->query$lambda$1(Lkotlin/jvm/functions/Function4;Landroid/database/sqlite/SQLiteDatabase;Landroid/database/sqlite/SQLiteCursorDriver;Ljava/lang/String;Landroid/database/sqlite/SQLiteQuery;)Landroid/database/Cursor;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->query(Landroidx/sqlite/db/SupportSQLiteQuery;)Landroid/database/Cursor;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase;->setTransactionSuccessful()V
+Landroidx/sqlite/db/framework/FrameworkSQLiteDatabase$$ExternalSyntheticLambda1;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase$$ExternalSyntheticLambda1;-><init>(Landroidx/sqlite/db/SupportSQLiteQuery;)V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/sqlite/db/framework/FrameworkSQLiteDatabase$$ExternalSyntheticLambda2;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase$$ExternalSyntheticLambda2;-><init>(Lkotlin/jvm/functions/Function4;)V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase$$ExternalSyntheticLambda2;->newCursor(Landroid/database/sqlite/SQLiteDatabase;Landroid/database/sqlite/SQLiteCursorDriver;Ljava/lang/String;Landroid/database/sqlite/SQLiteQuery;)Landroid/database/Cursor;
+Landroidx/sqlite/db/framework/FrameworkSQLiteDatabase$$ExternalSyntheticLambda3;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase$$ExternalSyntheticLambda3;-><init>()V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase$$ExternalSyntheticLambda3;->invoke()Ljava/lang/Object;
+Landroidx/sqlite/db/framework/FrameworkSQLiteDatabase$$ExternalSyntheticLambda4;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase$$ExternalSyntheticLambda4;-><init>()V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase$$ExternalSyntheticLambda4;->invoke()Ljava/lang/Object;
+Landroidx/sqlite/db/framework/FrameworkSQLiteDatabase$Companion;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase$Companion;-><init>()V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase$Companion;->access$getBeginTransactionMethod(Landroidx/sqlite/db/framework/FrameworkSQLiteDatabase$Companion;)Ljava/lang/reflect/Method;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase$Companion;->access$getGetThreadSessionMethod(Landroidx/sqlite/db/framework/FrameworkSQLiteDatabase$Companion;)Ljava/lang/reflect/Method;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase$Companion;->getBeginTransactionMethod()Ljava/lang/reflect/Method;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteDatabase$Companion;->getGetThreadSessionMethod()Ljava/lang/reflect/Method;
+Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper;-><clinit>()V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper;-><init>(Landroid/content/Context;Ljava/lang/String;Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;ZZ)V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper;->getDatabaseName()Ljava/lang/String;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper;->getDelegate()Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper;->getWritableDatabase()Landroidx/sqlite/db/SupportSQLiteDatabase;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper;->lazyDelegate$lambda$0(Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper;)Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper;->setWriteAheadLoggingEnabled(Z)V
+Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$$ExternalSyntheticLambda0;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$$ExternalSyntheticLambda0;-><init>(Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper;)V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$$ExternalSyntheticLambda0;->invoke()Ljava/lang/Object;
+Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$Companion;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$Companion;-><init>()V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$DBRefHolder;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$DBRefHolder;-><init>(Landroidx/sqlite/db/framework/FrameworkSQLiteDatabase;)V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$DBRefHolder;->getDb()Landroidx/sqlite/db/framework/FrameworkSQLiteDatabase;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$DBRefHolder;->setDb(Landroidx/sqlite/db/framework/FrameworkSQLiteDatabase;)V
+Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper;-><clinit>()V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper;-><init>(Landroid/content/Context;Ljava/lang/String;Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$DBRefHolder;Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;Z)V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper;->getSupportDatabase(Z)Landroidx/sqlite/db/SupportSQLiteDatabase;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper;->getWrappedDb(Landroid/database/sqlite/SQLiteDatabase;)Landroidx/sqlite/db/framework/FrameworkSQLiteDatabase;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper;->getWritableOrReadableDatabase(Z)Landroid/database/sqlite/SQLiteDatabase;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper;->innerGetDatabase(Z)Landroid/database/sqlite/SQLiteDatabase;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper;->onConfigure(Landroid/database/sqlite/SQLiteDatabase;)V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper;->onOpen(Landroid/database/sqlite/SQLiteDatabase;)V
+Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper$$ExternalSyntheticLambda0;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper$$ExternalSyntheticLambda0;-><init>(Landroidx/sqlite/db/SupportSQLiteOpenHelper$Callback;Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$DBRefHolder;)V
+Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper$CallbackException;
+Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper$Companion;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper$Companion;-><init>()V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$OpenHelper$Companion;->getWrappedDb(Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelper$DBRefHolder;Landroid/database/sqlite/SQLiteDatabase;)Landroidx/sqlite/db/framework/FrameworkSQLiteDatabase;
+Landroidx/sqlite/db/framework/FrameworkSQLiteOpenHelperFactory;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelperFactory;-><init>()V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteOpenHelperFactory;->create(Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration;)Landroidx/sqlite/db/SupportSQLiteOpenHelper;
+Landroidx/sqlite/db/framework/FrameworkSQLiteProgram;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteProgram;-><init>(Landroid/database/sqlite/SQLiteProgram;)V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteProgram;->bindLong(IJ)V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteProgram;->bindString(ILjava/lang/String;)V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteProgram;->close()V
+Landroidx/sqlite/db/framework/FrameworkSQLiteStatement;
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteStatement;-><init>(Landroid/database/sqlite/SQLiteStatement;)V
+SPLandroidx/sqlite/db/framework/FrameworkSQLiteStatement;->execute()V
+Landroidx/sqlite/util/ProcessLock;
+SPLandroidx/sqlite/util/ProcessLock;-><clinit>()V
+SPLandroidx/sqlite/util/ProcessLock;-><init>(Ljava/lang/String;Ljava/io/File;Z)V
+SPLandroidx/sqlite/util/ProcessLock;->access$getThreadLocksMap$cp()Ljava/util/Map;
+SPLandroidx/sqlite/util/ProcessLock;->lock(Z)V
+SPLandroidx/sqlite/util/ProcessLock;->unlock()V
+Landroidx/sqlite/util/ProcessLock$Companion;
+SPLandroidx/sqlite/util/ProcessLock$Companion;-><init>()V
+SPLandroidx/sqlite/util/ProcessLock$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/sqlite/util/ProcessLock$Companion;->access$getThreadLock(Landroidx/sqlite/util/ProcessLock$Companion;Ljava/lang/String;)Ljava/util/concurrent/locks/Lock;
+SPLandroidx/sqlite/util/ProcessLock$Companion;->getThreadLock(Ljava/lang/String;)Ljava/util/concurrent/locks/Lock;
+Landroidx/startup/AppInitializer;
+SPLandroidx/startup/AppInitializer;-><clinit>()V
+SPLandroidx/startup/AppInitializer;-><init>(Landroid/content/Context;)V
+SPLandroidx/startup/AppInitializer;->discoverAndInitialize(Landroid/os/Bundle;)V
+SPLandroidx/startup/AppInitializer;->discoverAndInitialize(Ljava/lang/Class;)V
+SPLandroidx/startup/AppInitializer;->doInitialize(Ljava/lang/Class;)Ljava/lang/Object;
+SPLandroidx/startup/AppInitializer;->doInitialize(Ljava/lang/Class;Ljava/util/Set;)Ljava/lang/Object;
+SPLandroidx/startup/AppInitializer;->getInstance(Landroid/content/Context;)Landroidx/startup/AppInitializer;
+SPLandroidx/startup/AppInitializer;->initializeComponent(Ljava/lang/Class;)Ljava/lang/Object;
+SPLandroidx/startup/AppInitializer;->isEagerlyInitialized(Ljava/lang/Class;)Z
+Landroidx/startup/InitializationProvider;
+SPLandroidx/startup/InitializationProvider;-><init>()V
+SPLandroidx/startup/InitializationProvider;->onCreate()Z
+Landroidx/startup/Initializer;
+Landroidx/startup/R$string;
+Landroidx/swiperefreshlayout/R$styleable;
+SPLandroidx/swiperefreshlayout/R$styleable;-><clinit>()V
+Landroidx/swiperefreshlayout/widget/CircleImageView;
+SPLandroidx/swiperefreshlayout/widget/CircleImageView;-><init>(Landroid/content/Context;)V
+SPLandroidx/swiperefreshlayout/widget/CircleImageView;->elevationSupported()Z
+SPLandroidx/swiperefreshlayout/widget/CircleImageView;->onMeasure(II)V
+Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;
+SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable;-><clinit>()V
+SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable;-><init>(Landroid/content/Context;)V
+SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable;->getOpacity()I
+SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable;->setSizeParameters(FFFF)V
+SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable;->setStrokeWidth(F)V
+SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable;->setStyle(I)V
+SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable;->setupAnimators()V
+Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$1;
+SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$1;-><init>(Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;)V
+Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$2;
+SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$2;-><init>(Landroidx/swiperefreshlayout/widget/CircularProgressDrawable;Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;)V
+Landroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;
+SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;-><init>()V
+SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->setArrowDimensions(FF)V
+SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->setCenterRadius(F)V
+SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->setColorIndex(I)V
+SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->setColors([I)V
+SPLandroidx/swiperefreshlayout/widget/CircularProgressDrawable$Ring;->setStrokeWidth(F)V
+Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;
+SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;-><clinit>()V
+SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->createProgressView()V
+SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->ensureTarget()V
+SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->getChildDrawingOrder(II)I
+SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->moveToStart(F)V
+SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->onLayout(ZIIII)V
+SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->onMeasure(II)V
+SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setDistanceToTriggerSync(I)V
+SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setEnabled(Z)V
+SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setNestedScrollingEnabled(Z)V
+SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setOnRefreshListener(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnRefreshListener;)V
+SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout;->setTargetOffsetTopAndBottom(I)V
+Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1;
+SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout$1;-><init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V
+Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6;
+SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout$6;-><init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V
+Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$7;
+SPLandroidx/swiperefreshlayout/widget/SwipeRefreshLayout$7;-><init>(Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;)V
+Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout$OnRefreshListener;
+Landroidx/tracing/PerfettoTracer$$ExternalSyntheticApiModelOutline0;
+SPLandroidx/tracing/PerfettoTracer$$ExternalSyntheticApiModelOutline0;->m()Landroid/content/pm/PackageInfo;
+Landroidx/tracing/Trace;
+SPLandroidx/tracing/Trace;-><clinit>()V
+SPLandroidx/tracing/Trace;-><init>()V
+SPLandroidx/tracing/Trace;->beginSection(Ljava/lang/String;)V
+SPLandroidx/tracing/Trace;->endSection()V
+SPLandroidx/tracing/Trace;->isEnabled()Z
+SPLandroidx/tracing/Trace;->truncatedTraceSectionLabel(Ljava/lang/String;)Ljava/lang/String;
+Landroidx/tracing/TraceApi29Impl;
+SPLandroidx/tracing/TraceApi29Impl;-><clinit>()V
+SPLandroidx/tracing/TraceApi29Impl;-><init>()V
+SPLandroidx/tracing/TraceApi29Impl;->isEnabled()Z
+Landroidx/transition/AutoTransition;
+SPLandroidx/transition/AutoTransition;-><init>()V
+SPLandroidx/transition/AutoTransition;->init()V
+Landroidx/transition/ChangeBounds;
+SPLandroidx/transition/ChangeBounds;-><clinit>()V
+SPLandroidx/transition/ChangeBounds;-><init>()V
+Landroidx/transition/ChangeBounds$1;
+SPLandroidx/transition/ChangeBounds$1;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Landroidx/transition/ChangeBounds$2;
+SPLandroidx/transition/ChangeBounds$2;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Landroidx/transition/ChangeBounds$3;
+SPLandroidx/transition/ChangeBounds$3;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Landroidx/transition/ChangeBounds$4;
+SPLandroidx/transition/ChangeBounds$4;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Landroidx/transition/ChangeBounds$5;
+SPLandroidx/transition/ChangeBounds$5;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Landroidx/transition/Fade;
+SPLandroidx/transition/Fade;-><init>(I)V
+Landroidx/transition/PathMotion;
+SPLandroidx/transition/PathMotion;-><init>()V
+Landroidx/transition/RectEvaluator;
+SPLandroidx/transition/RectEvaluator;-><init>()V
+Landroidx/transition/Transition;
+SPLandroidx/transition/Transition;-><clinit>()V
+SPLandroidx/transition/Transition;-><init>()V
+SPLandroidx/transition/Transition;->excludeTarget(Ljava/lang/Class;Z)Landroidx/transition/Transition;
+SPLandroidx/transition/Transition;->excludeType(Ljava/util/ArrayList;Ljava/lang/Class;Z)Ljava/util/ArrayList;
+SPLandroidx/transition/Transition;->getInterpolator()Landroid/animation/TimeInterpolator;
+SPLandroidx/transition/Transition;->setDuration(J)Landroidx/transition/Transition;
+SPLandroidx/transition/Transition;->setInterpolator(Landroid/animation/TimeInterpolator;)Landroidx/transition/Transition;
+Landroidx/transition/Transition$1;
+SPLandroidx/transition/Transition$1;-><init>()V
+Landroidx/transition/Transition$ArrayListManager;
+SPLandroidx/transition/Transition$ArrayListManager;->add(Ljava/util/ArrayList;Ljava/lang/Object;)Ljava/util/ArrayList;
+Landroidx/transition/TransitionManager;
+SPLandroidx/transition/TransitionManager;-><clinit>()V
+SPLandroidx/transition/TransitionManager;->beginDelayedTransition(Landroid/view/ViewGroup;Landroidx/transition/Transition;)V
+Landroidx/transition/TransitionSet;
+SPLandroidx/transition/TransitionSet;-><init>()V
+SPLandroidx/transition/TransitionSet;->addTransition(Landroidx/transition/Transition;)Landroidx/transition/TransitionSet;
+SPLandroidx/transition/TransitionSet;->addTransitionInternal(Landroidx/transition/Transition;)V
+SPLandroidx/transition/TransitionSet;->excludeTarget(Ljava/lang/Class;Z)Landroidx/transition/Transition;
+SPLandroidx/transition/TransitionSet;->setDuration(J)Landroidx/transition/TransitionSet;
+SPLandroidx/transition/TransitionSet;->setInterpolator(Landroid/animation/TimeInterpolator;)Landroidx/transition/TransitionSet;
+SPLandroidx/transition/TransitionSet;->setOrdering(I)Landroidx/transition/TransitionSet;
+Landroidx/transition/TransitionValuesMaps;
+SPLandroidx/transition/TransitionValuesMaps;-><init>()V
+Landroidx/transition/Visibility;
+SPLandroidx/transition/Visibility;-><clinit>()V
+SPLandroidx/transition/Visibility;-><init>()V
+SPLandroidx/transition/Visibility;->setMode(I)V
+Landroidx/vectordrawable/graphics/drawable/Animatable2Compat;
+Landroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback;
+SPLandroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback;-><init>()V
+Landroidx/vectordrawable/graphics/drawable/AnimationUtilsCompat;
+SPLandroidx/vectordrawable/graphics/drawable/AnimationUtilsCompat;->loadInterpolator(Landroid/content/Context;I)Landroid/view/animation/Interpolator;
+Landroidx/vectordrawable/graphics/drawable/VectorDrawableCommon;
+Landroidx/vectordrawable/graphics/drawable/VectorDrawableCompat;
+Landroidx/versionedparcelable/CustomVersionedParcelable;
+SPLandroidx/versionedparcelable/CustomVersionedParcelable;-><init>()V
+Landroidx/versionedparcelable/VersionedParcelable;
+Landroidx/viewbinding/ViewBinding;
+Landroidx/viewbinding/ViewBindings;
+SPLandroidx/viewbinding/ViewBindings;->findChildViewById(Landroid/view/View;I)Landroid/view/View;
+Landroidx/webkit/ProcessGlobalConfig;
+SPLandroidx/webkit/ProcessGlobalConfig;-><clinit>()V
+Landroidx/webkit/WebViewCompat;
+SPLandroidx/webkit/WebViewCompat;-><clinit>()V
+SPLandroidx/webkit/WebViewCompat;->getCurrentLoadedWebViewPackage()Landroid/content/pm/PackageInfo;
+SPLandroidx/webkit/WebViewCompat;->getCurrentWebViewPackage(Landroid/content/Context;)Landroid/content/pm/PackageInfo;
+Landroidx/webkit/internal/ApiHelperForO;
+SPLandroidx/webkit/internal/ApiHelperForO;->getCurrentWebViewPackage()Landroid/content/pm/PackageInfo;
+Landroidx/work/Clock;
+Landroidx/work/Configuration;
+SPLandroidx/work/Configuration;-><clinit>()V
+SPLandroidx/work/Configuration;-><init>(Landroidx/work/Configuration$Builder;)V
+SPLandroidx/work/Configuration;->getClock()Landroidx/work/Clock;
+SPLandroidx/work/Configuration;->getDefaultProcessName()Ljava/lang/String;
+SPLandroidx/work/Configuration;->getMaxSchedulerLimit()I
+SPLandroidx/work/Configuration;->getMinimumLoggingLevel()I
+SPLandroidx/work/Configuration;->getRunnableScheduler()Landroidx/work/RunnableScheduler;
+SPLandroidx/work/Configuration;->getTaskExecutor()Ljava/util/concurrent/Executor;
+SPLandroidx/work/Configuration;->getTracer()Landroidx/work/Tracer;
+SPLandroidx/work/Configuration;->isGreedySchedulerEnabled()Z
+SPLandroidx/work/Configuration;->isMarkingJobsAsImportantWhileForeground()Z
+SPLandroidx/work/Configuration;->isRepresentativeJobsEnabled()Z
+Landroidx/work/Configuration$Builder;
+SPLandroidx/work/Configuration$Builder;-><init>()V
+SPLandroidx/work/Configuration$Builder;->build()Landroidx/work/Configuration;
+SPLandroidx/work/Configuration$Builder;->getClock$work_runtime()Landroidx/work/Clock;
+SPLandroidx/work/Configuration$Builder;->getContentUriTriggerWorkersLimit$work_runtime()I
+SPLandroidx/work/Configuration$Builder;->getDefaultProcessName$work_runtime()Ljava/lang/String;
+SPLandroidx/work/Configuration$Builder;->getEnableGreedyScheduler$work_runtime()Z
+SPLandroidx/work/Configuration$Builder;->getEnableRepresentativeJobs$work_runtime()Z
+SPLandroidx/work/Configuration$Builder;->getExecutionEventListener$work_runtime()Landroidx/work/ExecutionEventListener;
+SPLandroidx/work/Configuration$Builder;->getExecutor$work_runtime()Ljava/util/concurrent/Executor;
+SPLandroidx/work/Configuration$Builder;->getInitializationExceptionHandler$work_runtime()Landroidx/core/util/Consumer;
+SPLandroidx/work/Configuration$Builder;->getInputMergerFactory$work_runtime()Landroidx/work/InputMergerFactory;
+SPLandroidx/work/Configuration$Builder;->getLoggingLevel$work_runtime()I
+SPLandroidx/work/Configuration$Builder;->getMarkJobsAsImportantWhileForeground$work_runtime()Z
+SPLandroidx/work/Configuration$Builder;->getMaxJobSchedulerId$work_runtime()I
+SPLandroidx/work/Configuration$Builder;->getMaxSchedulerLimit$work_runtime()I
+SPLandroidx/work/Configuration$Builder;->getMinJobSchedulerId$work_runtime()I
+SPLandroidx/work/Configuration$Builder;->getRemoteCancellationPropagationFixEnabled$work_runtime()Z
+SPLandroidx/work/Configuration$Builder;->getRemoteSessionTimeoutMillis$work_runtime()J
+SPLandroidx/work/Configuration$Builder;->getRunnableScheduler$work_runtime()Landroidx/work/RunnableScheduler;
+SPLandroidx/work/Configuration$Builder;->getScheduleEventListener$work_runtime()Landroidx/work/ScheduleEventListener;
+SPLandroidx/work/Configuration$Builder;->getSchedulingExceptionHandler$work_runtime()Landroidx/core/util/Consumer;
+SPLandroidx/work/Configuration$Builder;->getTaskExecutor$work_runtime()Ljava/util/concurrent/Executor;
+SPLandroidx/work/Configuration$Builder;->getTracer$work_runtime()Landroidx/work/Tracer;
+SPLandroidx/work/Configuration$Builder;->getWorkerContext$work_runtime()Lkotlin/coroutines/CoroutineContext;
+SPLandroidx/work/Configuration$Builder;->getWorkerExecutionExceptionHandler$work_runtime()Landroidx/core/util/Consumer;
+SPLandroidx/work/Configuration$Builder;->getWorkerFactory$work_runtime()Landroidx/work/WorkerFactory;
+SPLandroidx/work/Configuration$Builder;->getWorkerInitializationExceptionHandler$work_runtime()Landroidx/core/util/Consumer;
+Landroidx/work/Configuration$Companion;
+SPLandroidx/work/Configuration$Companion;-><init>()V
+SPLandroidx/work/Configuration$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/work/Configuration$Companion;->calculateExecutorParallelismLimit()I
+Landroidx/work/ConfigurationKt;
+SPLandroidx/work/ConfigurationKt;->access$createDefaultTracer()Landroidx/work/Tracer;
+SPLandroidx/work/ConfigurationKt;->createDefaultTracer()Landroidx/work/Tracer;
+Landroidx/work/ConfigurationKt$createDefaultTracer$tracer$1;
+SPLandroidx/work/ConfigurationKt$createDefaultTracer$tracer$1;-><init>()V
+SPLandroidx/work/ConfigurationKt$createDefaultTracer$tracer$1;->isEnabled()Z
+Landroidx/work/CoroutineWorker;
+Landroidx/work/Data;
+Landroidx/work/Data$Builder;
+Landroidx/work/DefaultWorkerFactory;
+SPLandroidx/work/DefaultWorkerFactory;-><clinit>()V
+SPLandroidx/work/DefaultWorkerFactory;-><init>()V
+Landroidx/work/ExecutionEventListener;
+Landroidx/work/InputMergerFactory;
+SPLandroidx/work/InputMergerFactory;-><init>()V
+Landroidx/work/ListenableWorker;
+Landroidx/work/Logger;
+SPLandroidx/work/Logger;-><clinit>()V
+SPLandroidx/work/Logger;-><init>(I)V
+SPLandroidx/work/Logger;->get()Landroidx/work/Logger;
+SPLandroidx/work/Logger;->setLogger(Landroidx/work/Logger;)V
+SPLandroidx/work/Logger;->tagWithPrefix(Ljava/lang/String;)Ljava/lang/String;
+Landroidx/work/Logger$LogcatLogger;
+SPLandroidx/work/Logger$LogcatLogger;-><init>(I)V
+SPLandroidx/work/Logger$LogcatLogger;->debug(Ljava/lang/String;Ljava/lang/String;)V
+Landroidx/work/NetworkType;
+SPLandroidx/work/NetworkType;->$values()[Landroidx/work/NetworkType;
+SPLandroidx/work/NetworkType;-><clinit>()V
+SPLandroidx/work/NetworkType;-><init>(Ljava/lang/String;I)V
+Landroidx/work/NoOpInputMergerFactory;
+SPLandroidx/work/NoOpInputMergerFactory;-><clinit>()V
+SPLandroidx/work/NoOpInputMergerFactory;-><init>()V
+Landroidx/work/Operation;
+SPLandroidx/work/Operation;-><clinit>()V
+Landroidx/work/Operation$State;
+SPLandroidx/work/Operation$State;-><init>()V
+Landroidx/work/Operation$State$IN_PROGRESS;
+SPLandroidx/work/Operation$State$IN_PROGRESS;-><init>()V
+SPLandroidx/work/Operation$State$IN_PROGRESS;-><init>(Landroidx/work/Operation-IA;)V
+Landroidx/work/Operation$State$SUCCESS;
+SPLandroidx/work/Operation$State$SUCCESS;-><init>()V
+SPLandroidx/work/Operation$State$SUCCESS;-><init>(Landroidx/work/Operation-IA;)V
+Landroidx/work/OperationImpl;
+SPLandroidx/work/OperationImpl;-><init>(Landroidx/lifecycle/LiveData;Lcom/google/common/util/concurrent/ListenableFuture;)V
+Landroidx/work/OperationKt;
+SPLandroidx/work/OperationKt;->$r8$lambda$HpXEiU5zZrnWi4iuCKdgd7dMYGk(Landroidx/work/Tracer;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/lifecycle/MutableLiveData;Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;)V
+SPLandroidx/work/OperationKt;->launchOperation$lambda$0$0(Landroidx/work/Tracer;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/lifecycle/MutableLiveData;Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;)V
+SPLandroidx/work/OperationKt;->launchOperation$lambda$0(Ljava/util/concurrent/Executor;Landroidx/work/Tracer;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/lifecycle/MutableLiveData;Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;)Lkotlin/Unit;
+SPLandroidx/work/OperationKt;->launchOperation(Landroidx/work/Tracer;Ljava/lang/String;Ljava/util/concurrent/Executor;Lkotlin/jvm/functions/Function0;)Landroidx/work/Operation;
+Landroidx/work/OperationKt$$ExternalSyntheticLambda0;
+SPLandroidx/work/OperationKt$$ExternalSyntheticLambda0;-><init>(Ljava/util/concurrent/Executor;Landroidx/work/Tracer;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/lifecycle/MutableLiveData;)V
+SPLandroidx/work/OperationKt$$ExternalSyntheticLambda0;->attachCompleter(Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;)Ljava/lang/Object;
+Landroidx/work/OperationKt$$ExternalSyntheticLambda1;
+SPLandroidx/work/OperationKt$$ExternalSyntheticLambda1;-><init>(Landroidx/work/Tracer;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/lifecycle/MutableLiveData;Landroidx/concurrent/futures/CallbackToFutureAdapter$Completer;)V
+SPLandroidx/work/OperationKt$$ExternalSyntheticLambda1;->run()V
+Landroidx/work/R$bool;
+Landroidx/work/RunnableScheduler;
+Landroidx/work/ScheduleEventListener;
+Landroidx/work/SystemClock;
+SPLandroidx/work/SystemClock;-><init>()V
+SPLandroidx/work/SystemClock;->currentTimeMillis()J
+Landroidx/work/Tracer;
+Landroidx/work/TracerKt;
+SPLandroidx/work/TracerKt;->traced(Landroidx/work/Tracer;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+Landroidx/work/WorkInfo;
+Landroidx/work/WorkInfo$State;
+SPLandroidx/work/WorkInfo$State;->$values()[Landroidx/work/WorkInfo$State;
+SPLandroidx/work/WorkInfo$State;-><clinit>()V
+SPLandroidx/work/WorkInfo$State;-><init>(Ljava/lang/String;I)V
+Landroidx/work/WorkManager;
+SPLandroidx/work/WorkManager;-><clinit>()V
+SPLandroidx/work/WorkManager;-><init>()V
+SPLandroidx/work/WorkManager;->getInstance(Landroid/content/Context;)Landroidx/work/WorkManager;
+SPLandroidx/work/WorkManager;->initialize(Landroid/content/Context;Landroidx/work/Configuration;)V
+Landroidx/work/WorkManager$Companion;
+SPLandroidx/work/WorkManager$Companion;-><init>()V
+SPLandroidx/work/WorkManager$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/work/WorkManager$Companion;->getInstance(Landroid/content/Context;)Landroidx/work/WorkManager;
+SPLandroidx/work/WorkManager$Companion;->initialize(Landroid/content/Context;Landroidx/work/Configuration;)V
+SPLandroidx/work/WorkManager$Companion;->isInitialized()Z
+Landroidx/work/WorkManagerInitializer;
+SPLandroidx/work/WorkManagerInitializer;-><clinit>()V
+SPLandroidx/work/WorkManagerInitializer;-><init>()V
+SPLandroidx/work/WorkManagerInitializer;->create(Landroid/content/Context;)Landroidx/work/WorkManager;
+SPLandroidx/work/WorkManagerInitializer;->create(Landroid/content/Context;)Ljava/lang/Object;
+SPLandroidx/work/WorkManagerInitializer;->dependencies()Ljava/util/List;
+Landroidx/work/WorkerFactory;
+SPLandroidx/work/WorkerFactory;-><init>()V
+Landroidx/work/impl/AutoMigration_14_15;
+SPLandroidx/work/impl/AutoMigration_14_15;-><init>()V
+Landroidx/work/impl/AutoMigration_19_20;
+SPLandroidx/work/impl/AutoMigration_19_20;-><init>()V
+Landroidx/work/impl/CleanupCallback;
+SPLandroidx/work/impl/CleanupCallback;-><init>(Landroidx/work/Clock;)V
+SPLandroidx/work/impl/CleanupCallback;->getPruneDate()J
+SPLandroidx/work/impl/CleanupCallback;->getPruneSQL()Ljava/lang/String;
+SPLandroidx/work/impl/CleanupCallback;->onOpen(Landroidx/sqlite/db/SupportSQLiteDatabase;)V
+Landroidx/work/impl/DefaultRunnableScheduler;
+SPLandroidx/work/impl/DefaultRunnableScheduler;-><init>()V
+Landroidx/work/impl/ExecutionListener;
+Landroidx/work/impl/Migration_11_12;
+SPLandroidx/work/impl/Migration_11_12;-><clinit>()V
+SPLandroidx/work/impl/Migration_11_12;-><init>()V
+Landroidx/work/impl/Migration_12_13;
+SPLandroidx/work/impl/Migration_12_13;-><clinit>()V
+SPLandroidx/work/impl/Migration_12_13;-><init>()V
+Landroidx/work/impl/Migration_15_16;
+SPLandroidx/work/impl/Migration_15_16;-><clinit>()V
+SPLandroidx/work/impl/Migration_15_16;-><init>()V
+Landroidx/work/impl/Migration_16_17;
+SPLandroidx/work/impl/Migration_16_17;-><clinit>()V
+SPLandroidx/work/impl/Migration_16_17;-><init>()V
+Landroidx/work/impl/Migration_1_2;
+SPLandroidx/work/impl/Migration_1_2;-><clinit>()V
+SPLandroidx/work/impl/Migration_1_2;-><init>()V
+Landroidx/work/impl/Migration_3_4;
+SPLandroidx/work/impl/Migration_3_4;-><clinit>()V
+SPLandroidx/work/impl/Migration_3_4;-><init>()V
+Landroidx/work/impl/Migration_4_5;
+SPLandroidx/work/impl/Migration_4_5;-><clinit>()V
+SPLandroidx/work/impl/Migration_4_5;-><init>()V
+Landroidx/work/impl/Migration_6_7;
+SPLandroidx/work/impl/Migration_6_7;-><clinit>()V
+SPLandroidx/work/impl/Migration_6_7;-><init>()V
+Landroidx/work/impl/Migration_7_8;
+SPLandroidx/work/impl/Migration_7_8;-><clinit>()V
+SPLandroidx/work/impl/Migration_7_8;-><init>()V
+Landroidx/work/impl/Migration_8_9;
+SPLandroidx/work/impl/Migration_8_9;-><clinit>()V
+SPLandroidx/work/impl/Migration_8_9;-><init>()V
+Landroidx/work/impl/Processor;
+SPLandroidx/work/impl/Processor;-><clinit>()V
+SPLandroidx/work/impl/Processor;-><init>(Landroid/content/Context;Landroidx/work/Configuration;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;Landroidx/work/impl/WorkDatabase;)V
+SPLandroidx/work/impl/Processor;->addExecutionListener(Landroidx/work/impl/ExecutionListener;)V
+Landroidx/work/impl/RescheduleMigration;
+SPLandroidx/work/impl/RescheduleMigration;-><init>(Landroid/content/Context;II)V
+Landroidx/work/impl/Scheduler;
+Landroidx/work/impl/Schedulers;
+SPLandroidx/work/impl/Schedulers;-><clinit>()V
+SPLandroidx/work/impl/Schedulers;->createBestAvailableBackgroundScheduler(Landroid/content/Context;Landroidx/work/impl/WorkDatabase;Landroidx/work/Configuration;)Landroidx/work/impl/Scheduler;
+SPLandroidx/work/impl/Schedulers;->markScheduled(Landroidx/work/impl/model/WorkSpecDao;Landroidx/work/Clock;Ljava/util/List;)V
+SPLandroidx/work/impl/Schedulers;->registerRescheduling(Ljava/util/List;Landroidx/work/impl/Processor;Ljava/util/concurrent/Executor;Landroidx/work/impl/WorkDatabase;Landroidx/work/Configuration;)V
+SPLandroidx/work/impl/Schedulers;->schedule(Landroidx/work/Configuration;Landroidx/work/impl/WorkDatabase;Ljava/util/List;)V
+SPLandroidx/work/impl/Schedulers;->scheduleWorkSpecs(Ljava/util/List;Ljava/util/List;Z)V
+Landroidx/work/impl/Schedulers$$ExternalSyntheticLambda1;
+SPLandroidx/work/impl/Schedulers$$ExternalSyntheticLambda1;-><init>(Ljava/util/concurrent/Executor;Landroidx/work/impl/WorkDatabase;Ljava/util/List;Landroidx/work/Configuration;)V
+Landroidx/work/impl/StartStopTokens;
+SPLandroidx/work/impl/StartStopTokens;-><clinit>()V
+SPLandroidx/work/impl/StartStopTokens;->create()Landroidx/work/impl/StartStopTokens;
+Landroidx/work/impl/StartStopTokens$Companion;
+SPLandroidx/work/impl/StartStopTokens$Companion;-><clinit>()V
+SPLandroidx/work/impl/StartStopTokens$Companion;-><init>()V
+SPLandroidx/work/impl/StartStopTokens$Companion;->create$default(Landroidx/work/impl/StartStopTokens$Companion;ZILjava/lang/Object;)Landroidx/work/impl/StartStopTokens;
+SPLandroidx/work/impl/StartStopTokens$Companion;->create()Landroidx/work/impl/StartStopTokens;
+SPLandroidx/work/impl/StartStopTokens$Companion;->create(Z)Landroidx/work/impl/StartStopTokens;
+Landroidx/work/impl/StartStopTokensImpl;
+SPLandroidx/work/impl/StartStopTokensImpl;-><init>()V
+Landroidx/work/impl/SynchronizedStartStopTokensImpl;
+SPLandroidx/work/impl/SynchronizedStartStopTokensImpl;-><init>(Landroidx/work/impl/StartStopTokens;)V
+Landroidx/work/impl/UnfinishedWorkListenerKt;
+SPLandroidx/work/impl/UnfinishedWorkListenerKt;-><clinit>()V
+SPLandroidx/work/impl/UnfinishedWorkListenerKt;->maybeLaunchUnfinishedWorkListener(Lkotlinx/coroutines/CoroutineScope;Landroid/content/Context;Landroidx/work/Configuration;Landroidx/work/impl/WorkDatabase;)V
+Landroidx/work/impl/UnfinishedWorkListenerKt$maybeLaunchUnfinishedWorkListener$1;
+SPLandroidx/work/impl/UnfinishedWorkListenerKt$maybeLaunchUnfinishedWorkListener$1;-><init>(Lkotlin/coroutines/Continuation;)V
+Landroidx/work/impl/UnfinishedWorkListenerKt$maybeLaunchUnfinishedWorkListener$2;
+SPLandroidx/work/impl/UnfinishedWorkListenerKt$maybeLaunchUnfinishedWorkListener$2;-><init>(Landroid/content/Context;Lkotlin/coroutines/Continuation;)V
+SPLandroidx/work/impl/UnfinishedWorkListenerKt$maybeLaunchUnfinishedWorkListener$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLandroidx/work/impl/UnfinishedWorkListenerKt$maybeLaunchUnfinishedWorkListener$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLandroidx/work/impl/UnfinishedWorkListenerKt$maybeLaunchUnfinishedWorkListener$2;->invoke(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLandroidx/work/impl/UnfinishedWorkListenerKt$maybeLaunchUnfinishedWorkListener$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/WorkDatabase;
+SPLandroidx/work/impl/WorkDatabase;-><clinit>()V
+SPLandroidx/work/impl/WorkDatabase;-><init>()V
+Landroidx/work/impl/WorkDatabase$Companion;
+SPLandroidx/work/impl/WorkDatabase$Companion;-><init>()V
+SPLandroidx/work/impl/WorkDatabase$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/work/impl/WorkDatabase$Companion;->create$lambda$0(Landroid/content/Context;Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration;)Landroidx/sqlite/db/SupportSQLiteOpenHelper;
+SPLandroidx/work/impl/WorkDatabase$Companion;->create(Landroid/content/Context;Ljava/util/concurrent/Executor;Landroidx/work/Clock;Z)Landroidx/work/impl/WorkDatabase;
+Landroidx/work/impl/WorkDatabase$Companion$$ExternalSyntheticLambda0;
+SPLandroidx/work/impl/WorkDatabase$Companion$$ExternalSyntheticLambda0;-><init>(Landroid/content/Context;)V
+SPLandroidx/work/impl/WorkDatabase$Companion$$ExternalSyntheticLambda0;->create(Landroidx/sqlite/db/SupportSQLiteOpenHelper$Configuration;)Landroidx/sqlite/db/SupportSQLiteOpenHelper;
+Landroidx/work/impl/WorkDatabaseKt;
+SPLandroidx/work/impl/WorkDatabaseKt;-><clinit>()V
+Landroidx/work/impl/WorkDatabasePathHelper;
+SPLandroidx/work/impl/WorkDatabasePathHelper;-><clinit>()V
+SPLandroidx/work/impl/WorkDatabasePathHelper;-><init>()V
+SPLandroidx/work/impl/WorkDatabasePathHelper;->getDefaultDatabasePath(Landroid/content/Context;)Ljava/io/File;
+SPLandroidx/work/impl/WorkDatabasePathHelper;->migrateDatabase(Landroid/content/Context;)V
+Landroidx/work/impl/WorkDatabase_AutoMigration_13_14_Impl;
+SPLandroidx/work/impl/WorkDatabase_AutoMigration_13_14_Impl;-><init>()V
+Landroidx/work/impl/WorkDatabase_AutoMigration_14_15_Impl;
+SPLandroidx/work/impl/WorkDatabase_AutoMigration_14_15_Impl;-><init>()V
+Landroidx/work/impl/WorkDatabase_AutoMigration_16_17_Impl;
+SPLandroidx/work/impl/WorkDatabase_AutoMigration_16_17_Impl;-><init>()V
+Landroidx/work/impl/WorkDatabase_AutoMigration_17_18_Impl;
+SPLandroidx/work/impl/WorkDatabase_AutoMigration_17_18_Impl;-><init>()V
+Landroidx/work/impl/WorkDatabase_AutoMigration_18_19_Impl;
+SPLandroidx/work/impl/WorkDatabase_AutoMigration_18_19_Impl;-><init>()V
+Landroidx/work/impl/WorkDatabase_AutoMigration_19_20_Impl;
+SPLandroidx/work/impl/WorkDatabase_AutoMigration_19_20_Impl;-><init>()V
+Landroidx/work/impl/WorkDatabase_AutoMigration_20_21_Impl;
+SPLandroidx/work/impl/WorkDatabase_AutoMigration_20_21_Impl;-><init>()V
+Landroidx/work/impl/WorkDatabase_AutoMigration_22_23_Impl;
+SPLandroidx/work/impl/WorkDatabase_AutoMigration_22_23_Impl;-><init>()V
+Landroidx/work/impl/WorkDatabase_AutoMigration_23_24_Impl;
+SPLandroidx/work/impl/WorkDatabase_AutoMigration_23_24_Impl;-><init>()V
+Landroidx/work/impl/WorkDatabase_Impl;
+SPLandroidx/work/impl/WorkDatabase_Impl;-><init>()V
+SPLandroidx/work/impl/WorkDatabase_Impl;->_preferenceDao$lambda$0(Landroidx/work/impl/WorkDatabase_Impl;)Landroidx/work/impl/model/PreferenceDao_Impl;
+SPLandroidx/work/impl/WorkDatabase_Impl;->_systemIdInfoDao$lambda$0(Landroidx/work/impl/WorkDatabase_Impl;)Landroidx/work/impl/model/SystemIdInfoDao_Impl;
+SPLandroidx/work/impl/WorkDatabase_Impl;->_workProgressDao$lambda$0(Landroidx/work/impl/WorkDatabase_Impl;)Landroidx/work/impl/model/WorkProgressDao_Impl;
+SPLandroidx/work/impl/WorkDatabase_Impl;->_workSpecDao$lambda$0(Landroidx/work/impl/WorkDatabase_Impl;)Landroidx/work/impl/model/WorkSpecDao_Impl;
+SPLandroidx/work/impl/WorkDatabase_Impl;->access$internalInitInvalidationTracker(Landroidx/work/impl/WorkDatabase_Impl;Landroidx/sqlite/SQLiteConnection;)V
+SPLandroidx/work/impl/WorkDatabase_Impl;->createAutoMigrations(Ljava/util/Map;)Ljava/util/List;
+SPLandroidx/work/impl/WorkDatabase_Impl;->createInvalidationTracker()Landroidx/room/InvalidationTracker;
+SPLandroidx/work/impl/WorkDatabase_Impl;->createOpenDelegate()Landroidx/room/RoomOpenDelegate;
+SPLandroidx/work/impl/WorkDatabase_Impl;->createOpenDelegate()Landroidx/room/RoomOpenDelegateMarker;
+SPLandroidx/work/impl/WorkDatabase_Impl;->getRequiredAutoMigrationSpecClasses()Ljava/util/Set;
+SPLandroidx/work/impl/WorkDatabase_Impl;->getRequiredTypeConverterClasses()Ljava/util/Map;
+SPLandroidx/work/impl/WorkDatabase_Impl;->preferenceDao()Landroidx/work/impl/model/PreferenceDao;
+SPLandroidx/work/impl/WorkDatabase_Impl;->systemIdInfoDao()Landroidx/work/impl/model/SystemIdInfoDao;
+SPLandroidx/work/impl/WorkDatabase_Impl;->workProgressDao()Landroidx/work/impl/model/WorkProgressDao;
+SPLandroidx/work/impl/WorkDatabase_Impl;->workSpecDao()Landroidx/work/impl/model/WorkSpecDao;
+Landroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda0;
+SPLandroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda0;-><init>(Landroidx/work/impl/WorkDatabase_Impl;)V
+SPLandroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda0;->invoke()Ljava/lang/Object;
+Landroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda1;
+SPLandroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda1;-><init>(Landroidx/work/impl/WorkDatabase_Impl;)V
+Landroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda2;
+SPLandroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda2;-><init>(Landroidx/work/impl/WorkDatabase_Impl;)V
+Landroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda3;
+SPLandroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda3;-><init>(Landroidx/work/impl/WorkDatabase_Impl;)V
+SPLandroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda3;->invoke()Ljava/lang/Object;
+Landroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda4;
+SPLandroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda4;-><init>(Landroidx/work/impl/WorkDatabase_Impl;)V
+Landroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda5;
+SPLandroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda5;-><init>(Landroidx/work/impl/WorkDatabase_Impl;)V
+SPLandroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda5;->invoke()Ljava/lang/Object;
+Landroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda6;
+SPLandroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda6;-><init>(Landroidx/work/impl/WorkDatabase_Impl;)V
+SPLandroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda6;->invoke()Ljava/lang/Object;
+Landroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda7;
+SPLandroidx/work/impl/WorkDatabase_Impl$$ExternalSyntheticLambda7;-><init>(Landroidx/work/impl/WorkDatabase_Impl;)V
+Landroidx/work/impl/WorkDatabase_Impl$createOpenDelegate$_openDelegate$1;
+SPLandroidx/work/impl/WorkDatabase_Impl$createOpenDelegate$_openDelegate$1;-><init>(Landroidx/work/impl/WorkDatabase_Impl;)V
+SPLandroidx/work/impl/WorkDatabase_Impl$createOpenDelegate$_openDelegate$1;->onOpen(Landroidx/sqlite/SQLiteConnection;)V
+Landroidx/work/impl/WorkLauncher;
+Landroidx/work/impl/WorkLauncherImpl;
+SPLandroidx/work/impl/WorkLauncherImpl;-><init>(Landroidx/work/impl/Processor;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;)V
+Landroidx/work/impl/WorkManagerImpl;
+SPLandroidx/work/impl/WorkManagerImpl;-><clinit>()V
+SPLandroidx/work/impl/WorkManagerImpl;-><init>(Landroid/content/Context;Landroidx/work/Configuration;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;Landroidx/work/impl/WorkDatabase;Ljava/util/List;Landroidx/work/impl/Processor;Landroidx/work/impl/constraints/trackers/Trackers;)V
+SPLandroidx/work/impl/WorkManagerImpl;->cancelUniqueWork(Ljava/lang/String;)Landroidx/work/Operation;
+SPLandroidx/work/impl/WorkManagerImpl;->getApplicationContext()Landroid/content/Context;
+SPLandroidx/work/impl/WorkManagerImpl;->getConfiguration()Landroidx/work/Configuration;
+SPLandroidx/work/impl/WorkManagerImpl;->getInstance()Landroidx/work/impl/WorkManagerImpl;
+SPLandroidx/work/impl/WorkManagerImpl;->getInstance(Landroid/content/Context;)Landroidx/work/impl/WorkManagerImpl;
+SPLandroidx/work/impl/WorkManagerImpl;->getPreferenceUtils()Landroidx/work/impl/utils/PreferenceUtils;
+SPLandroidx/work/impl/WorkManagerImpl;->getSchedulers()Ljava/util/List;
+SPLandroidx/work/impl/WorkManagerImpl;->getWorkDatabase()Landroidx/work/impl/WorkDatabase;
+SPLandroidx/work/impl/WorkManagerImpl;->getWorkInfosForUniqueWorkFlow(Ljava/lang/String;)Lkotlinx/coroutines/flow/Flow;
+SPLandroidx/work/impl/WorkManagerImpl;->getWorkTaskExecutor()Landroidx/work/impl/utils/taskexecutor/TaskExecutor;
+SPLandroidx/work/impl/WorkManagerImpl;->initialize(Landroid/content/Context;Landroidx/work/Configuration;)V
+SPLandroidx/work/impl/WorkManagerImpl;->isInitialized()Z
+SPLandroidx/work/impl/WorkManagerImpl;->lambda$rescheduleEligibleWork$0$androidx-work-impl-WorkManagerImpl()Lkotlin/Unit;
+SPLandroidx/work/impl/WorkManagerImpl;->onForceStopRunnableCompleted()V
+SPLandroidx/work/impl/WorkManagerImpl;->rescheduleEligibleWork()V
+Landroidx/work/impl/WorkManagerImpl$$ExternalSyntheticLambda1;
+SPLandroidx/work/impl/WorkManagerImpl$$ExternalSyntheticLambda1;-><init>(Landroidx/work/impl/WorkManagerImpl;)V
+SPLandroidx/work/impl/WorkManagerImpl$$ExternalSyntheticLambda1;->invoke()Ljava/lang/Object;
+Landroidx/work/impl/WorkManagerImpl$Api24Impl;
+SPLandroidx/work/impl/WorkManagerImpl$Api24Impl;->isDeviceProtectedStorage(Landroid/content/Context;)Z
+Landroidx/work/impl/WorkManagerImplExtKt;
+SPLandroidx/work/impl/WorkManagerImplExtKt;->access$createSchedulers(Landroid/content/Context;Landroidx/work/Configuration;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;Landroidx/work/impl/WorkDatabase;Landroidx/work/impl/constraints/trackers/Trackers;Landroidx/work/impl/Processor;)Ljava/util/List;
+SPLandroidx/work/impl/WorkManagerImplExtKt;->createSchedulers(Landroid/content/Context;Landroidx/work/Configuration;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;Landroidx/work/impl/WorkDatabase;Landroidx/work/impl/constraints/trackers/Trackers;Landroidx/work/impl/Processor;)Ljava/util/List;
+SPLandroidx/work/impl/WorkManagerImplExtKt;->createWorkManager$default(Landroid/content/Context;Landroidx/work/Configuration;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;Landroidx/work/impl/WorkDatabase;Landroidx/work/impl/constraints/trackers/Trackers;Landroidx/work/impl/Processor;Lkotlin/jvm/functions/Function6;ILjava/lang/Object;)Landroidx/work/impl/WorkManagerImpl;
+SPLandroidx/work/impl/WorkManagerImplExtKt;->createWorkManager(Landroid/content/Context;Landroidx/work/Configuration;)Landroidx/work/impl/WorkManagerImpl;
+SPLandroidx/work/impl/WorkManagerImplExtKt;->createWorkManager(Landroid/content/Context;Landroidx/work/Configuration;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;Landroidx/work/impl/WorkDatabase;Landroidx/work/impl/constraints/trackers/Trackers;Landroidx/work/impl/Processor;Lkotlin/jvm/functions/Function6;)Landroidx/work/impl/WorkManagerImpl;
+Landroidx/work/impl/WorkManagerImplExtKt$WorkManagerImpl$1;
+SPLandroidx/work/impl/WorkManagerImplExtKt$WorkManagerImpl$1;-><clinit>()V
+SPLandroidx/work/impl/WorkManagerImplExtKt$WorkManagerImpl$1;-><init>()V
+SPLandroidx/work/impl/WorkManagerImplExtKt$WorkManagerImpl$1;->invoke(Landroid/content/Context;Landroidx/work/Configuration;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;Landroidx/work/impl/WorkDatabase;Landroidx/work/impl/constraints/trackers/Trackers;Landroidx/work/impl/Processor;)Ljava/util/List;
+SPLandroidx/work/impl/WorkManagerImplExtKt$WorkManagerImpl$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/WorkMigration9To10;
+SPLandroidx/work/impl/WorkMigration9To10;-><init>(Landroid/content/Context;)V
+Landroidx/work/impl/background/greedy/DelayedWorkTracker;
+SPLandroidx/work/impl/background/greedy/DelayedWorkTracker;-><clinit>()V
+SPLandroidx/work/impl/background/greedy/DelayedWorkTracker;-><init>(Landroidx/work/impl/Scheduler;Landroidx/work/RunnableScheduler;Landroidx/work/Clock;)V
+Landroidx/work/impl/background/greedy/GreedyScheduler;
+SPLandroidx/work/impl/background/greedy/GreedyScheduler;-><clinit>()V
+SPLandroidx/work/impl/background/greedy/GreedyScheduler;-><init>(Landroid/content/Context;Landroidx/work/Configuration;Landroidx/work/impl/constraints/trackers/Trackers;Landroidx/work/impl/Processor;Landroidx/work/impl/WorkLauncher;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;)V
+Landroidx/work/impl/background/greedy/TimeLimiter;
+SPLandroidx/work/impl/background/greedy/TimeLimiter;-><init>(Landroidx/work/RunnableScheduler;Landroidx/work/impl/WorkLauncher;)V
+SPLandroidx/work/impl/background/greedy/TimeLimiter;-><init>(Landroidx/work/RunnableScheduler;Landroidx/work/impl/WorkLauncher;J)V
+SPLandroidx/work/impl/background/greedy/TimeLimiter;-><init>(Landroidx/work/RunnableScheduler;Landroidx/work/impl/WorkLauncher;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/work/impl/background/systemalarm/RescheduleReceiver;
+Landroidx/work/impl/background/systemjob/JobScheduler21;
+SPLandroidx/work/impl/background/systemjob/JobScheduler21;-><clinit>()V
+SPLandroidx/work/impl/background/systemjob/JobScheduler21;-><init>()V
+SPLandroidx/work/impl/background/systemjob/JobScheduler21;->getAllPendingJobs(Landroid/app/job/JobScheduler;)Ljava/util/List;
+Landroidx/work/impl/background/systemjob/JobScheduler34;
+SPLandroidx/work/impl/background/systemjob/JobScheduler34;-><clinit>()V
+SPLandroidx/work/impl/background/systemjob/JobScheduler34;-><init>()V
+SPLandroidx/work/impl/background/systemjob/JobScheduler34;->forNamespace(Landroid/app/job/JobScheduler;)Landroid/app/job/JobScheduler;
+Landroidx/work/impl/background/systemjob/JobSchedulerExtKt;
+SPLandroidx/work/impl/background/systemjob/JobSchedulerExtKt;-><clinit>()V
+SPLandroidx/work/impl/background/systemjob/JobSchedulerExtKt;->getSafePendingJobs(Landroid/app/job/JobScheduler;)Ljava/util/List;
+SPLandroidx/work/impl/background/systemjob/JobSchedulerExtKt;->getWmJobScheduler(Landroid/content/Context;)Landroid/app/job/JobScheduler;
+Landroidx/work/impl/background/systemjob/SystemJobInfoConverter;
+SPLandroidx/work/impl/background/systemjob/SystemJobInfoConverter;-><clinit>()V
+SPLandroidx/work/impl/background/systemjob/SystemJobInfoConverter;-><init>(Landroid/content/Context;Landroidx/work/Clock;Z)V
+Landroidx/work/impl/background/systemjob/SystemJobScheduler;
+SPLandroidx/work/impl/background/systemjob/SystemJobScheduler;-><clinit>()V
+SPLandroidx/work/impl/background/systemjob/SystemJobScheduler;-><init>(Landroid/content/Context;Landroidx/work/impl/WorkDatabase;Landroidx/work/Configuration;)V
+SPLandroidx/work/impl/background/systemjob/SystemJobScheduler;-><init>(Landroid/content/Context;Landroidx/work/impl/WorkDatabase;Landroidx/work/Configuration;Landroid/app/job/JobScheduler;Landroidx/work/impl/background/systemjob/SystemJobInfoConverter;)V
+SPLandroidx/work/impl/background/systemjob/SystemJobScheduler;->cancelAllInAllNamespaces(Landroid/content/Context;)V
+SPLandroidx/work/impl/background/systemjob/SystemJobScheduler;->getPendingJobs(Landroid/content/Context;Landroid/app/job/JobScheduler;)Ljava/util/List;
+SPLandroidx/work/impl/background/systemjob/SystemJobScheduler;->reconcileJobs(Landroid/content/Context;Landroidx/work/impl/WorkDatabase;)Z
+Landroidx/work/impl/background/systemjob/SystemJobService;
+Landroidx/work/impl/constraints/NetworkRequestConstraintController;
+SPLandroidx/work/impl/constraints/NetworkRequestConstraintController;-><init>(Landroid/net/ConnectivityManager;J)V
+SPLandroidx/work/impl/constraints/NetworkRequestConstraintController;-><init>(Landroid/net/ConnectivityManager;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+Landroidx/work/impl/constraints/OnConstraintsStateChangedListener;
+Landroidx/work/impl/constraints/WorkConstraintsTracker;
+SPLandroidx/work/impl/constraints/WorkConstraintsTracker;-><init>(Landroidx/work/impl/constraints/trackers/Trackers;)V
+SPLandroidx/work/impl/constraints/WorkConstraintsTracker;-><init>(Ljava/util/List;)V
+Landroidx/work/impl/constraints/WorkConstraintsTrackerKt;
+SPLandroidx/work/impl/constraints/WorkConstraintsTrackerKt;-><clinit>()V
+SPLandroidx/work/impl/constraints/WorkConstraintsTrackerKt;->NetworkRequestConstraintController(Landroid/content/Context;)Landroidx/work/impl/constraints/NetworkRequestConstraintController;
+SPLandroidx/work/impl/constraints/WorkConstraintsTrackerKt;->access$createControllers(Landroidx/work/impl/constraints/trackers/Trackers;)Ljava/util/List;
+SPLandroidx/work/impl/constraints/WorkConstraintsTrackerKt;->createControllers(Landroidx/work/impl/constraints/trackers/Trackers;)Ljava/util/List;
+Landroidx/work/impl/constraints/controllers/BaseConstraintController;
+SPLandroidx/work/impl/constraints/controllers/BaseConstraintController;-><init>(Landroidx/work/impl/constraints/trackers/ConstraintTracker;)V
+Landroidx/work/impl/constraints/controllers/BatteryChargingController;
+SPLandroidx/work/impl/constraints/controllers/BatteryChargingController;-><init>(Landroidx/work/impl/constraints/trackers/ConstraintTracker;)V
+Landroidx/work/impl/constraints/controllers/BatteryNotLowController;
+SPLandroidx/work/impl/constraints/controllers/BatteryNotLowController;-><init>(Landroidx/work/impl/constraints/trackers/BatteryNotLowTracker;)V
+Landroidx/work/impl/constraints/controllers/ConstraintController;
+Landroidx/work/impl/constraints/controllers/StorageNotLowController;
+SPLandroidx/work/impl/constraints/controllers/StorageNotLowController;-><init>(Landroidx/work/impl/constraints/trackers/ConstraintTracker;)V
+Landroidx/work/impl/constraints/trackers/BatteryChargingTracker;
+SPLandroidx/work/impl/constraints/trackers/BatteryChargingTracker;-><init>(Landroid/content/Context;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;)V
+Landroidx/work/impl/constraints/trackers/BatteryNotLowTracker;
+SPLandroidx/work/impl/constraints/trackers/BatteryNotLowTracker;-><init>(Landroid/content/Context;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;)V
+Landroidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker;
+SPLandroidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker;-><init>(Landroid/content/Context;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;)V
+Landroidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker$broadcastReceiver$1;
+SPLandroidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker$broadcastReceiver$1;-><init>(Landroidx/work/impl/constraints/trackers/BroadcastReceiverConstraintTracker;)V
+Landroidx/work/impl/constraints/trackers/ConstraintTracker;
+SPLandroidx/work/impl/constraints/trackers/ConstraintTracker;-><init>(Landroid/content/Context;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;)V
+Landroidx/work/impl/constraints/trackers/StorageNotLowTracker;
+SPLandroidx/work/impl/constraints/trackers/StorageNotLowTracker;-><init>(Landroid/content/Context;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;)V
+Landroidx/work/impl/constraints/trackers/Trackers;
+SPLandroidx/work/impl/constraints/trackers/Trackers;-><init>(Landroid/content/Context;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;Landroidx/work/impl/constraints/trackers/ConstraintTracker;Landroidx/work/impl/constraints/trackers/BatteryNotLowTracker;Landroidx/work/impl/constraints/trackers/ConstraintTracker;Landroidx/work/impl/constraints/trackers/ConstraintTracker;)V
+SPLandroidx/work/impl/constraints/trackers/Trackers;-><init>(Landroid/content/Context;Landroidx/work/impl/utils/taskexecutor/TaskExecutor;Landroidx/work/impl/constraints/trackers/ConstraintTracker;Landroidx/work/impl/constraints/trackers/BatteryNotLowTracker;Landroidx/work/impl/constraints/trackers/ConstraintTracker;Landroidx/work/impl/constraints/trackers/ConstraintTracker;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/work/impl/constraints/trackers/Trackers;->getBatteryChargingTracker()Landroidx/work/impl/constraints/trackers/ConstraintTracker;
+SPLandroidx/work/impl/constraints/trackers/Trackers;->getBatteryNotLowTracker()Landroidx/work/impl/constraints/trackers/BatteryNotLowTracker;
+SPLandroidx/work/impl/constraints/trackers/Trackers;->getContext()Landroid/content/Context;
+SPLandroidx/work/impl/constraints/trackers/Trackers;->getStorageNotLowTracker()Landroidx/work/impl/constraints/trackers/ConstraintTracker;
+Landroidx/work/impl/foreground/ForegroundProcessor;
+Landroidx/work/impl/model/DependencyDao;
+Landroidx/work/impl/model/DependencyDao_Impl;
+SPLandroidx/work/impl/model/DependencyDao_Impl;-><clinit>()V
+Landroidx/work/impl/model/DependencyDao_Impl$Companion;
+SPLandroidx/work/impl/model/DependencyDao_Impl$Companion;-><init>()V
+SPLandroidx/work/impl/model/DependencyDao_Impl$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/work/impl/model/DependencyDao_Impl$Companion;->getRequiredConverters()Ljava/util/List;
+Landroidx/work/impl/model/Preference;
+SPLandroidx/work/impl/model/Preference;-><init>(Ljava/lang/String;Ljava/lang/Long;)V
+SPLandroidx/work/impl/model/Preference;->getKey()Ljava/lang/String;
+SPLandroidx/work/impl/model/Preference;->getValue()Ljava/lang/Long;
+Landroidx/work/impl/model/PreferenceDao;
+Landroidx/work/impl/model/PreferenceDao_Impl;
+SPLandroidx/work/impl/model/PreferenceDao_Impl;-><clinit>()V
+SPLandroidx/work/impl/model/PreferenceDao_Impl;-><init>(Landroidx/room/RoomDatabase;)V
+SPLandroidx/work/impl/model/PreferenceDao_Impl;->getLongValue$lambda$0(Ljava/lang/String;Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/lang/Long;
+SPLandroidx/work/impl/model/PreferenceDao_Impl;->getLongValue(Ljava/lang/String;)Ljava/lang/Long;
+SPLandroidx/work/impl/model/PreferenceDao_Impl;->insertPreference$lambda$0(Landroidx/work/impl/model/PreferenceDao_Impl;Landroidx/work/impl/model/Preference;Landroidx/sqlite/SQLiteConnection;)Lkotlin/Unit;
+SPLandroidx/work/impl/model/PreferenceDao_Impl;->insertPreference(Landroidx/work/impl/model/Preference;)V
+Landroidx/work/impl/model/PreferenceDao_Impl$$ExternalSyntheticLambda0;
+SPLandroidx/work/impl/model/PreferenceDao_Impl$$ExternalSyntheticLambda0;-><init>(Landroidx/work/impl/model/PreferenceDao_Impl;Landroidx/work/impl/model/Preference;)V
+SPLandroidx/work/impl/model/PreferenceDao_Impl$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/model/PreferenceDao_Impl$$ExternalSyntheticLambda2;
+SPLandroidx/work/impl/model/PreferenceDao_Impl$$ExternalSyntheticLambda2;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+SPLandroidx/work/impl/model/PreferenceDao_Impl$$ExternalSyntheticLambda2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/model/PreferenceDao_Impl$1;
+SPLandroidx/work/impl/model/PreferenceDao_Impl$1;-><init>()V
+SPLandroidx/work/impl/model/PreferenceDao_Impl$1;->bind(Landroidx/sqlite/SQLiteStatement;Landroidx/work/impl/model/Preference;)V
+SPLandroidx/work/impl/model/PreferenceDao_Impl$1;->bind(Landroidx/sqlite/SQLiteStatement;Ljava/lang/Object;)V
+SPLandroidx/work/impl/model/PreferenceDao_Impl$1;->createQuery()Ljava/lang/String;
+Landroidx/work/impl/model/PreferenceDao_Impl$Companion;
+SPLandroidx/work/impl/model/PreferenceDao_Impl$Companion;-><init>()V
+SPLandroidx/work/impl/model/PreferenceDao_Impl$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/work/impl/model/PreferenceDao_Impl$Companion;->getRequiredConverters()Ljava/util/List;
+Landroidx/work/impl/model/RawWorkInfoDao;
+Landroidx/work/impl/model/RawWorkInfoDao_Impl;
+SPLandroidx/work/impl/model/RawWorkInfoDao_Impl;-><clinit>()V
+Landroidx/work/impl/model/RawWorkInfoDao_Impl$Companion;
+SPLandroidx/work/impl/model/RawWorkInfoDao_Impl$Companion;-><init>()V
+SPLandroidx/work/impl/model/RawWorkInfoDao_Impl$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/work/impl/model/RawWorkInfoDao_Impl$Companion;->getRequiredConverters()Ljava/util/List;
+Landroidx/work/impl/model/SystemIdInfoDao;
+Landroidx/work/impl/model/SystemIdInfoDao_Impl;
+SPLandroidx/work/impl/model/SystemIdInfoDao_Impl;-><clinit>()V
+SPLandroidx/work/impl/model/SystemIdInfoDao_Impl;-><init>(Landroidx/room/RoomDatabase;)V
+SPLandroidx/work/impl/model/SystemIdInfoDao_Impl;->getWorkSpecIds$lambda$0(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
+SPLandroidx/work/impl/model/SystemIdInfoDao_Impl;->getWorkSpecIds()Ljava/util/List;
+Landroidx/work/impl/model/SystemIdInfoDao_Impl$$ExternalSyntheticLambda1;
+SPLandroidx/work/impl/model/SystemIdInfoDao_Impl$$ExternalSyntheticLambda1;-><init>(Ljava/lang/String;)V
+SPLandroidx/work/impl/model/SystemIdInfoDao_Impl$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/model/SystemIdInfoDao_Impl$1;
+SPLandroidx/work/impl/model/SystemIdInfoDao_Impl$1;-><init>()V
+Landroidx/work/impl/model/SystemIdInfoDao_Impl$Companion;
+SPLandroidx/work/impl/model/SystemIdInfoDao_Impl$Companion;-><init>()V
+SPLandroidx/work/impl/model/SystemIdInfoDao_Impl$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/work/impl/model/SystemIdInfoDao_Impl$Companion;->getRequiredConverters()Ljava/util/List;
+Landroidx/work/impl/model/WorkNameDao;
+Landroidx/work/impl/model/WorkNameDao_Impl;
+SPLandroidx/work/impl/model/WorkNameDao_Impl;-><clinit>()V
+Landroidx/work/impl/model/WorkNameDao_Impl$Companion;
+SPLandroidx/work/impl/model/WorkNameDao_Impl$Companion;-><init>()V
+SPLandroidx/work/impl/model/WorkNameDao_Impl$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/work/impl/model/WorkNameDao_Impl$Companion;->getRequiredConverters()Ljava/util/List;
+Landroidx/work/impl/model/WorkProgressDao;
+Landroidx/work/impl/model/WorkProgressDao_Impl;
+SPLandroidx/work/impl/model/WorkProgressDao_Impl;-><clinit>()V
+SPLandroidx/work/impl/model/WorkProgressDao_Impl;-><init>(Landroidx/room/RoomDatabase;)V
+SPLandroidx/work/impl/model/WorkProgressDao_Impl;->deleteAll$lambda$0(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Lkotlin/Unit;
+SPLandroidx/work/impl/model/WorkProgressDao_Impl;->deleteAll()V
+Landroidx/work/impl/model/WorkProgressDao_Impl$$ExternalSyntheticLambda1;
+SPLandroidx/work/impl/model/WorkProgressDao_Impl$$ExternalSyntheticLambda1;-><init>(Ljava/lang/String;)V
+SPLandroidx/work/impl/model/WorkProgressDao_Impl$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/model/WorkProgressDao_Impl$1;
+SPLandroidx/work/impl/model/WorkProgressDao_Impl$1;-><init>()V
+Landroidx/work/impl/model/WorkProgressDao_Impl$Companion;
+SPLandroidx/work/impl/model/WorkProgressDao_Impl$Companion;-><init>()V
+SPLandroidx/work/impl/model/WorkProgressDao_Impl$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/work/impl/model/WorkProgressDao_Impl$Companion;->getRequiredConverters()Ljava/util/List;
+Landroidx/work/impl/model/WorkSpecDao;
+Landroidx/work/impl/model/WorkSpecDaoKt;
+SPLandroidx/work/impl/model/WorkSpecDaoKt;->dedup(Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/CoroutineDispatcher;)Lkotlinx/coroutines/flow/Flow;
+SPLandroidx/work/impl/model/WorkSpecDaoKt;->getWorkStatusPojoFlowForName(Landroidx/work/impl/model/WorkSpecDao;Lkotlinx/coroutines/CoroutineDispatcher;Ljava/lang/String;)Lkotlinx/coroutines/flow/Flow;
+Landroidx/work/impl/model/WorkSpecDaoKt$dedup$$inlined$map$1;
+SPLandroidx/work/impl/model/WorkSpecDaoKt$dedup$$inlined$map$1;-><init>(Lkotlinx/coroutines/flow/Flow;)V
+SPLandroidx/work/impl/model/WorkSpecDaoKt$dedup$$inlined$map$1;->collect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Landroidx/work/impl/model/WorkSpecDaoKt$dedup$$inlined$map$1$2;
+SPLandroidx/work/impl/model/WorkSpecDaoKt$dedup$$inlined$map$1$2;-><init>(Lkotlinx/coroutines/flow/FlowCollector;)V
+SPLandroidx/work/impl/model/WorkSpecDaoKt$dedup$$inlined$map$1$2;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Landroidx/work/impl/model/WorkSpecDaoKt$dedup$$inlined$map$1$2$1;
+SPLandroidx/work/impl/model/WorkSpecDaoKt$dedup$$inlined$map$1$2$1;-><init>(Landroidx/work/impl/model/WorkSpecDaoKt$dedup$$inlined$map$1$2;Lkotlin/coroutines/Continuation;)V
+Landroidx/work/impl/model/WorkSpecDao_Impl;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;-><clinit>()V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;-><init>(Landroidx/room/RoomDatabase;)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->__fetchRelationshipWorkProgressAsandroidxWorkData(Landroidx/sqlite/SQLiteConnection;Landroidx/collection/ArrayMap;)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->__fetchRelationshipWorkTagAsjavaLangString(Landroidx/sqlite/SQLiteConnection;Landroidx/collection/ArrayMap;)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getAllEligibleWorkSpecsForScheduling$lambda$0(Ljava/lang/String;ILandroidx/sqlite/SQLiteConnection;)Ljava/util/List;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getAllEligibleWorkSpecsForScheduling(I)Ljava/util/List;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getEligibleWorkForScheduling$lambda$0(Ljava/lang/String;ILandroidx/sqlite/SQLiteConnection;)Ljava/util/List;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getEligibleWorkForScheduling(I)Ljava/util/List;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getEligibleWorkForSchedulingWithContentUris$lambda$0(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getEligibleWorkForSchedulingWithContentUris()Ljava/util/List;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getRunningWork$lambda$0(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getRunningWork()Ljava/util/List;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getUnfinishedWorkWithName$lambda$0(Ljava/lang/String;Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getUnfinishedWorkWithName(Ljava/lang/String;)Ljava/util/List;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getWorkStatusPojoFlowForName$lambda$0(Ljava/lang/String;Ljava/lang/String;Landroidx/work/impl/model/WorkSpecDao_Impl;Landroidx/sqlite/SQLiteConnection;)Ljava/util/List;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->getWorkStatusPojoFlowForName(Ljava/lang/String;)Lkotlinx/coroutines/flow/Flow;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->hasUnfinishedWorkFlow$lambda$0(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)Z
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->hasUnfinishedWorkFlow()Lkotlinx/coroutines/flow/Flow;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->resetScheduledState$lambda$0(Ljava/lang/String;Landroidx/sqlite/SQLiteConnection;)I
+SPLandroidx/work/impl/model/WorkSpecDao_Impl;->resetScheduledState()I
+Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda13;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda13;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda13;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda23;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda23;-><init>(Ljava/lang/String;I)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda23;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda37;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda37;-><init>(Ljava/lang/String;)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda37;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda40;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda40;-><init>(Ljava/lang/String;Ljava/lang/String;Landroidx/work/impl/model/WorkSpecDao_Impl;)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda40;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda48;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda48;-><init>(Ljava/lang/String;)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda48;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda7;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda7;-><init>(Ljava/lang/String;)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda7;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda8;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda8;-><init>(Ljava/lang/String;I)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda8;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda9;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda9;-><init>(Ljava/lang/String;)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$$ExternalSyntheticLambda9;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/model/WorkSpecDao_Impl$1;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$1;-><init>()V
+Landroidx/work/impl/model/WorkSpecDao_Impl$2;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$2;-><init>()V
+Landroidx/work/impl/model/WorkSpecDao_Impl$Companion;
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$Companion;-><init>()V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/work/impl/model/WorkSpecDao_Impl$Companion;->getRequiredConverters()Ljava/util/List;
+Landroidx/work/impl/model/WorkTagDao;
+Landroidx/work/impl/model/WorkTagDao_Impl;
+SPLandroidx/work/impl/model/WorkTagDao_Impl;-><clinit>()V
+Landroidx/work/impl/model/WorkTagDao_Impl$Companion;
+SPLandroidx/work/impl/model/WorkTagDao_Impl$Companion;-><init>()V
+SPLandroidx/work/impl/model/WorkTagDao_Impl$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLandroidx/work/impl/model/WorkTagDao_Impl$Companion;->getRequiredConverters()Ljava/util/List;
+Landroidx/work/impl/utils/Api28Impl;
+SPLandroidx/work/impl/utils/Api28Impl;-><clinit>()V
+SPLandroidx/work/impl/utils/Api28Impl;-><init>()V
+SPLandroidx/work/impl/utils/Api28Impl;->getProcessName()Ljava/lang/String;
+Landroidx/work/impl/utils/CancelWorkRunnable;
+SPLandroidx/work/impl/utils/CancelWorkRunnable;->forName$lambda$0(Ljava/lang/String;Landroidx/work/impl/WorkManagerImpl;)Lkotlin/Unit;
+SPLandroidx/work/impl/utils/CancelWorkRunnable;->forName(Ljava/lang/String;Landroidx/work/impl/WorkManagerImpl;)Landroidx/work/Operation;
+SPLandroidx/work/impl/utils/CancelWorkRunnable;->forNameInline$lambda$0(Landroidx/work/impl/WorkDatabase;Ljava/lang/String;Landroidx/work/impl/WorkManagerImpl;)V
+SPLandroidx/work/impl/utils/CancelWorkRunnable;->forNameInline(Ljava/lang/String;Landroidx/work/impl/WorkManagerImpl;)V
+SPLandroidx/work/impl/utils/CancelWorkRunnable;->reschedulePendingWorkers(Landroidx/work/impl/WorkManagerImpl;)V
+Landroidx/work/impl/utils/CancelWorkRunnable$$ExternalSyntheticLambda0;
+SPLandroidx/work/impl/utils/CancelWorkRunnable$$ExternalSyntheticLambda0;-><init>(Landroidx/work/impl/WorkDatabase;Ljava/lang/String;Landroidx/work/impl/WorkManagerImpl;)V
+SPLandroidx/work/impl/utils/CancelWorkRunnable$$ExternalSyntheticLambda0;->run()V
+Landroidx/work/impl/utils/CancelWorkRunnable$$ExternalSyntheticLambda3;
+SPLandroidx/work/impl/utils/CancelWorkRunnable$$ExternalSyntheticLambda3;-><init>(Ljava/lang/String;Landroidx/work/impl/WorkManagerImpl;)V
+SPLandroidx/work/impl/utils/CancelWorkRunnable$$ExternalSyntheticLambda3;->invoke()Ljava/lang/Object;
+Landroidx/work/impl/utils/ForceStopRunnable;
+SPLandroidx/work/impl/utils/ForceStopRunnable;-><clinit>()V
+SPLandroidx/work/impl/utils/ForceStopRunnable;-><init>(Landroid/content/Context;Landroidx/work/impl/WorkManagerImpl;)V
+SPLandroidx/work/impl/utils/ForceStopRunnable;->cleanUp()Z
+SPLandroidx/work/impl/utils/ForceStopRunnable;->forceStopRunnable()V
+SPLandroidx/work/impl/utils/ForceStopRunnable;->getIntent(Landroid/content/Context;)Landroid/content/Intent;
+SPLandroidx/work/impl/utils/ForceStopRunnable;->getPendingIntent(Landroid/content/Context;I)Landroid/app/PendingIntent;
+SPLandroidx/work/impl/utils/ForceStopRunnable;->isForceStopped()Z
+SPLandroidx/work/impl/utils/ForceStopRunnable;->multiProcessChecks()Z
+SPLandroidx/work/impl/utils/ForceStopRunnable;->run()V
+SPLandroidx/work/impl/utils/ForceStopRunnable;->shouldRescheduleWorkers()Z
+Landroidx/work/impl/utils/ForceStopRunnable$BroadcastReceiver;
+Landroidx/work/impl/utils/PackageManagerHelper;
+SPLandroidx/work/impl/utils/PackageManagerHelper;-><clinit>()V
+SPLandroidx/work/impl/utils/PackageManagerHelper;->access$isReceiverEnabled(Landroid/content/pm/PackageManager;Landroid/content/ComponentName;)Z
+SPLandroidx/work/impl/utils/PackageManagerHelper;->access$isServiceEnabled(Landroid/content/pm/PackageManager;Landroid/content/ComponentName;)Z
+SPLandroidx/work/impl/utils/PackageManagerHelper;->isReceiverEnabled(Landroid/content/pm/PackageManager;Landroid/content/ComponentName;)Z
+SPLandroidx/work/impl/utils/PackageManagerHelper;->isServiceEnabled(Landroid/content/pm/PackageManager;Landroid/content/ComponentName;)Z
+SPLandroidx/work/impl/utils/PackageManagerHelper;->setComponentEnabled(Landroid/content/pm/PackageManager;Landroid/content/ComponentName;ZLkotlin/jvm/functions/Function2;)V
+SPLandroidx/work/impl/utils/PackageManagerHelper;->setReceiverEnabled(Landroid/content/Context;Ljava/lang/Class;Z)V
+SPLandroidx/work/impl/utils/PackageManagerHelper;->setServiceEnabled(Landroid/content/Context;Ljava/lang/Class;Z)V
+Landroidx/work/impl/utils/PackageManagerHelper$setReceiverEnabled$1;
+SPLandroidx/work/impl/utils/PackageManagerHelper$setReceiverEnabled$1;-><clinit>()V
+SPLandroidx/work/impl/utils/PackageManagerHelper$setReceiverEnabled$1;-><init>()V
+SPLandroidx/work/impl/utils/PackageManagerHelper$setReceiverEnabled$1;->invoke(Landroid/content/pm/PackageManager;Landroid/content/ComponentName;)Ljava/lang/Boolean;
+SPLandroidx/work/impl/utils/PackageManagerHelper$setReceiverEnabled$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/utils/PackageManagerHelper$setServiceEnabled$1;
+SPLandroidx/work/impl/utils/PackageManagerHelper$setServiceEnabled$1;-><clinit>()V
+SPLandroidx/work/impl/utils/PackageManagerHelper$setServiceEnabled$1;-><init>()V
+SPLandroidx/work/impl/utils/PackageManagerHelper$setServiceEnabled$1;->invoke(Landroid/content/pm/PackageManager;Landroid/content/ComponentName;)Ljava/lang/Boolean;
+SPLandroidx/work/impl/utils/PackageManagerHelper$setServiceEnabled$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Landroidx/work/impl/utils/PreferenceUtils;
+SPLandroidx/work/impl/utils/PreferenceUtils;-><init>(Landroidx/work/impl/WorkDatabase;)V
+SPLandroidx/work/impl/utils/PreferenceUtils;->getLastForceStopEventMillis()J
+SPLandroidx/work/impl/utils/PreferenceUtils;->getNeedsReschedule()Z
+SPLandroidx/work/impl/utils/PreferenceUtils;->setLastForceStopEventMillis(J)V
+Landroidx/work/impl/utils/ProcessUtils;
+SPLandroidx/work/impl/utils/ProcessUtils;-><clinit>()V
+SPLandroidx/work/impl/utils/ProcessUtils;->getProcessName(Landroid/content/Context;)Ljava/lang/String;
+SPLandroidx/work/impl/utils/ProcessUtils;->isDefaultProcess(Landroid/content/Context;Landroidx/work/Configuration;)Z
+Landroidx/work/impl/utils/SerialExecutorImpl;
+SPLandroidx/work/impl/utils/SerialExecutorImpl;-><clinit>()V
+SPLandroidx/work/impl/utils/SerialExecutorImpl;-><init>(Ljava/util/concurrent/Executor;)V
+SPLandroidx/work/impl/utils/SerialExecutorImpl;->execute(Ljava/lang/Runnable;)V
+SPLandroidx/work/impl/utils/SerialExecutorImpl;->scheduleNext()V
+Landroidx/work/impl/utils/SerialExecutorImpl$Task;
+SPLandroidx/work/impl/utils/SerialExecutorImpl$Task;-><init>(Landroidx/work/impl/utils/SerialExecutorImpl;Ljava/lang/Runnable;)V
+SPLandroidx/work/impl/utils/SerialExecutorImpl$Task;->run()V
+Landroidx/work/impl/utils/taskexecutor/SerialExecutor;
+Landroidx/work/impl/utils/taskexecutor/TaskExecutor;
+SPLandroidx/work/impl/utils/taskexecutor/TaskExecutor;->executeOnTaskThread(Ljava/lang/Runnable;)V
+Landroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor;
+SPLandroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor;-><init>(Ljava/util/concurrent/Executor;)V
+SPLandroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor;->getCoroutineScope()Lkotlinx/coroutines/CoroutineScope;
+SPLandroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor;->getSerialTaskExecutor()Landroidx/work/impl/utils/SerialExecutorImpl;
+SPLandroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor;->getSerialTaskExecutor()Landroidx/work/impl/utils/taskexecutor/SerialExecutor;
+SPLandroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor;->getTaskCoroutineDispatcher()Lkotlinx/coroutines/CoroutineDispatcher;
+Landroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor$1;
+SPLandroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor$1;-><init>(Landroidx/work/impl/utils/taskexecutor/WorkManagerTaskExecutor;)V
+Lanki/ankidroid/DbResponse;
+SPLanki/ankidroid/DbResponse;-><clinit>()V
+SPLanki/ankidroid/DbResponse;-><init>()V
+SPLanki/ankidroid/DbResponse;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/ankidroid/DbResponse;->getResult()Lanki/ankidroid/DbResult;
+SPLanki/ankidroid/DbResponse;->getRowCount()I
+SPLanki/ankidroid/DbResponse;->getSequenceNumber()I
+SPLanki/ankidroid/DbResponse;->getStartIndex()J
+SPLanki/ankidroid/DbResponse;->parseFrom([B)Lanki/ankidroid/DbResponse;
+Lanki/ankidroid/DbResponse$1;
+SPLanki/ankidroid/DbResponse$1;-><clinit>()V
+Lanki/ankidroid/DbResponseOrBuilder;
+Lanki/ankidroid/DbResult;
+SPLanki/ankidroid/DbResult;-><clinit>()V
+SPLanki/ankidroid/DbResult;-><init>()V
+SPLanki/ankidroid/DbResult;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/ankidroid/DbResult;->getRows(I)Lanki/ankidroid/Row;
+SPLanki/ankidroid/DbResult;->getRowsCount()I
+Lanki/ankidroid/DbResult$1;
+SPLanki/ankidroid/DbResult$1;-><clinit>()V
+Lanki/ankidroid/DbResultOrBuilder;
+Lanki/ankidroid/Row;
+SPLanki/ankidroid/Row;-><clinit>()V
+SPLanki/ankidroid/Row;-><init>()V
+SPLanki/ankidroid/Row;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/ankidroid/Row;->getFields(I)Lanki/ankidroid/SqlValue;
+Lanki/ankidroid/Row$1;
+SPLanki/ankidroid/Row$1;-><clinit>()V
+Lanki/ankidroid/RowOrBuilder;
+Lanki/ankidroid/SqlValue;
+SPLanki/ankidroid/SqlValue;-><clinit>()V
+SPLanki/ankidroid/SqlValue;-><init>()V
+SPLanki/ankidroid/SqlValue;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/ankidroid/SqlValue;->getDataCase()Lanki/ankidroid/SqlValue$DataCase;
+SPLanki/ankidroid/SqlValue;->getLongValue()J
+Lanki/ankidroid/SqlValue$1;
+SPLanki/ankidroid/SqlValue$1;-><clinit>()V
+Lanki/ankidroid/SqlValue$DataCase;
+SPLanki/ankidroid/SqlValue$DataCase;->$values()[Lanki/ankidroid/SqlValue$DataCase;
+SPLanki/ankidroid/SqlValue$DataCase;-><clinit>()V
+SPLanki/ankidroid/SqlValue$DataCase;-><init>(Ljava/lang/String;II)V
+SPLanki/ankidroid/SqlValue$DataCase;->forNumber(I)Lanki/ankidroid/SqlValue$DataCase;
+SPLanki/ankidroid/SqlValue$DataCase;->values()[Lanki/ankidroid/SqlValue$DataCase;
+Lanki/ankidroid/SqlValueOrBuilder;
+Lanki/backend/BackendError;
+SPLanki/backend/BackendError;-><clinit>()V
+SPLanki/backend/BackendError;-><init>()V
+SPLanki/backend/BackendError;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/backend/BackendError;->getKind()Lanki/backend/BackendError$Kind;
+SPLanki/backend/BackendError;->getMessage()Ljava/lang/String;
+SPLanki/backend/BackendError;->parseFrom([B)Lanki/backend/BackendError;
+Lanki/backend/BackendError$1;
+SPLanki/backend/BackendError$1;-><clinit>()V
+Lanki/backend/BackendError$Kind;
+SPLanki/backend/BackendError$Kind;->$values()[Lanki/backend/BackendError$Kind;
+SPLanki/backend/BackendError$Kind;-><clinit>()V
+SPLanki/backend/BackendError$Kind;-><init>(Ljava/lang/String;II)V
+SPLanki/backend/BackendError$Kind;->forNumber(I)Lanki/backend/BackendError$Kind;
+SPLanki/backend/BackendError$Kind;->values()[Lanki/backend/BackendError$Kind;
+Lanki/backend/BackendError$Kind$1;
+SPLanki/backend/BackendError$Kind$1;-><init>()V
+Lanki/backend/BackendErrorOrBuilder;
+Lanki/backend/BackendInit;
+SPLanki/backend/BackendInit;->-$$Nest$maddAllPreferredLangs(Lanki/backend/BackendInit;Ljava/lang/Iterable;)V
+SPLanki/backend/BackendInit;->-$$Nest$sfgetDEFAULT_INSTANCE()Lanki/backend/BackendInit;
+SPLanki/backend/BackendInit;-><clinit>()V
+SPLanki/backend/BackendInit;-><init>()V
+SPLanki/backend/BackendInit;->addAllPreferredLangs(Ljava/lang/Iterable;)V
+SPLanki/backend/BackendInit;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/backend/BackendInit;->ensurePreferredLangsIsMutable()V
+SPLanki/backend/BackendInit;->newBuilder()Lanki/backend/BackendInit$Builder;
+Lanki/backend/BackendInit$1;
+SPLanki/backend/BackendInit$1;-><clinit>()V
+Lanki/backend/BackendInit$Builder;
+SPLanki/backend/BackendInit$Builder;-><init>()V
+SPLanki/backend/BackendInit$Builder;-><init>(Lanki/backend/BackendInit-IA;)V
+SPLanki/backend/BackendInit$Builder;->addAllPreferredLangs(Ljava/lang/Iterable;)Lanki/backend/BackendInit$Builder;
+Lanki/backend/BackendInitOrBuilder;
+Lanki/backend/GeneratedBackend;
+SPLanki/backend/GeneratedBackend;-><init>()V
+SPLanki/backend/GeneratedBackend;->awaitBackupCompletion()V
+SPLanki/backend/GeneratedBackend;->awaitBackupCompletionRaw([B)[B
+SPLanki/backend/GeneratedBackend;->createBackup(Ljava/lang/String;ZZ)Z
+SPLanki/backend/GeneratedBackend;->createBackupRaw([B)[B
+SPLanki/backend/GeneratedBackend;->deckTree(J)Lanki/decks/DeckTreeNode;
+SPLanki/backend/GeneratedBackend;->deckTreeRaw([B)[B
+SPLanki/backend/GeneratedBackend;->flushQuery(I)V
+SPLanki/backend/GeneratedBackend;->flushQueryRaw([B)[B
+SPLanki/backend/GeneratedBackend;->getConfigBool(Lanki/config/ConfigKey$Bool;)Z
+SPLanki/backend/GeneratedBackend;->getConfigBoolRaw([B)[B
+SPLanki/backend/GeneratedBackend;->getConfigJson(Ljava/lang/String;)Lcom/google/protobuf/ByteString;
+SPLanki/backend/GeneratedBackend;->getConfigJsonRaw([B)[B
+SPLanki/backend/GeneratedBackend;->getCurrentDeck()Lanki/decks/Deck;
+SPLanki/backend/GeneratedBackend;->getCurrentDeckRaw([B)[B
+SPLanki/backend/GeneratedBackend;->getDeckLegacy(J)Lcom/google/protobuf/ByteString;
+SPLanki/backend/GeneratedBackend;->getDeckLegacyRaw([B)[B
+SPLanki/backend/GeneratedBackend;->getDeckNames(ZZ)Ljava/util/List;
+SPLanki/backend/GeneratedBackend;->getDeckNamesRaw([B)[B
+SPLanki/backend/GeneratedBackend;->getUndoStatus()Lanki/collection/UndoStatus;
+SPLanki/backend/GeneratedBackend;->getUndoStatusRaw([B)[B
+SPLanki/backend/GeneratedBackend;->i18nResources(Ljava/lang/Iterable;)Lcom/google/protobuf/ByteString;
+SPLanki/backend/GeneratedBackend;->i18nResourcesRaw([B)[B
+SPLanki/backend/GeneratedBackend;->openCollection(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+SPLanki/backend/GeneratedBackend;->openCollectionRaw([B)[B
+SPLanki/backend/GeneratedBackend;->runDbCommandProto(Lcom/google/protobuf/ByteString;)Lanki/ankidroid/DbResponse;
+SPLanki/backend/GeneratedBackend;->runDbCommandProtoRaw([B)[B
+SPLanki/backend/GeneratedBackend;->schedTimingToday()Lanki/scheduler/SchedTimingTodayResponse;
+SPLanki/backend/GeneratedBackend;->schedTimingTodayRaw([B)[B
+SPLanki/backend/GeneratedBackend;->studiedToday()Ljava/lang/String;
+SPLanki/backend/GeneratedBackend;->studiedTodayRaw([B)[B
+SPLanki/backend/GeneratedBackend;->translateStringRaw([B)[B
+Lanki/collection/CreateBackupRequest;
+SPLanki/collection/CreateBackupRequest;->-$$Nest$msetBackupFolder(Lanki/collection/CreateBackupRequest;Ljava/lang/String;)V
+SPLanki/collection/CreateBackupRequest;->-$$Nest$msetForce(Lanki/collection/CreateBackupRequest;Z)V
+SPLanki/collection/CreateBackupRequest;->-$$Nest$msetWaitForCompletion(Lanki/collection/CreateBackupRequest;Z)V
+SPLanki/collection/CreateBackupRequest;->-$$Nest$sfgetDEFAULT_INSTANCE()Lanki/collection/CreateBackupRequest;
+SPLanki/collection/CreateBackupRequest;-><clinit>()V
+SPLanki/collection/CreateBackupRequest;-><init>()V
+SPLanki/collection/CreateBackupRequest;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/collection/CreateBackupRequest;->newBuilder()Lanki/collection/CreateBackupRequest$Builder;
+SPLanki/collection/CreateBackupRequest;->setBackupFolder(Ljava/lang/String;)V
+SPLanki/collection/CreateBackupRequest;->setForce(Z)V
+SPLanki/collection/CreateBackupRequest;->setWaitForCompletion(Z)V
+Lanki/collection/CreateBackupRequest$1;
+SPLanki/collection/CreateBackupRequest$1;-><clinit>()V
+Lanki/collection/CreateBackupRequest$Builder;
+SPLanki/collection/CreateBackupRequest$Builder;-><init>()V
+SPLanki/collection/CreateBackupRequest$Builder;-><init>(Lanki/collection/CreateBackupRequest-IA;)V
+SPLanki/collection/CreateBackupRequest$Builder;->setBackupFolder(Ljava/lang/String;)Lanki/collection/CreateBackupRequest$Builder;
+SPLanki/collection/CreateBackupRequest$Builder;->setForce(Z)Lanki/collection/CreateBackupRequest$Builder;
+SPLanki/collection/CreateBackupRequest$Builder;->setWaitForCompletion(Z)Lanki/collection/CreateBackupRequest$Builder;
+Lanki/collection/CreateBackupRequestOrBuilder;
+Lanki/collection/OpChanges;
+SPLanki/collection/OpChanges;->-$$Nest$msetBrowserSidebar(Lanki/collection/OpChanges;Z)V
+SPLanki/collection/OpChanges;->-$$Nest$msetBrowserTable(Lanki/collection/OpChanges;Z)V
+SPLanki/collection/OpChanges;->-$$Nest$msetCard(Lanki/collection/OpChanges;Z)V
+SPLanki/collection/OpChanges;->-$$Nest$msetConfig(Lanki/collection/OpChanges;Z)V
+SPLanki/collection/OpChanges;->-$$Nest$msetDeck(Lanki/collection/OpChanges;Z)V
+SPLanki/collection/OpChanges;->-$$Nest$msetDeckConfig(Lanki/collection/OpChanges;Z)V
+SPLanki/collection/OpChanges;->-$$Nest$msetMtime(Lanki/collection/OpChanges;Z)V
+SPLanki/collection/OpChanges;->-$$Nest$msetNote(Lanki/collection/OpChanges;Z)V
+SPLanki/collection/OpChanges;->-$$Nest$msetNoteText(Lanki/collection/OpChanges;Z)V
+SPLanki/collection/OpChanges;->-$$Nest$msetNotetype(Lanki/collection/OpChanges;Z)V
+SPLanki/collection/OpChanges;->-$$Nest$msetStudyQueues(Lanki/collection/OpChanges;Z)V
+SPLanki/collection/OpChanges;->-$$Nest$msetTag(Lanki/collection/OpChanges;Z)V
+SPLanki/collection/OpChanges;->-$$Nest$sfgetDEFAULT_INSTANCE()Lanki/collection/OpChanges;
+SPLanki/collection/OpChanges;-><clinit>()V
+SPLanki/collection/OpChanges;-><init>()V
+SPLanki/collection/OpChanges;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/collection/OpChanges;->newBuilder()Lanki/collection/OpChanges$Builder;
+SPLanki/collection/OpChanges;->setBrowserSidebar(Z)V
+SPLanki/collection/OpChanges;->setBrowserTable(Z)V
+SPLanki/collection/OpChanges;->setCard(Z)V
+SPLanki/collection/OpChanges;->setConfig(Z)V
+SPLanki/collection/OpChanges;->setDeck(Z)V
+SPLanki/collection/OpChanges;->setDeckConfig(Z)V
+SPLanki/collection/OpChanges;->setMtime(Z)V
+SPLanki/collection/OpChanges;->setNote(Z)V
+SPLanki/collection/OpChanges;->setNoteText(Z)V
+SPLanki/collection/OpChanges;->setNotetype(Z)V
+SPLanki/collection/OpChanges;->setStudyQueues(Z)V
+SPLanki/collection/OpChanges;->setTag(Z)V
+Lanki/collection/OpChanges$1;
+SPLanki/collection/OpChanges$1;-><clinit>()V
+Lanki/collection/OpChanges$Builder;
+SPLanki/collection/OpChanges$Builder;-><init>()V
+SPLanki/collection/OpChanges$Builder;-><init>(Lanki/collection/OpChanges-IA;)V
+SPLanki/collection/OpChanges$Builder;->setBrowserSidebar(Z)Lanki/collection/OpChanges$Builder;
+SPLanki/collection/OpChanges$Builder;->setBrowserTable(Z)Lanki/collection/OpChanges$Builder;
+SPLanki/collection/OpChanges$Builder;->setCard(Z)Lanki/collection/OpChanges$Builder;
+SPLanki/collection/OpChanges$Builder;->setConfig(Z)Lanki/collection/OpChanges$Builder;
+SPLanki/collection/OpChanges$Builder;->setDeck(Z)Lanki/collection/OpChanges$Builder;
+SPLanki/collection/OpChanges$Builder;->setDeckConfig(Z)Lanki/collection/OpChanges$Builder;
+SPLanki/collection/OpChanges$Builder;->setMtime(Z)Lanki/collection/OpChanges$Builder;
+SPLanki/collection/OpChanges$Builder;->setNote(Z)Lanki/collection/OpChanges$Builder;
+SPLanki/collection/OpChanges$Builder;->setNoteText(Z)Lanki/collection/OpChanges$Builder;
+SPLanki/collection/OpChanges$Builder;->setNotetype(Z)Lanki/collection/OpChanges$Builder;
+SPLanki/collection/OpChanges$Builder;->setStudyQueues(Z)Lanki/collection/OpChanges$Builder;
+SPLanki/collection/OpChanges$Builder;->setTag(Z)Lanki/collection/OpChanges$Builder;
+Lanki/collection/OpChangesKt$Dsl;
+SPLanki/collection/OpChangesKt$Dsl;-><clinit>()V
+SPLanki/collection/OpChangesKt$Dsl;-><init>(Lanki/collection/OpChanges$Builder;)V
+SPLanki/collection/OpChangesKt$Dsl;-><init>(Lanki/collection/OpChanges$Builder;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLanki/collection/OpChangesKt$Dsl;->_build()Lanki/collection/OpChanges;
+SPLanki/collection/OpChangesKt$Dsl;->setBrowserSidebar(Z)V
+SPLanki/collection/OpChangesKt$Dsl;->setBrowserTable(Z)V
+SPLanki/collection/OpChangesKt$Dsl;->setCard(Z)V
+SPLanki/collection/OpChangesKt$Dsl;->setConfig(Z)V
+SPLanki/collection/OpChangesKt$Dsl;->setDeck(Z)V
+SPLanki/collection/OpChangesKt$Dsl;->setDeckConfig(Z)V
+SPLanki/collection/OpChangesKt$Dsl;->setMtime(Z)V
+SPLanki/collection/OpChangesKt$Dsl;->setNote(Z)V
+SPLanki/collection/OpChangesKt$Dsl;->setNoteText(Z)V
+SPLanki/collection/OpChangesKt$Dsl;->setNotetype(Z)V
+SPLanki/collection/OpChangesKt$Dsl;->setStudyQueues(Z)V
+SPLanki/collection/OpChangesKt$Dsl;->setTag(Z)V
+Lanki/collection/OpChangesKt$Dsl$Companion;
+SPLanki/collection/OpChangesKt$Dsl$Companion;-><init>()V
+SPLanki/collection/OpChangesKt$Dsl$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLanki/collection/OpChangesKt$Dsl$Companion;->_create(Lanki/collection/OpChanges$Builder;)Lanki/collection/OpChangesKt$Dsl;
+Lanki/collection/OpChangesOrBuilder;
+Lanki/collection/OpenCollectionRequest;
+SPLanki/collection/OpenCollectionRequest;->-$$Nest$msetCollectionPath(Lanki/collection/OpenCollectionRequest;Ljava/lang/String;)V
+SPLanki/collection/OpenCollectionRequest;->-$$Nest$msetMediaDbPath(Lanki/collection/OpenCollectionRequest;Ljava/lang/String;)V
+SPLanki/collection/OpenCollectionRequest;->-$$Nest$msetMediaFolderPath(Lanki/collection/OpenCollectionRequest;Ljava/lang/String;)V
+SPLanki/collection/OpenCollectionRequest;->-$$Nest$sfgetDEFAULT_INSTANCE()Lanki/collection/OpenCollectionRequest;
+SPLanki/collection/OpenCollectionRequest;-><clinit>()V
+SPLanki/collection/OpenCollectionRequest;-><init>()V
+SPLanki/collection/OpenCollectionRequest;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/collection/OpenCollectionRequest;->newBuilder()Lanki/collection/OpenCollectionRequest$Builder;
+SPLanki/collection/OpenCollectionRequest;->setCollectionPath(Ljava/lang/String;)V
+SPLanki/collection/OpenCollectionRequest;->setMediaDbPath(Ljava/lang/String;)V
+SPLanki/collection/OpenCollectionRequest;->setMediaFolderPath(Ljava/lang/String;)V
+Lanki/collection/OpenCollectionRequest$1;
+SPLanki/collection/OpenCollectionRequest$1;-><clinit>()V
+Lanki/collection/OpenCollectionRequest$Builder;
+SPLanki/collection/OpenCollectionRequest$Builder;-><init>()V
+SPLanki/collection/OpenCollectionRequest$Builder;-><init>(Lanki/collection/OpenCollectionRequest-IA;)V
+SPLanki/collection/OpenCollectionRequest$Builder;->setCollectionPath(Ljava/lang/String;)Lanki/collection/OpenCollectionRequest$Builder;
+SPLanki/collection/OpenCollectionRequest$Builder;->setMediaDbPath(Ljava/lang/String;)Lanki/collection/OpenCollectionRequest$Builder;
+SPLanki/collection/OpenCollectionRequest$Builder;->setMediaFolderPath(Ljava/lang/String;)Lanki/collection/OpenCollectionRequest$Builder;
+Lanki/collection/OpenCollectionRequestOrBuilder;
+Lanki/collection/UndoStatus;
+SPLanki/collection/UndoStatus;-><clinit>()V
+SPLanki/collection/UndoStatus;-><init>()V
+SPLanki/collection/UndoStatus;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/collection/UndoStatus;->getLastStep()I
+SPLanki/collection/UndoStatus;->getRedo()Ljava/lang/String;
+SPLanki/collection/UndoStatus;->getUndo()Ljava/lang/String;
+SPLanki/collection/UndoStatus;->parseFrom([B)Lanki/collection/UndoStatus;
+Lanki/collection/UndoStatus$1;
+SPLanki/collection/UndoStatus$1;-><clinit>()V
+Lanki/collection/UndoStatusOrBuilder;
+Lanki/config/ConfigKey$Bool;
+SPLanki/config/ConfigKey$Bool;->$values()[Lanki/config/ConfigKey$Bool;
+SPLanki/config/ConfigKey$Bool;-><clinit>()V
+SPLanki/config/ConfigKey$Bool;-><init>(Ljava/lang/String;II)V
+SPLanki/config/ConfigKey$Bool;->getNumber()I
+Lanki/config/ConfigKey$Bool$1;
+SPLanki/config/ConfigKey$Bool$1;-><init>()V
+Lanki/config/ConfigKey$String;
+SPLanki/config/ConfigKey$String;->$values()[Lanki/config/ConfigKey$String;
+SPLanki/config/ConfigKey$String;-><clinit>()V
+SPLanki/config/ConfigKey$String;-><init>(Ljava/lang/String;II)V
+Lanki/config/ConfigKey$String$1;
+SPLanki/config/ConfigKey$String$1;-><init>()V
+Lanki/config/GetConfigBoolRequest;
+SPLanki/config/GetConfigBoolRequest;->-$$Nest$msetKey(Lanki/config/GetConfigBoolRequest;Lanki/config/ConfigKey$Bool;)V
+SPLanki/config/GetConfigBoolRequest;->-$$Nest$sfgetDEFAULT_INSTANCE()Lanki/config/GetConfigBoolRequest;
+SPLanki/config/GetConfigBoolRequest;-><clinit>()V
+SPLanki/config/GetConfigBoolRequest;-><init>()V
+SPLanki/config/GetConfigBoolRequest;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/config/GetConfigBoolRequest;->newBuilder()Lanki/config/GetConfigBoolRequest$Builder;
+SPLanki/config/GetConfigBoolRequest;->setKey(Lanki/config/ConfigKey$Bool;)V
+Lanki/config/GetConfigBoolRequest$1;
+SPLanki/config/GetConfigBoolRequest$1;-><clinit>()V
+Lanki/config/GetConfigBoolRequest$Builder;
+SPLanki/config/GetConfigBoolRequest$Builder;-><init>()V
+SPLanki/config/GetConfigBoolRequest$Builder;-><init>(Lanki/config/GetConfigBoolRequest-IA;)V
+SPLanki/config/GetConfigBoolRequest$Builder;->setKey(Lanki/config/ConfigKey$Bool;)Lanki/config/GetConfigBoolRequest$Builder;
+Lanki/config/GetConfigBoolRequestOrBuilder;
+Lanki/decks/Deck;
+SPLanki/decks/Deck;-><clinit>()V
+SPLanki/decks/Deck;-><init>()V
+SPLanki/decks/Deck;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/decks/Deck;->getId()J
+SPLanki/decks/Deck;->parseFrom([B)Lanki/decks/Deck;
+Lanki/decks/Deck$1;
+SPLanki/decks/Deck$1;-><clinit>()V
+Lanki/decks/Deck$Common;
+SPLanki/decks/Deck$Common;-><clinit>()V
+SPLanki/decks/Deck$Common;-><init>()V
+SPLanki/decks/Deck$Common;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Lanki/decks/Deck$CommonOrBuilder;
+Lanki/decks/Deck$Filtered;
+Lanki/decks/Deck$FilteredOrBuilder;
+Lanki/decks/Deck$Normal;
+SPLanki/decks/Deck$Normal;-><clinit>()V
+SPLanki/decks/Deck$Normal;-><init>()V
+SPLanki/decks/Deck$Normal;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Lanki/decks/Deck$Normal$DayLimit;
+Lanki/decks/Deck$Normal$DayLimitOrBuilder;
+Lanki/decks/Deck$NormalOrBuilder;
+Lanki/decks/DeckId;
+SPLanki/decks/DeckId;->-$$Nest$msetDid(Lanki/decks/DeckId;J)V
+SPLanki/decks/DeckId;->-$$Nest$sfgetDEFAULT_INSTANCE()Lanki/decks/DeckId;
+SPLanki/decks/DeckId;-><clinit>()V
+SPLanki/decks/DeckId;-><init>()V
+SPLanki/decks/DeckId;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/decks/DeckId;->newBuilder()Lanki/decks/DeckId$Builder;
+SPLanki/decks/DeckId;->setDid(J)V
+Lanki/decks/DeckId$1;
+SPLanki/decks/DeckId$1;-><clinit>()V
+Lanki/decks/DeckId$Builder;
+SPLanki/decks/DeckId$Builder;-><init>()V
+SPLanki/decks/DeckId$Builder;-><init>(Lanki/decks/DeckId-IA;)V
+SPLanki/decks/DeckId$Builder;->setDid(J)Lanki/decks/DeckId$Builder;
+Lanki/decks/DeckIdOrBuilder;
+Lanki/decks/DeckNameId;
+SPLanki/decks/DeckNameId;-><clinit>()V
+SPLanki/decks/DeckNameId;-><init>()V
+SPLanki/decks/DeckNameId;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/decks/DeckNameId;->getId()J
+SPLanki/decks/DeckNameId;->getName()Ljava/lang/String;
+Lanki/decks/DeckNameId$1;
+SPLanki/decks/DeckNameId$1;-><clinit>()V
+Lanki/decks/DeckNameIdOrBuilder;
+Lanki/decks/DeckNames;
+SPLanki/decks/DeckNames;-><clinit>()V
+SPLanki/decks/DeckNames;-><init>()V
+SPLanki/decks/DeckNames;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/decks/DeckNames;->getEntriesList()Ljava/util/List;
+SPLanki/decks/DeckNames;->parseFrom([B)Lanki/decks/DeckNames;
+Lanki/decks/DeckNames$1;
+SPLanki/decks/DeckNames$1;-><clinit>()V
+Lanki/decks/DeckNamesOrBuilder;
+Lanki/decks/DeckOrBuilder;
+Lanki/decks/DeckTreeNode;
+SPLanki/decks/DeckTreeNode;-><clinit>()V
+SPLanki/decks/DeckTreeNode;-><init>()V
+SPLanki/decks/DeckTreeNode;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/decks/DeckTreeNode;->getChildrenList()Ljava/util/List;
+SPLanki/decks/DeckTreeNode;->getCollapsed()Z
+SPLanki/decks/DeckTreeNode;->getDeckId()J
+SPLanki/decks/DeckTreeNode;->getFiltered()Z
+SPLanki/decks/DeckTreeNode;->getLearnCount()I
+SPLanki/decks/DeckTreeNode;->getLevel()I
+SPLanki/decks/DeckTreeNode;->getName()Ljava/lang/String;
+SPLanki/decks/DeckTreeNode;->getNewCount()I
+SPLanki/decks/DeckTreeNode;->getReviewCount()I
+SPLanki/decks/DeckTreeNode;->parseFrom([B)Lanki/decks/DeckTreeNode;
+Lanki/decks/DeckTreeNode$1;
+SPLanki/decks/DeckTreeNode$1;-><clinit>()V
+Lanki/decks/DeckTreeNodeOrBuilder;
+Lanki/decks/DeckTreeRequest;
+SPLanki/decks/DeckTreeRequest;->-$$Nest$msetNow(Lanki/decks/DeckTreeRequest;J)V
+SPLanki/decks/DeckTreeRequest;->-$$Nest$sfgetDEFAULT_INSTANCE()Lanki/decks/DeckTreeRequest;
+SPLanki/decks/DeckTreeRequest;-><clinit>()V
+SPLanki/decks/DeckTreeRequest;-><init>()V
+SPLanki/decks/DeckTreeRequest;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/decks/DeckTreeRequest;->newBuilder()Lanki/decks/DeckTreeRequest$Builder;
+SPLanki/decks/DeckTreeRequest;->setNow(J)V
+Lanki/decks/DeckTreeRequest$1;
+SPLanki/decks/DeckTreeRequest$1;-><clinit>()V
+Lanki/decks/DeckTreeRequest$Builder;
+SPLanki/decks/DeckTreeRequest$Builder;-><init>()V
+SPLanki/decks/DeckTreeRequest$Builder;-><init>(Lanki/decks/DeckTreeRequest-IA;)V
+SPLanki/decks/DeckTreeRequest$Builder;->setNow(J)Lanki/decks/DeckTreeRequest$Builder;
+Lanki/decks/DeckTreeRequestOrBuilder;
+Lanki/decks/GetDeckNamesRequest;
+SPLanki/decks/GetDeckNamesRequest;->-$$Nest$msetIncludeFiltered(Lanki/decks/GetDeckNamesRequest;Z)V
+SPLanki/decks/GetDeckNamesRequest;->-$$Nest$msetSkipEmptyDefault(Lanki/decks/GetDeckNamesRequest;Z)V
+SPLanki/decks/GetDeckNamesRequest;->-$$Nest$sfgetDEFAULT_INSTANCE()Lanki/decks/GetDeckNamesRequest;
+SPLanki/decks/GetDeckNamesRequest;-><clinit>()V
+SPLanki/decks/GetDeckNamesRequest;-><init>()V
+SPLanki/decks/GetDeckNamesRequest;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/decks/GetDeckNamesRequest;->newBuilder()Lanki/decks/GetDeckNamesRequest$Builder;
+SPLanki/decks/GetDeckNamesRequest;->setIncludeFiltered(Z)V
+SPLanki/decks/GetDeckNamesRequest;->setSkipEmptyDefault(Z)V
+Lanki/decks/GetDeckNamesRequest$1;
+SPLanki/decks/GetDeckNamesRequest$1;-><clinit>()V
+Lanki/decks/GetDeckNamesRequest$Builder;
+SPLanki/decks/GetDeckNamesRequest$Builder;-><init>()V
+SPLanki/decks/GetDeckNamesRequest$Builder;-><init>(Lanki/decks/GetDeckNamesRequest-IA;)V
+SPLanki/decks/GetDeckNamesRequest$Builder;->setIncludeFiltered(Z)Lanki/decks/GetDeckNamesRequest$Builder;
+SPLanki/decks/GetDeckNamesRequest$Builder;->setSkipEmptyDefault(Z)Lanki/decks/GetDeckNamesRequest$Builder;
+Lanki/decks/GetDeckNamesRequestOrBuilder;
+Lanki/generic/Bool;
+SPLanki/generic/Bool;-><clinit>()V
+SPLanki/generic/Bool;-><init>()V
+SPLanki/generic/Bool;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/generic/Bool;->getVal()Z
+SPLanki/generic/Bool;->parseFrom([B)Lanki/generic/Bool;
+Lanki/generic/Bool$1;
+SPLanki/generic/Bool$1;-><clinit>()V
+Lanki/generic/BoolOrBuilder;
+Lanki/generic/Empty;
+SPLanki/generic/Empty;->-$$Nest$sfgetDEFAULT_INSTANCE()Lanki/generic/Empty;
+SPLanki/generic/Empty;-><clinit>()V
+SPLanki/generic/Empty;-><init>()V
+SPLanki/generic/Empty;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/generic/Empty;->newBuilder()Lanki/generic/Empty$Builder;
+SPLanki/generic/Empty;->parseFrom([B)Lanki/generic/Empty;
+Lanki/generic/Empty$1;
+SPLanki/generic/Empty$1;-><clinit>()V
+Lanki/generic/Empty$Builder;
+SPLanki/generic/Empty$Builder;-><init>()V
+SPLanki/generic/Empty$Builder;-><init>(Lanki/generic/Empty-IA;)V
+Lanki/generic/EmptyOrBuilder;
+Lanki/generic/Int32;
+SPLanki/generic/Int32;->-$$Nest$msetVal(Lanki/generic/Int32;I)V
+SPLanki/generic/Int32;->-$$Nest$sfgetDEFAULT_INSTANCE()Lanki/generic/Int32;
+SPLanki/generic/Int32;-><clinit>()V
+SPLanki/generic/Int32;-><init>()V
+SPLanki/generic/Int32;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/generic/Int32;->newBuilder()Lanki/generic/Int32$Builder;
+SPLanki/generic/Int32;->setVal(I)V
+Lanki/generic/Int32$1;
+SPLanki/generic/Int32$1;-><clinit>()V
+Lanki/generic/Int32$Builder;
+SPLanki/generic/Int32$Builder;-><init>()V
+SPLanki/generic/Int32$Builder;-><init>(Lanki/generic/Int32-IA;)V
+SPLanki/generic/Int32$Builder;->setVal(I)Lanki/generic/Int32$Builder;
+Lanki/generic/Int32OrBuilder;
+Lanki/generic/Int64;
+SPLanki/generic/Int64;-><clinit>()V
+SPLanki/generic/Int64;-><init>()V
+SPLanki/generic/Int64;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/generic/Int64;->getVal()J
+SPLanki/generic/Int64;->parseFrom([B)Lanki/generic/Int64;
+Lanki/generic/Int64$1;
+SPLanki/generic/Int64$1;-><clinit>()V
+Lanki/generic/Int64OrBuilder;
+Lanki/generic/Json;
+SPLanki/generic/Json;->-$$Nest$msetJson(Lanki/generic/Json;Lcom/google/protobuf/ByteString;)V
+SPLanki/generic/Json;->-$$Nest$sfgetDEFAULT_INSTANCE()Lanki/generic/Json;
+SPLanki/generic/Json;-><clinit>()V
+SPLanki/generic/Json;-><init>()V
+SPLanki/generic/Json;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/generic/Json;->getJson()Lcom/google/protobuf/ByteString;
+SPLanki/generic/Json;->newBuilder()Lanki/generic/Json$Builder;
+SPLanki/generic/Json;->parseFrom([B)Lanki/generic/Json;
+SPLanki/generic/Json;->setJson(Lcom/google/protobuf/ByteString;)V
+Lanki/generic/Json$1;
+SPLanki/generic/Json$1;-><clinit>()V
+Lanki/generic/Json$Builder;
+SPLanki/generic/Json$Builder;-><init>()V
+SPLanki/generic/Json$Builder;-><init>(Lanki/generic/Json-IA;)V
+SPLanki/generic/Json$Builder;->setJson(Lcom/google/protobuf/ByteString;)Lanki/generic/Json$Builder;
+Lanki/generic/JsonOrBuilder;
+Lanki/generic/String;
+SPLanki/generic/String;->-$$Nest$msetVal(Lanki/generic/String;Ljava/lang/String;)V
+SPLanki/generic/String;->-$$Nest$sfgetDEFAULT_INSTANCE()Lanki/generic/String;
+SPLanki/generic/String;-><clinit>()V
+SPLanki/generic/String;-><init>()V
+SPLanki/generic/String;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/generic/String;->getVal()Ljava/lang/String;
+SPLanki/generic/String;->newBuilder()Lanki/generic/String$Builder;
+SPLanki/generic/String;->parseFrom([B)Lanki/generic/String;
+SPLanki/generic/String;->setVal(Ljava/lang/String;)V
+Lanki/generic/String$1;
+SPLanki/generic/String$1;-><clinit>()V
+Lanki/generic/String$Builder;
+SPLanki/generic/String$Builder;-><init>()V
+SPLanki/generic/String$Builder;-><init>(Lanki/generic/String-IA;)V
+SPLanki/generic/String$Builder;->setVal(Ljava/lang/String;)Lanki/generic/String$Builder;
+Lanki/generic/StringOrBuilder;
+Lanki/i18n/GeneratedTranslations;
+SPLanki/i18n/GeneratedTranslations;->actionsDecks()Ljava/lang/String;
+SPLanki/i18n/GeneratedTranslations;->actionsEmptyCards()Ljava/lang/String;
+SPLanki/i18n/GeneratedTranslations;->actionsExport()Ljava/lang/String;
+SPLanki/i18n/GeneratedTranslations;->actionsImport()Ljava/lang/String;
+SPLanki/i18n/GeneratedTranslations;->databaseCheckTitle()Ljava/lang/String;
+SPLanki/i18n/GeneratedTranslations;->decksCreateDeck()Ljava/lang/String;
+SPLanki/i18n/GeneratedTranslations;->mediaCheckCheckMediaAction()Ljava/lang/String;
+SPLanki/i18n/GeneratedTranslations;->statisticsTitle()Ljava/lang/String;
+Lanki/i18n/I18nResourcesRequest;
+SPLanki/i18n/I18nResourcesRequest;->-$$Nest$maddAllModules(Lanki/i18n/I18nResourcesRequest;Ljava/lang/Iterable;)V
+SPLanki/i18n/I18nResourcesRequest;->-$$Nest$sfgetDEFAULT_INSTANCE()Lanki/i18n/I18nResourcesRequest;
+SPLanki/i18n/I18nResourcesRequest;-><clinit>()V
+SPLanki/i18n/I18nResourcesRequest;-><init>()V
+SPLanki/i18n/I18nResourcesRequest;->addAllModules(Ljava/lang/Iterable;)V
+SPLanki/i18n/I18nResourcesRequest;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/i18n/I18nResourcesRequest;->ensureModulesIsMutable()V
+SPLanki/i18n/I18nResourcesRequest;->newBuilder()Lanki/i18n/I18nResourcesRequest$Builder;
+Lanki/i18n/I18nResourcesRequest$1;
+SPLanki/i18n/I18nResourcesRequest$1;-><clinit>()V
+Lanki/i18n/I18nResourcesRequest$Builder;
+SPLanki/i18n/I18nResourcesRequest$Builder;-><init>()V
+SPLanki/i18n/I18nResourcesRequest$Builder;-><init>(Lanki/i18n/I18nResourcesRequest-IA;)V
+SPLanki/i18n/I18nResourcesRequest$Builder;->addAllModules(Ljava/lang/Iterable;)Lanki/i18n/I18nResourcesRequest$Builder;
+Lanki/i18n/I18nResourcesRequestOrBuilder;
+Lanki/i18n/TranslateArgValue;
+SPLanki/i18n/TranslateArgValue;-><clinit>()V
+SPLanki/i18n/TranslateArgValue;-><init>()V
+SPLanki/i18n/TranslateArgValue;->getDefaultInstance()Lanki/i18n/TranslateArgValue;
+Lanki/i18n/TranslateArgValueOrBuilder;
+Lanki/i18n/TranslateStringRequest;
+SPLanki/i18n/TranslateStringRequest;->-$$Nest$mgetMutableArgsMap(Lanki/i18n/TranslateStringRequest;)Ljava/util/Map;
+SPLanki/i18n/TranslateStringRequest;->-$$Nest$msetMessageIndex(Lanki/i18n/TranslateStringRequest;I)V
+SPLanki/i18n/TranslateStringRequest;->-$$Nest$msetModuleIndex(Lanki/i18n/TranslateStringRequest;I)V
+SPLanki/i18n/TranslateStringRequest;->-$$Nest$sfgetDEFAULT_INSTANCE()Lanki/i18n/TranslateStringRequest;
+SPLanki/i18n/TranslateStringRequest;-><clinit>()V
+SPLanki/i18n/TranslateStringRequest;-><init>()V
+SPLanki/i18n/TranslateStringRequest;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/i18n/TranslateStringRequest;->getMutableArgsMap()Ljava/util/Map;
+SPLanki/i18n/TranslateStringRequest;->internalGetMutableArgs()Lcom/google/protobuf/MapFieldLite;
+SPLanki/i18n/TranslateStringRequest;->newBuilder()Lanki/i18n/TranslateStringRequest$Builder;
+SPLanki/i18n/TranslateStringRequest;->setMessageIndex(I)V
+SPLanki/i18n/TranslateStringRequest;->setModuleIndex(I)V
+Lanki/i18n/TranslateStringRequest$1;
+SPLanki/i18n/TranslateStringRequest$1;-><clinit>()V
+Lanki/i18n/TranslateStringRequest$ArgsDefaultEntryHolder;
+SPLanki/i18n/TranslateStringRequest$ArgsDefaultEntryHolder;-><clinit>()V
+Lanki/i18n/TranslateStringRequest$Builder;
+SPLanki/i18n/TranslateStringRequest$Builder;-><init>()V
+SPLanki/i18n/TranslateStringRequest$Builder;-><init>(Lanki/i18n/TranslateStringRequest-IA;)V
+SPLanki/i18n/TranslateStringRequest$Builder;->putAllArgs(Ljava/util/Map;)Lanki/i18n/TranslateStringRequest$Builder;
+SPLanki/i18n/TranslateStringRequest$Builder;->setMessageIndex(I)Lanki/i18n/TranslateStringRequest$Builder;
+SPLanki/i18n/TranslateStringRequest$Builder;->setModuleIndex(I)Lanki/i18n/TranslateStringRequest$Builder;
+Lanki/i18n/TranslateStringRequestOrBuilder;
+Lanki/scheduler/SchedTimingTodayResponse;
+SPLanki/scheduler/SchedTimingTodayResponse;-><clinit>()V
+SPLanki/scheduler/SchedTimingTodayResponse;-><init>()V
+SPLanki/scheduler/SchedTimingTodayResponse;->dynamicMethod(Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLanki/scheduler/SchedTimingTodayResponse;->getNextDayAt()J
+SPLanki/scheduler/SchedTimingTodayResponse;->parseFrom([B)Lanki/scheduler/SchedTimingTodayResponse;
+Lanki/scheduler/SchedTimingTodayResponse$1;
+SPLanki/scheduler/SchedTimingTodayResponse$1;-><clinit>()V
+Lanki/scheduler/SchedTimingTodayResponseOrBuilder;
+Lanki/sync/SyncStatusResponse$Required;
+SPLanki/sync/SyncStatusResponse$Required;->$values()[Lanki/sync/SyncStatusResponse$Required;
+SPLanki/sync/SyncStatusResponse$Required;-><clinit>()V
+SPLanki/sync/SyncStatusResponse$Required;-><init>(Ljava/lang/String;II)V
+SPLanki/sync/SyncStatusResponse$Required;->values()[Lanki/sync/SyncStatusResponse$Required;
+Lanki/sync/SyncStatusResponse$Required$1;
+SPLanki/sync/SyncStatusResponse$Required$1;-><init>()V
+Lcom/canhub/cropper/CropFileProvider;
+SPLcom/canhub/cropper/CropFileProvider;-><init>()V
+Lcom/canhub/cropper/R$xml;
+Lcom/criticalay/GoogleAnalytics;
+SPLcom/criticalay/GoogleAnalytics;-><clinit>()V
+Lcom/criticalay/GoogleAnalytics$Companion;
+SPLcom/criticalay/GoogleAnalytics$Companion;-><clinit>()V
+SPLcom/criticalay/GoogleAnalytics$Companion;-><init>()V
+SPLcom/criticalay/GoogleAnalytics$Companion;->builder(Lkotlin/jvm/functions/Function1;)Lcom/criticalay/GoogleAnalytics;
+Lcom/criticalay/GoogleAnalyticsBuilder;
+SPLcom/criticalay/GoogleAnalyticsBuilder;-><init>()V
+SPLcom/criticalay/GoogleAnalyticsBuilder;->build()Lcom/criticalay/GoogleAnalytics;
+SPLcom/criticalay/GoogleAnalyticsBuilder;->setApiSecret(Ljava/lang/String;)V
+SPLcom/criticalay/GoogleAnalyticsBuilder;->setAppName(Ljava/lang/String;)V
+SPLcom/criticalay/GoogleAnalyticsBuilder;->setAppVersion(Ljava/lang/String;)V
+SPLcom/criticalay/GoogleAnalyticsBuilder;->setDebug(Z)V
+SPLcom/criticalay/GoogleAnalyticsBuilder;->setEnabled(Z)V
+SPLcom/criticalay/GoogleAnalyticsBuilder;->setMeasurementId(Ljava/lang/String;)V
+SPLcom/criticalay/GoogleAnalyticsBuilder;->setSamplePercentage(I)V
+Lcom/criticalay/GoogleAnalyticsConfig;
+SPLcom/criticalay/GoogleAnalyticsConfig;-><clinit>()V
+SPLcom/criticalay/GoogleAnalyticsConfig;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZIZILjava/lang/String;Ljava/lang/String;IJJ)V
+SPLcom/criticalay/GoogleAnalyticsConfig;->getConnectTimeoutMs()J
+SPLcom/criticalay/GoogleAnalyticsConfig;->getProxyHost()Ljava/lang/String;
+SPLcom/criticalay/GoogleAnalyticsConfig;->getReadTimeoutMs()J
+SPLcom/criticalay/GoogleAnalyticsConfig;->getSamplePercentage()I
+Lcom/criticalay/GoogleAnalyticsConfig$Companion;
+SPLcom/criticalay/GoogleAnalyticsConfig$Companion;-><init>()V
+SPLcom/criticalay/GoogleAnalyticsConfig$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/criticalay/httpclient/OkHttpClientImpl;
+SPLcom/criticalay/httpclient/OkHttpClientImpl;-><init>(Lcom/criticalay/GoogleAnalyticsConfig;)V
+SPLcom/criticalay/httpclient/OkHttpClientImpl;->buildClient()Lokhttp3/OkHttpClient;
+SPLcom/criticalay/httpclient/OkHttpClientImpl;->json$lambda$0(Lkotlinx/serialization/json/JsonBuilder;)Lkotlin/Unit;
+Lcom/criticalay/httpclient/OkHttpClientImpl$$ExternalSyntheticLambda1;
+SPLcom/criticalay/httpclient/OkHttpClientImpl$$ExternalSyntheticLambda1;-><init>()V
+SPLcom/criticalay/httpclient/OkHttpClientImpl$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/criticalay/internal/GaImpl;
+SPLcom/criticalay/internal/GaImpl;-><init>(Lcom/criticalay/GoogleAnalyticsConfig;Lcom/criticalay/httpclient/OkHttpClientImpl;)V
+SPLcom/criticalay/internal/GaImpl;->getConfig()Lcom/criticalay/GoogleAnalyticsConfig;
+SPLcom/criticalay/internal/GaImpl;->getInSample()Z
+SPLcom/criticalay/internal/GaImpl;->performSamplingElection$lambda$0(ILcom/criticalay/internal/GaImpl;)Ljava/lang/Object;
+SPLcom/criticalay/internal/GaImpl;->performSamplingElection$lambda$1(ILcom/criticalay/internal/GaImpl;)Ljava/lang/Object;
+SPLcom/criticalay/internal/GaImpl;->performSamplingElection()Z
+Lcom/criticalay/internal/GaImpl$$ExternalSyntheticLambda4;
+SPLcom/criticalay/internal/GaImpl$$ExternalSyntheticLambda4;-><init>(ILcom/criticalay/internal/GaImpl;)V
+SPLcom/criticalay/internal/GaImpl$$ExternalSyntheticLambda4;->invoke()Ljava/lang/Object;
+Lcom/criticalay/internal/GaImpl$$ExternalSyntheticLambda5;
+SPLcom/criticalay/internal/GaImpl$$ExternalSyntheticLambda5;-><init>(ILcom/criticalay/internal/GaImpl;)V
+SPLcom/criticalay/internal/GaImpl$$ExternalSyntheticLambda5;->invoke()Ljava/lang/Object;
+Lcom/criticalay/internal/GaImplKt;
+SPLcom/criticalay/internal/GaImplKt;-><clinit>()V
+SPLcom/criticalay/internal/GaImplKt;->access$getLogger$p()Lio/github/oshai/kotlinlogging/KLogger;
+Lcom/criticalay/internal/GaImplKt$$ExternalSyntheticLambda0;
+SPLcom/criticalay/internal/GaImplKt$$ExternalSyntheticLambda0;-><init>()V
+Lcom/google/android/material/R$anim;
+Lcom/google/android/material/R$attr;
+Lcom/google/android/material/R$dimen;
+Lcom/google/android/material/R$drawable;
+Lcom/google/android/material/R$id;
+Lcom/google/android/material/R$integer;
+Lcom/google/android/material/R$layout;
+Lcom/google/android/material/R$style;
+Lcom/google/android/material/R$styleable;
+SPLcom/google/android/material/R$styleable;-><clinit>()V
+Lcom/google/android/material/animation/AnimationUtils;
+SPLcom/google/android/material/animation/AnimationUtils;-><clinit>()V
+SPLcom/google/android/material/animation/AnimationUtils;->lerp(FFF)F
+SPLcom/google/android/material/animation/AnimationUtils;->lerp(FFFFF)F
+Lcom/google/android/material/animation/MotionSpec;
+SPLcom/google/android/material/animation/MotionSpec;-><init>()V
+SPLcom/google/android/material/animation/MotionSpec;->addInfoFromAnimator(Lcom/google/android/material/animation/MotionSpec;Landroid/animation/Animator;)V
+SPLcom/google/android/material/animation/MotionSpec;->createFromAttribute(Landroid/content/Context;Landroid/content/res/TypedArray;I)Lcom/google/android/material/animation/MotionSpec;
+SPLcom/google/android/material/animation/MotionSpec;->createFromResource(Landroid/content/Context;I)Lcom/google/android/material/animation/MotionSpec;
+SPLcom/google/android/material/animation/MotionSpec;->createSpecFromAnimators(Ljava/util/List;)Lcom/google/android/material/animation/MotionSpec;
+SPLcom/google/android/material/animation/MotionSpec;->setPropertyValues(Ljava/lang/String;[Landroid/animation/PropertyValuesHolder;)V
+SPLcom/google/android/material/animation/MotionSpec;->setTiming(Ljava/lang/String;Lcom/google/android/material/animation/MotionTiming;)V
+Lcom/google/android/material/animation/MotionTiming;
+SPLcom/google/android/material/animation/MotionTiming;-><init>(JJLandroid/animation/TimeInterpolator;)V
+SPLcom/google/android/material/animation/MotionTiming;->createFromAnimator(Landroid/animation/ValueAnimator;)Lcom/google/android/material/animation/MotionTiming;
+Lcom/google/android/material/badge/BadgeDrawable;
+Lcom/google/android/material/behavior/HideViewOnScrollBehavior;
+SPLcom/google/android/material/behavior/HideViewOnScrollBehavior;-><clinit>()V
+SPLcom/google/android/material/behavior/HideViewOnScrollBehavior;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+Lcom/google/android/material/bottomnavigation/BottomNavigationItemView;
+SPLcom/google/android/material/bottomnavigation/BottomNavigationItemView;-><init>(Landroid/content/Context;)V
+SPLcom/google/android/material/bottomnavigation/BottomNavigationItemView;->getItemDefaultMarginResId()I
+SPLcom/google/android/material/bottomnavigation/BottomNavigationItemView;->getItemLayoutResId()I
+Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
+SPLcom/google/android/material/bottomnavigation/BottomNavigationMenuView;-><init>(Landroid/content/Context;)V
+SPLcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->createNavigationBarItemView(Landroid/content/Context;)Lcom/google/android/material/navigation/NavigationBarItemView;
+SPLcom/google/android/material/bottomnavigation/BottomNavigationMenuView;->isItemHorizontalTranslationEnabled()Z
+Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView;->applyWindowInsets()V
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView;->createNavigationBarMenuView(Landroid/content/Context;)Lcom/google/android/material/navigation/NavigationBarMenuView;
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView;->getMaxItemCount()I
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView;->setItemHorizontalTranslationEnabled(Z)V
+Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView$1;-><init>(Lcom/google/android/material/bottomnavigation/BottomNavigationView;)V
+SPLcom/google/android/material/bottomnavigation/BottomNavigationView$1;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;Lcom/google/android/material/internal/ViewUtils$RelativePadding;)Landroidx/core/view/WindowInsetsCompat;
+Lcom/google/android/material/button/MaterialButton;
+SPLcom/google/android/material/button/MaterialButton;-><clinit>()V
+SPLcom/google/android/material/button/MaterialButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLcom/google/android/material/button/MaterialButton;->canUpdateWithoutTextAlignment(I)Z
+SPLcom/google/android/material/button/MaterialButton;->getA11yClassName()Ljava/lang/String;
+SPLcom/google/android/material/button/MaterialButton;->getActualTextAlignment()Landroid/text/Layout$Alignment;
+SPLcom/google/android/material/button/MaterialButton;->getGravityTextAlignment()Landroid/text/Layout$Alignment;
+SPLcom/google/android/material/button/MaterialButton;->getIcon()Landroid/graphics/drawable/Drawable;
+SPLcom/google/android/material/button/MaterialButton;->getIconPadding()I
+SPLcom/google/android/material/button/MaterialButton;->getIconSize()I
+SPLcom/google/android/material/button/MaterialButton;->getTextLayoutWidth()I
+SPLcom/google/android/material/button/MaterialButton;->getUpdatedIconFor(I)Landroid/graphics/drawable/Drawable;
+SPLcom/google/android/material/button/MaterialButton;->isCheckable()Z
+SPLcom/google/android/material/button/MaterialButton;->isChecked()Z
+SPLcom/google/android/material/button/MaterialButton;->isIconEnd()Z
+SPLcom/google/android/material/button/MaterialButton;->isIconStart()Z
+SPLcom/google/android/material/button/MaterialButton;->isIconTop()Z
+SPLcom/google/android/material/button/MaterialButton;->isInHorizontalButtonGroup()Z
+SPLcom/google/android/material/button/MaterialButton;->isUsingOriginalBackground()Z
+SPLcom/google/android/material/button/MaterialButton;->onAttachedToWindow()V
+SPLcom/google/android/material/button/MaterialButton;->onCreateDrawableState(I)[I
+SPLcom/google/android/material/button/MaterialButton;->onInitializeAccessibilityNodeInfo(Landroid/view/accessibility/AccessibilityNodeInfo;)V
+SPLcom/google/android/material/button/MaterialButton;->onLayout(ZIIII)V
+SPLcom/google/android/material/button/MaterialButton;->onTextChanged(Ljava/lang/CharSequence;III)V
+SPLcom/google/android/material/button/MaterialButton;->refreshDrawableState()V
+SPLcom/google/android/material/button/MaterialButton;->setBackgroundTintList(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/button/MaterialButton;->setCheckedInternal(Z)V
+SPLcom/google/android/material/button/MaterialButton;->setCompoundDrawablePadding(I)V
+SPLcom/google/android/material/button/MaterialButton;->setElevation(F)V
+SPLcom/google/android/material/button/MaterialButton;->setInternalBackground(Landroid/graphics/drawable/Drawable;)V
+SPLcom/google/android/material/button/MaterialButton;->setOpticalCenterEnabled(Z)V
+SPLcom/google/android/material/button/MaterialButton;->setShapeAppearanceModel(Lcom/google/android/material/shape/ShapeAppearanceModel;)V
+SPLcom/google/android/material/button/MaterialButton;->setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/button/MaterialButton;->setText(Ljava/lang/CharSequence;Landroid/widget/TextView$BufferType;)V
+SPLcom/google/android/material/button/MaterialButton;->updateIcon(Z)V
+SPLcom/google/android/material/button/MaterialButton;->updateIconPosition(II)V
+SPLcom/google/android/material/button/MaterialButton;->updateSecondaryIcon(Z)V
+SPLcom/google/android/material/button/MaterialButton;->updateSecondaryIconPosition(II)V
+SPLcom/google/android/material/button/MaterialButton;->validateIconGravity()V
+SPLcom/google/android/material/button/MaterialButton;->validateSecondaryIconGravity()V
+Lcom/google/android/material/button/MaterialButton$1;
+SPLcom/google/android/material/button/MaterialButton$1;-><init>(Ljava/lang/String;)V
+Lcom/google/android/material/button/MaterialButton$WidthChangeDirection;
+SPLcom/google/android/material/button/MaterialButton$WidthChangeDirection;->$values()[Lcom/google/android/material/button/MaterialButton$WidthChangeDirection;
+SPLcom/google/android/material/button/MaterialButton$WidthChangeDirection;-><clinit>()V
+SPLcom/google/android/material/button/MaterialButton$WidthChangeDirection;-><init>(Ljava/lang/String;I)V
+Lcom/google/android/material/button/MaterialButtonGroup;
+Lcom/google/android/material/button/MaterialButtonHelper;
+SPLcom/google/android/material/button/MaterialButtonHelper;-><init>(Lcom/google/android/material/button/MaterialButton;Lcom/google/android/material/shape/ShapeAppearance;)V
+SPLcom/google/android/material/button/MaterialButtonHelper;->createBackground()Landroid/graphics/drawable/Drawable;
+SPLcom/google/android/material/button/MaterialButtonHelper;->getMaskDrawable()Lcom/google/android/material/shape/Shapeable;
+SPLcom/google/android/material/button/MaterialButtonHelper;->getMaterialShapeDrawable()Lcom/google/android/material/shape/MaterialShapeDrawable;
+SPLcom/google/android/material/button/MaterialButtonHelper;->getMaterialShapeDrawable(Z)Lcom/google/android/material/shape/MaterialShapeDrawable;
+SPLcom/google/android/material/button/MaterialButtonHelper;->getSurfaceColorStrokeDrawable()Lcom/google/android/material/shape/MaterialShapeDrawable;
+SPLcom/google/android/material/button/MaterialButtonHelper;->isBackgroundOverwritten()Z
+SPLcom/google/android/material/button/MaterialButtonHelper;->isCheckable()Z
+SPLcom/google/android/material/button/MaterialButtonHelper;->loadFromAttributes(Landroid/content/res/TypedArray;)V
+SPLcom/google/android/material/button/MaterialButtonHelper;->setShapeAppearance(Lcom/google/android/material/shape/ShapeAppearance;)V
+SPLcom/google/android/material/button/MaterialButtonHelper;->updateBackground()V
+SPLcom/google/android/material/button/MaterialButtonHelper;->updateButtonShape()V
+SPLcom/google/android/material/button/MaterialButtonHelper;->wrapDrawableWithInset(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/InsetDrawable;
+Lcom/google/android/material/color/MaterialColors;
+SPLcom/google/android/material/color/MaterialColors;->getColor(Landroid/content/Context;II)I
+SPLcom/google/android/material/color/MaterialColors;->getColor(Landroid/view/View;I)I
+SPLcom/google/android/material/color/MaterialColors;->getColorOrNull(Landroid/content/Context;I)Ljava/lang/Integer;
+SPLcom/google/android/material/color/MaterialColors;->layer(II)I
+SPLcom/google/android/material/color/MaterialColors;->layer(IIF)I
+SPLcom/google/android/material/color/MaterialColors;->resolveColor(Landroid/content/Context;Landroid/util/TypedValue;)I
+Lcom/google/android/material/drawable/DrawableUtils;
+SPLcom/google/android/material/drawable/DrawableUtils;->getColorStateListOrNull(Landroid/graphics/drawable/Drawable;)Landroid/content/res/ColorStateList;
+Lcom/google/android/material/elevation/ElevationOverlayProvider;
+SPLcom/google/android/material/elevation/ElevationOverlayProvider;-><clinit>()V
+SPLcom/google/android/material/elevation/ElevationOverlayProvider;-><init>(Landroid/content/Context;)V
+SPLcom/google/android/material/elevation/ElevationOverlayProvider;-><init>(ZIIIF)V
+SPLcom/google/android/material/elevation/ElevationOverlayProvider;->calculateOverlayAlphaFraction(F)F
+SPLcom/google/android/material/elevation/ElevationOverlayProvider;->compositeOverlay(IF)I
+SPLcom/google/android/material/elevation/ElevationOverlayProvider;->compositeOverlayIfNeeded(IF)I
+SPLcom/google/android/material/elevation/ElevationOverlayProvider;->isThemeElevationOverlayEnabled()Z
+SPLcom/google/android/material/elevation/ElevationOverlayProvider;->isThemeSurfaceColor(I)Z
+Lcom/google/android/material/floatingactionbutton/AnimatorTracker;
+SPLcom/google/android/material/floatingactionbutton/AnimatorTracker;-><init>()V
+Lcom/google/android/material/floatingactionbutton/BaseMotionStrategy;
+SPLcom/google/android/material/floatingactionbutton/BaseMotionStrategy;-><init>(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Lcom/google/android/material/floatingactionbutton/AnimatorTracker;)V
+SPLcom/google/android/material/floatingactionbutton/BaseMotionStrategy;->setMotionSpec(Lcom/google/android/material/animation/MotionSpec;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;-><clinit>()V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->access$202(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;I)I
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->access$302(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;I)I
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->access$500(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;)Z
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->access$502(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Z)Z
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->access$600(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->getAccessibilityClassName()Ljava/lang/CharSequence;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->getCollapsedPadding()I
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->getCollapsedSize()I
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->getSizeFromExtendStrategyType(I)Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$Size;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->onAttachedToWindow()V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->saveOriginalTextCsl()V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->setClickable(Z)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->setContentDescription(Ljava/lang/CharSequence;)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->setExtended(Z)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->setPaddingRelative(IIII)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->setText(Ljava/lang/CharSequence;Landroid/widget/TextView$BufferType;)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->setTextColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->silentlyUpdateTextColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;->updateTooltip()V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$1;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$1;-><init>(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$1;->getHeight()I
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$1;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$1;->getPaddingEnd()I
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$1;->getPaddingStart()I
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$1;->getWidth()I
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$2;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$2;-><init>(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$3;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$3;-><init>(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$Size;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$4;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$4;-><init>(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$Size;Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$Size;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$6;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$6;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$7;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$7;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$8;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$8;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$9;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$9;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$ChangeSizeStrategy;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$ChangeSizeStrategy;-><init>(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Lcom/google/android/material/floatingactionbutton/AnimatorTracker;Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$Size;Z)V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$ChangeSizeStrategy;->performNow()V
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$ChangeSizeStrategy;->shouldCancel()Z
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$ExtendedFloatingActionButtonBehavior;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$ExtendedFloatingActionButtonBehavior;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$HideStrategy;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$HideStrategy;-><init>(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Lcom/google/android/material/floatingactionbutton/AnimatorTracker;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$ShowStrategy;
+SPLcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$ShowStrategy;-><init>(Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Lcom/google/android/material/floatingactionbutton/AnimatorTracker;)V
+Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton$Size;
+Lcom/google/android/material/floatingactionbutton/MotionStrategy;
+Lcom/google/android/material/focus/FocusRingDrawable;
+SPLcom/google/android/material/focus/FocusRingDrawable;-><clinit>()V
+SPLcom/google/android/material/focus/FocusRingDrawable;->find(Landroid/graphics/drawable/Drawable;)Lcom/google/android/material/focus/FocusRingDrawable;
+SPLcom/google/android/material/focus/FocusRingDrawable;->layer(Landroid/content/Context;Landroid/graphics/drawable/LayerDrawable;)Lcom/google/android/material/focus/FocusRingDrawable;
+SPLcom/google/android/material/focus/FocusRingDrawable;->layer(Landroid/content/Context;Landroid/graphics/drawable/LayerDrawable;Lcom/google/android/material/shape/MaterialShapeDrawable;)Lcom/google/android/material/focus/FocusRingDrawable;
+SPLcom/google/android/material/focus/FocusRingDrawable;->shouldUseFocusRing(Landroid/content/Context;)Z
+Lcom/google/android/material/focus/FocusRingDrawable$1;
+SPLcom/google/android/material/focus/FocusRingDrawable$1;-><init>(Ljava/lang/String;)V
+Lcom/google/android/material/internal/BaselineLayout;
+SPLcom/google/android/material/internal/BaselineLayout;-><init>(Landroid/content/Context;)V
+SPLcom/google/android/material/internal/BaselineLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLcom/google/android/material/internal/BaselineLayout;->setMeasurePaddingFromBaseline(Z)V
+Lcom/google/android/material/internal/ContextUtils;
+SPLcom/google/android/material/internal/ContextUtils;->getActivity(Landroid/content/Context;)Landroid/app/Activity;
+Lcom/google/android/material/internal/EdgeToEdgeUtils;
+SPLcom/google/android/material/internal/EdgeToEdgeUtils;->getNavigationBarColor(Landroid/view/Window;)I
+Lcom/google/android/material/internal/ForegroundLinearLayout;
+SPLcom/google/android/material/internal/ForegroundLinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLcom/google/android/material/internal/ForegroundLinearLayout;->drawableStateChanged()V
+SPLcom/google/android/material/internal/ForegroundLinearLayout;->jumpDrawablesToCurrentState()V
+SPLcom/google/android/material/internal/ForegroundLinearLayout;->onLayout(ZIIII)V
+SPLcom/google/android/material/internal/ForegroundLinearLayout;->onSizeChanged(IIII)V
+SPLcom/google/android/material/internal/ForegroundLinearLayout;->setForeground(Landroid/graphics/drawable/Drawable;)V
+SPLcom/google/android/material/internal/ForegroundLinearLayout;->verifyDrawable(Landroid/graphics/drawable/Drawable;)Z
+Lcom/google/android/material/internal/NavigationMenu;
+SPLcom/google/android/material/internal/NavigationMenu;-><init>(Landroid/content/Context;)V
+Lcom/google/android/material/internal/NavigationMenuItemView;
+SPLcom/google/android/material/internal/NavigationMenuItemView;-><clinit>()V
+SPLcom/google/android/material/internal/NavigationMenuItemView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLcom/google/android/material/internal/NavigationMenuItemView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLcom/google/android/material/internal/NavigationMenuItemView;->adjustAppearance()V
+SPLcom/google/android/material/internal/NavigationMenuItemView;->initialize(Landroidx/appcompat/view/menu/MenuItemImpl;I)V
+SPLcom/google/android/material/internal/NavigationMenuItemView;->initialize(Landroidx/appcompat/view/menu/MenuItemImpl;Z)V
+SPLcom/google/android/material/internal/NavigationMenuItemView;->onCreateDrawableState(I)[I
+SPLcom/google/android/material/internal/NavigationMenuItemView;->setActionView(Landroid/view/View;)V
+SPLcom/google/android/material/internal/NavigationMenuItemView;->setCheckable(Z)V
+SPLcom/google/android/material/internal/NavigationMenuItemView;->setChecked(Z)V
+SPLcom/google/android/material/internal/NavigationMenuItemView;->setIcon(Landroid/graphics/drawable/Drawable;)V
+SPLcom/google/android/material/internal/NavigationMenuItemView;->setIconPadding(I)V
+SPLcom/google/android/material/internal/NavigationMenuItemView;->setIconSize(I)V
+SPLcom/google/android/material/internal/NavigationMenuItemView;->setIconTintList(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/internal/NavigationMenuItemView;->setMaxLines(I)V
+SPLcom/google/android/material/internal/NavigationMenuItemView;->setNeedsEmptyIcon(Z)V
+SPLcom/google/android/material/internal/NavigationMenuItemView;->setTextAppearance(I)V
+SPLcom/google/android/material/internal/NavigationMenuItemView;->setTextColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/internal/NavigationMenuItemView;->setTitle(Ljava/lang/CharSequence;)V
+SPLcom/google/android/material/internal/NavigationMenuItemView;->shouldExpandActionArea()Z
+Lcom/google/android/material/internal/NavigationMenuItemView$1;
+SPLcom/google/android/material/internal/NavigationMenuItemView$1;-><init>(Lcom/google/android/material/internal/NavigationMenuItemView;)V
+Lcom/google/android/material/internal/NavigationMenuPresenter;
+SPLcom/google/android/material/internal/NavigationMenuPresenter;-><init>()V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->access$300(Lcom/google/android/material/internal/NavigationMenuPresenter;)I
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->addHeaderView(Landroid/view/View;)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->getDividerInsetStart()I
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->getItemHorizontalPadding()I
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->getMenuView(Landroid/view/ViewGroup;)Landroidx/appcompat/view/menu/MenuView;
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->inflateHeaderView(I)Landroid/view/View;
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->initForMenu(Landroid/content/Context;Landroidx/appcompat/view/menu/MenuBuilder;)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setBehindStatusBar(Z)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setDividerInsetEnd(I)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setDividerInsetStart(I)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setId(I)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setItemBackground(Landroid/graphics/drawable/Drawable;)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setItemHorizontalPadding(I)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setItemIconPadding(I)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setItemIconSize(I)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setItemIconTintList(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setItemMaxLines(I)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setItemTextAppearance(I)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setItemTextAppearanceActiveBoldEnabled(Z)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setItemTextColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setItemVerticalPadding(I)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setOverScrollMode(I)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setSubheaderColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setSubheaderInsetEnd(I)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setSubheaderInsetStart(I)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setSubheaderTextAppearance(I)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->setUpdateSuspended(Z)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->updateAllDividerMenuItems()V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->updateAllSubHeaderMenuItems()V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->updateAllTextMenuItems()V
+SPLcom/google/android/material/internal/NavigationMenuPresenter;->updateMenuView(Z)V
+Lcom/google/android/material/internal/NavigationMenuPresenter$1;
+SPLcom/google/android/material/internal/NavigationMenuPresenter$1;-><init>(Lcom/google/android/material/internal/NavigationMenuPresenter;)V
+Lcom/google/android/material/internal/NavigationMenuPresenter$HeaderViewHolder;
+SPLcom/google/android/material/internal/NavigationMenuPresenter$HeaderViewHolder;-><init>(Landroid/view/View;)V
+Lcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;-><init>(Lcom/google/android/material/internal/NavigationMenuPresenter;)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->access$000(Lcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->access$200(Lcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->getItemCount()I
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->getItemId(I)J
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->getItemViewType(I)I
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->onBindViewHolder(Lcom/google/android/material/internal/NavigationMenuPresenter$ViewHolder;I)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/google/android/material/internal/NavigationMenuPresenter$ViewHolder;
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->prepareMenuItems()V
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->setAccessibilityDelegate(Landroid/view/View;IZ)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->setCheckedItem(Landroidx/appcompat/view/menu/MenuItemImpl;)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->setUpdateSuspended(Z)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->update()V
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->updateAllDividerMenuItems()V
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;->updateAllTextMenuItems()V
+Lcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter$1;
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter$1;-><init>(Lcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuAdapter;IZ)V
+Lcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuHeaderItem;
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuHeaderItem;-><init>()V
+Lcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuItem;
+Lcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuSeparatorItem;
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuSeparatorItem;-><init>(II)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuSeparatorItem;->getPaddingBottom()I
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuSeparatorItem;->getPaddingTop()I
+Lcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuTextItem;
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuTextItem;-><init>(Landroidx/appcompat/view/menu/MenuItemImpl;)V
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuTextItem;->getMenuItem()Landroidx/appcompat/view/menu/MenuItemImpl;
+Lcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuViewAccessibilityDelegate;
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NavigationMenuViewAccessibilityDelegate;-><init>(Lcom/google/android/material/internal/NavigationMenuPresenter;Landroidx/recyclerview/widget/RecyclerView;)V
+Lcom/google/android/material/internal/NavigationMenuPresenter$NormalViewHolder;
+SPLcom/google/android/material/internal/NavigationMenuPresenter$NormalViewHolder;-><init>(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/view/View$OnClickListener;)V
+Lcom/google/android/material/internal/NavigationMenuPresenter$SeparatorViewHolder;
+SPLcom/google/android/material/internal/NavigationMenuPresenter$SeparatorViewHolder;-><init>(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;)V
+Lcom/google/android/material/internal/NavigationMenuPresenter$ViewHolder;
+SPLcom/google/android/material/internal/NavigationMenuPresenter$ViewHolder;-><init>(Landroid/view/View;)V
+Lcom/google/android/material/internal/NavigationMenuView;
+SPLcom/google/android/material/internal/NavigationMenuView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLcom/google/android/material/internal/NavigationMenuView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+SPLcom/google/android/material/internal/ScrimInsetsFrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLcom/google/android/material/internal/ScrimInsetsFrameLayout;->onAttachedToWindow()V
+SPLcom/google/android/material/internal/ScrimInsetsFrameLayout;->setDrawBottomInsetForeground(Z)V
+SPLcom/google/android/material/internal/ScrimInsetsFrameLayout;->setDrawLeftInsetForeground(Z)V
+SPLcom/google/android/material/internal/ScrimInsetsFrameLayout;->setDrawRightInsetForeground(Z)V
+SPLcom/google/android/material/internal/ScrimInsetsFrameLayout;->setDrawTopInsetForeground(Z)V
+Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;
+SPLcom/google/android/material/internal/ScrimInsetsFrameLayout$1;-><init>(Lcom/google/android/material/internal/ScrimInsetsFrameLayout;)V
+Lcom/google/android/material/internal/TextDrawableHelper$TextDrawableDelegate;
+Lcom/google/android/material/internal/TextScale;
+SPLcom/google/android/material/internal/TextScale;-><init>()V
+Lcom/google/android/material/internal/ThemeEnforcement;
+SPLcom/google/android/material/internal/ThemeEnforcement;-><clinit>()V
+SPLcom/google/android/material/internal/ThemeEnforcement;->checkAppCompatTheme(Landroid/content/Context;)V
+SPLcom/google/android/material/internal/ThemeEnforcement;->checkCompatibleTheme(Landroid/content/Context;Landroid/util/AttributeSet;II)V
+SPLcom/google/android/material/internal/ThemeEnforcement;->checkTextAppearance(Landroid/content/Context;Landroid/util/AttributeSet;[III[I)V
+SPLcom/google/android/material/internal/ThemeEnforcement;->checkTheme(Landroid/content/Context;[ILjava/lang/String;)V
+SPLcom/google/android/material/internal/ThemeEnforcement;->isCustomTextAppearanceValid(Landroid/content/Context;Landroid/util/AttributeSet;[III[I)Z
+SPLcom/google/android/material/internal/ThemeEnforcement;->isTheme(Landroid/content/Context;[I)Z
+SPLcom/google/android/material/internal/ThemeEnforcement;->obtainStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[III[I)Landroid/content/res/TypedArray;
+SPLcom/google/android/material/internal/ThemeEnforcement;->obtainTintedStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[III[I)Landroidx/appcompat/widget/TintTypedArray;
+Lcom/google/android/material/internal/ViewUtils;
+SPLcom/google/android/material/internal/ViewUtils;->doOnApplyWindowInsets(Landroid/view/View;Lcom/google/android/material/internal/ViewUtils$OnApplyWindowInsetsListener;)V
+SPLcom/google/android/material/internal/ViewUtils;->getParentAbsoluteElevation(Landroid/view/View;)F
+SPLcom/google/android/material/internal/ViewUtils;->parseTintMode(ILandroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuff$Mode;
+SPLcom/google/android/material/internal/ViewUtils;->requestApplyInsetsWhenAttached(Landroid/view/View;)V
+Lcom/google/android/material/internal/ViewUtils$2;
+SPLcom/google/android/material/internal/ViewUtils$2;-><init>(Lcom/google/android/material/internal/ViewUtils$OnApplyWindowInsetsListener;Lcom/google/android/material/internal/ViewUtils$RelativePadding;)V
+SPLcom/google/android/material/internal/ViewUtils$2;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+Lcom/google/android/material/internal/ViewUtils$3;
+SPLcom/google/android/material/internal/ViewUtils$3;-><init>()V
+SPLcom/google/android/material/internal/ViewUtils$3;->onViewAttachedToWindow(Landroid/view/View;)V
+Lcom/google/android/material/internal/ViewUtils$OnApplyWindowInsetsListener;
+Lcom/google/android/material/internal/ViewUtils$RelativePadding;
+SPLcom/google/android/material/internal/ViewUtils$RelativePadding;-><init>(IIII)V
+SPLcom/google/android/material/internal/ViewUtils$RelativePadding;-><init>(Lcom/google/android/material/internal/ViewUtils$RelativePadding;)V
+SPLcom/google/android/material/internal/ViewUtils$RelativePadding;->applyToView(Landroid/view/View;)V
+Lcom/google/android/material/internal/WindowUtils;
+SPLcom/google/android/material/internal/WindowUtils;->getCurrentWindowBounds(Landroid/content/Context;)Landroid/graphics/Rect;
+Lcom/google/android/material/internal/WindowUtils$Api30Impl;
+SPLcom/google/android/material/internal/WindowUtils$Api30Impl;->getCurrentWindowBounds(Landroid/view/WindowManager;)Landroid/graphics/Rect;
+Lcom/google/android/material/motion/MaterialBackAnimationHelper;
+SPLcom/google/android/material/motion/MaterialBackAnimationHelper;-><init>(Landroid/view/View;)V
+Lcom/google/android/material/motion/MaterialBackHandler;
+Lcom/google/android/material/motion/MaterialBackOrchestrator;
+SPLcom/google/android/material/motion/MaterialBackOrchestrator;-><init>(Landroid/view/View;)V
+SPLcom/google/android/material/motion/MaterialBackOrchestrator;-><init>(Lcom/google/android/material/motion/MaterialBackHandler;Landroid/view/View;)V
+SPLcom/google/android/material/motion/MaterialBackOrchestrator;->createBackCallbackDelegate()Lcom/google/android/material/motion/MaterialBackOrchestrator$BackCallbackDelegate;
+SPLcom/google/android/material/motion/MaterialBackOrchestrator;->shouldListenForBackCallbacks()Z
+Lcom/google/android/material/motion/MaterialBackOrchestrator$Api33BackCallbackDelegate;
+SPLcom/google/android/material/motion/MaterialBackOrchestrator$Api33BackCallbackDelegate;-><init>()V
+SPLcom/google/android/material/motion/MaterialBackOrchestrator$Api33BackCallbackDelegate;-><init>(Lcom/google/android/material/motion/MaterialBackOrchestrator$1;)V
+Lcom/google/android/material/motion/MaterialBackOrchestrator$Api34BackCallbackDelegate;
+SPLcom/google/android/material/motion/MaterialBackOrchestrator$Api34BackCallbackDelegate;-><init>()V
+SPLcom/google/android/material/motion/MaterialBackOrchestrator$Api34BackCallbackDelegate;-><init>(Lcom/google/android/material/motion/MaterialBackOrchestrator$1;)V
+Lcom/google/android/material/motion/MaterialBackOrchestrator$BackCallbackDelegate;
+Lcom/google/android/material/motion/MaterialSideContainerBackHelper;
+SPLcom/google/android/material/motion/MaterialSideContainerBackHelper;-><init>(Landroid/view/View;)V
+Lcom/google/android/material/motion/MotionUtils;
+SPLcom/google/android/material/motion/MotionUtils;->getLegacyControlPoint([Ljava/lang/String;I)F
+SPLcom/google/android/material/motion/MotionUtils;->getLegacyEasingContent(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+SPLcom/google/android/material/motion/MotionUtils;->getLegacyThemeInterpolator(Ljava/lang/String;)Landroid/animation/TimeInterpolator;
+SPLcom/google/android/material/motion/MotionUtils;->isLegacyEasingAttribute(Ljava/lang/String;)Z
+SPLcom/google/android/material/motion/MotionUtils;->isLegacyEasingType(Ljava/lang/String;Ljava/lang/String;)Z
+SPLcom/google/android/material/motion/MotionUtils;->resolveThemeDuration(Landroid/content/Context;II)I
+SPLcom/google/android/material/motion/MotionUtils;->resolveThemeInterpolator(Landroid/content/Context;ILandroid/animation/TimeInterpolator;)Landroid/animation/TimeInterpolator;
+Lcom/google/android/material/navigation/DividerMenuItem;
+Lcom/google/android/material/navigation/NavigationBarItemView;
+SPLcom/google/android/material/navigation/NavigationBarItemView;-><clinit>()V
+SPLcom/google/android/material/navigation/NavigationBarItemView;-><init>(Landroid/content/Context;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->calculateTextScaleFactors()V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->getActiveIndicatorDrawable()Landroid/graphics/drawable/Drawable;
+SPLcom/google/android/material/navigation/NavigationBarItemView;->getItemBackgroundResId()I
+SPLcom/google/android/material/navigation/NavigationBarItemView;->getItemData()Landroidx/appcompat/view/menu/MenuItemImpl;
+SPLcom/google/android/material/navigation/NavigationBarItemView;->initialize(Landroidx/appcompat/view/menu/MenuItemImpl;I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->initializeDefaultExpandedLabelGroupViews()V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->isActiveIndicatorResizeableAndUnlabeled()Z
+SPLcom/google/android/material/navigation/NavigationBarItemView;->maybeAnimateActiveIndicatorToProgress(F)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->onCreateDrawableState(I)[I
+SPLcom/google/android/material/navigation/NavigationBarItemView;->refreshChecked()V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->refreshItemBackground()V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorDrawable(Landroid/graphics/drawable/Drawable;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorExpandedHeight(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorExpandedMarginHorizontal(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorExpandedPadding(Landroid/graphics/Rect;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorExpandedWidth(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorHeight(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorLabelPadding(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorMarginHorizontal(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorProgress(FF)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorResizeable(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setActiveIndicatorWidth(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setCheckable(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setChecked(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setExpanded(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setExpandedLabelGroupMargins()V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setHorizontalTextAppearanceActive(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setHorizontalTextAppearanceInactive(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setIcon(Landroid/graphics/drawable/Drawable;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setIconLabelHorizontalSpacing(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setIconSize(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setIconTintList(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setItemBackground(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setItemBackground(Landroid/graphics/drawable/Drawable;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setItemGravity(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setItemIconGravity(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setItemPaddingBottom(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setItemPaddingTop(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setItemPosition(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setItemRippleColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setLabelFontScalingEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setLabelMaxLines(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setLabelPivots(Landroid/widget/TextView;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setLabelVisibilityMode(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setLayoutConfigurationIconAndLabel(Landroid/view/View;Landroid/view/View;FF)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setMeasureBottomPaddingFromLabelBaseline(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setOnlyShowWhenExpanded(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setShifting(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setTextAppearanceActive(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setTextAppearanceActiveBoldEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setTextAppearanceForLabel(Landroid/widget/TextView;I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setTextAppearanceInactive(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setTextAppearanceWithoutFontScaling(Landroid/widget/TextView;I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setTextColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setTitle(Ljava/lang/CharSequence;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setViewMarginAndGravity(Landroid/view/View;III)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->setViewScaleValues(Landroid/view/View;FFI)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->updateActiveIndicatorLayoutParams(I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->updateActiveIndicatorTransform()V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->updateActiveLabelBoldness()V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->updateActiveLabelTextAppearance(Landroid/widget/TextView;I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->updateInactiveLabelTextAppearance(Landroid/widget/TextView;I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->updateViewPaddingBottom(Landroid/view/View;I)V
+SPLcom/google/android/material/navigation/NavigationBarItemView;->updateVisibility()V
+Lcom/google/android/material/navigation/NavigationBarItemView$$ExternalSyntheticLambda1;
+SPLcom/google/android/material/navigation/NavigationBarItemView$$ExternalSyntheticLambda1;-><init>(Lcom/google/android/material/navigation/NavigationBarItemView;)V
+Lcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorTransform;
+SPLcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorTransform;-><init>()V
+SPLcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorTransform;-><init>(Lcom/google/android/material/navigation/NavigationBarItemView$1;)V
+SPLcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorTransform;->calculateAlpha(FF)F
+SPLcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorTransform;->calculateScaleX(F)F
+SPLcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorTransform;->calculateScaleY(F)F
+SPLcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorTransform;->updateForProgress(FFLandroid/view/View;)V
+Lcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorUnlabeledTransform;
+SPLcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorUnlabeledTransform;-><init>()V
+SPLcom/google/android/material/navigation/NavigationBarItemView$ActiveIndicatorUnlabeledTransform;-><init>(Lcom/google/android/material/navigation/NavigationBarItemView$1;)V
+Lcom/google/android/material/navigation/NavigationBarMenu;
+SPLcom/google/android/material/navigation/NavigationBarMenu;-><init>(Landroid/content/Context;Ljava/lang/Class;IZ)V
+SPLcom/google/android/material/navigation/NavigationBarMenu;->addInternal(IIILjava/lang/CharSequence;)Landroid/view/MenuItem;
+Lcom/google/android/material/navigation/NavigationBarMenuBuilder;
+SPLcom/google/android/material/navigation/NavigationBarMenuBuilder;-><init>(Landroidx/appcompat/view/menu/MenuBuilder;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuBuilder;->getContentItemCount()I
+SPLcom/google/android/material/navigation/NavigationBarMenuBuilder;->getItemAt(I)Landroid/view/MenuItem;
+SPLcom/google/android/material/navigation/NavigationBarMenuBuilder;->getVisibleMainContentItemCount()I
+SPLcom/google/android/material/navigation/NavigationBarMenuBuilder;->refreshItems()V
+SPLcom/google/android/material/navigation/NavigationBarMenuBuilder;->size()I
+Lcom/google/android/material/navigation/NavigationBarMenuItemView;
+Lcom/google/android/material/navigation/NavigationBarMenuView;
+SPLcom/google/android/material/navigation/NavigationBarMenuView;-><clinit>()V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;-><init>(Landroid/content/Context;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->buildMenuView()V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->createDefaultColorStateList(I)Landroid/content/res/ColorStateList;
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->createItemActiveIndicatorDrawable()Landroid/graphics/drawable/Drawable;
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->createMenuItem(ILandroidx/appcompat/view/menu/MenuItemImpl;ZZ)Lcom/google/android/material/navigation/NavigationBarItemView;
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->getCollapsedVisibleItemCount()I
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->getCurrentVisibleContentItemCount()I
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->getItemGravity()I
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->getItemIconGravity()I
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->getLabelVisibilityMode()I
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->getNewItem()Lcom/google/android/material/navigation/NavigationBarItemView;
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->initialize(Landroidx/appcompat/view/menu/MenuBuilder;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->isMenuStructureSame()Z
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->isShifting(II)Z
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->isValidId(I)Z
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->releaseItemPool()V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->removeUnusedBadges()V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setActiveIndicatorLabelPadding(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setBadgeIfNeeded(Lcom/google/android/material/navigation/NavigationBarItemView;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setCheckedItem(Landroid/view/MenuItem;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setCollapsedMaxItemCount(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setIconLabelHorizontalSpacing(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setIconTintList(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorExpandedHeight(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorExpandedMarginHorizontal(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorExpandedPadding(IIII)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorExpandedWidth(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorHeight(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorMarginHorizontal(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorShapeAppearance(Lcom/google/android/material/shape/ShapeAppearanceModel;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemActiveIndicatorWidth(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemIconSize(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemPaddingBottom(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemPaddingTop(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemRippleColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemTextAppearanceActive(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemTextAppearanceActiveBoldEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemTextAppearanceInactive(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setItemTextColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setLabelFontScalingEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setLabelMaxLines(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setLabelVisibilityMode(I)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setMeasurePaddingFromLabelBaseline(Z)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->setPresenter(Lcom/google/android/material/navigation/NavigationBarPresenter;)V
+SPLcom/google/android/material/navigation/NavigationBarMenuView;->updateMenuView()V
+Lcom/google/android/material/navigation/NavigationBarMenuView$1;
+SPLcom/google/android/material/navigation/NavigationBarMenuView$1;-><init>(Lcom/google/android/material/navigation/NavigationBarMenuView;)V
+Lcom/google/android/material/navigation/NavigationBarPresenter;
+SPLcom/google/android/material/navigation/NavigationBarPresenter;-><init>()V
+SPLcom/google/android/material/navigation/NavigationBarPresenter;->initForMenu(Landroid/content/Context;Landroidx/appcompat/view/menu/MenuBuilder;)V
+SPLcom/google/android/material/navigation/NavigationBarPresenter;->setId(I)V
+SPLcom/google/android/material/navigation/NavigationBarPresenter;->setMenuView(Lcom/google/android/material/navigation/NavigationBarMenuView;)V
+SPLcom/google/android/material/navigation/NavigationBarPresenter;->setUpdateSuspended(Z)V
+SPLcom/google/android/material/navigation/NavigationBarPresenter;->updateMenuView(Z)V
+Lcom/google/android/material/navigation/NavigationBarView;
+SPLcom/google/android/material/navigation/NavigationBarView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
+SPLcom/google/android/material/navigation/NavigationBarView;->getCollapsedMaxItemCount()I
+SPLcom/google/android/material/navigation/NavigationBarView;->getMenuInflater()Landroid/view/MenuInflater;
+SPLcom/google/android/material/navigation/NavigationBarView;->getMenuView()Landroidx/appcompat/view/menu/MenuView;
+SPLcom/google/android/material/navigation/NavigationBarView;->inflateMenu(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->isSubMenuSupported()Z
+SPLcom/google/android/material/navigation/NavigationBarView;->onAttachedToWindow()V
+SPLcom/google/android/material/navigation/NavigationBarView;->setActiveIndicatorLabelPadding(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setElevation(F)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setIconLabelHorizontalSpacing(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorExpandedHeight(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorExpandedMarginHorizontal(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorExpandedPadding(IIII)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorExpandedWidth(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorHeight(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorMarginHorizontal(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorShapeAppearance(Lcom/google/android/material/shape/ShapeAppearanceModel;)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemActiveIndicatorWidth(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemGravity(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemIconGravity(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemIconSize(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemPaddingBottom(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemPaddingTop(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemRippleColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemTextAppearanceActive(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemTextAppearanceActiveBoldEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemTextAppearanceInactive(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setItemTextColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setLabelFontScalingEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setLabelMaxLines(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setLabelVisibilityMode(I)V
+SPLcom/google/android/material/navigation/NavigationBarView;->setMeasureBottomPaddingFromLabelBaseline(Z)V
+SPLcom/google/android/material/navigation/NavigationBarView;->shouldAddMenuView()Z
+Lcom/google/android/material/navigation/NavigationBarView$1;
+SPLcom/google/android/material/navigation/NavigationBarView$1;-><init>(Lcom/google/android/material/navigation/NavigationBarView;)V
+Lcom/google/android/material/navigation/NavigationView;
+SPLcom/google/android/material/navigation/NavigationView;-><clinit>()V
+SPLcom/google/android/material/navigation/NavigationView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLcom/google/android/material/navigation/NavigationView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLcom/google/android/material/navigation/NavigationView;->access$300(Lcom/google/android/material/navigation/NavigationView;)[I
+SPLcom/google/android/material/navigation/NavigationView;->access$400(Lcom/google/android/material/navigation/NavigationView;)Lcom/google/android/material/internal/NavigationMenuPresenter;
+SPLcom/google/android/material/navigation/NavigationView;->getDividerInsetStart()I
+SPLcom/google/android/material/navigation/NavigationView;->getItemHorizontalPadding()I
+SPLcom/google/android/material/navigation/NavigationView;->getMenu()Landroid/view/Menu;
+SPLcom/google/android/material/navigation/NavigationView;->getMenuInflater()Landroid/view/MenuInflater;
+SPLcom/google/android/material/navigation/NavigationView;->inflateHeaderView(I)Landroid/view/View;
+SPLcom/google/android/material/navigation/NavigationView;->inflateMenu(I)V
+SPLcom/google/android/material/navigation/NavigationView;->isStartInsetScrimEnabled()Z
+SPLcom/google/android/material/navigation/NavigationView;->isTopInsetScrimEnabled()Z
+SPLcom/google/android/material/navigation/NavigationView;->maybeUpdateCornerSizeForDrawerLayout(II)V
+SPLcom/google/android/material/navigation/NavigationView;->onAttachedToWindow()V
+SPLcom/google/android/material/navigation/NavigationView;->onMeasure(II)V
+SPLcom/google/android/material/navigation/NavigationView;->onSizeChanged(IIII)V
+SPLcom/google/android/material/navigation/NavigationView;->setBottomInsetScrimEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationView;->setDividerInsetEnd(I)V
+SPLcom/google/android/material/navigation/NavigationView;->setDividerInsetStart(I)V
+SPLcom/google/android/material/navigation/NavigationView;->setElevation(F)V
+SPLcom/google/android/material/navigation/NavigationView;->setEndInsetScrimEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationView;->setItemHorizontalPadding(I)V
+SPLcom/google/android/material/navigation/NavigationView;->setItemIconSize(I)V
+SPLcom/google/android/material/navigation/NavigationView;->setItemMaxLines(I)V
+SPLcom/google/android/material/navigation/NavigationView;->setItemVerticalPadding(I)V
+SPLcom/google/android/material/navigation/NavigationView;->setNavigationItemSelectedListener(Lcom/google/android/material/navigation/NavigationView$OnNavigationItemSelectedListener;)V
+SPLcom/google/android/material/navigation/NavigationView;->setOverScrollMode(I)V
+SPLcom/google/android/material/navigation/NavigationView;->setStartInsetScrimEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationView;->setSubheaderInsetEnd(I)V
+SPLcom/google/android/material/navigation/NavigationView;->setSubheaderInsetStart(I)V
+SPLcom/google/android/material/navigation/NavigationView;->setTopInsetScrimEnabled(Z)V
+SPLcom/google/android/material/navigation/NavigationView;->setupInsetScrimsListener()V
+Lcom/google/android/material/navigation/NavigationView$1;
+SPLcom/google/android/material/navigation/NavigationView$1;-><init>(Lcom/google/android/material/navigation/NavigationView;)V
+Lcom/google/android/material/navigation/NavigationView$2;
+SPLcom/google/android/material/navigation/NavigationView$2;-><init>(Lcom/google/android/material/navigation/NavigationView;)V
+Lcom/google/android/material/navigation/NavigationView$3;
+SPLcom/google/android/material/navigation/NavigationView$3;-><init>(Lcom/google/android/material/navigation/NavigationView;)V
+SPLcom/google/android/material/navigation/NavigationView$3;->onGlobalLayout()V
+Lcom/google/android/material/navigation/NavigationView$FocusDrawerListener;
+SPLcom/google/android/material/navigation/NavigationView$FocusDrawerListener;-><init>(Lcom/google/android/material/navigation/NavigationView;)V
+SPLcom/google/android/material/navigation/NavigationView$FocusDrawerListener;-><init>(Lcom/google/android/material/navigation/NavigationView;Lcom/google/android/material/navigation/NavigationView$1;)V
+SPLcom/google/android/material/navigation/NavigationView$FocusDrawerListener;->clearLastFocusedView()V
+Lcom/google/android/material/navigation/NavigationView$OnNavigationItemSelectedListener;
+Lcom/google/android/material/progressindicator/AnimatorDurationScaleProvider;
+SPLcom/google/android/material/progressindicator/AnimatorDurationScaleProvider;-><init>()V
+SPLcom/google/android/material/progressindicator/AnimatorDurationScaleProvider;->getSystemAnimatorDurationScale(Landroid/content/ContentResolver;)F
+Lcom/google/android/material/progressindicator/BaseProgressIndicator;
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;-><clinit>()V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->applyNewVisibility(Z)V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->getCurrentDrawable()Landroid/graphics/drawable/Drawable;
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->getIndeterminateDrawable()Lcom/google/android/material/progressindicator/IndeterminateDrawable;
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->getProgressDrawable()Lcom/google/android/material/progressindicator/DeterminateDrawable;
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->isEffectivelyVisible()Z
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->onAttachedToWindow()V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->onDetachedFromWindow()V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->onVisibilityChanged(Landroid/view/View;I)V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->onWindowVisibilityChanged(I)V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->registerAnimationCallbacks()V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->registerSwitchIndeterminateModeCallback()V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->setIndeterminate(Z)V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->setIndeterminateDrawable(Landroid/graphics/drawable/Drawable;)V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->setProgress(I)V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->setProgressCompat(IZ)V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->setProgressDrawable(Landroid/graphics/drawable/Drawable;)V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->unregisterAnimationCallbacks()V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator;->visibleToUser()Z
+Lcom/google/android/material/progressindicator/BaseProgressIndicator$$ExternalSyntheticLambda0;
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator$$ExternalSyntheticLambda0;-><init>(Lcom/google/android/material/progressindicator/BaseProgressIndicator;)V
+Lcom/google/android/material/progressindicator/BaseProgressIndicator$1;
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator$1;-><init>(Lcom/google/android/material/progressindicator/BaseProgressIndicator;)V
+Lcom/google/android/material/progressindicator/BaseProgressIndicator$2;
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator$2;-><init>(Lcom/google/android/material/progressindicator/BaseProgressIndicator;)V
+Lcom/google/android/material/progressindicator/BaseProgressIndicator$3;
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator$3;-><init>(Lcom/google/android/material/progressindicator/BaseProgressIndicator;)V
+Lcom/google/android/material/progressindicator/BaseProgressIndicator$4;
+SPLcom/google/android/material/progressindicator/BaseProgressIndicator$4;-><init>(Lcom/google/android/material/progressindicator/BaseProgressIndicator;)V
+Lcom/google/android/material/progressindicator/BaseProgressIndicatorSpec;
+SPLcom/google/android/material/progressindicator/BaseProgressIndicatorSpec;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicatorSpec;->hasWavyEffect(Z)Z
+SPLcom/google/android/material/progressindicator/BaseProgressIndicatorSpec;->loadIndicatorColors(Landroid/content/Context;Landroid/content/res/TypedArray;)V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicatorSpec;->loadTrackColor(Landroid/content/Context;Landroid/content/res/TypedArray;)V
+SPLcom/google/android/material/progressindicator/BaseProgressIndicatorSpec;->validateSpec()V
+Lcom/google/android/material/progressindicator/DeterminateDrawable;
+SPLcom/google/android/material/progressindicator/DeterminateDrawable;-><clinit>()V
+SPLcom/google/android/material/progressindicator/DeterminateDrawable;-><init>(Landroid/content/Context;Lcom/google/android/material/progressindicator/BaseProgressIndicatorSpec;Lcom/google/android/material/progressindicator/DrawingDelegate;)V
+SPLcom/google/android/material/progressindicator/DeterminateDrawable;->createLinearDrawable(Landroid/content/Context;Lcom/google/android/material/progressindicator/LinearProgressIndicatorSpec;Lcom/google/android/material/progressindicator/LinearDrawingDelegate;)Lcom/google/android/material/progressindicator/DeterminateDrawable;
+SPLcom/google/android/material/progressindicator/DeterminateDrawable;->getIntrinsicHeight()I
+SPLcom/google/android/material/progressindicator/DeterminateDrawable;->hideNow()Z
+SPLcom/google/android/material/progressindicator/DeterminateDrawable;->jumpToCurrentState()V
+SPLcom/google/android/material/progressindicator/DeterminateDrawable;->registerAnimationCallback(Landroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback;)V
+SPLcom/google/android/material/progressindicator/DeterminateDrawable;->setAlpha(I)V
+SPLcom/google/android/material/progressindicator/DeterminateDrawable;->setDrawingDelegate(Lcom/google/android/material/progressindicator/DrawingDelegate;)V
+SPLcom/google/android/material/progressindicator/DeterminateDrawable;->setIndicatorFraction(F)V
+SPLcom/google/android/material/progressindicator/DeterminateDrawable;->setLevelByFraction(F)V
+SPLcom/google/android/material/progressindicator/DeterminateDrawable;->setVisible(ZZZ)Z
+SPLcom/google/android/material/progressindicator/DeterminateDrawable;->setVisibleInternal(ZZZ)Z
+SPLcom/google/android/material/progressindicator/DeterminateDrawable;->unregisterAnimationCallback(Landroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback;)Z
+Lcom/google/android/material/progressindicator/DeterminateDrawable$$ExternalSyntheticLambda1;
+SPLcom/google/android/material/progressindicator/DeterminateDrawable$$ExternalSyntheticLambda1;-><init>(Lcom/google/android/material/progressindicator/DeterminateDrawable;Lcom/google/android/material/progressindicator/BaseProgressIndicatorSpec;)V
+Lcom/google/android/material/progressindicator/DeterminateDrawable$1;
+SPLcom/google/android/material/progressindicator/DeterminateDrawable$1;-><init>(Ljava/lang/String;)V
+Lcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;-><clinit>()V
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;-><init>(Landroid/content/Context;Lcom/google/android/material/progressindicator/BaseProgressIndicatorSpec;)V
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->access$101(Lcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;ZZ)Z
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->access$200(Lcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;)V
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->dispatchAnimationEnd()V
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->endAnimatorsWithoutCallbacks([Landroid/animation/ValueAnimator;)V
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->hideNow()Z
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->isHiding()Z
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->isRunning()Z
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->isShowing()Z
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->maybeInitializeAnimators()V
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->registerAnimationCallback(Landroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback;)V
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->setAlpha(I)V
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->setGrowFraction(F)V
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->setHideAnimator(Landroid/animation/ValueAnimator;)V
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->setShowAnimator(Landroid/animation/ValueAnimator;)V
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->setVisible(ZZ)Z
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->setVisible(ZZZ)Z
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->setVisibleInternal(ZZZ)Z
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->stop()V
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;->unregisterAnimationCallback(Landroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback;)Z
+Lcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange$1;
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange$1;-><init>(Lcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;)V
+Lcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange$2;
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange$2;-><init>(Lcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;)V
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange$2;->onAnimationEnd(Landroid/animation/Animator;)V
+Lcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange$3;
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange$3;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange$3;->set(Lcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange;Ljava/lang/Float;)V
+SPLcom/google/android/material/progressindicator/DrawableWithAnimatedVisibilityChange$3;->set(Ljava/lang/Object;Ljava/lang/Object;)V
+Lcom/google/android/material/progressindicator/DrawingDelegate;
+SPLcom/google/android/material/progressindicator/DrawingDelegate;-><init>(Lcom/google/android/material/progressindicator/BaseProgressIndicatorSpec;)V
+Lcom/google/android/material/progressindicator/DrawingDelegate$ActiveIndicator;
+SPLcom/google/android/material/progressindicator/DrawingDelegate$ActiveIndicator;-><init>()V
+Lcom/google/android/material/progressindicator/DrawingDelegate$PathPoint;
+SPLcom/google/android/material/progressindicator/DrawingDelegate$PathPoint;-><init>(Lcom/google/android/material/progressindicator/DrawingDelegate;)V
+Lcom/google/android/material/progressindicator/IndeterminateAnimatorDelegate;
+SPLcom/google/android/material/progressindicator/IndeterminateAnimatorDelegate;-><init>(I)V
+SPLcom/google/android/material/progressindicator/IndeterminateAnimatorDelegate;->registerDrawable(Lcom/google/android/material/progressindicator/IndeterminateDrawable;)V
+Lcom/google/android/material/progressindicator/IndeterminateDrawable;
+SPLcom/google/android/material/progressindicator/IndeterminateDrawable;-><init>(Landroid/content/Context;Lcom/google/android/material/progressindicator/BaseProgressIndicatorSpec;Lcom/google/android/material/progressindicator/DrawingDelegate;Lcom/google/android/material/progressindicator/IndeterminateAnimatorDelegate;)V
+SPLcom/google/android/material/progressindicator/IndeterminateDrawable;->createLinearDrawable(Landroid/content/Context;Lcom/google/android/material/progressindicator/LinearProgressIndicatorSpec;Lcom/google/android/material/progressindicator/LinearDrawingDelegate;)Lcom/google/android/material/progressindicator/IndeterminateDrawable;
+SPLcom/google/android/material/progressindicator/IndeterminateDrawable;->getAnimatorDelegate()Lcom/google/android/material/progressindicator/IndeterminateAnimatorDelegate;
+SPLcom/google/android/material/progressindicator/IndeterminateDrawable;->hideNow()Z
+SPLcom/google/android/material/progressindicator/IndeterminateDrawable;->isHiding()Z
+SPLcom/google/android/material/progressindicator/IndeterminateDrawable;->isRunning()Z
+SPLcom/google/android/material/progressindicator/IndeterminateDrawable;->isShowing()Z
+SPLcom/google/android/material/progressindicator/IndeterminateDrawable;->isSystemAnimatorDisabled()Z
+SPLcom/google/android/material/progressindicator/IndeterminateDrawable;->registerAnimationCallback(Landroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback;)V
+SPLcom/google/android/material/progressindicator/IndeterminateDrawable;->setAlpha(I)V
+SPLcom/google/android/material/progressindicator/IndeterminateDrawable;->setAnimatorDelegate(Lcom/google/android/material/progressindicator/IndeterminateAnimatorDelegate;)V
+SPLcom/google/android/material/progressindicator/IndeterminateDrawable;->setDrawingDelegate(Lcom/google/android/material/progressindicator/DrawingDelegate;)V
+SPLcom/google/android/material/progressindicator/IndeterminateDrawable;->setVisible(ZZ)Z
+SPLcom/google/android/material/progressindicator/IndeterminateDrawable;->setVisible(ZZZ)Z
+SPLcom/google/android/material/progressindicator/IndeterminateDrawable;->setVisibleInternal(ZZZ)Z
+SPLcom/google/android/material/progressindicator/IndeterminateDrawable;->stop()V
+SPLcom/google/android/material/progressindicator/IndeterminateDrawable;->unregisterAnimationCallback(Landroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback;)Z
+Lcom/google/android/material/progressindicator/LinearDrawingDelegate;
+SPLcom/google/android/material/progressindicator/LinearDrawingDelegate;-><init>(Lcom/google/android/material/progressindicator/LinearProgressIndicatorSpec;)V
+SPLcom/google/android/material/progressindicator/LinearDrawingDelegate;->getPreferredHeight()I
+Lcom/google/android/material/progressindicator/LinearIndeterminateDisjointAnimatorDelegate;
+SPLcom/google/android/material/progressindicator/LinearIndeterminateDisjointAnimatorDelegate;-><clinit>()V
+SPLcom/google/android/material/progressindicator/LinearIndeterminateDisjointAnimatorDelegate;-><init>(Landroid/content/Context;Lcom/google/android/material/progressindicator/LinearProgressIndicatorSpec;)V
+SPLcom/google/android/material/progressindicator/LinearIndeterminateDisjointAnimatorDelegate;->cancelAnimatorImmediately()V
+SPLcom/google/android/material/progressindicator/LinearIndeterminateDisjointAnimatorDelegate;->registerAnimatorsCompleteCallback(Landroidx/vectordrawable/graphics/drawable/Animatable2Compat$AnimationCallback;)V
+SPLcom/google/android/material/progressindicator/LinearIndeterminateDisjointAnimatorDelegate;->unregisterAnimatorsCompleteCallback()V
+Lcom/google/android/material/progressindicator/LinearIndeterminateDisjointAnimatorDelegate$3;
+SPLcom/google/android/material/progressindicator/LinearIndeterminateDisjointAnimatorDelegate$3;-><init>(Ljava/lang/Class;Ljava/lang/String;)V
+Lcom/google/android/material/progressindicator/LinearProgressIndicator;
+SPLcom/google/android/material/progressindicator/LinearProgressIndicator;-><clinit>()V
+SPLcom/google/android/material/progressindicator/LinearProgressIndicator;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLcom/google/android/material/progressindicator/LinearProgressIndicator;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLcom/google/android/material/progressindicator/LinearProgressIndicator;->createSpec(Landroid/content/Context;Landroid/util/AttributeSet;)Lcom/google/android/material/progressindicator/BaseProgressIndicatorSpec;
+SPLcom/google/android/material/progressindicator/LinearProgressIndicator;->createSpec(Landroid/content/Context;Landroid/util/AttributeSet;)Lcom/google/android/material/progressindicator/LinearProgressIndicatorSpec;
+SPLcom/google/android/material/progressindicator/LinearProgressIndicator;->initializeDrawables()V
+SPLcom/google/android/material/progressindicator/LinearProgressIndicator;->setProgressCompat(IZ)V
+Lcom/google/android/material/progressindicator/LinearProgressIndicatorSpec;
+SPLcom/google/android/material/progressindicator/LinearProgressIndicatorSpec;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLcom/google/android/material/progressindicator/LinearProgressIndicatorSpec;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLcom/google/android/material/progressindicator/LinearProgressIndicatorSpec;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
+SPLcom/google/android/material/progressindicator/LinearProgressIndicatorSpec;->validateSpec()V
+Lcom/google/android/material/resources/MaterialAttributes;
+SPLcom/google/android/material/resources/MaterialAttributes;->resolve(Landroid/content/Context;I)Landroid/util/TypedValue;
+SPLcom/google/android/material/resources/MaterialAttributes;->resolve(Landroid/content/res/Resources$Theme;I)Landroid/util/TypedValue;
+SPLcom/google/android/material/resources/MaterialAttributes;->resolveBoolean(Landroid/content/Context;IZ)Z
+SPLcom/google/android/material/resources/MaterialAttributes;->resolveBoolean(Landroid/content/res/Resources$Theme;IZ)Z
+SPLcom/google/android/material/resources/MaterialAttributes;->resolveInteger(Landroid/content/Context;II)I
+SPLcom/google/android/material/resources/MaterialAttributes;->resolveInteger(Landroid/content/res/Resources$Theme;II)I
+SPLcom/google/android/material/resources/MaterialAttributes;->resolveTypedValueOrThrow(Landroid/content/Context;ILjava/lang/String;)Landroid/util/TypedValue;
+SPLcom/google/android/material/resources/MaterialAttributes;->resolveTypedValueOrThrow(Landroid/view/View;I)Landroid/util/TypedValue;
+Lcom/google/android/material/resources/MaterialResources;
+SPLcom/google/android/material/resources/MaterialResources;->getColorStateList(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/content/res/ColorStateList;
+SPLcom/google/android/material/resources/MaterialResources;->getColorStateList(Landroid/content/Context;Landroidx/appcompat/widget/TintTypedArray;I)Landroid/content/res/ColorStateList;
+SPLcom/google/android/material/resources/MaterialResources;->getComplexUnit(Landroid/util/TypedValue;)I
+SPLcom/google/android/material/resources/MaterialResources;->getDimensionPixelSize(Landroid/content/Context;Landroid/content/res/TypedArray;II)I
+SPLcom/google/android/material/resources/MaterialResources;->getDrawable(Landroid/content/Context;Landroid/content/res/TypedArray;I)Landroid/graphics/drawable/Drawable;
+SPLcom/google/android/material/resources/MaterialResources;->getUnscaledLineHeight(Landroid/content/Context;II)I
+SPLcom/google/android/material/resources/MaterialResources;->getUnscaledTextSize(Landroid/content/Context;II)I
+Lcom/google/android/material/ripple/RippleUtils;
+SPLcom/google/android/material/ripple/RippleUtils;-><clinit>()V
+SPLcom/google/android/material/ripple/RippleUtils;->sanitizeRippleDrawableColor(Landroid/content/res/ColorStateList;)Landroid/content/res/ColorStateList;
+Lcom/google/android/material/shadow/ShadowRenderer;
+SPLcom/google/android/material/shadow/ShadowRenderer;-><clinit>()V
+SPLcom/google/android/material/shadow/ShadowRenderer;-><init>()V
+SPLcom/google/android/material/shadow/ShadowRenderer;-><init>(I)V
+SPLcom/google/android/material/shadow/ShadowRenderer;->setShadowColor(I)V
+Lcom/google/android/material/shape/AbsoluteCornerSize;
+SPLcom/google/android/material/shape/AbsoluteCornerSize;-><init>(F)V
+SPLcom/google/android/material/shape/AbsoluteCornerSize;->getCornerSize(Landroid/graphics/RectF;)F
+Lcom/google/android/material/shape/CornerSize;
+Lcom/google/android/material/shape/CornerTreatment;
+SPLcom/google/android/material/shape/CornerTreatment;-><init>()V
+SPLcom/google/android/material/shape/CornerTreatment;->getCornerPath(Lcom/google/android/material/shape/ShapePath;FFLandroid/graphics/RectF;Lcom/google/android/material/shape/CornerSize;)V
+Lcom/google/android/material/shape/EdgeTreatment;
+SPLcom/google/android/material/shape/EdgeTreatment;-><init>()V
+SPLcom/google/android/material/shape/EdgeTreatment;->forceIntersection()Z
+SPLcom/google/android/material/shape/EdgeTreatment;->getEdgePath(FFFLcom/google/android/material/shape/ShapePath;)V
+Lcom/google/android/material/shape/MaterialShapeDrawable;
+SPLcom/google/android/material/shape/MaterialShapeDrawable;-><clinit>()V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;-><init>(Lcom/google/android/material/shape/MaterialShapeDrawable$MaterialShapeDrawableState;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;-><init>(Lcom/google/android/material/shape/ShapeAppearance;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;-><init>(Lcom/google/android/material/shape/ShapeAppearanceModel;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->access$602(Lcom/google/android/material/shape/MaterialShapeDrawable;Z)Z
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->access$702(Lcom/google/android/material/shape/MaterialShapeDrawable;Z)Z
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->calculatePaintColorTintFilter(Landroid/graphics/Paint;Z)Landroid/graphics/PorterDuffColorFilter;
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->calculateRoundRectCornerSize(Landroid/graphics/RectF;Lcom/google/android/material/shape/ShapeAppearanceModel;[F)F
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->calculateTintColorTintFilter(Landroid/content/res/ColorStateList;Landroid/graphics/PorterDuff$Mode;Z)Landroid/graphics/PorterDuffColorFilter;
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->calculateTintFilter(Landroid/content/res/ColorStateList;Landroid/graphics/PorterDuff$Mode;Landroid/graphics/Paint;Z)Landroid/graphics/PorterDuffColorFilter;
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->compositeElevationOverlayIfNeeded(I)I
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->draw(Landroid/graphics/Canvas;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->drawFillShape(Landroid/graphics/Canvas;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->drawShape(Landroid/graphics/Canvas;Landroid/graphics/Paint;Landroid/graphics/Path;Lcom/google/android/material/shape/ShapeAppearanceModel;[FLandroid/graphics/RectF;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->getBoundsAsRectF()Landroid/graphics/RectF;
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->getConstantState()Landroid/graphics/drawable/Drawable$ConstantState;
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->getElevation()F
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->getOpacity()I
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->getOutline(Landroid/graphics/Outline;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->getPadding(Landroid/graphics/Rect;)Z
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->getParentAbsoluteElevation()F
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->getShapeAppearanceModel()Lcom/google/android/material/shape/ShapeAppearanceModel;
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->getTranslationZ()F
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->getZ()F
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->hasCompatShadow()Z
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->hasFill()Z
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->hasStroke()Z
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->initializeElevationOverlay(Landroid/content/Context;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->invalidateSelf()V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->invalidateSelfIgnoreShape()V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->isElevationOverlayEnabled()Z
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->isRoundRect()Z
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->isStateful()Z
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->maybeDrawCompatShadow(Landroid/graphics/Canvas;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->modulateAlpha(II)I
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->mutate()Landroid/graphics/drawable/Drawable;
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->onBoundsChange(Landroid/graphics/Rect;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->onStateChange([I)Z
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->requiresCompatShadow()Z
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->setColorFilter(Landroid/graphics/ColorFilter;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->setElevation(F)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->setFillColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->setParentAbsoluteElevation(F)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->setShapeAppearance(Lcom/google/android/material/shape/ShapeAppearance;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->setShapeAppearanceModel(Lcom/google/android/material/shape/ShapeAppearanceModel;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->setStroke(FI)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->setStroke(FLandroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->setStrokeColor(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->setStrokeWidth(F)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->setTint(I)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->setTintList(Landroid/content/res/ColorStateList;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->setTintMode(Landroid/graphics/PorterDuff$Mode;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->shouldCalculatePath()Z
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->updateColorsForState([I)Z
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->updateTintFilter()Z
+SPLcom/google/android/material/shape/MaterialShapeDrawable;->updateZ()V
+Lcom/google/android/material/shape/MaterialShapeDrawable$1;
+SPLcom/google/android/material/shape/MaterialShapeDrawable$1;-><init>(Lcom/google/android/material/shape/MaterialShapeDrawable;)V
+Lcom/google/android/material/shape/MaterialShapeDrawable$2;
+SPLcom/google/android/material/shape/MaterialShapeDrawable$2;-><init>(Lcom/google/android/material/shape/MaterialShapeDrawable;)V
+Lcom/google/android/material/shape/MaterialShapeDrawable$MaterialShapeDrawableState;
+SPLcom/google/android/material/shape/MaterialShapeDrawable$MaterialShapeDrawableState;-><init>(Lcom/google/android/material/shape/MaterialShapeDrawable$MaterialShapeDrawableState;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable$MaterialShapeDrawableState;-><init>(Lcom/google/android/material/shape/ShapeAppearance;Lcom/google/android/material/elevation/ElevationOverlayProvider;)V
+SPLcom/google/android/material/shape/MaterialShapeDrawable$MaterialShapeDrawableState;->newDrawable()Landroid/graphics/drawable/Drawable;
+Lcom/google/android/material/shape/MaterialShapeDrawable$SpringAnimatedCornerSizeProperty;
+SPLcom/google/android/material/shape/MaterialShapeDrawable$SpringAnimatedCornerSizeProperty;-><init>(I)V
+Lcom/google/android/material/shape/MaterialShapeUtils;
+SPLcom/google/android/material/shape/MaterialShapeUtils;->createCornerTreatment(I)Lcom/google/android/material/shape/CornerTreatment;
+SPLcom/google/android/material/shape/MaterialShapeUtils;->createDefaultCornerTreatment()Lcom/google/android/material/shape/CornerTreatment;
+SPLcom/google/android/material/shape/MaterialShapeUtils;->createDefaultEdgeTreatment()Lcom/google/android/material/shape/EdgeTreatment;
+SPLcom/google/android/material/shape/MaterialShapeUtils;->setElevation(Landroid/view/View;F)V
+SPLcom/google/android/material/shape/MaterialShapeUtils;->setParentAbsoluteElevation(Landroid/view/View;)V
+SPLcom/google/android/material/shape/MaterialShapeUtils;->setParentAbsoluteElevation(Landroid/view/View;Lcom/google/android/material/shape/MaterialShapeDrawable;)V
+Lcom/google/android/material/shape/RelativeCornerSize;
+SPLcom/google/android/material/shape/RelativeCornerSize;-><init>(F)V
+Lcom/google/android/material/shape/RoundedCornerTreatment;
+SPLcom/google/android/material/shape/RoundedCornerTreatment;-><init>()V
+SPLcom/google/android/material/shape/RoundedCornerTreatment;->getCornerPath(Lcom/google/android/material/shape/ShapePath;FFF)V
+Lcom/google/android/material/shape/ShapeAppearance;
+Lcom/google/android/material/shape/ShapeAppearanceModel;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;-><clinit>()V
+SPLcom/google/android/material/shape/ShapeAppearanceModel;-><init>(Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;)V
+SPLcom/google/android/material/shape/ShapeAppearanceModel;-><init>(Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;Lcom/google/android/material/shape/ShapeAppearanceModel$1;)V
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->builder()Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->builder(Landroid/content/Context;II)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->builder(Landroid/content/Context;III)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->builder(Landroid/content/Context;IILcom/google/android/material/shape/CornerSize;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->builder(Landroid/content/Context;Landroid/util/AttributeSet;II)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->builder(Landroid/content/Context;Landroid/util/AttributeSet;III)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->builder(Landroid/content/Context;Landroid/util/AttributeSet;IILcom/google/android/material/shape/CornerSize;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->builder(Landroid/content/res/TypedArray;Lcom/google/android/material/shape/CornerSize;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->getBottomEdge()Lcom/google/android/material/shape/EdgeTreatment;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->getBottomLeftCorner()Lcom/google/android/material/shape/CornerTreatment;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->getBottomLeftCornerSize()Lcom/google/android/material/shape/CornerSize;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->getBottomRightCorner()Lcom/google/android/material/shape/CornerTreatment;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->getBottomRightCornerSize()Lcom/google/android/material/shape/CornerSize;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->getCornerSize(Landroid/content/res/TypedArray;ILcom/google/android/material/shape/CornerSize;)Lcom/google/android/material/shape/CornerSize;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->getDefaultShape()Lcom/google/android/material/shape/ShapeAppearanceModel;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->getLeftEdge()Lcom/google/android/material/shape/EdgeTreatment;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->getRightEdge()Lcom/google/android/material/shape/EdgeTreatment;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->getShapeForState([I)Lcom/google/android/material/shape/ShapeAppearanceModel;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->getTopEdge()Lcom/google/android/material/shape/EdgeTreatment;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->getTopLeftCorner()Lcom/google/android/material/shape/CornerTreatment;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->getTopLeftCornerSize()Lcom/google/android/material/shape/CornerSize;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->getTopRightCorner()Lcom/google/android/material/shape/CornerTreatment;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->getTopRightCornerSize()Lcom/google/android/material/shape/CornerSize;
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->hasRoundedCorners()Z
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->isRoundRect(Landroid/graphics/RectF;)Z
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->isStateful()Z
+SPLcom/google/android/material/shape/ShapeAppearanceModel;->toBuilder()Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;-><init>()V
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;-><init>(Lcom/google/android/material/shape/ShapeAppearanceModel;)V
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->access$100(Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;)Lcom/google/android/material/shape/CornerTreatment;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->access$1000(Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;)Lcom/google/android/material/shape/EdgeTreatment;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->access$1100(Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;)Lcom/google/android/material/shape/EdgeTreatment;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->access$1200(Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;)Lcom/google/android/material/shape/EdgeTreatment;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->access$200(Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;)Lcom/google/android/material/shape/CornerTreatment;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->access$300(Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;)Lcom/google/android/material/shape/CornerTreatment;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->access$400(Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;)Lcom/google/android/material/shape/CornerTreatment;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->access$500(Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;)Lcom/google/android/material/shape/CornerSize;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->access$600(Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;)Lcom/google/android/material/shape/CornerSize;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->access$700(Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;)Lcom/google/android/material/shape/CornerSize;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->access$800(Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;)Lcom/google/android/material/shape/CornerSize;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->access$900(Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;)Lcom/google/android/material/shape/EdgeTreatment;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->build()Lcom/google/android/material/shape/ShapeAppearanceModel;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->compatCornerTreatmentSize(Lcom/google/android/material/shape/CornerTreatment;)F
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setAllCornerSizes(F)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setAllCorners(IF)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setAllCorners(Lcom/google/android/material/shape/CornerTreatment;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setBottomLeftCorner(ILcom/google/android/material/shape/CornerSize;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setBottomLeftCorner(Lcom/google/android/material/shape/CornerTreatment;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setBottomLeftCornerSize(F)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setBottomLeftCornerSize(Lcom/google/android/material/shape/CornerSize;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setBottomRightCorner(ILcom/google/android/material/shape/CornerSize;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setBottomRightCorner(Lcom/google/android/material/shape/CornerTreatment;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setBottomRightCornerSize(F)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setBottomRightCornerSize(Lcom/google/android/material/shape/CornerSize;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setTopLeftCorner(ILcom/google/android/material/shape/CornerSize;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setTopLeftCorner(Lcom/google/android/material/shape/CornerTreatment;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setTopLeftCornerSize(F)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setTopLeftCornerSize(Lcom/google/android/material/shape/CornerSize;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setTopRightCorner(ILcom/google/android/material/shape/CornerSize;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setTopRightCorner(Lcom/google/android/material/shape/CornerTreatment;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setTopRightCornerSize(F)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+SPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;->setTopRightCornerSize(Lcom/google/android/material/shape/CornerSize;)Lcom/google/android/material/shape/ShapeAppearanceModel$Builder;
+Lcom/google/android/material/shape/ShapeAppearanceModel$CornerSizeUnaryOperator;
+Lcom/google/android/material/shape/ShapeAppearancePathProvider;
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;-><init>()V
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->angleOfEdge(I)F
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->appendCornerPath(Lcom/google/android/material/shape/ShapeAppearancePathProvider$ShapeAppearancePathSpec;I)V
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->appendEdgePath(Lcom/google/android/material/shape/ShapeAppearancePathProvider$ShapeAppearancePathSpec;I)V
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->calculatePath(Lcom/google/android/material/shape/ShapeAppearanceModel;FLandroid/graphics/RectF;Landroid/graphics/Path;)V
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->calculatePath(Lcom/google/android/material/shape/ShapeAppearanceModel;FLandroid/graphics/RectF;Lcom/google/android/material/shape/ShapeAppearancePathProvider$PathListener;Landroid/graphics/Path;)V
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->calculatePath(Lcom/google/android/material/shape/ShapeAppearanceModel;[FFLandroid/graphics/RectF;Lcom/google/android/material/shape/ShapeAppearancePathProvider$PathListener;Landroid/graphics/Path;)V
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->getCoordinatesOfCorner(ILandroid/graphics/RectF;Landroid/graphics/PointF;)V
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->getCornerSizeForIndex(ILcom/google/android/material/shape/ShapeAppearanceModel;)Lcom/google/android/material/shape/CornerSize;
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->getCornerTreatmentForIndex(ILcom/google/android/material/shape/ShapeAppearanceModel;)Lcom/google/android/material/shape/CornerTreatment;
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->getEdgeCenterForIndex(Landroid/graphics/RectF;I)F
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->getEdgeTreatmentForIndex(ILcom/google/android/material/shape/ShapeAppearanceModel;)Lcom/google/android/material/shape/EdgeTreatment;
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->getInstance()Lcom/google/android/material/shape/ShapeAppearancePathProvider;
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->getInstanceOrCreate()Lcom/google/android/material/shape/ShapeAppearancePathProvider;
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->pathOverlapsCorner(Landroid/graphics/Path;I)Z
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->setCornerPathAndTransform(Lcom/google/android/material/shape/ShapeAppearancePathProvider$ShapeAppearancePathSpec;I[F)V
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider;->setEdgePathAndTransform(I)V
+Lcom/google/android/material/shape/ShapeAppearancePathProvider$Lazy;
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider$Lazy;-><clinit>()V
+Lcom/google/android/material/shape/ShapeAppearancePathProvider$PathListener;
+Lcom/google/android/material/shape/ShapeAppearancePathProvider$ShapeAppearancePathSpec;
+SPLcom/google/android/material/shape/ShapeAppearancePathProvider$ShapeAppearancePathSpec;-><init>(Lcom/google/android/material/shape/ShapeAppearanceModel;FLandroid/graphics/RectF;Lcom/google/android/material/shape/ShapeAppearancePathProvider$PathListener;Landroid/graphics/Path;)V
+Lcom/google/android/material/shape/ShapePath;
+SPLcom/google/android/material/shape/ShapePath;-><init>()V
+SPLcom/google/android/material/shape/ShapePath;->addArc(FFFFFF)V
+SPLcom/google/android/material/shape/ShapePath;->addConnectingShadowIfNecessary(F)V
+SPLcom/google/android/material/shape/ShapePath;->addShadowCompatOperation(Lcom/google/android/material/shape/ShapePath$ShadowCompatOperation;FF)V
+SPLcom/google/android/material/shape/ShapePath;->applyToPath(Landroid/graphics/Matrix;Landroid/graphics/Path;)V
+SPLcom/google/android/material/shape/ShapePath;->getCurrentShadowAngle()F
+SPLcom/google/android/material/shape/ShapePath;->getEndX()F
+SPLcom/google/android/material/shape/ShapePath;->getEndY()F
+SPLcom/google/android/material/shape/ShapePath;->getStartX()F
+SPLcom/google/android/material/shape/ShapePath;->getStartY()F
+SPLcom/google/android/material/shape/ShapePath;->lineTo(FF)V
+SPLcom/google/android/material/shape/ShapePath;->reset(FF)V
+SPLcom/google/android/material/shape/ShapePath;->reset(FFFF)V
+SPLcom/google/android/material/shape/ShapePath;->setCurrentShadowAngle(F)V
+SPLcom/google/android/material/shape/ShapePath;->setEndShadowAngle(F)V
+SPLcom/google/android/material/shape/ShapePath;->setEndX(F)V
+SPLcom/google/android/material/shape/ShapePath;->setEndY(F)V
+SPLcom/google/android/material/shape/ShapePath;->setStartX(F)V
+SPLcom/google/android/material/shape/ShapePath;->setStartY(F)V
+Lcom/google/android/material/shape/ShapePath$ArcShadowOperation;
+SPLcom/google/android/material/shape/ShapePath$ArcShadowOperation;-><init>(Lcom/google/android/material/shape/ShapePath$PathArcOperation;)V
+Lcom/google/android/material/shape/ShapePath$LineShadowOperation;
+SPLcom/google/android/material/shape/ShapePath$LineShadowOperation;-><init>(Lcom/google/android/material/shape/ShapePath$PathLineOperation;FF)V
+SPLcom/google/android/material/shape/ShapePath$LineShadowOperation;->getAngle()F
+Lcom/google/android/material/shape/ShapePath$PathArcOperation;
+SPLcom/google/android/material/shape/ShapePath$PathArcOperation;-><clinit>()V
+SPLcom/google/android/material/shape/ShapePath$PathArcOperation;-><init>(FFFF)V
+SPLcom/google/android/material/shape/ShapePath$PathArcOperation;->access$600(Lcom/google/android/material/shape/ShapePath$PathArcOperation;F)V
+SPLcom/google/android/material/shape/ShapePath$PathArcOperation;->access$700(Lcom/google/android/material/shape/ShapePath$PathArcOperation;F)V
+SPLcom/google/android/material/shape/ShapePath$PathArcOperation;->applyToPath(Landroid/graphics/Matrix;Landroid/graphics/Path;)V
+SPLcom/google/android/material/shape/ShapePath$PathArcOperation;->getBottom()F
+SPLcom/google/android/material/shape/ShapePath$PathArcOperation;->getLeft()F
+SPLcom/google/android/material/shape/ShapePath$PathArcOperation;->getRight()F
+SPLcom/google/android/material/shape/ShapePath$PathArcOperation;->getStartAngle()F
+SPLcom/google/android/material/shape/ShapePath$PathArcOperation;->getSweepAngle()F
+SPLcom/google/android/material/shape/ShapePath$PathArcOperation;->getTop()F
+SPLcom/google/android/material/shape/ShapePath$PathArcOperation;->setBottom(F)V
+SPLcom/google/android/material/shape/ShapePath$PathArcOperation;->setLeft(F)V
+SPLcom/google/android/material/shape/ShapePath$PathArcOperation;->setRight(F)V
+SPLcom/google/android/material/shape/ShapePath$PathArcOperation;->setStartAngle(F)V
+SPLcom/google/android/material/shape/ShapePath$PathArcOperation;->setSweepAngle(F)V
+SPLcom/google/android/material/shape/ShapePath$PathArcOperation;->setTop(F)V
+Lcom/google/android/material/shape/ShapePath$PathLineOperation;
+SPLcom/google/android/material/shape/ShapePath$PathLineOperation;-><init>()V
+SPLcom/google/android/material/shape/ShapePath$PathLineOperation;->access$000(Lcom/google/android/material/shape/ShapePath$PathLineOperation;)F
+SPLcom/google/android/material/shape/ShapePath$PathLineOperation;->access$002(Lcom/google/android/material/shape/ShapePath$PathLineOperation;F)F
+SPLcom/google/android/material/shape/ShapePath$PathLineOperation;->access$100(Lcom/google/android/material/shape/ShapePath$PathLineOperation;)F
+SPLcom/google/android/material/shape/ShapePath$PathLineOperation;->access$102(Lcom/google/android/material/shape/ShapePath$PathLineOperation;F)F
+SPLcom/google/android/material/shape/ShapePath$PathLineOperation;->applyToPath(Landroid/graphics/Matrix;Landroid/graphics/Path;)V
+Lcom/google/android/material/shape/ShapePath$PathOperation;
+SPLcom/google/android/material/shape/ShapePath$PathOperation;-><init>()V
+Lcom/google/android/material/shape/ShapePath$ShadowCompatOperation;
+SPLcom/google/android/material/shape/ShapePath$ShadowCompatOperation;-><clinit>()V
+SPLcom/google/android/material/shape/ShapePath$ShadowCompatOperation;-><init>()V
+Lcom/google/android/material/shape/Shapeable;
+Lcom/google/android/material/shape/ShapeableDelegate;
+SPLcom/google/android/material/shape/ShapeableDelegate;-><init>()V
+SPLcom/google/android/material/shape/ShapeableDelegate;->create(Landroid/view/View;)Lcom/google/android/material/shape/ShapeableDelegate;
+SPLcom/google/android/material/shape/ShapeableDelegate;->isMaskBoundsValid()Z
+SPLcom/google/android/material/shape/ShapeableDelegate;->onMaskChanged(Landroid/view/View;Landroid/graphics/RectF;)V
+SPLcom/google/android/material/shape/ShapeableDelegate;->onShapeAppearanceChanged(Landroid/view/View;Lcom/google/android/material/shape/ShapeAppearanceModel;)V
+SPLcom/google/android/material/shape/ShapeableDelegate;->setOffsetZeroCornerEdgeBoundsEnabled(Landroid/view/View;Z)V
+SPLcom/google/android/material/shape/ShapeableDelegate;->updateShapePath()V
+Lcom/google/android/material/shape/ShapeableDelegateV33;
+SPLcom/google/android/material/shape/ShapeableDelegateV33;-><init>(Landroid/view/View;)V
+SPLcom/google/android/material/shape/ShapeableDelegateV33;->initMaskOutlineProvider(Landroid/view/View;)V
+SPLcom/google/android/material/shape/ShapeableDelegateV33;->invalidateClippingMethod(Landroid/view/View;)V
+SPLcom/google/android/material/shape/ShapeableDelegateV33;->shouldUseCompatClipping()Z
+Lcom/google/android/material/shape/ShapeableDelegateV33$1;
+SPLcom/google/android/material/shape/ShapeableDelegateV33$1;-><init>(Lcom/google/android/material/shape/ShapeableDelegateV33;)V
+SPLcom/google/android/material/shape/ShapeableDelegateV33$1;->getOutline(Landroid/view/View;Landroid/graphics/Outline;)V
+Lcom/google/android/material/shape/StateListShapeAppearanceModel;
+SPLcom/google/android/material/shape/StateListShapeAppearanceModel;->create(Landroid/content/Context;Landroid/content/res/TypedArray;I)Lcom/google/android/material/shape/StateListShapeAppearanceModel;
+Lcom/google/android/material/snackbar/BaseTransientBottomBar$BaseCallback;
+SPLcom/google/android/material/snackbar/BaseTransientBottomBar$BaseCallback;-><init>()V
+Lcom/google/android/material/textview/MaterialTextView;
+SPLcom/google/android/material/textview/MaterialTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLcom/google/android/material/textview/MaterialTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLcom/google/android/material/textview/MaterialTextView;->applyLineHeightFromViewAppearance(Landroid/content/res/Resources$Theme;I)V
+SPLcom/google/android/material/textview/MaterialTextView;->canApplyTextAppearanceLineHeight(Landroid/content/Context;)Z
+SPLcom/google/android/material/textview/MaterialTextView;->findViewAppearanceResourceId(Landroid/content/res/Resources$Theme;Landroid/util/AttributeSet;II)I
+SPLcom/google/android/material/textview/MaterialTextView;->initialize(Landroid/util/AttributeSet;II)V
+SPLcom/google/android/material/textview/MaterialTextView;->readFirstAvailableDimension(Landroid/content/Context;Landroid/content/res/TypedArray;[I)I
+SPLcom/google/android/material/textview/MaterialTextView;->setTextAppearance(Landroid/content/Context;I)V
+SPLcom/google/android/material/textview/MaterialTextView;->viewAttrsHasLineHeight(Landroid/content/Context;Landroid/content/res/Resources$Theme;Landroid/util/AttributeSet;II)Z
+Lcom/google/android/material/theme/MaterialComponentsViewInflater;
+SPLcom/google/android/material/theme/MaterialComponentsViewInflater;-><init>()V
+SPLcom/google/android/material/theme/MaterialComponentsViewInflater;->createTextView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroidx/appcompat/widget/AppCompatTextView;
+Lcom/google/android/material/theme/overlay/MaterialThemeOverlay;
+SPLcom/google/android/material/theme/overlay/MaterialThemeOverlay;-><clinit>()V
+SPLcom/google/android/material/theme/overlay/MaterialThemeOverlay;->obtainAndroidThemeOverlayId(Landroid/content/Context;Landroid/util/AttributeSet;)I
+SPLcom/google/android/material/theme/overlay/MaterialThemeOverlay;->obtainMaterialOverlayIds(Landroid/content/Context;Landroid/util/AttributeSet;[III)[I
+SPLcom/google/android/material/theme/overlay/MaterialThemeOverlay;->obtainMaterialThemeOverlayId(Landroid/content/Context;Landroid/util/AttributeSet;II)I
+SPLcom/google/android/material/theme/overlay/MaterialThemeOverlay;->wrap(Landroid/content/Context;Landroid/util/AttributeSet;II)Landroid/content/Context;
+SPLcom/google/android/material/theme/overlay/MaterialThemeOverlay;->wrap(Landroid/content/Context;Landroid/util/AttributeSet;II[I)Landroid/content/Context;
+Lcom/google/common/util/concurrent/ListenableFuture;
+Lcom/google/common/util/concurrent/Striped$SmallLazyStriped$$ExternalSyntheticBackportWithForwarding0;
+SPLcom/google/common/util/concurrent/Striped$SmallLazyStriped$$ExternalSyntheticBackportWithForwarding0;->m(Ljava/util/concurrent/atomic/AtomicReferenceArray;ILjava/lang/Object;Ljava/lang/Object;)Z
+Lcom/google/protobuf/AbstractMessageLite;
+SPLcom/google/protobuf/AbstractMessageLite;-><init>()V
+SPLcom/google/protobuf/AbstractMessageLite;->addAll(Ljava/lang/Iterable;Ljava/util/List;)V
+SPLcom/google/protobuf/AbstractMessageLite;->toByteArray()[B
+Lcom/google/protobuf/AbstractMessageLite$Builder;
+SPLcom/google/protobuf/AbstractMessageLite$Builder;-><init>()V
+SPLcom/google/protobuf/AbstractMessageLite$Builder;->addAll(Ljava/lang/Iterable;Ljava/util/List;)V
+SPLcom/google/protobuf/AbstractMessageLite$Builder;->addAllCheckingNulls(Ljava/lang/Iterable;Ljava/util/List;)V
+Lcom/google/protobuf/AbstractProtobufList;
+SPLcom/google/protobuf/AbstractProtobufList;-><init>(Z)V
+SPLcom/google/protobuf/AbstractProtobufList;->ensureIsMutable()V
+SPLcom/google/protobuf/AbstractProtobufList;->isModifiable()Z
+SPLcom/google/protobuf/AbstractProtobufList;->makeImmutable()V
+Lcom/google/protobuf/Android;
+SPLcom/google/protobuf/Android;-><clinit>()V
+SPLcom/google/protobuf/Android;->getClassForName(Ljava/lang/String;)Ljava/lang/Class;
+SPLcom/google/protobuf/Android;->getMemoryClass()Ljava/lang/Class;
+SPLcom/google/protobuf/Android;->isOnAndroidDevice()Z
+Lcom/google/protobuf/ArrayDecoders;
+SPLcom/google/protobuf/ArrayDecoders;-><clinit>()V
+SPLcom/google/protobuf/ArrayDecoders;->checkRecursionLimit(I)V
+SPLcom/google/protobuf/ArrayDecoders;->decodeBytes([BILcom/google/protobuf/ArrayDecoders$Registers;)I
+SPLcom/google/protobuf/ArrayDecoders;->decodeMessageField(Lcom/google/protobuf/Schema;[BIILcom/google/protobuf/ArrayDecoders$Registers;)I
+SPLcom/google/protobuf/ArrayDecoders;->decodeMessageList(Lcom/google/protobuf/Schema;I[BIILcom/google/protobuf/Internal$ProtobufList;Lcom/google/protobuf/ArrayDecoders$Registers;)I
+SPLcom/google/protobuf/ArrayDecoders;->decodeStringRequireUtf8([BILcom/google/protobuf/ArrayDecoders$Registers;)I
+SPLcom/google/protobuf/ArrayDecoders;->decodeVarint32(I[BILcom/google/protobuf/ArrayDecoders$Registers;)I
+SPLcom/google/protobuf/ArrayDecoders;->decodeVarint32([BILcom/google/protobuf/ArrayDecoders$Registers;)I
+SPLcom/google/protobuf/ArrayDecoders;->decodeVarint64(J[BILcom/google/protobuf/ArrayDecoders$Registers;)I
+SPLcom/google/protobuf/ArrayDecoders;->decodeVarint64([BILcom/google/protobuf/ArrayDecoders$Registers;)I
+SPLcom/google/protobuf/ArrayDecoders;->mergeMessageField(Ljava/lang/Object;Lcom/google/protobuf/Schema;[BIILcom/google/protobuf/ArrayDecoders$Registers;)I
+Lcom/google/protobuf/ArrayDecoders$Registers;
+SPLcom/google/protobuf/ArrayDecoders$Registers;-><init>(Lcom/google/protobuf/ExtensionRegistryLite;)V
+Lcom/google/protobuf/ByteOutput;
+SPLcom/google/protobuf/ByteOutput;-><init>()V
+Lcom/google/protobuf/ByteString;
+SPLcom/google/protobuf/ByteString;-><clinit>()V
+SPLcom/google/protobuf/ByteString;-><init>()V
+SPLcom/google/protobuf/ByteString;->checkRange(III)I
+SPLcom/google/protobuf/ByteString;->copyFrom([BII)Lcom/google/protobuf/ByteString;
+SPLcom/google/protobuf/ByteString;->copyFrom([BIIZ)Lcom/google/protobuf/ByteString;
+SPLcom/google/protobuf/ByteString;->copyFromUtf8(Ljava/lang/String;)Lcom/google/protobuf/ByteString;
+SPLcom/google/protobuf/ByteString;->equals(Ljava/lang/Object;)Z
+SPLcom/google/protobuf/ByteString;->isEmpty()Z
+SPLcom/google/protobuf/ByteString;->toString(Ljava/nio/charset/Charset;)Ljava/lang/String;
+SPLcom/google/protobuf/ByteString;->toStringUtf8()Ljava/lang/String;
+Lcom/google/protobuf/ByteString$2;
+SPLcom/google/protobuf/ByteString$2;-><init>()V
+Lcom/google/protobuf/ByteString$ByteArrayCopier;
+Lcom/google/protobuf/ByteString$LeafByteString;
+SPLcom/google/protobuf/ByteString$LeafByteString;-><init>()V
+SPLcom/google/protobuf/ByteString$LeafByteString;-><init>(Lcom/google/protobuf/ByteString$1;)V
+Lcom/google/protobuf/ByteString$LiteralByteString;
+SPLcom/google/protobuf/ByteString$LiteralByteString;-><init>([B)V
+SPLcom/google/protobuf/ByteString$LiteralByteString;->size()I
+SPLcom/google/protobuf/ByteString$LiteralByteString;->toStringInternal(Ljava/nio/charset/Charset;)Ljava/lang/String;
+SPLcom/google/protobuf/ByteString$LiteralByteString;->writeTo(Lcom/google/protobuf/ByteOutput;)V
+Lcom/google/protobuf/ByteString$SystemByteArrayCopier;
+SPLcom/google/protobuf/ByteString$SystemByteArrayCopier;-><init>()V
+SPLcom/google/protobuf/ByteString$SystemByteArrayCopier;-><init>(Lcom/google/protobuf/ByteString$1;)V
+SPLcom/google/protobuf/ByteString$SystemByteArrayCopier;->copyFrom([BII)[B
+Lcom/google/protobuf/CodedInputStream;
+SPLcom/google/protobuf/CodedInputStream;-><clinit>()V
+SPLcom/google/protobuf/CodedInputStream;-><init>()V
+SPLcom/google/protobuf/CodedInputStream;-><init>(Lcom/google/protobuf/CodedInputStream$1;)V
+SPLcom/google/protobuf/CodedInputStream;->newInstance([B)Lcom/google/protobuf/CodedInputStream;
+SPLcom/google/protobuf/CodedInputStream;->newInstance([BII)Lcom/google/protobuf/CodedInputStream;
+SPLcom/google/protobuf/CodedInputStream;->newInstance([BIIZ)Lcom/google/protobuf/CodedInputStream;
+Lcom/google/protobuf/CodedInputStream$ArrayDecoder;
+SPLcom/google/protobuf/CodedInputStream$ArrayDecoder;-><init>([BIIZ)V
+SPLcom/google/protobuf/CodedInputStream$ArrayDecoder;-><init>([BIIZLcom/google/protobuf/CodedInputStream$1;)V
+SPLcom/google/protobuf/CodedInputStream$ArrayDecoder;->pushLimit(I)I
+SPLcom/google/protobuf/CodedInputStream$ArrayDecoder;->setCurrentLimit(I)V
+Lcom/google/protobuf/CodedInputStream$ArrayDecoderOldVarint;
+SPLcom/google/protobuf/CodedInputStream$ArrayDecoderOldVarint;-><init>([BIIZ)V
+SPLcom/google/protobuf/CodedInputStream$ArrayDecoderOldVarint;-><init>([BIIZLcom/google/protobuf/CodedInputStream$1;)V
+Lcom/google/protobuf/CodedInputStream$VarintExperiment;
+SPLcom/google/protobuf/CodedInputStream$VarintExperiment;->$values()[Lcom/google/protobuf/CodedInputStream$VarintExperiment;
+SPLcom/google/protobuf/CodedInputStream$VarintExperiment;-><clinit>()V
+SPLcom/google/protobuf/CodedInputStream$VarintExperiment;-><init>(Ljava/lang/String;I)V
+Lcom/google/protobuf/CodedOutputStream;
+SPLcom/google/protobuf/CodedOutputStream;-><init>()V
+SPLcom/google/protobuf/CodedOutputStream;-><init>(Lcom/google/protobuf/CodedOutputStream$1;)V
+SPLcom/google/protobuf/CodedOutputStream;->checkNoSpaceLeft()V
+SPLcom/google/protobuf/CodedOutputStream;->computeBoolSize(IZ)I
+SPLcom/google/protobuf/CodedOutputStream;->computeBoolSizeNoTag(Z)I
+SPLcom/google/protobuf/CodedOutputStream;->computeBytesSize(ILcom/google/protobuf/ByteString;)I
+SPLcom/google/protobuf/CodedOutputStream;->computeBytesSizeNoTag(Lcom/google/protobuf/ByteString;)I
+SPLcom/google/protobuf/CodedOutputStream;->computeEnumSize(II)I
+SPLcom/google/protobuf/CodedOutputStream;->computeEnumSizeNoTag(I)I
+SPLcom/google/protobuf/CodedOutputStream;->computeInt32SizeNoTag(I)I
+SPLcom/google/protobuf/CodedOutputStream;->computeInt64Size(IJ)I
+SPLcom/google/protobuf/CodedOutputStream;->computeInt64SizeNoTag(J)I
+SPLcom/google/protobuf/CodedOutputStream;->computeLengthDelimitedFieldSize(I)I
+SPLcom/google/protobuf/CodedOutputStream;->computeSInt32Size(II)I
+SPLcom/google/protobuf/CodedOutputStream;->computeSInt32SizeNoTag(I)I
+SPLcom/google/protobuf/CodedOutputStream;->computeStringSize(ILjava/lang/String;)I
+SPLcom/google/protobuf/CodedOutputStream;->computeStringSizeNoTag(Ljava/lang/String;)I
+SPLcom/google/protobuf/CodedOutputStream;->computeTagSize(I)I
+SPLcom/google/protobuf/CodedOutputStream;->computeUInt32Size(II)I
+SPLcom/google/protobuf/CodedOutputStream;->computeUInt32SizeNoTag(I)I
+SPLcom/google/protobuf/CodedOutputStream;->computeUInt64SizeNoTag(J)I
+SPLcom/google/protobuf/CodedOutputStream;->encodeZigZag32(I)I
+SPLcom/google/protobuf/CodedOutputStream;->isSerializationDeterministic()Z
+SPLcom/google/protobuf/CodedOutputStream;->newInstance([B)Lcom/google/protobuf/CodedOutputStream;
+SPLcom/google/protobuf/CodedOutputStream;->newInstance([BII)Lcom/google/protobuf/CodedOutputStream;
+SPLcom/google/protobuf/CodedOutputStream;->writeEnum(II)V
+SPLcom/google/protobuf/CodedOutputStream;->writeInt64(IJ)V
+SPLcom/google/protobuf/CodedOutputStream;->writeSInt32(II)V
+Lcom/google/protobuf/CodedOutputStream$ArrayEncoder;
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;-><init>([BII)V
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;-><init>([BIILcom/google/protobuf/CodedOutputStream$ByteBufferFlusher;)V
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->spaceLeft()I
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->write(B)V
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->write([BII)V
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->writeBool(IZ)V
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->writeBytes(ILcom/google/protobuf/ByteString;)V
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->writeBytesNoTag(Lcom/google/protobuf/ByteString;)V
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->writeInt32(II)V
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->writeInt32NoTag(I)V
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->writeLazy([BII)V
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->writeString(ILjava/lang/String;)V
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->writeStringNoTag(Ljava/lang/String;)V
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->writeTag(II)V
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->writeUInt32(II)V
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->writeUInt32NoTag(I)V
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->writeUInt64(IJ)V
+SPLcom/google/protobuf/CodedOutputStream$ArrayEncoder;->writeUInt64NoTag(J)V
+Lcom/google/protobuf/CodedOutputStream$ByteBufferFlusher;
+Lcom/google/protobuf/CodedOutputStreamWriter;
+SPLcom/google/protobuf/CodedOutputStreamWriter;-><init>(Lcom/google/protobuf/CodedOutputStream;)V
+SPLcom/google/protobuf/CodedOutputStreamWriter;->forCodedOutput(Lcom/google/protobuf/CodedOutputStream;)Lcom/google/protobuf/CodedOutputStreamWriter;
+SPLcom/google/protobuf/CodedOutputStreamWriter;->writeBool(IZ)V
+SPLcom/google/protobuf/CodedOutputStreamWriter;->writeBytes(ILcom/google/protobuf/ByteString;)V
+SPLcom/google/protobuf/CodedOutputStreamWriter;->writeEnum(II)V
+SPLcom/google/protobuf/CodedOutputStreamWriter;->writeInt64(IJ)V
+SPLcom/google/protobuf/CodedOutputStreamWriter;->writeMap(ILcom/google/protobuf/MapEntryLite$Metadata;Ljava/util/Map;)V
+SPLcom/google/protobuf/CodedOutputStreamWriter;->writeSInt32(II)V
+SPLcom/google/protobuf/CodedOutputStreamWriter;->writeString(ILjava/lang/String;)V
+SPLcom/google/protobuf/CodedOutputStreamWriter;->writeStringList(ILjava/util/List;)V
+SPLcom/google/protobuf/CodedOutputStreamWriter;->writeUInt32(II)V
+Lcom/google/protobuf/ExtensionRegistryFactory;
+SPLcom/google/protobuf/ExtensionRegistryFactory;-><clinit>()V
+SPLcom/google/protobuf/ExtensionRegistryFactory;->createEmpty()Lcom/google/protobuf/ExtensionRegistryLite;
+SPLcom/google/protobuf/ExtensionRegistryFactory;->invokeSubclassFactory(Ljava/lang/String;)Lcom/google/protobuf/ExtensionRegistryLite;
+SPLcom/google/protobuf/ExtensionRegistryFactory;->reflectExtensionRegistry()Ljava/lang/Class;
+Lcom/google/protobuf/ExtensionRegistryLite;
+SPLcom/google/protobuf/ExtensionRegistryLite;-><clinit>()V
+SPLcom/google/protobuf/ExtensionRegistryLite;-><init>(Z)V
+SPLcom/google/protobuf/ExtensionRegistryLite;->getEmptyRegistry()Lcom/google/protobuf/ExtensionRegistryLite;
+Lcom/google/protobuf/ExtensionRegistryLite$LazyExtensionMode;
+SPLcom/google/protobuf/ExtensionRegistryLite$LazyExtensionMode;->$values()[Lcom/google/protobuf/ExtensionRegistryLite$LazyExtensionMode;
+SPLcom/google/protobuf/ExtensionRegistryLite$LazyExtensionMode;-><clinit>()V
+SPLcom/google/protobuf/ExtensionRegistryLite$LazyExtensionMode;-><init>(Ljava/lang/String;I)V
+Lcom/google/protobuf/ExtensionSchema;
+Lcom/google/protobuf/FieldType;
+SPLcom/google/protobuf/FieldType;->$values()[Lcom/google/protobuf/FieldType;
+SPLcom/google/protobuf/FieldType;-><clinit>()V
+SPLcom/google/protobuf/FieldType;-><init>(Ljava/lang/String;IILcom/google/protobuf/FieldType$Collection;Lcom/google/protobuf/JavaType;)V
+SPLcom/google/protobuf/FieldType;->id()I
+SPLcom/google/protobuf/FieldType;->values()[Lcom/google/protobuf/FieldType;
+Lcom/google/protobuf/FieldType$1;
+SPLcom/google/protobuf/FieldType$1;-><clinit>()V
+Lcom/google/protobuf/FieldType$Collection;
+SPLcom/google/protobuf/FieldType$Collection;->$values()[Lcom/google/protobuf/FieldType$Collection;
+SPLcom/google/protobuf/FieldType$Collection;-><clinit>()V
+SPLcom/google/protobuf/FieldType$Collection;-><init>(Ljava/lang/String;IZ)V
+Lcom/google/protobuf/GeneratedMessageInfoFactory;
+SPLcom/google/protobuf/GeneratedMessageInfoFactory;-><clinit>()V
+SPLcom/google/protobuf/GeneratedMessageInfoFactory;-><init>()V
+SPLcom/google/protobuf/GeneratedMessageInfoFactory;->getInstance()Lcom/google/protobuf/GeneratedMessageInfoFactory;
+SPLcom/google/protobuf/GeneratedMessageInfoFactory;->messageInfoFor(Ljava/lang/Class;)Lcom/google/protobuf/MessageInfo;
+Lcom/google/protobuf/GeneratedMessageLite;
+SPLcom/google/protobuf/GeneratedMessageLite;-><clinit>()V
+SPLcom/google/protobuf/GeneratedMessageLite;-><init>()V
+SPLcom/google/protobuf/GeneratedMessageLite;->buildMessageInfo()Ljava/lang/Object;
+SPLcom/google/protobuf/GeneratedMessageLite;->checkMessageInitialized(Lcom/google/protobuf/GeneratedMessageLite;)Lcom/google/protobuf/GeneratedMessageLite;
+SPLcom/google/protobuf/GeneratedMessageLite;->clearMemoizedHashCode()V
+SPLcom/google/protobuf/GeneratedMessageLite;->clearMemoizedSerializedSize()V
+SPLcom/google/protobuf/GeneratedMessageLite;->computeSerializedSize(Lcom/google/protobuf/Schema;)I
+SPLcom/google/protobuf/GeneratedMessageLite;->createBuilder()Lcom/google/protobuf/GeneratedMessageLite$Builder;
+SPLcom/google/protobuf/GeneratedMessageLite;->emptyProtobufList()Lcom/google/protobuf/Internal$ProtobufList;
+SPLcom/google/protobuf/GeneratedMessageLite;->getDefaultInstance(Ljava/lang/Class;)Lcom/google/protobuf/GeneratedMessageLite;
+SPLcom/google/protobuf/GeneratedMessageLite;->getMemoizedSerializedSize()I
+SPLcom/google/protobuf/GeneratedMessageLite;->getSerializedSize()I
+SPLcom/google/protobuf/GeneratedMessageLite;->getSerializedSize(Lcom/google/protobuf/Schema;)I
+SPLcom/google/protobuf/GeneratedMessageLite;->isInitialized()Z
+SPLcom/google/protobuf/GeneratedMessageLite;->isInitialized(Lcom/google/protobuf/GeneratedMessageLite;Z)Z
+SPLcom/google/protobuf/GeneratedMessageLite;->isMutable()Z
+SPLcom/google/protobuf/GeneratedMessageLite;->makeImmutable()V
+SPLcom/google/protobuf/GeneratedMessageLite;->markImmutable()V
+SPLcom/google/protobuf/GeneratedMessageLite;->mutableCopy(Lcom/google/protobuf/Internal$ProtobufList;)Lcom/google/protobuf/Internal$ProtobufList;
+SPLcom/google/protobuf/GeneratedMessageLite;->newMessageInfo(Lcom/google/protobuf/MessageLite;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/google/protobuf/GeneratedMessageLite;->newMutableInstance()Lcom/google/protobuf/GeneratedMessageLite;
+SPLcom/google/protobuf/GeneratedMessageLite;->parseFrom(Lcom/google/protobuf/GeneratedMessageLite;[B)Lcom/google/protobuf/GeneratedMessageLite;
+SPLcom/google/protobuf/GeneratedMessageLite;->parsePartialFrom(Lcom/google/protobuf/GeneratedMessageLite;[BIILcom/google/protobuf/ExtensionRegistryLite;)Lcom/google/protobuf/GeneratedMessageLite;
+SPLcom/google/protobuf/GeneratedMessageLite;->registerDefaultInstance(Ljava/lang/Class;Lcom/google/protobuf/GeneratedMessageLite;)V
+SPLcom/google/protobuf/GeneratedMessageLite;->setMemoizedSerializedSize(I)V
+SPLcom/google/protobuf/GeneratedMessageLite;->writeTo(Lcom/google/protobuf/CodedOutputStream;)V
+Lcom/google/protobuf/GeneratedMessageLite$Builder;
+SPLcom/google/protobuf/GeneratedMessageLite$Builder;-><init>(Lcom/google/protobuf/GeneratedMessageLite;)V
+SPLcom/google/protobuf/GeneratedMessageLite$Builder;->build()Lcom/google/protobuf/GeneratedMessageLite;
+SPLcom/google/protobuf/GeneratedMessageLite$Builder;->buildPartial()Lcom/google/protobuf/GeneratedMessageLite;
+SPLcom/google/protobuf/GeneratedMessageLite$Builder;->copyOnWrite()V
+SPLcom/google/protobuf/GeneratedMessageLite$Builder;->newMutableInstance()Lcom/google/protobuf/GeneratedMessageLite;
+Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;
+SPLcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;->$values()[Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;
+SPLcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;-><clinit>()V
+SPLcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;-><init>(Ljava/lang/String;I)V
+SPLcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;->values()[Lcom/google/protobuf/GeneratedMessageLite$MethodToInvoke;
+Lcom/google/protobuf/Internal;
+SPLcom/google/protobuf/Internal;-><clinit>()V
+SPLcom/google/protobuf/Internal;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/google/protobuf/Internal;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
+Lcom/google/protobuf/Internal$EnumLite;
+Lcom/google/protobuf/Internal$EnumLiteMap;
+Lcom/google/protobuf/Internal$EnumVerifier;
+Lcom/google/protobuf/Internal$ProtobufList;
+Lcom/google/protobuf/InvalidProtocolBufferException;
+Lcom/google/protobuf/InvalidProtocolBufferException$InvalidWireTypeException;
+Lcom/google/protobuf/JavaType;
+SPLcom/google/protobuf/JavaType;->$values()[Lcom/google/protobuf/JavaType;
+SPLcom/google/protobuf/JavaType;-><clinit>()V
+SPLcom/google/protobuf/JavaType;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
+SPLcom/google/protobuf/JavaType;->getBoxedType()Ljava/lang/Class;
+SPLcom/google/protobuf/JavaType;->values()[Lcom/google/protobuf/JavaType;
+Lcom/google/protobuf/LazyStringList;
+Lcom/google/protobuf/ListFieldSchema;
+Lcom/google/protobuf/ListFieldSchemaLite;
+SPLcom/google/protobuf/ListFieldSchemaLite;-><init>()V
+SPLcom/google/protobuf/ListFieldSchemaLite;->getProtobufList(Ljava/lang/Object;J)Lcom/google/protobuf/Internal$ProtobufList;
+SPLcom/google/protobuf/ListFieldSchemaLite;->makeImmutableListAt(Ljava/lang/Object;J)V
+Lcom/google/protobuf/ListFieldSchemas;
+SPLcom/google/protobuf/ListFieldSchemas;-><clinit>()V
+SPLcom/google/protobuf/ListFieldSchemas;->lite()Lcom/google/protobuf/ListFieldSchema;
+Lcom/google/protobuf/ManifestSchemaFactory;
+SPLcom/google/protobuf/ManifestSchemaFactory;-><init>()V
+SPLcom/google/protobuf/ManifestSchemaFactory;-><init>(Lcom/google/protobuf/MessageInfoFactory;)V
+SPLcom/google/protobuf/ManifestSchemaFactory;->allowExtensions(Lcom/google/protobuf/MessageInfo;)Z
+SPLcom/google/protobuf/ManifestSchemaFactory;->createSchema(Ljava/lang/Class;)Lcom/google/protobuf/Schema;
+SPLcom/google/protobuf/ManifestSchemaFactory;->getDefaultMessageInfoFactory()Lcom/google/protobuf/MessageInfoFactory;
+SPLcom/google/protobuf/ManifestSchemaFactory;->newSchema(Ljava/lang/Class;Lcom/google/protobuf/MessageInfo;)Lcom/google/protobuf/Schema;
+SPLcom/google/protobuf/ManifestSchemaFactory;->useLiteRuntime(Ljava/lang/Class;)Z
+Lcom/google/protobuf/ManifestSchemaFactory$1;
+SPLcom/google/protobuf/ManifestSchemaFactory$1;-><clinit>()V
+Lcom/google/protobuf/MapEntryLite;
+SPLcom/google/protobuf/MapEntryLite;-><init>(Lcom/google/protobuf/WireFormat$FieldType;Ljava/lang/Object;Lcom/google/protobuf/WireFormat$FieldType;Ljava/lang/Object;)V
+SPLcom/google/protobuf/MapEntryLite;->getMetadata()Lcom/google/protobuf/MapEntryLite$Metadata;
+SPLcom/google/protobuf/MapEntryLite;->newDefaultInstance(Lcom/google/protobuf/WireFormat$FieldType;Ljava/lang/Object;Lcom/google/protobuf/WireFormat$FieldType;Ljava/lang/Object;)Lcom/google/protobuf/MapEntryLite;
+Lcom/google/protobuf/MapEntryLite$Metadata;
+SPLcom/google/protobuf/MapEntryLite$Metadata;-><init>(Lcom/google/protobuf/WireFormat$FieldType;Ljava/lang/Object;Lcom/google/protobuf/WireFormat$FieldType;Ljava/lang/Object;)V
+Lcom/google/protobuf/MapFieldLite;
+SPLcom/google/protobuf/MapFieldLite;-><clinit>()V
+SPLcom/google/protobuf/MapFieldLite;-><init>()V
+SPLcom/google/protobuf/MapFieldLite;->checkForNullKeysAndValues(Ljava/util/Map;)V
+SPLcom/google/protobuf/MapFieldLite;->emptyMapField()Lcom/google/protobuf/MapFieldLite;
+SPLcom/google/protobuf/MapFieldLite;->ensureMutable()V
+SPLcom/google/protobuf/MapFieldLite;->entrySet()Ljava/util/Set;
+SPLcom/google/protobuf/MapFieldLite;->isMutable()Z
+SPLcom/google/protobuf/MapFieldLite;->makeImmutable()V
+SPLcom/google/protobuf/MapFieldLite;->mutableCopy()Lcom/google/protobuf/MapFieldLite;
+SPLcom/google/protobuf/MapFieldLite;->putAll(Ljava/util/Map;)V
+Lcom/google/protobuf/MapFieldSchema;
+Lcom/google/protobuf/MapFieldSchemaLite;
+SPLcom/google/protobuf/MapFieldSchemaLite;-><init>()V
+SPLcom/google/protobuf/MapFieldSchemaLite;->forMapData(Ljava/lang/Object;)Ljava/util/Map;
+SPLcom/google/protobuf/MapFieldSchemaLite;->forMapMetadata(Ljava/lang/Object;)Lcom/google/protobuf/MapEntryLite$Metadata;
+SPLcom/google/protobuf/MapFieldSchemaLite;->getSerializedSize(ILjava/lang/Object;Ljava/lang/Object;)I
+SPLcom/google/protobuf/MapFieldSchemaLite;->getSerializedSizeLite(ILjava/lang/Object;Ljava/lang/Object;)I
+SPLcom/google/protobuf/MapFieldSchemaLite;->toImmutable(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/google/protobuf/MapFieldSchemas;
+SPLcom/google/protobuf/MapFieldSchemas;-><clinit>()V
+SPLcom/google/protobuf/MapFieldSchemas;->lite()Lcom/google/protobuf/MapFieldSchema;
+Lcom/google/protobuf/MessageInfo;
+Lcom/google/protobuf/MessageInfoFactory;
+Lcom/google/protobuf/MessageLite;
+Lcom/google/protobuf/MessageLite$Builder;
+Lcom/google/protobuf/MessageLiteOrBuilder;
+Lcom/google/protobuf/MessageSchema;
+SPLcom/google/protobuf/MessageSchema;-><clinit>()V
+SPLcom/google/protobuf/MessageSchema;-><init>([I[Ljava/lang/Object;IILcom/google/protobuf/MessageLite;Z[IIILcom/google/protobuf/NewInstanceSchema;Lcom/google/protobuf/ListFieldSchema;Lcom/google/protobuf/UnknownFieldSchema;Lcom/google/protobuf/ExtensionSchema;Lcom/google/protobuf/MapFieldSchema;)V
+SPLcom/google/protobuf/MessageSchema;->booleanAt(Ljava/lang/Object;J)Z
+SPLcom/google/protobuf/MessageSchema;->checkMutable(Ljava/lang/Object;)V
+SPLcom/google/protobuf/MessageSchema;->getEnumFieldVerifier(I)Lcom/google/protobuf/Internal$EnumVerifier;
+SPLcom/google/protobuf/MessageSchema;->getMapFieldDefaultEntry(I)Ljava/lang/Object;
+SPLcom/google/protobuf/MessageSchema;->getMessageFieldSchema(I)Lcom/google/protobuf/Schema;
+SPLcom/google/protobuf/MessageSchema;->getSerializedSize(Ljava/lang/Object;)I
+SPLcom/google/protobuf/MessageSchema;->getUnknownFieldsSerializedSize(Lcom/google/protobuf/UnknownFieldSchema;Ljava/lang/Object;)I
+SPLcom/google/protobuf/MessageSchema;->isEnforceUtf8(I)Z
+SPLcom/google/protobuf/MessageSchema;->isFieldPresent(Ljava/lang/Object;I)Z
+SPLcom/google/protobuf/MessageSchema;->isFieldPresent(Ljava/lang/Object;IIII)Z
+SPLcom/google/protobuf/MessageSchema;->isLegacyEnumIsClosed(I)Z
+SPLcom/google/protobuf/MessageSchema;->isMutable(Ljava/lang/Object;)Z
+SPLcom/google/protobuf/MessageSchema;->isOneofPresent(Ljava/lang/Object;II)Z
+SPLcom/google/protobuf/MessageSchema;->makeImmutable(Ljava/lang/Object;)V
+SPLcom/google/protobuf/MessageSchema;->mergeFrom(Ljava/lang/Object;[BIILcom/google/protobuf/ArrayDecoders$Registers;)V
+SPLcom/google/protobuf/MessageSchema;->mutableMessageFieldForMerge(Ljava/lang/Object;I)Ljava/lang/Object;
+SPLcom/google/protobuf/MessageSchema;->mutableOneofMessageFieldForMerge(Ljava/lang/Object;II)Ljava/lang/Object;
+SPLcom/google/protobuf/MessageSchema;->newInstance()Ljava/lang/Object;
+SPLcom/google/protobuf/MessageSchema;->newSchema(Ljava/lang/Class;Lcom/google/protobuf/MessageInfo;Lcom/google/protobuf/NewInstanceSchema;Lcom/google/protobuf/ListFieldSchema;Lcom/google/protobuf/UnknownFieldSchema;Lcom/google/protobuf/ExtensionSchema;Lcom/google/protobuf/MapFieldSchema;)Lcom/google/protobuf/MessageSchema;
+SPLcom/google/protobuf/MessageSchema;->newSchemaForRawMessageInfo(Lcom/google/protobuf/RawMessageInfo;Lcom/google/protobuf/NewInstanceSchema;Lcom/google/protobuf/ListFieldSchema;Lcom/google/protobuf/UnknownFieldSchema;Lcom/google/protobuf/ExtensionSchema;Lcom/google/protobuf/MapFieldSchema;)Lcom/google/protobuf/MessageSchema;
+SPLcom/google/protobuf/MessageSchema;->numberAt(I)I
+SPLcom/google/protobuf/MessageSchema;->offset(I)J
+SPLcom/google/protobuf/MessageSchema;->parseMessage(Ljava/lang/Object;[BIIILcom/google/protobuf/ArrayDecoders$Registers;)I
+SPLcom/google/protobuf/MessageSchema;->parseOneofField(Ljava/lang/Object;[BIIIIIIIJILcom/google/protobuf/ArrayDecoders$Registers;)I
+SPLcom/google/protobuf/MessageSchema;->positionForFieldNumber(II)I
+SPLcom/google/protobuf/MessageSchema;->presenceMaskAndOffsetAt(I)I
+SPLcom/google/protobuf/MessageSchema;->reflectField(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
+SPLcom/google/protobuf/MessageSchema;->setFieldPresent(Ljava/lang/Object;I)V
+SPLcom/google/protobuf/MessageSchema;->setOneofPresent(Ljava/lang/Object;II)V
+SPLcom/google/protobuf/MessageSchema;->slowPositionForFieldNumber(II)I
+SPLcom/google/protobuf/MessageSchema;->storeMessageField(Ljava/lang/Object;ILjava/lang/Object;)V
+SPLcom/google/protobuf/MessageSchema;->storeOneofMessageField(Ljava/lang/Object;IILjava/lang/Object;)V
+SPLcom/google/protobuf/MessageSchema;->type(I)I
+SPLcom/google/protobuf/MessageSchema;->typeAndOffsetAt(I)I
+SPLcom/google/protobuf/MessageSchema;->writeMapHelper(Lcom/google/protobuf/CodedOutputStreamWriter;ILjava/lang/Object;I)V
+SPLcom/google/protobuf/MessageSchema;->writeString(ILjava/lang/Object;Lcom/google/protobuf/CodedOutputStreamWriter;)V
+SPLcom/google/protobuf/MessageSchema;->writeTo(Ljava/lang/Object;Lcom/google/protobuf/CodedOutputStreamWriter;)V
+SPLcom/google/protobuf/MessageSchema;->writeUnknownInMessageTo(Lcom/google/protobuf/UnknownFieldSchema;Ljava/lang/Object;Lcom/google/protobuf/CodedOutputStreamWriter;)V
+Lcom/google/protobuf/NewInstanceSchema;
+Lcom/google/protobuf/NewInstanceSchemaLite;
+SPLcom/google/protobuf/NewInstanceSchemaLite;-><init>()V
+SPLcom/google/protobuf/NewInstanceSchemaLite;->newInstance(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/google/protobuf/NewInstanceSchemas;
+SPLcom/google/protobuf/NewInstanceSchemas;-><clinit>()V
+SPLcom/google/protobuf/NewInstanceSchemas;->lite()Lcom/google/protobuf/NewInstanceSchema;
+Lcom/google/protobuf/PrimitiveNonBoxingCollection;
+Lcom/google/protobuf/ProtoSyntax;
+SPLcom/google/protobuf/ProtoSyntax;->$values()[Lcom/google/protobuf/ProtoSyntax;
+SPLcom/google/protobuf/ProtoSyntax;-><clinit>()V
+SPLcom/google/protobuf/ProtoSyntax;-><init>(Ljava/lang/String;I)V
+SPLcom/google/protobuf/ProtoSyntax;->values()[Lcom/google/protobuf/ProtoSyntax;
+Lcom/google/protobuf/Protobuf;
+SPLcom/google/protobuf/Protobuf;-><clinit>()V
+SPLcom/google/protobuf/Protobuf;-><init>()V
+SPLcom/google/protobuf/Protobuf;->getInstance()Lcom/google/protobuf/Protobuf;
+SPLcom/google/protobuf/Protobuf;->registerSchema(Ljava/lang/Class;)Lcom/google/protobuf/Schema;
+SPLcom/google/protobuf/Protobuf;->schemaFor(Lcom/google/protobuf/GeneratedMessageLite;)Lcom/google/protobuf/Schema;
+SPLcom/google/protobuf/Protobuf;->schemaFor(Ljava/lang/Class;)Lcom/google/protobuf/Schema;
+Lcom/google/protobuf/ProtobufArrayList;
+SPLcom/google/protobuf/ProtobufArrayList;-><clinit>()V
+SPLcom/google/protobuf/ProtobufArrayList;-><init>([Ljava/lang/Object;IZ)V
+SPLcom/google/protobuf/ProtobufArrayList;->add(Ljava/lang/Object;)Z
+SPLcom/google/protobuf/ProtobufArrayList;->emptyList()Lcom/google/protobuf/ProtobufArrayList;
+SPLcom/google/protobuf/ProtobufArrayList;->ensureCapacity(I)V
+SPLcom/google/protobuf/ProtobufArrayList;->ensureIndexInRange(I)V
+SPLcom/google/protobuf/ProtobufArrayList;->get(I)Ljava/lang/Object;
+SPLcom/google/protobuf/ProtobufArrayList;->mutableCopyWithCapacity(I)Lcom/google/protobuf/Internal$ProtobufList;
+SPLcom/google/protobuf/ProtobufArrayList;->mutableCopyWithCapacity(I)Lcom/google/protobuf/ProtobufArrayList;
+SPLcom/google/protobuf/ProtobufArrayList;->size()I
+Lcom/google/protobuf/ProtocolStringList;
+Lcom/google/protobuf/RawMessageInfo;
+SPLcom/google/protobuf/RawMessageInfo;-><init>(Lcom/google/protobuf/MessageLite;Ljava/lang/String;[Ljava/lang/Object;)V
+SPLcom/google/protobuf/RawMessageInfo;->getDefaultInstance()Lcom/google/protobuf/MessageLite;
+SPLcom/google/protobuf/RawMessageInfo;->getObjects()[Ljava/lang/Object;
+SPLcom/google/protobuf/RawMessageInfo;->getStringInfo()Ljava/lang/String;
+SPLcom/google/protobuf/RawMessageInfo;->getSyntax()Lcom/google/protobuf/ProtoSyntax;
+SPLcom/google/protobuf/RawMessageInfo;->isMessageSetWireFormat()Z
+Lcom/google/protobuf/Schema;
+Lcom/google/protobuf/SchemaUtil;
+SPLcom/google/protobuf/SchemaUtil;-><clinit>()V
+SPLcom/google/protobuf/SchemaUtil;->computeSizeStringList(ILjava/util/List;)I
+SPLcom/google/protobuf/SchemaUtil;->getGeneratedMessageClass()Ljava/lang/Class;
+SPLcom/google/protobuf/SchemaUtil;->requireGeneratedMessage(Ljava/lang/Class;)V
+SPLcom/google/protobuf/SchemaUtil;->unknownFieldSetLiteSchema()Lcom/google/protobuf/UnknownFieldSchema;
+SPLcom/google/protobuf/SchemaUtil;->writeStringList(ILjava/util/List;Lcom/google/protobuf/CodedOutputStreamWriter;)V
+Lcom/google/protobuf/UninitializedMessageException;
+Lcom/google/protobuf/UnknownFieldSchema;
+SPLcom/google/protobuf/UnknownFieldSchema;-><clinit>()V
+SPLcom/google/protobuf/UnknownFieldSchema;-><init>()V
+Lcom/google/protobuf/UnknownFieldSetLite;
+SPLcom/google/protobuf/UnknownFieldSetLite;-><clinit>()V
+SPLcom/google/protobuf/UnknownFieldSetLite;-><init>(I[I[Ljava/lang/Object;Z)V
+SPLcom/google/protobuf/UnknownFieldSetLite;->getDefaultInstance()Lcom/google/protobuf/UnknownFieldSetLite;
+SPLcom/google/protobuf/UnknownFieldSetLite;->getSerializedSize()I
+SPLcom/google/protobuf/UnknownFieldSetLite;->makeImmutable()V
+SPLcom/google/protobuf/UnknownFieldSetLite;->writeTo(Lcom/google/protobuf/CodedOutputStreamWriter;)V
+Lcom/google/protobuf/UnknownFieldSetLiteSchema;
+SPLcom/google/protobuf/UnknownFieldSetLiteSchema;-><init>()V
+SPLcom/google/protobuf/UnknownFieldSetLiteSchema;->getFromMessage(Ljava/lang/Object;)Lcom/google/protobuf/UnknownFieldSetLite;
+SPLcom/google/protobuf/UnknownFieldSetLiteSchema;->getFromMessage(Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/google/protobuf/UnknownFieldSetLiteSchema;->getSerializedSize(Lcom/google/protobuf/UnknownFieldSetLite;)I
+SPLcom/google/protobuf/UnknownFieldSetLiteSchema;->getSerializedSize(Ljava/lang/Object;)I
+SPLcom/google/protobuf/UnknownFieldSetLiteSchema;->makeImmutable(Ljava/lang/Object;)V
+SPLcom/google/protobuf/UnknownFieldSetLiteSchema;->writeTo(Lcom/google/protobuf/UnknownFieldSetLite;Lcom/google/protobuf/CodedOutputStreamWriter;)V
+SPLcom/google/protobuf/UnknownFieldSetLiteSchema;->writeTo(Ljava/lang/Object;Lcom/google/protobuf/CodedOutputStreamWriter;)V
+Lcom/google/protobuf/UnsafeUtil;
+SPLcom/google/protobuf/UnsafeUtil;-><clinit>()V
+SPLcom/google/protobuf/UnsafeUtil;->access$700(Ljava/lang/Object;J)Z
+SPLcom/google/protobuf/UnsafeUtil;->access$900(Ljava/lang/Object;JZ)V
+SPLcom/google/protobuf/UnsafeUtil;->arrayBaseOffset(Ljava/lang/Class;)I
+SPLcom/google/protobuf/UnsafeUtil;->arrayIndexScale(Ljava/lang/Class;)I
+SPLcom/google/protobuf/UnsafeUtil;->bufferAddressField()Ljava/lang/reflect/Field;
+SPLcom/google/protobuf/UnsafeUtil;->determineAndroidSupportByAddressSize(Ljava/lang/Class;)Z
+SPLcom/google/protobuf/UnsafeUtil;->field(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/reflect/Field;
+SPLcom/google/protobuf/UnsafeUtil;->fieldOffset(Ljava/lang/reflect/Field;)J
+SPLcom/google/protobuf/UnsafeUtil;->getBoolean(Ljava/lang/Object;J)Z
+SPLcom/google/protobuf/UnsafeUtil;->getBooleanLittleEndian(Ljava/lang/Object;J)Z
+SPLcom/google/protobuf/UnsafeUtil;->getByteLittleEndian(Ljava/lang/Object;J)B
+SPLcom/google/protobuf/UnsafeUtil;->getInt(Ljava/lang/Object;J)I
+SPLcom/google/protobuf/UnsafeUtil;->getLong(Ljava/lang/Object;J)J
+SPLcom/google/protobuf/UnsafeUtil;->getMemoryAccessor()Lcom/google/protobuf/UnsafeUtil$MemoryAccessor;
+SPLcom/google/protobuf/UnsafeUtil;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+SPLcom/google/protobuf/UnsafeUtil;->getUnsafe()Lsun/misc/Unsafe;
+SPLcom/google/protobuf/UnsafeUtil;->putBoolean(Ljava/lang/Object;JZ)V
+SPLcom/google/protobuf/UnsafeUtil;->putBooleanLittleEndian(Ljava/lang/Object;JZ)V
+SPLcom/google/protobuf/UnsafeUtil;->putByteLittleEndian(Ljava/lang/Object;JB)V
+SPLcom/google/protobuf/UnsafeUtil;->putInt(Ljava/lang/Object;JI)V
+SPLcom/google/protobuf/UnsafeUtil;->supportsUnsafeArrayOperations()Z
+SPLcom/google/protobuf/UnsafeUtil;->supportsUnsafeByteBufferOperations()Z
+Lcom/google/protobuf/UnsafeUtil$1;
+SPLcom/google/protobuf/UnsafeUtil$1;-><init>()V
+SPLcom/google/protobuf/UnsafeUtil$1;->run()Ljava/lang/Object;
+SPLcom/google/protobuf/UnsafeUtil$1;->run()Lsun/misc/Unsafe;
+Lcom/google/protobuf/UnsafeUtil$Android64MemoryAccessor;
+SPLcom/google/protobuf/UnsafeUtil$Android64MemoryAccessor;-><init>(Lsun/misc/Unsafe;)V
+SPLcom/google/protobuf/UnsafeUtil$Android64MemoryAccessor;->getBoolean(Ljava/lang/Object;J)Z
+SPLcom/google/protobuf/UnsafeUtil$Android64MemoryAccessor;->putBoolean(Ljava/lang/Object;JZ)V
+SPLcom/google/protobuf/UnsafeUtil$Android64MemoryAccessor;->supportsUnsafeByteBufferOperations()Z
+Lcom/google/protobuf/UnsafeUtil$MemoryAccessor;
+SPLcom/google/protobuf/UnsafeUtil$MemoryAccessor;-><init>(Lsun/misc/Unsafe;)V
+SPLcom/google/protobuf/UnsafeUtil$MemoryAccessor;->arrayBaseOffset(Ljava/lang/Class;)I
+SPLcom/google/protobuf/UnsafeUtil$MemoryAccessor;->arrayIndexScale(Ljava/lang/Class;)I
+SPLcom/google/protobuf/UnsafeUtil$MemoryAccessor;->getInt(Ljava/lang/Object;J)I
+SPLcom/google/protobuf/UnsafeUtil$MemoryAccessor;->getLong(Ljava/lang/Object;J)J
+SPLcom/google/protobuf/UnsafeUtil$MemoryAccessor;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
+SPLcom/google/protobuf/UnsafeUtil$MemoryAccessor;->objectFieldOffset(Ljava/lang/reflect/Field;)J
+SPLcom/google/protobuf/UnsafeUtil$MemoryAccessor;->putInt(Ljava/lang/Object;JI)V
+SPLcom/google/protobuf/UnsafeUtil$MemoryAccessor;->supportsUnsafeArrayOperations()Z
+Lcom/google/protobuf/Utf8;
+SPLcom/google/protobuf/Utf8;-><clinit>()V
+SPLcom/google/protobuf/Utf8;->createProcessor()Lcom/google/protobuf/Utf8$Processor;
+SPLcom/google/protobuf/Utf8;->decodeUtf8([BII)Ljava/lang/String;
+SPLcom/google/protobuf/Utf8;->encode(Ljava/lang/String;[BII)I
+SPLcom/google/protobuf/Utf8;->encodedLength(Ljava/lang/String;)I
+Lcom/google/protobuf/Utf8$DecodeUtil;
+SPLcom/google/protobuf/Utf8$DecodeUtil;->access$000(B)Z
+SPLcom/google/protobuf/Utf8$DecodeUtil;->access$100(B[CI)V
+SPLcom/google/protobuf/Utf8$DecodeUtil;->access$200(B)Z
+SPLcom/google/protobuf/Utf8$DecodeUtil;->access$400(B)Z
+SPLcom/google/protobuf/Utf8$DecodeUtil;->access$500(BBB[CI)V
+SPLcom/google/protobuf/Utf8$DecodeUtil;->handleOneByte(B[CI)V
+SPLcom/google/protobuf/Utf8$DecodeUtil;->handleThreeBytes(BBB[CI)V
+SPLcom/google/protobuf/Utf8$DecodeUtil;->isNotTrailingByte(B)Z
+SPLcom/google/protobuf/Utf8$DecodeUtil;->isOneByte(B)Z
+SPLcom/google/protobuf/Utf8$DecodeUtil;->isThreeBytes(B)Z
+SPLcom/google/protobuf/Utf8$DecodeUtil;->isTwoBytes(B)Z
+SPLcom/google/protobuf/Utf8$DecodeUtil;->trailingByteValue(B)I
+Lcom/google/protobuf/Utf8$MobileProcessor;
+SPLcom/google/protobuf/Utf8$MobileProcessor;-><init>()V
+SPLcom/google/protobuf/Utf8$MobileProcessor;->decodeUtf8([BII)Ljava/lang/String;
+SPLcom/google/protobuf/Utf8$MobileProcessor;->encodeUtf8(Ljava/lang/String;[BII)I
+Lcom/google/protobuf/Utf8$Processor;
+SPLcom/google/protobuf/Utf8$Processor;-><init>()V
+SPLcom/google/protobuf/Utf8$Processor;->encodedLength(Ljava/lang/String;)I
+Lcom/google/protobuf/Utf8$UnpairedSurrogateException;
+Lcom/google/protobuf/WireFormat;
+SPLcom/google/protobuf/WireFormat;-><clinit>()V
+SPLcom/google/protobuf/WireFormat;->makeTag(II)I
+Lcom/google/protobuf/WireFormat$FieldType;
+SPLcom/google/protobuf/WireFormat$FieldType;->$values()[Lcom/google/protobuf/WireFormat$FieldType;
+SPLcom/google/protobuf/WireFormat$FieldType;-><clinit>()V
+SPLcom/google/protobuf/WireFormat$FieldType;-><init>(Ljava/lang/String;ILcom/google/protobuf/WireFormat$JavaType;I)V
+SPLcom/google/protobuf/WireFormat$FieldType;-><init>(Ljava/lang/String;ILcom/google/protobuf/WireFormat$JavaType;ILcom/google/protobuf/WireFormat$1;)V
+Lcom/google/protobuf/WireFormat$FieldType$1;
+SPLcom/google/protobuf/WireFormat$FieldType$1;-><init>(Ljava/lang/String;ILcom/google/protobuf/WireFormat$JavaType;I)V
+Lcom/google/protobuf/WireFormat$FieldType$2;
+SPLcom/google/protobuf/WireFormat$FieldType$2;-><init>(Ljava/lang/String;ILcom/google/protobuf/WireFormat$JavaType;I)V
+Lcom/google/protobuf/WireFormat$FieldType$3;
+SPLcom/google/protobuf/WireFormat$FieldType$3;-><init>(Ljava/lang/String;ILcom/google/protobuf/WireFormat$JavaType;I)V
+Lcom/google/protobuf/WireFormat$FieldType$4;
+SPLcom/google/protobuf/WireFormat$FieldType$4;-><init>(Ljava/lang/String;ILcom/google/protobuf/WireFormat$JavaType;I)V
+Lcom/google/protobuf/WireFormat$JavaType;
+SPLcom/google/protobuf/WireFormat$JavaType;->$values()[Lcom/google/protobuf/WireFormat$JavaType;
+SPLcom/google/protobuf/WireFormat$JavaType;-><clinit>()V
+SPLcom/google/protobuf/WireFormat$JavaType;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
+Lcom/ichi2/anki/AbstractFlashcardViewer;
+SPLcom/ichi2/anki/AbstractFlashcardViewer;-><clinit>()V
+Lcom/ichi2/anki/AbstractFlashcardViewer$Companion;
+SPLcom/ichi2/anki/AbstractFlashcardViewer$Companion;-><init>()V
+SPLcom/ichi2/anki/AbstractFlashcardViewer$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/AbstractIntentHandler;
+SPLcom/ichi2/anki/AbstractIntentHandler;-><clinit>()V
+SPLcom/ichi2/anki/AbstractIntentHandler;-><init>()V
+SPLcom/ichi2/anki/AbstractIntentHandler;->onCreate(Landroid/os/Bundle;)V
+SPLcom/ichi2/anki/AbstractIntentHandler;->showedActivityFailedScreen(Landroid/os/Bundle;)Z
+Lcom/ichi2/anki/AbstractIntentHandler$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/AbstractIntentHandler$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/AbstractIntentHandler;)V
+Lcom/ichi2/anki/AcraCrashReporter;
+SPLcom/ichi2/anki/AcraCrashReporter;-><clinit>()V
+SPLcom/ichi2/anki/AcraCrashReporter;-><init>()V
+SPLcom/ichi2/anki/AcraCrashReporter;->createAcraCoreConfigBuilder()Lorg/acra/config/CoreConfigurationBuilder;
+SPLcom/ichi2/anki/AcraCrashReporter;->fetchWebViewInformation()Ljava/util/HashMap;
+SPLcom/ichi2/anki/AcraCrashReporter;->initialize(Landroid/app/Application;)V
+SPLcom/ichi2/anki/AcraCrashReporter;->isEnabled(Landroid/content/Context;Z)Z
+SPLcom/ichi2/anki/AcraCrashReporter;->isProperServiceProcess()Z
+SPLcom/ichi2/anki/AcraCrashReporter;->setProductionACRAConfig(Landroid/content/SharedPreferences;)V
+SPLcom/ichi2/anki/AcraCrashReporter;->setReportingMode(Ljava/lang/String;)V
+Lcom/ichi2/anki/AcraCrashReporter$ToastType;
+SPLcom/ichi2/anki/AcraCrashReporter$ToastType;->$values()[Lcom/ichi2/anki/AcraCrashReporter$ToastType;
+SPLcom/ichi2/anki/AcraCrashReporter$ToastType;-><clinit>()V
+SPLcom/ichi2/anki/AcraCrashReporter$ToastType;-><init>(Ljava/lang/String;II)V
+SPLcom/ichi2/anki/AcraCrashReporter$ToastType;->getToastMessage(Landroid/content/Context;)Ljava/lang/String;
+Lcom/ichi2/anki/AcraCrashReporterKt;
+SPLcom/ichi2/anki/AcraCrashReporterKt;->initializeAcraCrashReporter(Landroid/app/Application;)V
+SPLcom/ichi2/anki/AcraCrashReporterKt;->isAcraSenderProcess()Z
+Lcom/ichi2/anki/ActionProviderCompat;
+SPLcom/ichi2/anki/ActionProviderCompat;-><clinit>()V
+SPLcom/ichi2/anki/ActionProviderCompat;-><init>(Landroid/content/Context;)V
+Lcom/ichi2/anki/AndroidTtsVoice;
+SPLcom/ichi2/anki/AndroidTtsVoice;-><clinit>()V
+SPLcom/ichi2/anki/AndroidTtsVoice;-><init>(Landroid/speech/tts/Voice;Ljava/lang/String;)V
+SPLcom/ichi2/anki/AndroidTtsVoice;->getEngine()Ljava/lang/String;
+SPLcom/ichi2/anki/AndroidTtsVoice;->getVoice()Landroid/speech/tts/Voice;
+Lcom/ichi2/anki/AnkiActivity;
+SPLcom/ichi2/anki/AnkiActivity;-><clinit>()V
+SPLcom/ichi2/anki/AnkiActivity;-><init>(Ljava/lang/Integer;)V
+SPLcom/ichi2/anki/AnkiActivity;->enableToolbar()Landroidx/appcompat/app/ActionBar;
+SPLcom/ichi2/anki/AnkiActivity;->exportReadyViewModel_delegate$lambda$0()Landroidx/lifecycle/ViewModelProvider$Factory;
+SPLcom/ichi2/anki/AnkiActivity;->getAnalyticsScreenName()Ljava/lang/String;
+SPLcom/ichi2/anki/AnkiActivity;->getBroadcastsActions()Ljava/util/Map;
+SPLcom/ichi2/anki/AnkiActivity;->getDefaultViewModelCreationExtras()Landroidx/lifecycle/viewmodel/CreationExtras;
+SPLcom/ichi2/anki/AnkiActivity;->getDialogHandler()Lcom/ichi2/anki/dialogs/DialogHandler;
+SPLcom/ichi2/anki/AnkiActivity;->getExportReadyViewModel()Lcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel;
+SPLcom/ichi2/anki/AnkiActivity;->hideProgressBar()V
+SPLcom/ichi2/anki/AnkiActivity;->onCreate(Landroid/os/Bundle;)V
+SPLcom/ichi2/anki/AnkiActivity;->onResume()V
+SPLcom/ichi2/anki/AnkiActivity;->onStart()V
+SPLcom/ichi2/anki/AnkiActivity;->registerReceiver()V
+SPLcom/ichi2/anki/AnkiActivity;->setContentView(Landroid/view/View;)V
+SPLcom/ichi2/anki/AnkiActivity;->showedActivityFailedScreen(Landroid/os/Bundle;)Z
+Lcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/AnkiActivity;)V
+Lcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda1;-><init>(Lcom/ichi2/anki/AnkiActivity;)V
+Lcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda2;-><init>(Lcom/ichi2/anki/AnkiActivity;)V
+Lcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda3;-><init>()V
+SPLcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda3;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda4;
+SPLcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda4;-><init>(Lcom/ichi2/anki/AnkiActivity;)V
+Lcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda5;
+SPLcom/ichi2/anki/AnkiActivity$$ExternalSyntheticLambda5;-><init>(Lcom/ichi2/anki/AnkiActivity;)V
+Lcom/ichi2/anki/AnkiActivity$Companion;
+SPLcom/ichi2/anki/AnkiActivity$Companion;-><init>()V
+SPLcom/ichi2/anki/AnkiActivity$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/AnkiActivity$onCreate$3;
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3;-><init>(Lcom/ichi2/anki/AnkiActivity;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/AnkiActivity$onCreate$3$1;
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3$1;-><init>(Lcom/ichi2/anki/AnkiActivity;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/AnkiActivity$onCreate$3$1$1;
+SPLcom/ichi2/anki/AnkiActivity$onCreate$3$1$1;-><init>(Lcom/ichi2/anki/AnkiActivity;)V
+Lcom/ichi2/anki/AnkiActivity$registerReceiver$1;
+SPLcom/ichi2/anki/AnkiActivity$registerReceiver$1;-><init>(Lcom/ichi2/anki/AnkiActivity;)V
+Lcom/ichi2/anki/AnkiActivity$special$$inlined$viewModels$default$2;
+SPLcom/ichi2/anki/AnkiActivity$special$$inlined$viewModels$default$2;-><init>(Landroidx/activity/ComponentActivity;)V
+SPLcom/ichi2/anki/AnkiActivity$special$$inlined$viewModels$default$2;->invoke()Landroidx/lifecycle/ViewModelStore;
+SPLcom/ichi2/anki/AnkiActivity$special$$inlined$viewModels$default$2;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/AnkiActivity$special$$inlined$viewModels$default$3;
+SPLcom/ichi2/anki/AnkiActivity$special$$inlined$viewModels$default$3;-><init>(Lkotlin/jvm/functions/Function0;Landroidx/activity/ComponentActivity;)V
+SPLcom/ichi2/anki/AnkiActivity$special$$inlined$viewModels$default$3;->invoke()Landroidx/lifecycle/viewmodel/CreationExtras;
+SPLcom/ichi2/anki/AnkiActivity$special$$inlined$viewModels$default$3;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/AnkiActivityProvider;
+Lcom/ichi2/anki/AnkiDroidApp;
+SPLcom/ichi2/anki/AnkiDroidApp;-><clinit>()V
+SPLcom/ichi2/anki/AnkiDroidApp;-><init>()V
+SPLcom/ichi2/anki/AnkiDroidApp;->access$getFatalInitializationError$p(Lcom/ichi2/anki/AnkiDroidApp;)Lcom/ichi2/anki/FatalInitializationError;
+SPLcom/ichi2/anki/AnkiDroidApp;->access$getInstance$cp()Lcom/ichi2/anki/AnkiDroidApp;
+SPLcom/ichi2/anki/AnkiDroidApp;->access$getNotifications$p(Lcom/ichi2/anki/AnkiDroidApp;)Landroidx/lifecycle/MutableLiveData;
+SPLcom/ichi2/anki/AnkiDroidApp;->access$getSharedPreferencesTestingOverride$cp()Landroid/content/SharedPreferences;
+SPLcom/ichi2/anki/AnkiDroidApp;->access$setAppLifecycleObserver$p(Lcom/ichi2/anki/AnkiDroidApp;Lcom/ichi2/anki/AppLifecycleObserver;)V
+SPLcom/ichi2/anki/AnkiDroidApp;->access$setInstance$cp(Lcom/ichi2/anki/AnkiDroidApp;)V
+SPLcom/ichi2/anki/AnkiDroidApp;->access$syncPlatform(Lcom/ichi2/anki/AnkiDroidApp;)Ljava/lang/String;
+SPLcom/ichi2/anki/AnkiDroidApp;->attachBaseContext(Landroid/content/Context;)V
+SPLcom/ichi2/anki/AnkiDroidApp;->checkWebViewAvailable()Z
+SPLcom/ichi2/anki/AnkiDroidApp;->getCacheDir()Ljava/io/File;
+SPLcom/ichi2/anki/AnkiDroidApp;->getDatabasePath(Ljava/lang/String;)Ljava/io/File;
+SPLcom/ichi2/anki/AnkiDroidApp;->getDir(Ljava/lang/String;I)Ljava/io/File;
+SPLcom/ichi2/anki/AnkiDroidApp;->getFilesDir()Ljava/io/File;
+SPLcom/ichi2/anki/AnkiDroidApp;->getNoBackupFilesDir()Ljava/io/File;
+SPLcom/ichi2/anki/AnkiDroidApp;->getProfileContext()Landroid/content/Context;
+SPLcom/ichi2/anki/AnkiDroidApp;->getSharedPreferences(Ljava/lang/String;I)Landroid/content/SharedPreferences;
+SPLcom/ichi2/anki/AnkiDroidApp;->initAnkiBackend(Z)V
+SPLcom/ichi2/anki/AnkiDroidApp;->initializeAnkiDroidDirectory(Lcom/ichi2/anki/AnkiDroidApp$AnkiContext;)V
+SPLcom/ichi2/anki/AnkiDroidApp;->launchCacheCleanup()Lkotlinx/coroutines/Job;
+SPLcom/ichi2/anki/AnkiDroidApp;->onCreate$lambda$2(Landroid/content/Context;)Lcom/ichi2/anki/common/preferences/AnimationPreferences;
+SPLcom/ichi2/anki/AnkiDroidApp;->onCreate()V
+SPLcom/ichi2/anki/AnkiDroidApp;->setActivityAgnosticDialogs(Lcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs;)V
+SPLcom/ichi2/anki/AnkiDroidApp;->setupAnkiBackend()V
+SPLcom/ichi2/anki/AnkiDroidApp;->setupAnkiDroidApp()Z
+SPLcom/ichi2/anki/AnkiDroidApp;->setupAppLifecycleObserver()V
+SPLcom/ichi2/anki/AnkiDroidApp;->setupBackendChangeManager()V
+SPLcom/ichi2/anki/AnkiDroidApp;->setupContextMenus()V
+SPLcom/ichi2/anki/AnkiDroidApp;->setupCustomFieldFilters()V
+SPLcom/ichi2/anki/AnkiDroidApp;->setupDayRollover(Lcom/ichi2/anki/AnkiDroidApp$AnkiContext;)V
+SPLcom/ichi2/anki/AnkiDroidApp;->setupLifecycleLogging()V
+SPLcom/ichi2/anki/AnkiDroidApp;->setupNotifications()Ljava/lang/Object;
+SPLcom/ichi2/anki/AnkiDroidApp;->setupTextToSpeech()V
+SPLcom/ichi2/anki/AnkiDroidApp;->syncPlatform()Ljava/lang/String;
+Lcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/AnkiDroidApp;)V
+Lcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda1;-><init>()V
+Lcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda2;-><init>()V
+SPLcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/AnkiDroidApp$$ExternalSyntheticLambda3;-><init>(Lcom/ichi2/anki/AnkiDroidApp;)V
+Lcom/ichi2/anki/AnkiDroidApp$AnkiContext;
+SPLcom/ichi2/anki/AnkiDroidApp$AnkiContext;-><clinit>()V
+SPLcom/ichi2/anki/AnkiDroidApp$AnkiContext;-><init>()V
+Lcom/ichi2/anki/AnkiDroidApp$Companion;
+SPLcom/ichi2/anki/AnkiDroidApp$Companion;-><init>()V
+SPLcom/ichi2/anki/AnkiDroidApp$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/AnkiDroidApp$Companion;->_get_sharedPreferencesProvider_$lambda$0()Landroid/content/SharedPreferences;
+SPLcom/ichi2/anki/AnkiDroidApp$Companion;->getAppResources()Landroid/content/res/Resources;
+SPLcom/ichi2/anki/AnkiDroidApp$Companion;->getFatalError()Lcom/ichi2/anki/FatalInitializationError;
+SPLcom/ichi2/anki/AnkiDroidApp$Companion;->getInstance()Lcom/ichi2/anki/AnkiDroidApp;
+SPLcom/ichi2/anki/AnkiDroidApp$Companion;->getSharedPreferencesProvider()Lcom/ichi2/anki/preferences/SharedPreferencesProvider;
+SPLcom/ichi2/anki/AnkiDroidApp$Companion;->getSharedPreferencesTestingOverride()Landroid/content/SharedPreferences;
+SPLcom/ichi2/anki/AnkiDroidApp$Companion;->isInitialized()Z
+SPLcom/ichi2/anki/AnkiDroidApp$Companion;->makeBackendUsable(Landroid/content/Context;)V
+SPLcom/ichi2/anki/AnkiDroidApp$Companion;->sharedPrefs()Landroid/content/SharedPreferences;
+Lcom/ichi2/anki/AnkiDroidApp$Companion$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/AnkiDroidApp$Companion$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/AnkiDroidApp$Companion$$ExternalSyntheticLambda0;->sharedPrefs()Landroid/content/SharedPreferences;
+Lcom/ichi2/anki/AnkiDroidApp$WhenMappings;
+SPLcom/ichi2/anki/AnkiDroidApp$WhenMappings;-><clinit>()V
+Lcom/ichi2/anki/AnkiDroidApp$launchCacheCleanup$1;
+SPLcom/ichi2/anki/AnkiDroidApp$launchCacheCleanup$1;-><init>(Lcom/ichi2/anki/AnkiDroidApp;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/AnkiDroidApp$launchCacheCleanup$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/AnkiDroidApp$launchCacheCleanup$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/AnkiDroidApp$onCreate$5;
+SPLcom/ichi2/anki/AnkiDroidApp$onCreate$5;-><init>(Lcom/ichi2/anki/AnkiDroidApp;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/AnkiDroidApp$onCreate$5;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/AnkiDroidApp$onCreate$5;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/AnkiDroidApp$sam$androidx_lifecycle_Observer$0;
+SPLcom/ichi2/anki/AnkiDroidApp$sam$androidx_lifecycle_Observer$0;-><init>(Lkotlin/jvm/functions/Function1;)V
+Lcom/ichi2/anki/AnkiDroidApp$setupLifecycleLogging$1$1;
+SPLcom/ichi2/anki/AnkiDroidApp$setupLifecycleLogging$1$1;-><init>()V
+SPLcom/ichi2/anki/AnkiDroidApp$setupLifecycleLogging$1$1;->onActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
+SPLcom/ichi2/anki/AnkiDroidApp$setupLifecycleLogging$1$1;->onActivityDestroyed(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/AnkiDroidApp$setupLifecycleLogging$1$1;->onActivityResumed(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/AnkiDroidApp$setupLifecycleLogging$1$1;->onActivityStarted(Landroid/app/Activity;)V
+Lcom/ichi2/anki/AnkiDroidApp$setupNotifications$1$2;
+SPLcom/ichi2/anki/AnkiDroidApp$setupNotifications$1$2;-><init>(Landroid/content/Context;)V
+Lcom/ichi2/anki/AppLifecycleObserver;
+SPLcom/ichi2/anki/AppLifecycleObserver;-><clinit>()V
+SPLcom/ichi2/anki/AppLifecycleObserver;-><init>(Landroid/content/Context;)V
+SPLcom/ichi2/anki/AppLifecycleObserver;->onCreate(Landroidx/lifecycle/LifecycleOwner;)V
+SPLcom/ichi2/anki/AppLifecycleObserver;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
+SPLcom/ichi2/anki/AppLifecycleObserver;->onStart(Landroidx/lifecycle/LifecycleOwner;)V
+Lcom/ichi2/anki/BackendBackupsKt;
+SPLcom/ichi2/anki/BackendBackupsKt;-><clinit>()V
+SPLcom/ichi2/anki/BackendBackupsKt;->access$createBackup(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/BackendBackupsKt;->access$createBackupHoldingLock(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/BackendBackupsKt;->createBackup(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/BackendBackupsKt;->createBackupHoldingLock$lambda$0(ZLcom/ichi2/anki/libanki/Collection;)Z
+SPLcom/ichi2/anki/BackendBackupsKt;->createBackupHoldingLock(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/BackendBackupsKt;->performBackupInBackground$default(ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/BackendBackupsKt;->performBackupInBackground(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/BackendBackupsKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/BackendBackupsKt$$ExternalSyntheticLambda0;-><init>(Z)V
+SPLcom/ichi2/anki/BackendBackupsKt$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/BackendBackupsKt$createBackup$1;
+SPLcom/ichi2/anki/BackendBackupsKt$createBackup$1;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/BackendBackupsKt$createBackup$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$1;
+SPLcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$1;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$2;
+SPLcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$2;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$2;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/BackendBackupsKt$createBackupHoldingLock$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/BackendBackupsKt$performBackupInBackground$1;
+SPLcom/ichi2/anki/BackendBackupsKt$performBackupInBackground$1;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/BackendBackupsKt$performBackupInBackground$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/BackupManager;
+SPLcom/ichi2/anki/BackupManager;-><clinit>()V
+Lcom/ichi2/anki/BackupManager$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/BackupManager$$ExternalSyntheticLambda0;-><init>()V
+Lcom/ichi2/anki/BackupManager$Companion;
+SPLcom/ichi2/anki/BackupManager$Companion;-><init>()V
+SPLcom/ichi2/anki/BackupManager$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/BackupManager$Companion;->enoughDiscSpace(Ljava/io/File;)Z
+SPLcom/ichi2/anki/BackupManager$Companion;->getBackupDirectory(Ljava/io/File;)Ljava/io/File;
+SPLcom/ichi2/anki/BackupManager$Companion;->getBackupDirectoryFromCollection(Ljava/io/File;)Ljava/lang/String;
+SPLcom/ichi2/anki/BackupManager$Companion;->getFreeDiscSpace(Ljava/io/File;)J
+Lcom/ichi2/anki/BottomNavController$NavigationItem;
+SPLcom/ichi2/anki/BottomNavController$NavigationItem;->$values()[Lcom/ichi2/anki/BottomNavController$NavigationItem;
+SPLcom/ichi2/anki/BottomNavController$NavigationItem;-><clinit>()V
+SPLcom/ichi2/anki/BottomNavController$NavigationItem;-><init>(Ljava/lang/String;IILjava/lang/String;ILjava/lang/String;)V
+SPLcom/ichi2/anki/BottomNavController$NavigationItem;->getTag()Ljava/lang/String;
+Lcom/ichi2/anki/BottomNavController$NavigationItem$Companion;
+SPLcom/ichi2/anki/BottomNavController$NavigationItem$Companion;-><init>()V
+SPLcom/ichi2/anki/BottomNavController$NavigationItem$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/BuildConfig;
+SPLcom/ichi2/anki/BuildConfig;-><clinit>()V
+Lcom/ichi2/anki/CardBrowser;
+SPLcom/ichi2/anki/CardBrowser;-><clinit>()V
+Lcom/ichi2/anki/CardBrowser$Companion;
+SPLcom/ichi2/anki/CardBrowser$Companion;-><init>()V
+SPLcom/ichi2/anki/CardBrowser$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/CardBrowser$Companion;->clearLastDeckId()V
+Lcom/ichi2/anki/CollectionLeaseManager;
+SPLcom/ichi2/anki/CollectionLeaseManager;-><clinit>()V
+SPLcom/ichi2/anki/CollectionLeaseManager;-><init>()V
+SPLcom/ichi2/anki/CollectionLeaseManager;->getFlowOfLease()Lkotlinx/coroutines/flow/StateFlow;
+Lcom/ichi2/anki/CollectionManager;
+SPLcom/ichi2/anki/CollectionManager;->$r8$lambda$CVrn_Kh6Msxahpe8OehADhoCTBs(Lcom/ichi2/anki/CollectionManager;)Lcom/ichi2/anki/libanki/Collection;
+SPLcom/ichi2/anki/CollectionManager;->$r8$lambda$W1MuSlVHYw8laATlr7Q27r6qm7c(Lcom/ichi2/anki/CollectionManager;)Z
+SPLcom/ichi2/anki/CollectionManager;-><clinit>()V
+SPLcom/ichi2/anki/CollectionManager;-><init>()V
+SPLcom/ichi2/anki/CollectionManager;->access$ensureBackendInner(Lcom/ichi2/anki/CollectionManager;)V
+SPLcom/ichi2/anki/CollectionManager;->access$withQueue(Lcom/ichi2/anki/CollectionManager;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CollectionManager;->backend()Lnet/ankiweb/rsdroid/Backend;
+SPLcom/ichi2/anki/CollectionManager;->blockForQueue(Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CollectionManager;->collectionPathInValidFolder()Lcom/ichi2/anki/libanki/CollectionFiles;
+SPLcom/ichi2/anki/CollectionManager;->ensureBackendInner()V
+SPLcom/ichi2/anki/CollectionManager;->ensureOpenInner$lambda$1(Lnet/ankiweb/rsdroid/Backend;)Lcom/ichi2/anki/libanki/DB;
+SPLcom/ichi2/anki/CollectionManager;->ensureOpenInner()V
+SPLcom/ichi2/anki/CollectionManager;->getBackend()Lnet/ankiweb/rsdroid/Backend;
+SPLcom/ichi2/anki/CollectionManager;->getColUnsafe$lambda$0$0(Lcom/ichi2/anki/CollectionManager;)Lcom/ichi2/anki/libanki/Collection;
+SPLcom/ichi2/anki/CollectionManager;->getColUnsafe$lambda$0()Lcom/ichi2/anki/libanki/Collection;
+SPLcom/ichi2/anki/CollectionManager;->getColUnsafe()Lcom/ichi2/anki/libanki/Collection;
+SPLcom/ichi2/anki/CollectionManager;->getCollection()Lcom/ichi2/anki/libanki/Collection;
+SPLcom/ichi2/anki/CollectionManager;->getCollectionDirectory()Ljava/io/File;
+SPLcom/ichi2/anki/CollectionManager;->getTR()Lnet/ankiweb/rsdroid/Translations;
+SPLcom/ichi2/anki/CollectionManager;->isOpenUnsafe$lambda$0$0(Lcom/ichi2/anki/CollectionManager;)Z
+SPLcom/ichi2/anki/CollectionManager;->isOpenUnsafe$lambda$0()Z
+SPLcom/ichi2/anki/CollectionManager;->isOpenUnsafe()Z
+SPLcom/ichi2/anki/CollectionManager;->logUIHangs(Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CollectionManager;->setBackend(Lnet/ankiweb/rsdroid/Backend;)V
+SPLcom/ichi2/anki/CollectionManager;->setCollection(Lcom/ichi2/anki/libanki/Collection;)V
+SPLcom/ichi2/anki/CollectionManager;->updateCustomCertificate(Ljava/lang/String;)Z
+SPLcom/ichi2/anki/CollectionManager;->withColInternal$lambda$0(Lkotlin/jvm/functions/Function1;Lcom/ichi2/anki/CollectionManager;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CollectionManager;->withColInternal(Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CollectionManager;->withOpenColOrNull$lambda$0(Lkotlin/jvm/functions/Function1;Lcom/ichi2/anki/CollectionManager;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CollectionManager;->withOpenColOrNull(Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CollectionManager;->withQueue(Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda1;-><init>()V
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda11;
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda11;-><init>()V
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda11;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda2;-><init>(Lkotlin/jvm/functions/Function1;)V
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda6;
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda6;-><init>()V
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda6;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda7;
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda7;-><init>()V
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda7;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda8;
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda8;-><init>(Lkotlin/jvm/functions/Function1;)V
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda8;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda9;
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda9;-><init>()V
+SPLcom/ichi2/anki/CollectionManager$$ExternalSyntheticLambda9;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CollectionManager$blockForQueue$2;
+SPLcom/ichi2/anki/CollectionManager$blockForQueue$2;-><init>(Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/CollectionManager$blockForQueue$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/CollectionManager$blockForQueue$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CollectionManager$getBackend$1;
+SPLcom/ichi2/anki/CollectionManager$getBackend$1;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/CollectionManager$getBackend$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/CollectionManager$getBackend$1;->invokeSuspend$lambda$0(Lcom/ichi2/anki/CollectionManager;)Lkotlin/Unit;
+SPLcom/ichi2/anki/CollectionManager$getBackend$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CollectionManager$getBackend$1$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/CollectionManager$getBackend$1$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/CollectionManager$getBackend$1$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CollectionManager$withQueue$3;
+SPLcom/ichi2/anki/CollectionManager$withQueue$3;-><init>(Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/CollectionManager$withQueue$3;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/CollectionManager$withQueue$3;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CoroutineHelpersKt;
+SPLcom/ichi2/anki/CoroutineHelpersKt;-><clinit>()V
+SPLcom/ichi2/anki/CoroutineHelpersKt;->access$dismissDialogIfShowing(Landroid/app/Dialog;)V
+SPLcom/ichi2/anki/CoroutineHelpersKt;->dismissDialogIfShowing(Landroid/app/Dialog;)V
+SPLcom/ichi2/anki/CoroutineHelpersKt;->launchCatchingIO(Landroidx/lifecycle/ViewModel;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
+SPLcom/ichi2/anki/CoroutineHelpersKt;->launchCatchingTask$default(Landroidx/fragment/app/FragmentActivity;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+SPLcom/ichi2/anki/CoroutineHelpersKt;->launchCatchingTask(Landroidx/fragment/app/FragmentActivity;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
+SPLcom/ichi2/anki/CoroutineHelpersKt;->runCatching(Landroidx/fragment/app/FragmentActivity;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CoroutineHelpersKt;->withProgress$default(Landroid/app/Activity;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CoroutineHelpersKt;->withProgress(Landroid/app/Activity;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CoroutineHelpersKt;->withProgressDialog-WPi__2c$default(Landroid/app/Activity;Lkotlin/jvm/functions/Function0;JLjava/lang/Integer;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CoroutineHelpersKt;->withProgressDialog-WPi__2c(Landroid/app/Activity;Lkotlin/jvm/functions/Function0;JLjava/lang/Integer;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/CoroutineHelpersKt$launchCatchingIO$1;
+SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatchingIO$1;-><init>(Landroidx/lifecycle/ViewModel;Lkotlin/coroutines/Continuation;)V
+Lcom/ichi2/anki/CoroutineHelpersKt$launchCatchingIO$2;
+SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatchingIO$2;-><init>(Lkotlin/jvm/functions/Function2;Landroidx/lifecycle/ViewModel;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatchingIO$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatchingIO$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatchingIO$2;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatchingIO$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CoroutineHelpersKt$launchCatchingTask$1;
+SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatchingTask$1;-><init>(Landroidx/fragment/app/FragmentActivity;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatchingTask$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatchingTask$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CoroutineHelpersKt$launchCatchingTask$1$1;
+SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatchingTask$1$1;-><init>(Lkotlin/jvm/functions/Function2;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatchingTask$1$1;->create(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatchingTask$1$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatchingTask$1$1;->invoke(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CoroutineHelpersKt$launchCatchingTask$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CoroutineHelpersKt$runCatching$1;
+SPLcom/ichi2/anki/CoroutineHelpersKt$runCatching$1;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/CoroutineHelpersKt$runCatching$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CoroutineHelpersKt$withProgress$8;
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgress$8;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgress$8;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgress$8;->invoke(Landroid/app/ProgressDialog;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgress$8;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgress$8;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2;
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2;-><init>(Landroid/app/Activity;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function0;Ljava/lang/Integer;JLkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2;->invokeSuspend$lambda$1(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2;->invokeSuspend$lambda$2(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2$$ExternalSyntheticLambda2;-><init>(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2$$ExternalSyntheticLambda2;->run()V
+Lcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2$$ExternalSyntheticLambda3;-><init>(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2$$ExternalSyntheticLambda3;->run()V
+Lcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2$dialogJob$1;
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2$dialogJob$1;-><init>(JLkotlin/jvm/functions/Function0;Ljava/lang/Integer;Landroid/app/ProgressDialog;Lkotlin/jvm/internal/Ref$BooleanRef;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2$dialogJob$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/CoroutineHelpersKt$withProgressDialog$2$dialogJob$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DayRolloverHandler;
+SPLcom/ichi2/anki/DayRolloverHandler;->$r8$lambda$UUd88d_6FpFa_FHFUjhALzYt_Sw(Lcom/ichi2/anki/libanki/Collection;)J
+SPLcom/ichi2/anki/DayRolloverHandler;-><clinit>()V
+SPLcom/ichi2/anki/DayRolloverHandler;-><init>()V
+SPLcom/ichi2/anki/DayRolloverHandler;->handleTimeChange$AnkiDroid(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DayRolloverHandler;->handleTimeChange$lambda$0$0(Lcom/ichi2/anki/libanki/Collection;)J
+SPLcom/ichi2/anki/DayRolloverHandler;->listenForRolloverEvents$register(Landroid/content/Context;Landroid/content/IntentFilter;)Landroid/content/Intent;
+SPLcom/ichi2/anki/DayRolloverHandler;->listenForRolloverEvents(Landroid/content/Context;)V
+SPLcom/ichi2/anki/DayRolloverHandler;->onReceiveBroadcast(Landroid/content/Context;Landroid/content/Intent;)V
+Lcom/ichi2/anki/DayRolloverHandler$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/DayRolloverHandler$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/DayRolloverHandler$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DayRolloverHandler$handleTimeChange$1;
+SPLcom/ichi2/anki/DayRolloverHandler$handleTimeChange$1;-><init>(Lcom/ichi2/anki/DayRolloverHandler;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/DayRolloverHandler$handleTimeChange$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DayRolloverHandler$onReceiveBroadcast$1;
+SPLcom/ichi2/anki/DayRolloverHandler$onReceiveBroadcast$1;-><init>(Lkotlin/coroutines/Continuation;)V
+Lcom/ichi2/anki/DayRolloverHandler$onReceiveBroadcast$2;
+SPLcom/ichi2/anki/DayRolloverHandler$onReceiveBroadcast$2;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/DayRolloverHandler$onReceiveBroadcast$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/DayRolloverHandler$onReceiveBroadcast$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DayRolloverHandler$onReceiveBroadcast$2;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DayRolloverHandler$onReceiveBroadcast$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker;
+SPLcom/ichi2/anki/DeckPicker;-><clinit>()V
+SPLcom/ichi2/anki/DeckPicker;-><init>()V
+SPLcom/ichi2/anki/DeckPicker;->access$applyDeckPickerBackground(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker;->access$getDecksLayoutManager$p(Lcom/ichi2/anki/DeckPicker;)Landroidx/recyclerview/widget/LinearLayoutManager;
+SPLcom/ichi2/anki/DeckPicker;->access$getPullToSyncWrapper$p(Lcom/ichi2/anki/DeckPicker;)Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;
+SPLcom/ichi2/anki/DeckPicker;->access$restoreSearchState(Lcom/ichi2/anki/DeckPicker;Landroid/view/Menu;)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onCardsDueChanged(Lcom/ichi2/anki/DeckPicker;Ljava/lang/Integer;)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onCollectionStatusChanged(Lcom/ichi2/anki/DeckPicker;Z)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onDeckListChanged(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onDecksReloaded(Lcom/ichi2/anki/DeckPicker;Lkotlin/Unit;)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onFocusedDeckChanged(Lcom/ichi2/anki/DeckPicker;Ljava/lang/Long;)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onOptionsMenuUpdated(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/deckpicker/OptionsMenuState;)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onResizingDividerVisibilityChanged(Lcom/ichi2/anki/DeckPicker;Z)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onStartupResponse(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse;)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onStudiedTodayChanged(Lcom/ichi2/anki/DeckPicker;Ljava/lang/String;)V
+SPLcom/ichi2/anki/DeckPicker;->access$setupFlows$onStudyOptionsVisibilityChanged(Lcom/ichi2/anki/DeckPicker;Z)V
+SPLcom/ichi2/anki/DeckPicker;->access$updateDeckRelatedMenuItems(Lcom/ichi2/anki/DeckPicker;Landroid/view/Menu;)V
+SPLcom/ichi2/anki/DeckPicker;->access$updateSearchVisibilityFromState(Lcom/ichi2/anki/DeckPicker;Landroid/view/Menu;)V
+SPLcom/ichi2/anki/DeckPicker;->applyDeckPickerBackground(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker;->automaticSync$default(Lcom/ichi2/anki/DeckPicker;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker;->automaticSync(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker;->fitsSystemWindows()Z
+SPLcom/ichi2/anki/DeckPicker;->getAnalyticsScreenName()Ljava/lang/String;
+SPLcom/ichi2/anki/DeckPicker;->getBinding$AnkiDroid()Lcom/ichi2/anki/databinding/ActivityHomescreenBinding;
+SPLcom/ichi2/anki/DeckPicker;->getBottomNavigationEnabled$AnkiDroid()Z
+SPLcom/ichi2/anki/DeckPicker;->getBroadcastsActions()Ljava/util/Map;
+SPLcom/ichi2/anki/DeckPicker;->getDeckPickerBinding$AnkiDroid()Lcom/ichi2/anki/databinding/IncludeDeckPickerBinding;
+SPLcom/ichi2/anki/DeckPicker;->getFloatingActionButtonBinding()Lcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;
+SPLcom/ichi2/anki/DeckPicker;->getFragment()Lcom/ichi2/anki/StudyOptionsFragment;
+SPLcom/ichi2/anki/DeckPicker;->getFragmented()Z
+SPLcom/ichi2/anki/DeckPicker;->getImportViewModel()Lcom/ichi2/anki/dialogs/ImportViewModel;
+SPLcom/ichi2/anki/DeckPicker;->getViewModel()Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;
+SPLcom/ichi2/anki/DeckPicker;->handleStartup()V
+SPLcom/ichi2/anki/DeckPicker;->onAttachedToWindow()V
+SPLcom/ichi2/anki/DeckPicker;->onCreate$lambda$0(Landroid/content/res/Resources;)Z
+SPLcom/ichi2/anki/DeckPicker;->onCreate(Landroid/os/Bundle;)V
+SPLcom/ichi2/anki/DeckPicker;->onCreateOptionsMenu(Landroid/view/Menu;)Z
+SPLcom/ichi2/anki/DeckPicker;->onFinishedStartup()V
+SPLcom/ichi2/anki/DeckPicker;->onResume()V
+SPLcom/ichi2/anki/DeckPicker;->raiseFabAboveSummary(I)V
+SPLcom/ichi2/anki/DeckPicker;->recreateActivityResultLauncher(Lcom/ichi2/anki/AnkiActivity;)Landroidx/activity/result/ActivityResultLauncher;
+SPLcom/ichi2/anki/DeckPicker;->refreshState()V
+SPLcom/ichi2/anki/DeckPicker;->restoreSearchState(Landroid/view/Menu;)V
+SPLcom/ichi2/anki/DeckPicker;->setFloatingActionMenu(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
+SPLcom/ichi2/anki/DeckPicker;->setupBackPressedCallbacks()V
+SPLcom/ichi2/anki/DeckPicker;->setupEdgeToEdge$lambda$0(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+SPLcom/ichi2/anki/DeckPicker;->setupEdgeToEdge$lambda$1(Lcom/ichi2/anki/DeckPicker;Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+SPLcom/ichi2/anki/DeckPicker;->setupEdgeToEdge$lambda$2(Lcom/ichi2/anki/DeckPicker;)Lkotlin/Unit;
+SPLcom/ichi2/anki/DeckPicker;->setupEdgeToEdge$lambda$3(Lcom/ichi2/anki/DeckPicker;Landroid/view/View;IIIIIIII)V
+SPLcom/ichi2/anki/DeckPicker;->setupEdgeToEdge$listAnchor(Lcom/ichi2/anki/DeckPicker;)Landroid/view/View;
+SPLcom/ichi2/anki/DeckPicker;->setupEdgeToEdge$setRecyclerViewBottomPaddingAbove(Lcom/ichi2/anki/DeckPicker;Landroid/view/View;)V
+SPLcom/ichi2/anki/DeckPicker;->setupEdgeToEdge()V
+SPLcom/ichi2/anki/DeckPicker;->setupFlows$onCardsDueChanged(Lcom/ichi2/anki/DeckPicker;Ljava/lang/Integer;)V
+SPLcom/ichi2/anki/DeckPicker;->setupFlows$onCollectionStatusChanged(Lcom/ichi2/anki/DeckPicker;Z)V
+SPLcom/ichi2/anki/DeckPicker;->setupFlows$onDeckListChanged(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;)V
+SPLcom/ichi2/anki/DeckPicker;->setupFlows$onDecksReloaded(Lcom/ichi2/anki/DeckPicker;Lkotlin/Unit;)V
+SPLcom/ichi2/anki/DeckPicker;->setupFlows$onFocusedDeckChanged$lambda$4(Lcom/ichi2/anki/DeckPicker;I)V
+SPLcom/ichi2/anki/DeckPicker;->setupFlows$onFocusedDeckChanged(Lcom/ichi2/anki/DeckPicker;Ljava/lang/Long;)V
+SPLcom/ichi2/anki/DeckPicker;->setupFlows$onOptionsMenuUpdated(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/deckpicker/OptionsMenuState;)V
+SPLcom/ichi2/anki/DeckPicker;->setupFlows$onResizingDividerVisibilityChanged(Lcom/ichi2/anki/DeckPicker;Z)V
+SPLcom/ichi2/anki/DeckPicker;->setupFlows$onStartupResponse(Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse;)V
+SPLcom/ichi2/anki/DeckPicker;->setupFlows$onStudiedTodayChanged(Lcom/ichi2/anki/DeckPicker;Ljava/lang/String;)V
+SPLcom/ichi2/anki/DeckPicker;->setupFlows$onStudyOptionsVisibilityChanged(Lcom/ichi2/anki/DeckPicker;Z)V
+SPLcom/ichi2/anki/DeckPicker;->setupFlows()V
+SPLcom/ichi2/anki/DeckPicker;->setupMediaSyncMenuItem(Landroid/view/Menu;)V
+SPLcom/ichi2/anki/DeckPicker;->setupPullToSync()V
+SPLcom/ichi2/anki/DeckPicker;->setupSearchIcon(Landroid/view/MenuItem;)V
+SPLcom/ichi2/anki/DeckPicker;->showStartupScreensAndDialogs(Landroid/content/SharedPreferences;I)V
+SPLcom/ichi2/anki/DeckPicker;->tryShowStudyOptionsPanel()Z
+SPLcom/ichi2/anki/DeckPicker;->updateDeckList()V
+SPLcom/ichi2/anki/DeckPicker;->updateDeckRelatedMenuItems(Landroid/view/Menu;)V
+SPLcom/ichi2/anki/DeckPicker;->updateMenuFromState(Landroid/view/Menu;)V
+SPLcom/ichi2/anki/DeckPicker;->updateSearchVisibilityFromState(Landroid/view/Menu;)V
+SPLcom/ichi2/anki/DeckPicker;->updateSyncIconFromState(Landroid/view/MenuItem;Lcom/ichi2/anki/deckpicker/OptionsMenuState;)V
+SPLcom/ichi2/anki/DeckPicker;->updateUndoLabelFromState(Landroid/view/MenuItem;Ljava/lang/String;Z)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m$1(Landroid/content/pm/PackageManager;Landroid/content/Intent;Landroid/content/pm/PackageManager$ResolveInfoFlags;)Landroid/content/pm/ResolveInfo;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m()Landroid/graphics/Bitmap$CompressFormat;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m()Landroid/graphics/BlendMode;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(J)Landroid/content/pm/PackageManager$PackageInfoFlags;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(J)Landroid/content/pm/PackageManager$ResolveInfoFlags;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/Activity;)I
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/ActivityManager;Ljava/lang/String;II)Ljava/util/List;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/ApplicationExitInfo;)I
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/PackageManager;Landroid/content/Intent;Landroid/content/pm/PackageManager$ResolveInfoFlags;)Landroid/content/pm/ResolveInfo;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/PackageManager;Landroid/content/Intent;Landroid/content/pm/PackageManager$ResolveInfoFlags;)Ljava/util/List;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/PackageManager;Ljava/lang/String;Landroid/content/pm/PackageManager$PackageInfoFlags;)Landroid/content/pm/PackageInfo;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Landroid/graphics/Paint;Landroid/graphics/BlendMode;)V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/Window;Z)V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticApiModelOutline0;->m(Ljava/lang/Object;)Landroid/app/ApplicationExitInfo;
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda1;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda10;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda10;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda12;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda12;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda13;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda13;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda19;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda19;-><init>()V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda19;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda2;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda20;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda20;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda20;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda21;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda21;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda21;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda23;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda23;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda23;->onLayoutChange(Landroid/view/View;IIIIIIII)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda26;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda26;-><init>(Lcom/ichi2/anki/DeckPicker;I)V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda26;->run()V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda28;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda28;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda29;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda29;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda3;-><init>()V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda30;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda30;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda31;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda31;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda32;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda32;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda34;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda34;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda35;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda35;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda36;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda36;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda37;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda37;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda39;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda39;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda4;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda4;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda42;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda42;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda5;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda5;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda50;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda50;-><init>()V
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda50;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda51;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda51;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda52;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda52;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda6;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda6;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda7;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda7;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda8;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda8;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda9;
+SPLcom/ichi2/anki/DeckPicker$$ExternalSyntheticLambda9;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$Companion;
+SPLcom/ichi2/anki/DeckPicker$Companion;-><init>()V
+SPLcom/ichi2/anki/DeckPicker$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/DeckPicker$DeckPickerActivityResultCallback;
+SPLcom/ichi2/anki/DeckPicker$DeckPickerActivityResultCallback;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/jvm/functions/Function1;)V
+Lcom/ichi2/anki/DeckPicker$DeckSelectionType;
+SPLcom/ichi2/anki/DeckPicker$DeckSelectionType;->$values()[Lcom/ichi2/anki/DeckPicker$DeckSelectionType;
+SPLcom/ichi2/anki/DeckPicker$DeckSelectionType;-><clinit>()V
+SPLcom/ichi2/anki/DeckPicker$DeckSelectionType;-><init>(Ljava/lang/String;I)V
+SPLcom/ichi2/anki/DeckPicker$DeckSelectionType;->values()[Lcom/ichi2/anki/DeckPicker$DeckSelectionType;
+Lcom/ichi2/anki/DeckPicker$WhenMappings;
+SPLcom/ichi2/anki/DeckPicker$WhenMappings;-><clinit>()V
+Lcom/ichi2/anki/DeckPicker$activeSnackbarCallback$1;
+SPLcom/ichi2/anki/DeckPicker$activeSnackbarCallback$1;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$applyDeckPickerBackground$1;
+SPLcom/ichi2/anki/DeckPicker$applyDeckPickerBackground$1;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)V
+Lcom/ichi2/anki/DeckPicker$automaticSync$1;
+SPLcom/ichi2/anki/DeckPicker$automaticSync$1;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)V
+Lcom/ichi2/anki/DeckPicker$closeFloatingActionBarBackPressCallback$1;
+SPLcom/ichi2/anki/DeckPicker$closeFloatingActionBarBackPressCallback$1;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$exitAndSyncBackCallback$1;
+SPLcom/ichi2/anki/DeckPicker$exitAndSyncBackCallback$1;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$handleStartup$environment$1;
+SPLcom/ichi2/anki/DeckPicker$handleStartup$environment$1;-><init>(Landroid/content/Context;)V
+SPLcom/ichi2/anki/DeckPicker$handleStartup$environment$1;->decideStorageIfUndecided()V
+SPLcom/ichi2/anki/DeckPicker$handleStartup$environment$1;->getPreferences()Landroid/content/SharedPreferences;
+SPLcom/ichi2/anki/DeckPicker$handleStartup$environment$1;->hasRequiredPermissions()Z
+Lcom/ichi2/anki/DeckPicker$onCreate$8;
+SPLcom/ichi2/anki/DeckPicker$onCreate$8;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/DeckPicker$onCreate$8;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/DeckPicker$onCreate$8;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$onCreate$8$1;
+SPLcom/ichi2/anki/DeckPicker$onCreate$8$1;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/DeckPicker$onCreate$8$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/DeckPicker$onCreate$8$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$onCreate$8$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$onCreate$8$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$onCreateOptionsMenu$2;
+SPLcom/ichi2/anki/DeckPicker$onCreateOptionsMenu$2;-><init>(Lcom/ichi2/anki/DeckPicker;Landroid/view/Menu;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/DeckPicker$onCreateOptionsMenu$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/DeckPicker$onCreateOptionsMenu$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$onCreateOptionsMenu$2;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$onCreateOptionsMenu$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$onFinishedStartup$1;
+SPLcom/ichi2/anki/DeckPicker$onFinishedStartup$1;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/DeckPicker$onFinishedStartup$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/DeckPicker$onFinishedStartup$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$onFinishedStartup$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$onFinishedStartup$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupFlows$1;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$1;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$10;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$10;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$11;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$11;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$12;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$12;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$13;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$13;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$14;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$14;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$14;->invoke(Lcom/ichi2/anki/deckpicker/OptionsMenuState;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$14;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupFlows$15;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$15;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$15;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$15;->invoke(Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupFlows$16;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$16;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$16;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$16;->invoke(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupFlows$17;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$17;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$17;->invoke(Ljava/lang/Integer;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$17;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupFlows$18;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$18;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$18;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$18;->invoke(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupFlows$19;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$19;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$19;->invoke(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$19;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupFlows$2;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$2;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$20;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$20;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$20;->invoke(Ljava/lang/Long;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$20;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupFlows$21;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$21;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$21;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$21;->invoke(ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupFlows$22;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$22;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$22;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$22;->invoke(Lkotlin/Unit;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupFlows$23;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$23;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupFlows$23;->invoke(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$23;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupFlows$24;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$24;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$25;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$25;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$26;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$26;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$27;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$27;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$3;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$3;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$4;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$4;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$5;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$5;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$6;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$6;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$7;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$7;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$8;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$8;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)V
+Lcom/ichi2/anki/DeckPicker$setupFlows$9;
+SPLcom/ichi2/anki/DeckPicker$setupFlows$9;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$setupMediaSyncMenuItem$1;
+SPLcom/ichi2/anki/DeckPicker$setupMediaSyncMenuItem$1;-><init>(Lkotlinx/coroutines/flow/Flow;Lcom/ichi2/anki/DeckPicker;Lcom/google/android/material/progressindicator/LinearProgressIndicator;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/DeckPicker$setupMediaSyncMenuItem$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/DeckPicker$setupMediaSyncMenuItem$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupMediaSyncMenuItem$1$1;
+SPLcom/ichi2/anki/DeckPicker$setupMediaSyncMenuItem$1$1;-><init>(Lcom/google/android/material/progressindicator/LinearProgressIndicator;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/DeckPicker$setupMediaSyncMenuItem$1$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/DeckPicker$setupMediaSyncMenuItem$1$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupMediaSyncMenuItem$1$1;->invoke(Ljava/util/List;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$setupMediaSyncMenuItem$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$setupPullToSync$$inlined$doOnScrolled$1;
+SPLcom/ichi2/anki/DeckPicker$setupPullToSync$$inlined$doOnScrolled$1;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+SPLcom/ichi2/anki/DeckPicker$setupPullToSync$$inlined$doOnScrolled$1;->onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
+Lcom/ichi2/anki/DeckPicker$setupSearchIcon$1;
+SPLcom/ichi2/anki/DeckPicker$setupSearchIcon$1;-><init>(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/DeckPicker$setupSearchIcon$2$1;
+SPLcom/ichi2/anki/DeckPicker$setupSearchIcon$2$1;-><init>(Lcom/ichi2/ui/AccessibleSearchView;Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/ui/AccessibleSearchView;Landroid/view/MenuItem;)V
+Lcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$1;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$1;-><init>(Landroidx/activity/ComponentActivity;)V
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$1;->invoke()Landroidx/lifecycle/ViewModelProvider$Factory;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$1;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$2;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$2;-><init>(Landroidx/activity/ComponentActivity;)V
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$2;->invoke()Landroidx/lifecycle/ViewModelStore;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$2;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$3;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$3;-><init>(Lkotlin/jvm/functions/Function0;Landroidx/activity/ComponentActivity;)V
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$3;->invoke()Landroidx/lifecycle/viewmodel/CreationExtras;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$3;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$4;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$4;-><init>(Landroidx/activity/ComponentActivity;)V
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$4;->invoke()Landroidx/lifecycle/ViewModelProvider$Factory;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$4;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$5;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$5;-><init>(Landroidx/activity/ComponentActivity;)V
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$5;->invoke()Landroidx/lifecycle/ViewModelStore;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$5;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$6;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$6;-><init>(Lkotlin/jvm/functions/Function0;Landroidx/activity/ComponentActivity;)V
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$6;->invoke()Landroidx/lifecycle/viewmodel/CreationExtras;
+SPLcom/ichi2/anki/DeckPicker$special$$inlined$viewModels$default$6;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$updateDeckList$1;
+SPLcom/ichi2/anki/DeckPicker$updateDeckList$1;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/DeckPicker$updateDeckList$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/DeckPicker$updateDeckList$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$updateDeckList$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$updateDeckList$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPicker$updateDeckList$1$1;
+SPLcom/ichi2/anki/DeckPicker$updateDeckList$1$1;-><init>(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/DeckPicker$updateDeckList$1$1;->create(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/DeckPicker$updateDeckList$1$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$updateDeckList$1$1;->invoke(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/DeckPicker$updateDeckList$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;-><clinit>()V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;-><init>(Landroid/content/Context;Lcom/ichi2/anki/databinding/ActivityHomescreenBinding;Lcom/ichi2/anki/DeckPicker;Lcom/ichi2/anki/DeckPickerFloatingActionMenu$FloatingActionBarToggleListener;Z)V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;->access$resetMenuAfterAdding(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;->createActivationKeyListener(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Landroid/view/View$OnKeyListener;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;->resetMenuAfterAdding()V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu;->setCreateDeckButtonLabel()V
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda1;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda10;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda10;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda2;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda3;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda4;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda4;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda5;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda5;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda6;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda6;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda7;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda7;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda8;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda8;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda9;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$$ExternalSyntheticLambda9;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu$1;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$1;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;)V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$1;->onCreate(Landroidx/lifecycle/LifecycleOwner;)V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$1;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$1;->onStart(Landroidx/lifecycle/LifecycleOwner;)V
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu$2;
+SPLcom/ichi2/anki/DeckPickerFloatingActionMenu$2;-><init>(Lcom/ichi2/anki/DeckPickerFloatingActionMenu;Landroid/content/Context;)V
+Lcom/ichi2/anki/DeckPickerFloatingActionMenu$FloatingActionBarToggleListener;
+Lcom/ichi2/anki/DeckPickerKt;
+SPLcom/ichi2/anki/DeckPickerKt;->getStudyoptionsFrame(Lcom/ichi2/anki/databinding/ActivityHomescreenBinding;)Landroidx/fragment/app/FragmentContainerView;
+Lcom/ichi2/anki/DispatchKeyEventListener;
+Lcom/ichi2/anki/Flag;
+SPLcom/ichi2/anki/Flag;->$values()[Lcom/ichi2/anki/Flag;
+SPLcom/ichi2/anki/Flag;-><clinit>()V
+SPLcom/ichi2/anki/Flag;-><init>(Ljava/lang/String;IIIILjava/lang/Integer;)V
+SPLcom/ichi2/anki/Flag;->getEntries()Lkotlin/enums/EnumEntries;
+SPLcom/ichi2/anki/Flag;->getId()I
+Lcom/ichi2/anki/Flag$Companion;
+SPLcom/ichi2/anki/Flag$Companion;-><init>()V
+SPLcom/ichi2/anki/Flag$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/FlashCardsContract;
+SPLcom/ichi2/anki/FlashCardsContract;-><clinit>()V
+SPLcom/ichi2/anki/FlashCardsContract;-><init>()V
+SPLcom/ichi2/anki/FlashCardsContract;->getAuthority$default(Lcom/ichi2/anki/FlashCardsContract;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
+SPLcom/ichi2/anki/FlashCardsContract;->getAuthority(Ljava/lang/String;)Ljava/lang/String;
+SPLcom/ichi2/anki/FlashCardsContract;->getAuthorityUri$default(Lcom/ichi2/anki/FlashCardsContract;Ljava/lang/String;ILjava/lang/Object;)Landroid/net/Uri;
+SPLcom/ichi2/anki/FlashCardsContract;->getAuthorityUri(Ljava/lang/String;)Landroid/net/Uri;
+SPLcom/ichi2/anki/FlashCardsContract;->getPermission(Ljava/lang/String;)Ljava/lang/String;
+Lcom/ichi2/anki/FlashCardsContract$Note;
+SPLcom/ichi2/anki/FlashCardsContract$Note;-><clinit>()V
+SPLcom/ichi2/anki/FlashCardsContract$Note;-><init>()V
+SPLcom/ichi2/anki/FlashCardsContract$Note;->getDefaultColumns()[Ljava/lang/String;
+Lcom/ichi2/anki/HomeScreenNavigationKt;
+SPLcom/ichi2/anki/HomeScreenNavigationKt;->selectedBottomNavItem(Lcom/ichi2/anki/DeckPicker;)Lcom/ichi2/anki/BottomNavController$NavigationItem;
+SPLcom/ichi2/anki/HomeScreenNavigationKt;->setupBottomNavigation(Lcom/ichi2/anki/DeckPicker;)V
+Lcom/ichi2/anki/ImportColpkgListener;
+Lcom/ichi2/anki/InitialActivity;
+SPLcom/ichi2/anki/InitialActivity;-><clinit>()V
+SPLcom/ichi2/anki/InitialActivity;-><init>()V
+SPLcom/ichi2/anki/InitialActivity;->decideStorageIfUndecided(Landroid/content/Context;)V
+SPLcom/ichi2/anki/InitialActivity;->getStartupFailureType(Landroid/content/SharedPreferences;Lkotlin/jvm/functions/Function0;)Lcom/ichi2/anki/InitialActivity$StartupFailure;
+SPLcom/ichi2/anki/InitialActivity;->isLatestVersion(Landroid/content/SharedPreferences;)Z
+SPLcom/ichi2/anki/InitialActivity;->performSetupFromFreshInstallOrClearedPreferences(Landroid/content/SharedPreferences;)Z
+SPLcom/ichi2/anki/InitialActivity;->wasFreshInstall(Landroid/content/SharedPreferences;)Z
+Lcom/ichi2/anki/InitialActivity$StartupFailure;
+Lcom/ichi2/anki/InitialActivityKt;
+SPLcom/ichi2/anki/InitialActivityKt;->configureRenderingMode()V
+SPLcom/ichi2/anki/InitialActivityKt;->selectStoragePermissions(Landroid/content/Context;)Lcom/ichi2/anki/StoragePermissionSet;
+Lcom/ichi2/anki/IntentHandler;
+SPLcom/ichi2/anki/IntentHandler;-><clinit>()V
+SPLcom/ichi2/anki/IntentHandler;-><init>()V
+SPLcom/ichi2/anki/IntentHandler;->launchDeckPickerIfNoOtherTasks(Landroid/content/Intent;)V
+SPLcom/ichi2/anki/IntentHandler;->onCreate(Landroid/os/Bundle;)V
+SPLcom/ichi2/anki/IntentHandler;->onDestroy()V
+Lcom/ichi2/anki/IntentHandler$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/IntentHandler$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/IntentHandler;Landroid/content/Intent;Ljava/lang/String;)V
+Lcom/ichi2/anki/IntentHandler$Companion;
+SPLcom/ichi2/anki/IntentHandler$Companion;-><init>()V
+SPLcom/ichi2/anki/IntentHandler$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/IntentHandler$Companion;->getLaunchType(Landroid/content/Intent;)Lcom/ichi2/anki/IntentHandler$LaunchType;
+SPLcom/ichi2/anki/IntentHandler$Companion;->isBrowserDeepLink(Landroid/content/Intent;)Z
+SPLcom/ichi2/anki/IntentHandler$Companion;->requiresCollectionAccess(Lcom/ichi2/anki/IntentHandler$LaunchType;)Z
+Lcom/ichi2/anki/IntentHandler$Companion$WhenMappings;
+SPLcom/ichi2/anki/IntentHandler$Companion$WhenMappings;-><clinit>()V
+Lcom/ichi2/anki/IntentHandler$LaunchType;
+SPLcom/ichi2/anki/IntentHandler$LaunchType;->$values()[Lcom/ichi2/anki/IntentHandler$LaunchType;
+SPLcom/ichi2/anki/IntentHandler$LaunchType;-><clinit>()V
+SPLcom/ichi2/anki/IntentHandler$LaunchType;-><init>(Ljava/lang/String;I)V
+SPLcom/ichi2/anki/IntentHandler$LaunchType;->values()[Lcom/ichi2/anki/IntentHandler$LaunchType;
+Lcom/ichi2/anki/IntentHandler$WhenMappings;
+SPLcom/ichi2/anki/IntentHandler$WhenMappings;-><clinit>()V
+Lcom/ichi2/anki/IntentHandler2;
+Lcom/ichi2/anki/IntroductionActivityKt;
+SPLcom/ichi2/anki/IntroductionActivityKt;->hasShownAppIntro(Landroid/content/Context;)Z
+Lcom/ichi2/anki/LaunchCatchingKt;
+SPLcom/ichi2/anki/LaunchCatchingKt;->launchCatching(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
+Lcom/ichi2/anki/LaunchCatchingKt$launchCatching$1;
+SPLcom/ichi2/anki/LaunchCatchingKt$launchCatching$1;-><init>(Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/LaunchCatchingKt$launchCatching$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/LaunchCatchingKt$launchCatching$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/LeakCanaryConfiguration;
+SPLcom/ichi2/anki/LeakCanaryConfiguration;-><clinit>()V
+SPLcom/ichi2/anki/LeakCanaryConfiguration;-><init>()V
+SPLcom/ichi2/anki/LeakCanaryConfiguration;->disable()V
+Lcom/ichi2/anki/MetaDbWidgetRepository;
+SPLcom/ichi2/anki/MetaDbWidgetRepository;-><clinit>()V
+SPLcom/ichi2/anki/MetaDbWidgetRepository;-><init>(Landroid/content/Context;)V
+Lcom/ichi2/anki/MetaDbWidgetRepositoryKt;
+SPLcom/ichi2/anki/MetaDbWidgetRepositoryKt;->initializeWidgetRepository(Landroid/app/Application;)V
+Lcom/ichi2/anki/NavigationDrawerActivity;
+SPLcom/ichi2/anki/NavigationDrawerActivity;-><clinit>()V
+SPLcom/ichi2/anki/NavigationDrawerActivity;-><init>(Ljava/lang/Integer;)V
+SPLcom/ichi2/anki/NavigationDrawerActivity;-><init>(Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/NavigationDrawerActivity;->getDrawerLayout()Landroidx/drawerlayout/widget/DrawerLayout;
+SPLcom/ichi2/anki/NavigationDrawerActivity;->getDrawerToggle()Landroidx/appcompat/app/ActionBarDrawerToggle;
+SPLcom/ichi2/anki/NavigationDrawerActivity;->getNavigationDrawerLayout()I
+SPLcom/ichi2/anki/NavigationDrawerActivity;->initNavigationDrawer$default(Lcom/ichi2/anki/NavigationDrawerActivity;Landroid/view/View;ILjava/lang/Object;)V
+SPLcom/ichi2/anki/NavigationDrawerActivity;->initNavigationDrawer(Landroid/view/View;)V
+SPLcom/ichi2/anki/NavigationDrawerActivity;->isDrawerOpen()Z
+SPLcom/ichi2/anki/NavigationDrawerActivity;->navDrawerIsReady()Z
+SPLcom/ichi2/anki/NavigationDrawerActivity;->onPostCreate(Landroid/os/Bundle;)V
+SPLcom/ichi2/anki/NavigationDrawerActivity;->selectNavigationItem(I)V
+SPLcom/ichi2/anki/NavigationDrawerActivity;->setDrawerLayout(Landroidx/drawerlayout/widget/DrawerLayout;)V
+SPLcom/ichi2/anki/NavigationDrawerActivity;->setTitle(Ljava/lang/CharSequence;)V
+SPLcom/ichi2/anki/NavigationDrawerActivity;->setViewBinding(Landroidx/viewbinding/ViewBinding;)V
+SPLcom/ichi2/anki/NavigationDrawerActivity;->setupBackPressedCallbacks()V
+SPLcom/ichi2/anki/NavigationDrawerActivity;->setupDrawerInsets$lambda$0(Lkotlin/jvm/internal/Ref$IntRef;Lcom/google/android/material/navigation/NavigationView;IIILandroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+SPLcom/ichi2/anki/NavigationDrawerActivity;->setupDrawerInsets(Lcom/google/android/material/navigation/NavigationView;)V
+Lcom/ichi2/anki/NavigationDrawerActivity$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/NavigationDrawerActivity$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/NavigationDrawerActivity;)V
+Lcom/ichi2/anki/NavigationDrawerActivity$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/NavigationDrawerActivity$$ExternalSyntheticLambda1;-><init>(Lcom/ichi2/anki/NavigationDrawerActivity;)V
+Lcom/ichi2/anki/NavigationDrawerActivity$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/NavigationDrawerActivity$$ExternalSyntheticLambda2;-><init>(Lkotlin/jvm/internal/Ref$IntRef;Lcom/google/android/material/navigation/NavigationView;III)V
+SPLcom/ichi2/anki/NavigationDrawerActivity$$ExternalSyntheticLambda2;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+Lcom/ichi2/anki/NavigationDrawerActivity$Companion;
+SPLcom/ichi2/anki/NavigationDrawerActivity$Companion;-><init>()V
+SPLcom/ichi2/anki/NavigationDrawerActivity$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/NavigationDrawerActivity$Companion;->enablePostShortcut(Landroid/content/Context;)V
+Lcom/ichi2/anki/NavigationDrawerActivity$drawerBackCallback$1;
+SPLcom/ichi2/anki/NavigationDrawerActivity$drawerBackCallback$1;-><init>(Lcom/ichi2/anki/NavigationDrawerActivity;)V
+Lcom/ichi2/anki/NavigationDrawerActivity$initNavigationDrawer$3;
+SPLcom/ichi2/anki/NavigationDrawerActivity$initNavigationDrawer$3;-><init>(Lcom/ichi2/anki/NavigationDrawerActivity;Landroidx/drawerlayout/widget/DrawerLayout;II)V
+Lcom/ichi2/anki/NoteEditorActivity;
+Lcom/ichi2/anki/NoteEditorFragment$Companion$NoteEditorCaller;
+SPLcom/ichi2/anki/NoteEditorFragment$Companion$NoteEditorCaller;->$values()[Lcom/ichi2/anki/NoteEditorFragment$Companion$NoteEditorCaller;
+SPLcom/ichi2/anki/NoteEditorFragment$Companion$NoteEditorCaller;-><clinit>()V
+SPLcom/ichi2/anki/NoteEditorFragment$Companion$NoteEditorCaller;-><init>(Ljava/lang/String;II)V
+SPLcom/ichi2/anki/NoteEditorFragment$Companion$NoteEditorCaller;->getValue()I
+Lcom/ichi2/anki/NoteEditorFragment$Companion$NoteEditorCaller$Companion;
+SPLcom/ichi2/anki/NoteEditorFragment$Companion$NoteEditorCaller$Companion;-><init>()V
+SPLcom/ichi2/anki/NoteEditorFragment$Companion$NoteEditorCaller$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/NotificationChannel;
+SPLcom/ichi2/anki/NotificationChannel;->$values()[Lcom/ichi2/anki/NotificationChannel;
+SPLcom/ichi2/anki/NotificationChannel;-><clinit>()V
+SPLcom/ichi2/anki/NotificationChannel;-><init>(Ljava/lang/String;ILjava/lang/String;II)V
+SPLcom/ichi2/anki/NotificationChannel;->getEntries()Lkotlin/enums/EnumEntries;
+SPLcom/ichi2/anki/NotificationChannel;->getId()Ljava/lang/String;
+SPLcom/ichi2/anki/NotificationChannel;->getImportance()I
+SPLcom/ichi2/anki/NotificationChannel;->getName(Landroid/content/res/Resources;)Ljava/lang/String;
+Lcom/ichi2/anki/NotificationChannelKt;
+SPLcom/ichi2/anki/NotificationChannelKt;-><clinit>()V
+SPLcom/ichi2/anki/NotificationChannelKt;->setupNotificationChannels(Landroid/content/Context;)V
+Lcom/ichi2/anki/OnErrorListener;
+Lcom/ichi2/anki/OnPageFinishedCallback;
+Lcom/ichi2/anki/PermissionSet;
+SPLcom/ichi2/anki/PermissionSet;->hasRequiredPermissions(Landroid/content/Context;)Z
+Lcom/ichi2/anki/R$color;
+Lcom/ichi2/anki/R$dimen;
+Lcom/ichi2/anki/R$drawable;
+Lcom/ichi2/anki/R$id;
+Lcom/ichi2/anki/R$integer;
+Lcom/ichi2/anki/R$layout;
+Lcom/ichi2/anki/R$menu;
+Lcom/ichi2/anki/R$string;
+Lcom/ichi2/anki/R$style;
+Lcom/ichi2/anki/Reviewer;
+SPLcom/ichi2/anki/Reviewer;-><clinit>()V
+Lcom/ichi2/anki/Reviewer$$ExternalSyntheticLambda17;
+SPLcom/ichi2/anki/Reviewer$$ExternalSyntheticLambda17;-><init>()V
+Lcom/ichi2/anki/Reviewer$$ExternalSyntheticLambda18;
+SPLcom/ichi2/anki/Reviewer$$ExternalSyntheticLambda18;-><init>()V
+Lcom/ichi2/anki/Reviewer$Companion;
+SPLcom/ichi2/anki/Reviewer$Companion;-><init>()V
+SPLcom/ichi2/anki/Reviewer$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/Reviewer$Companion;->getIntent(Landroid/content/Context;)Landroid/content/Intent;
+Lcom/ichi2/anki/StoragePermissionSet;
+SPLcom/ichi2/anki/StoragePermissionSet;->$values()[Lcom/ichi2/anki/StoragePermissionSet;
+SPLcom/ichi2/anki/StoragePermissionSet;-><clinit>()V
+SPLcom/ichi2/anki/StoragePermissionSet;-><init>(Ljava/lang/String;ILjava/util/List;Ljava/lang/Class;)V
+SPLcom/ichi2/anki/StoragePermissionSet;->getPermissions()Ljava/util/List;
+SPLcom/ichi2/anki/StoragePermissionSet;->hasRequiredPermissions(Landroid/content/Context;)Z
+Lcom/ichi2/anki/StoragePermissionSet$Creator;
+SPLcom/ichi2/anki/StoragePermissionSet$Creator;-><init>()V
+Lcom/ichi2/anki/StudyOptionsFragment;
+SPLcom/ichi2/anki/StudyOptionsFragment;-><clinit>()V
+Lcom/ichi2/anki/StudyOptionsFragment$Companion;
+SPLcom/ichi2/anki/StudyOptionsFragment$Companion;-><init>()V
+SPLcom/ichi2/anki/StudyOptionsFragment$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/StudyOptionsFragment$Companion;->registerStudyOptionsAddEditReminderHandler(Landroidx/fragment/app/FragmentActivity;Lkotlin/jvm/functions/Function1;)V
+SPLcom/ichi2/anki/StudyOptionsFragment$Companion;->registerStudyOptionsStudyHandler(Landroidx/fragment/app/FragmentActivity;Lkotlin/jvm/functions/Function0;)V
+Lcom/ichi2/anki/StudyOptionsFragment$Companion$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/StudyOptionsFragment$Companion$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/functions/Function0;)V
+Lcom/ichi2/anki/StudyOptionsFragment$Companion$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/StudyOptionsFragment$Companion$$ExternalSyntheticLambda1;-><init>(Lkotlin/jvm/functions/Function1;)V
+Lcom/ichi2/anki/SyncActionProvider;
+SPLcom/ichi2/anki/SyncActionProvider;-><clinit>()V
+SPLcom/ichi2/anki/SyncActionProvider;-><init>(Landroid/content/Context;)V
+SPLcom/ichi2/anki/SyncActionProvider;->getIcon()Landroid/graphics/drawable/Drawable;
+SPLcom/ichi2/anki/SyncActionProvider;->onCreateActionView(Landroid/view/MenuItem;)Landroid/view/View;
+SPLcom/ichi2/anki/SyncActionProvider;->setIcon(Landroid/graphics/drawable/Drawable;)V
+SPLcom/ichi2/anki/SyncActionProvider;->setTooltipText(Ljava/lang/CharSequence;)V
+Lcom/ichi2/anki/SyncActionProvider$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/SyncActionProvider$$ExternalSyntheticLambda0;-><init>(Landroid/view/MenuItem;Lcom/ichi2/anki/SyncActionProvider;)V
+Lcom/ichi2/anki/SyncKt;
+SPLcom/ichi2/anki/SyncKt;-><clinit>()V
+SPLcom/ichi2/anki/SyncKt;->getEndpoint()Ljava/lang/String;
+SPLcom/ichi2/anki/SyncKt;->syncAuth()Lcom/ichi2/anki/sync/SyncAuth;
+Lcom/ichi2/anki/TtsVoices;
+SPLcom/ichi2/anki/TtsVoices;-><clinit>()V
+SPLcom/ichi2/anki/TtsVoices;-><init>()V
+SPLcom/ichi2/anki/TtsVoices;->access$getAvailableVoices$p()Ljava/util/List;
+SPLcom/ichi2/anki/TtsVoices;->access$setAvailableVoices$p(Ljava/util/List;)V
+SPLcom/ichi2/anki/TtsVoices;->access$setBuildLocalesJob$p(Lkotlinx/coroutines/Job;)V
+SPLcom/ichi2/anki/TtsVoices;->access$setTtsEngine$p(Ljava/lang/String;)V
+SPLcom/ichi2/anki/TtsVoices;->createTts(Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/TtsVoices;->launchBuildLocalesJob()V
+SPLcom/ichi2/anki/TtsVoices;->loadVoices$AnkiDroid(Lkotlinx/coroutines/CompletableDeferred;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/TtsVoices;->loadVoicesFromEngines$AnkiDroid(Ljava/util/List;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/TtsVoices;->readLocales(Landroid/speech/tts/TextToSpeech;)Ljava/util/List;
+Lcom/ichi2/anki/TtsVoices$EngineLocales;
+SPLcom/ichi2/anki/TtsVoices$EngineLocales;-><clinit>()V
+SPLcom/ichi2/anki/TtsVoices$EngineLocales;-><init>(Ljava/lang/String;Ljava/util/List;)V
+Lcom/ichi2/anki/TtsVoices$createTts$2$1;
+SPLcom/ichi2/anki/TtsVoices$createTts$2$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;)V
+Lcom/ichi2/anki/TtsVoices$createTts$2$onInit$1;
+SPLcom/ichi2/anki/TtsVoices$createTts$2$onInit$1;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlinx/coroutines/CancellableContinuation;)V
+SPLcom/ichi2/anki/TtsVoices$createTts$2$onInit$1;->onInit(I)V
+Lcom/ichi2/anki/TtsVoices$launchBuildLocalesJob$1;
+SPLcom/ichi2/anki/TtsVoices$launchBuildLocalesJob$1;-><init>(Lkotlinx/coroutines/CompletableDeferred;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/TtsVoices$launchBuildLocalesJob$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/TtsVoices$launchBuildLocalesJob$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/TtsVoices$launchBuildLocalesJob$1$1;
+SPLcom/ichi2/anki/TtsVoices$launchBuildLocalesJob$1$1;-><init>(Ljava/lang/Object;)V
+SPLcom/ichi2/anki/TtsVoices$launchBuildLocalesJob$1$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/TtsVoices$launchBuildLocalesJob$1$1;->invoke(Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/TtsVoices$loadVoices$1;
+SPLcom/ichi2/anki/TtsVoices$loadVoices$1;-><init>(Lcom/ichi2/anki/TtsVoices;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/TtsVoices$loadVoices$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/TtsVoices$loadVoices$2;
+SPLcom/ichi2/anki/TtsVoices$loadVoices$2;-><init>(Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/TtsVoices$loadVoices$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/TtsVoices$loadVoices$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/TtsVoices$loadVoices$2;->invoke(Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/TtsVoices$loadVoices$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/TtsVoices$loadVoicesFromEngines$1;
+SPLcom/ichi2/anki/TtsVoices$loadVoicesFromEngines$1;-><init>(Lcom/ichi2/anki/TtsVoices;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/TtsVoices$loadVoicesFromEngines$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/TtsVoicesFieldFilter;
+SPLcom/ichi2/anki/TtsVoicesFieldFilter;-><clinit>()V
+SPLcom/ichi2/anki/TtsVoicesFieldFilter;-><init>()V
+Lcom/ichi2/anki/TtsVoicesFieldFilter$Companion;
+SPLcom/ichi2/anki/TtsVoicesFieldFilter$Companion;-><init>()V
+SPLcom/ichi2/anki/TtsVoicesFieldFilter$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/TtsVoicesFieldFilter$Companion;->ensureApplied()V
+Lcom/ichi2/anki/TtsVoicesKt;
+SPLcom/ichi2/anki/TtsVoicesKt;->toTtsVoice(Landroid/speech/tts/Voice;Ljava/lang/String;)Lcom/ichi2/anki/AndroidTtsVoice;
+Lcom/ichi2/anki/WhiteboardMultiTouchMethods;
+Lcom/ichi2/anki/analytics/AnalyticsConstants;
+SPLcom/ichi2/anki/analytics/AnalyticsConstants;-><clinit>()V
+SPLcom/ichi2/anki/analytics/AnalyticsConstants;-><init>()V
+SPLcom/ichi2/anki/analytics/AnalyticsConstants;->getReportablePrefKeys()Ljava/util/Set;
+Lcom/ichi2/anki/analytics/AnalyticsExceptionHandler;
+SPLcom/ichi2/anki/analytics/AnalyticsExceptionHandler;-><clinit>()V
+SPLcom/ichi2/anki/analytics/AnalyticsExceptionHandler;-><init>(Ljava/lang/Thread$UncaughtExceptionHandler;Lkotlin/jvm/functions/Function2;)V
+Lcom/ichi2/anki/analytics/AnalyticsExceptionHandler$Companion;
+SPLcom/ichi2/anki/analytics/AnalyticsExceptionHandler$Companion;-><init>()V
+SPLcom/ichi2/anki/analytics/AnalyticsExceptionHandler$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/analytics/AnalyticsExceptionHandler$Companion;->install(Lkotlin/jvm/functions/Function2;)V
+Lcom/ichi2/anki/analytics/AnalyticsSamplePercentage;
+SPLcom/ichi2/anki/analytics/AnalyticsSamplePercentage;-><clinit>()V
+SPLcom/ichi2/anki/analytics/AnalyticsSamplePercentage;->access$getUninitialized$cp()I
+SPLcom/ichi2/anki/analytics/AnalyticsSamplePercentage;->constructor-impl(I)I
+SPLcom/ichi2/anki/analytics/AnalyticsSamplePercentage;->isInitialized-impl(I)Z
+Lcom/ichi2/anki/analytics/AnalyticsSamplePercentage$Companion;
+SPLcom/ichi2/anki/analytics/AnalyticsSamplePercentage$Companion;-><init>()V
+SPLcom/ichi2/anki/analytics/AnalyticsSamplePercentage$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/analytics/AnalyticsSamplePercentage$Companion;->getUninitialized--UvX6DQ()I
+Lcom/ichi2/anki/analytics/AnkiDroidCrashReportDialog;
+Lcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;-><clinit>()V
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;-><init>()V
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;->configure$lambda$0(Lcom/criticalay/GoogleAnalyticsBuilder;)Lkotlin/Unit;
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;->configure(Landroid/content/Context;)V
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;->getAnalyticsSamplePercentage(Landroid/content/Context;)I
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;->handlePreferences(Landroid/content/Context;)V
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;->initialize(Landroid/content/Context;)V
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;->initializePrefKeys(Landroid/content/Context;)V
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics;->sendAnalyticsScreenView(Ljava/lang/String;)V
+Lcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$$ExternalSyntheticLambda1;-><init>()V
+Lcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$$ExternalSyntheticLambda2;-><init>()V
+Lcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$initialize$1;
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalytics$initialize$1;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/analytics/AnkiDroidUsageAnalyticsKt;
+SPLcom/ichi2/anki/analytics/AnkiDroidUsageAnalyticsKt;->initializeAnalytics(Landroid/app/Application;)V
+Lcom/ichi2/anki/analytics/PreviousAnrReporterKt;
+SPLcom/ichi2/anki/analytics/PreviousAnrReporterKt;->launchPreviousAnrReporting(Lcom/ichi2/anki/AnkiDroidApp;)V
+SPLcom/ichi2/anki/analytics/PreviousAnrReporterKt;->reportPreviousAnr(Lcom/ichi2/anki/AnkiDroidApp;)V
+Lcom/ichi2/anki/analytics/PreviousAnrReporterKt$launchPreviousAnrReporting$1;
+SPLcom/ichi2/anki/analytics/PreviousAnrReporterKt$launchPreviousAnrReporting$1;-><init>(Lcom/ichi2/anki/AnkiDroidApp;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/analytics/PreviousAnrReporterKt$launchPreviousAnrReporting$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/analytics/PreviousAnrReporterKt$launchPreviousAnrReporting$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/analytics/SharedPreferencesAnrReportState;
+SPLcom/ichi2/anki/analytics/SharedPreferencesAnrReportState;-><clinit>()V
+SPLcom/ichi2/anki/analytics/SharedPreferencesAnrReportState;-><init>(Landroid/content/Context;)V
+SPLcom/ichi2/anki/analytics/SharedPreferencesAnrReportState;->getLastProcessedTimestamp()J
+SPLcom/ichi2/anki/analytics/SharedPreferencesAnrReportState;->getPreferences()Landroid/content/SharedPreferences;
+Lcom/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallbackKt;
+SPLcom/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallbackKt;->exitViaDoubleTapBackCallback(Lcom/ichi2/anki/AnkiActivity;)Landroidx/activity/OnBackPressedCallback;
+Lcom/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallbackKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallbackKt$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/AnkiActivity;Lcom/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallbackKt$exitViaDoubleTapBackCallback$1;)V
+Lcom/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallbackKt$exitViaDoubleTapBackCallback$1;
+SPLcom/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallbackKt$exitViaDoubleTapBackCallback$1;-><init>(Lcom/ichi2/anki/AnkiActivity;Z)V
+SPLcom/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallbackKt$exitViaDoubleTapBackCallback$1;->getStrongListenerReference()Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
+SPLcom/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallbackKt$exitViaDoubleTapBackCallback$1;->setStrongListenerReference(Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;)V
+Lcom/ichi2/anki/android/input/ShortcutGroupProvider;
+Lcom/ichi2/anki/android/view/ViewLocation;
+SPLcom/ichi2/anki/android/view/ViewLocation;->constructor-impl([I)[I
+SPLcom/ichi2/anki/android/view/ViewLocation;->getY-impl([I)I
+Lcom/ichi2/anki/android/view/ViewLocationKt;
+SPLcom/ichi2/anki/android/view/ViewLocationKt;->locationInWindow$default(Landroid/view/View;[IILjava/lang/Object;)[I
+SPLcom/ichi2/anki/android/view/ViewLocationKt;->locationInWindow(Landroid/view/View;[I)[I
+SPLcom/ichi2/anki/android/view/ViewLocationKt;->locationOnScreen(Landroid/view/View;[I)[I
+Lcom/ichi2/anki/ankicommon/R$string;
+Lcom/ichi2/anki/backend/AnkiBackendLanguage;
+SPLcom/ichi2/anki/backend/AnkiBackendLanguage;-><clinit>()V
+SPLcom/ichi2/anki/backend/AnkiBackendLanguage;->access$constructor-impl(Ljava/lang/String;)Ljava/lang/String;
+SPLcom/ichi2/anki/backend/AnkiBackendLanguage;->access$getLANGUAGE_IDENTIFIER$cp()Lkotlin/text/Regex;
+SPLcom/ichi2/anki/backend/AnkiBackendLanguage;->constructor-impl(Ljava/lang/String;)Ljava/lang/String;
+Lcom/ichi2/anki/backend/AnkiBackendLanguage$Companion;
+SPLcom/ichi2/anki/backend/AnkiBackendLanguage$Companion;-><init>()V
+SPLcom/ichi2/anki/backend/AnkiBackendLanguage$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/backend/AnkiBackendLanguage$Companion;->fromIdentifier-hHuSVNI(Ljava/lang/String;)Ljava/lang/String;
+SPLcom/ichi2/anki/backend/AnkiBackendLanguage$Companion;->fromLanguageTag-hHuSVNI(Ljava/lang/String;)Ljava/lang/String;
+Lcom/ichi2/anki/backend/BackendDatabaseKt;
+SPLcom/ichi2/anki/backend/BackendDatabaseKt;->createDatabaseUsingRustBackend(Lnet/ankiweb/rsdroid/Backend;)Lcom/ichi2/anki/libanki/DB;
+Lcom/ichi2/anki/backend/BackendLocales;
+SPLcom/ichi2/anki/backend/BackendLocales;-><clinit>()V
+SPLcom/ichi2/anki/backend/BackendLocales;-><init>(Ljava/util/List;)V
+SPLcom/ichi2/anki/backend/BackendLocales;->getAll()Ljava/util/List;
+Lcom/ichi2/anki/backend/BackendLocalesKt;
+SPLcom/ichi2/anki/backend/BackendLocalesKt;->getLocales(Lnet/ankiweb/rsdroid/Backend;)Lcom/ichi2/anki/backend/BackendLocales;
+Lcom/ichi2/anki/browser/BrowserDestinationKt;
+SPLcom/ichi2/anki/browser/BrowserDestinationKt;->toIntent(Lcom/ichi2/anki/common/destinations/BrowserDestination;Landroid/content/Context;)Landroid/content/Intent;
+Lcom/ichi2/anki/browser/LastDeckIdRepository;
+Lcom/ichi2/anki/browser/SharedPreferencesLastDeckIdRepository;
+SPLcom/ichi2/anki/browser/SharedPreferencesLastDeckIdRepository;-><clinit>()V
+SPLcom/ichi2/anki/browser/SharedPreferencesLastDeckIdRepository;-><init>()V
+Lcom/ichi2/anki/browser/SharedPreferencesLastDeckIdRepository$Companion;
+SPLcom/ichi2/anki/browser/SharedPreferencesLastDeckIdRepository$Companion;-><init>()V
+SPLcom/ichi2/anki/browser/SharedPreferencesLastDeckIdRepository$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/browser/SharedPreferencesLastDeckIdRepository$Companion;->clearLastDeckId()V
+Lcom/ichi2/anki/cardviewer/MediaErrorHandler;
+SPLcom/ichi2/anki/cardviewer/MediaErrorHandler;-><clinit>()V
+SPLcom/ichi2/anki/cardviewer/MediaErrorHandler;-><init>()V
+Lcom/ichi2/anki/cardviewer/MediaErrorHandler$Companion;
+SPLcom/ichi2/anki/cardviewer/MediaErrorHandler$Companion;-><init>()V
+SPLcom/ichi2/anki/cardviewer/MediaErrorHandler$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/cardviewer/MediaErrorListener;
+Lcom/ichi2/anki/cardviewer/ViewerCommand$CommandProcessor;
+Lcom/ichi2/anki/common/analytics/Analytics;
+SPLcom/ichi2/anki/common/analytics/Analytics;-><clinit>()V
+SPLcom/ichi2/anki/common/analytics/Analytics;-><init>()V
+SPLcom/ichi2/anki/common/analytics/Analytics;->sendAnalyticsScreenView(Ljava/lang/String;)V
+SPLcom/ichi2/anki/common/analytics/Analytics;->setAnalytics(Lcom/ichi2/anki/common/analytics/UsageAnalytics;)V
+Lcom/ichi2/anki/common/analytics/Analytics$Unregistered;
+SPLcom/ichi2/anki/common/analytics/Analytics$Unregistered;-><clinit>()V
+SPLcom/ichi2/anki/common/analytics/Analytics$Unregistered;-><init>()V
+Lcom/ichi2/anki/common/analytics/UsageAnalytics;
+SPLcom/ichi2/anki/common/analytics/UsageAnalytics;-><clinit>()V
+Lcom/ichi2/anki/common/analytics/UsageAnalytics$Companion;
+SPLcom/ichi2/anki/common/analytics/UsageAnalytics$Companion;-><clinit>()V
+SPLcom/ichi2/anki/common/analytics/UsageAnalytics$Companion;-><init>()V
+Lcom/ichi2/anki/common/android/AdaptionUtil;
+SPLcom/ichi2/anki/common/android/AdaptionUtil;-><clinit>()V
+SPLcom/ichi2/anki/common/android/AdaptionUtil;-><init>()V
+SPLcom/ichi2/anki/common/android/AdaptionUtil;->isRunningUnderFirebaseTestLab()Z
+SPLcom/ichi2/anki/common/android/AdaptionUtil;->isRunningUnderFirebaseTestLab(Landroid/content/ContentResolver;)Z
+SPLcom/ichi2/anki/common/android/AdaptionUtil;->isUserATestClient()Z
+Lcom/ichi2/anki/common/android/AdaptionUtil$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/common/android/AdaptionUtil$$ExternalSyntheticLambda0;-><init>()V
+Lcom/ichi2/anki/common/android/AdaptionUtil$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/common/android/AdaptionUtil$$ExternalSyntheticLambda1;-><init>()V
+Lcom/ichi2/anki/common/android/AlarmManagement;
+SPLcom/ichi2/anki/common/android/AlarmManagement;-><clinit>()V
+SPLcom/ichi2/anki/common/android/AlarmManagement;-><init>()V
+SPLcom/ichi2/anki/common/android/AlarmManagement;->getWINDOW_LENGTH_MS()J
+SPLcom/ichi2/anki/common/android/AlarmManagement;->useAlarmManager$default(Lcom/ichi2/anki/common/android/AlarmManagement;Landroid/content/Context;ZLkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+SPLcom/ichi2/anki/common/android/AlarmManagement;->useAlarmManager(Landroid/content/Context;ZLkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)V
+Lcom/ichi2/anki/common/android/AlarmManagement$useAlarmManager$1;
+SPLcom/ichi2/anki/common/android/AlarmManagement$useAlarmManager$1;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/android/Animations;
+SPLcom/ichi2/anki/common/android/Animations;-><clinit>()V
+SPLcom/ichi2/anki/common/android/Animations;-><init>()V
+SPLcom/ichi2/anki/common/android/Animations;->areAnimationsEnabled(Landroid/content/Context;)Z
+SPLcom/ichi2/anki/common/android/Animations;->areSystemAnimationsEnabled(Landroid/content/Context;)Z
+SPLcom/ichi2/anki/common/android/Animations;->setPreferencesProvider(Landroid/app/Application;Lkotlin/jvm/functions/Function1;)V
+Lcom/ichi2/anki/common/android/AnimationsKt;
+SPLcom/ichi2/anki/common/android/AnimationsKt;->animationDisabled(Landroidx/fragment/app/FragmentActivity;)Z
+SPLcom/ichi2/anki/common/android/AnimationsKt;->animationEnabled(Landroidx/fragment/app/FragmentActivity;)Z
+Lcom/ichi2/anki/common/android/AnkiBroadcastReceiver;
+SPLcom/ichi2/anki/common/android/AnkiBroadcastReceiver;-><clinit>()V
+SPLcom/ichi2/anki/common/android/AnkiBroadcastReceiver;-><init>()V
+SPLcom/ichi2/anki/common/android/AnkiBroadcastReceiver;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V
+Lcom/ichi2/anki/common/android/AppLocaleKt;
+SPLcom/ichi2/anki/common/android/AppLocaleKt;->getCurrentLocaleTag()Ljava/lang/String;
+SPLcom/ichi2/anki/common/android/AppLocaleKt;->withAppLocale(Landroid/content/Context;)Landroid/content/Context;
+Lcom/ichi2/anki/common/android/ApplicationContextInitializer;
+SPLcom/ichi2/anki/common/android/ApplicationContextInitializer;-><clinit>()V
+SPLcom/ichi2/anki/common/android/ApplicationContextInitializer;-><init>()V
+SPLcom/ichi2/anki/common/android/ApplicationContextInitializer;->getInstanceOrNull()Landroid/content/Context;
+SPLcom/ichi2/anki/common/android/ApplicationContextInitializer;->setInstance(Landroid/app/Application;)V
+Lcom/ichi2/anki/common/android/ApplicationContextInitializerKt;
+SPLcom/ichi2/anki/common/android/ApplicationContextInitializerKt;->access$getAppContext$p()Landroid/content/Context;
+SPLcom/ichi2/anki/common/android/ApplicationContextInitializerKt;->access$setAppContext$p(Landroid/content/Context;)V
+SPLcom/ichi2/anki/common/android/ApplicationContextInitializerKt;->getAppContext()Landroid/content/Context;
+Lcom/ichi2/anki/common/android/R$attr;
+Lcom/ichi2/anki/common/android/R$color;
+Lcom/ichi2/anki/common/android/R$drawable;
+Lcom/ichi2/anki/common/android/R$string;
+Lcom/ichi2/anki/common/android/R$style;
+Lcom/ichi2/anki/common/android/themes/XiaomiKt;
+SPLcom/ichi2/anki/common/android/themes/XiaomiKt;->disableXiaomiForceDarkMode(Landroid/content/Context;)V
+Lcom/ichi2/anki/common/coroutines/ApplicationScopeKt;
+SPLcom/ichi2/anki/common/coroutines/ApplicationScopeKt;-><clinit>()V
+SPLcom/ichi2/anki/common/coroutines/ApplicationScopeKt;->applicationScope_delegate$lambda$0()Lkotlinx/coroutines/CoroutineScope;
+SPLcom/ichi2/anki/common/coroutines/ApplicationScopeKt;->getApplicationScope()Lkotlinx/coroutines/CoroutineScope;
+Lcom/ichi2/anki/common/coroutines/ApplicationScopeKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/common/coroutines/ApplicationScopeKt$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/common/coroutines/ApplicationScopeKt$$ExternalSyntheticLambda0;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/common/crashreporting/CrashReportService;
+SPLcom/ichi2/anki/common/crashreporting/CrashReportService;-><clinit>()V
+SPLcom/ichi2/anki/common/crashreporting/CrashReportService;-><init>()V
+SPLcom/ichi2/anki/common/crashreporting/CrashReportService;->isEnabled(Landroid/content/Context;Z)Z
+SPLcom/ichi2/anki/common/crashreporting/CrashReportService;->setReporter(Lcom/ichi2/anki/common/crashreporting/CrashReporter;)V
+Lcom/ichi2/anki/common/crashreporting/CrashReportServiceKt;
+SPLcom/ichi2/anki/common/crashreporting/CrashReportServiceKt;->runCatchingWithReport(Ljava/lang/String;ZLkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+Lcom/ichi2/anki/common/crashreporting/CrashReporter;
+Lcom/ichi2/anki/common/crashreporting/UninitializedCrashReporter;
+SPLcom/ichi2/anki/common/crashreporting/UninitializedCrashReporter;-><clinit>()V
+SPLcom/ichi2/anki/common/crashreporting/UninitializedCrashReporter;-><init>()V
+Lcom/ichi2/anki/common/destinations/BrowserDestination;
+SPLcom/ichi2/anki/common/destinations/BrowserDestination;-><clinit>()V
+SPLcom/ichi2/anki/common/destinations/BrowserDestination;-><init>()V
+SPLcom/ichi2/anki/common/destinations/BrowserDestination;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/common/destinations/BrowserDestination$Open;
+SPLcom/ichi2/anki/common/destinations/BrowserDestination$Open;-><clinit>()V
+SPLcom/ichi2/anki/common/destinations/BrowserDestination$Open;-><init>()V
+Lcom/ichi2/anki/common/destinations/CardInfoDestination;
+Lcom/ichi2/anki/common/destinations/DeferredNavigation;
+SPLcom/ichi2/anki/common/destinations/DeferredNavigation;-><clinit>()V
+Lcom/ichi2/anki/common/destinations/DeferredNavigation$Companion;
+SPLcom/ichi2/anki/common/destinations/DeferredNavigation$Companion;-><clinit>()V
+SPLcom/ichi2/anki/common/destinations/DeferredNavigation$Companion;-><init>()V
+Lcom/ichi2/anki/common/destinations/Destination;
+SPLcom/ichi2/anki/common/destinations/Destination;-><clinit>()V
+SPLcom/ichi2/anki/common/destinations/Destination;-><init>()V
+SPLcom/ichi2/anki/common/destinations/Destination;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/common/destinations/Navigator;
+SPLcom/ichi2/anki/common/destinations/Navigator;-><clinit>()V
+Lcom/ichi2/anki/common/destinations/Navigator$Companion;
+SPLcom/ichi2/anki/common/destinations/Navigator$Companion;-><clinit>()V
+SPLcom/ichi2/anki/common/destinations/Navigator$Companion;-><init>()V
+SPLcom/ichi2/anki/common/destinations/Navigator$Companion;->register(Lcom/ichi2/anki/common/destinations/Navigator;)V
+Lcom/ichi2/anki/common/destinations/NavigatorKt;
+SPLcom/ichi2/anki/common/destinations/NavigatorKt;->access$setNavigatorInstance$p(Lcom/ichi2/anki/common/destinations/Navigator;)V
+SPLcom/ichi2/anki/common/destinations/NavigatorKt;->toIntent(Lcom/ichi2/anki/common/destinations/DeferredNavigation;Lcom/ichi2/anki/common/destinations/Destination;)Landroid/content/Intent;
+Lcom/ichi2/anki/common/destinations/NoteEditorDestination;
+SPLcom/ichi2/anki/common/destinations/NoteEditorDestination;-><clinit>()V
+SPLcom/ichi2/anki/common/destinations/NoteEditorDestination;-><init>()V
+SPLcom/ichi2/anki/common/destinations/NoteEditorDestination;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/common/destinations/NoteEditorDestination$AddNote;
+SPLcom/ichi2/anki/common/destinations/NoteEditorDestination$AddNote;-><clinit>()V
+SPLcom/ichi2/anki/common/destinations/NoteEditorDestination$AddNote;-><init>(Ljava/lang/Long;)V
+SPLcom/ichi2/anki/common/destinations/NoteEditorDestination$AddNote;-><init>(Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/common/destinations/NoteEditorDestination$AddNote;->getDeckId()Ljava/lang/Long;
+Lcom/ichi2/anki/common/json/JSONContainerKt;
+SPLcom/ichi2/anki/common/json/JSONContainerKt;->jsonArray(Lcom/ichi2/anki/common/json/JSONObjectHolder;Ljava/lang/String;)Lcom/ichi2/anki/common/json/JsonArrayDelegate;
+SPLcom/ichi2/anki/common/json/JSONContainerKt;->jsonBoolean(Lcom/ichi2/anki/common/json/JSONObjectHolder;Ljava/lang/String;)Lcom/ichi2/anki/common/json/JsonBooleanDelegate;
+SPLcom/ichi2/anki/common/json/JSONContainerKt;->jsonBoolean(Lcom/ichi2/anki/common/json/JSONObjectHolder;Ljava/lang/String;Z)Lcom/ichi2/anki/common/json/JsonBooleanDelegate;
+SPLcom/ichi2/anki/common/json/JSONContainerKt;->jsonLong(Lcom/ichi2/anki/common/json/JSONObjectHolder;Ljava/lang/String;)Lcom/ichi2/anki/common/json/JsonLongDelegate;
+SPLcom/ichi2/anki/common/json/JSONContainerKt;->jsonString(Lcom/ichi2/anki/common/json/JSONObjectHolder;Ljava/lang/String;)Lcom/ichi2/anki/common/json/JsonStringDelegate;
+SPLcom/ichi2/anki/common/json/JSONContainerKt;->jsonString(Lcom/ichi2/anki/common/json/JSONObjectHolder;Ljava/lang/String;Ljava/lang/String;)Lcom/ichi2/anki/common/json/JsonStringDelegate;
+Lcom/ichi2/anki/common/json/JSONObjectHolder;
+Lcom/ichi2/anki/common/json/JsonArrayDelegate;
+SPLcom/ichi2/anki/common/json/JsonArrayDelegate;-><init>(Lorg/json/JSONObject;Ljava/lang/String;)V
+Lcom/ichi2/anki/common/json/JsonBooleanDelegate;
+SPLcom/ichi2/anki/common/json/JsonBooleanDelegate;-><init>(Lorg/json/JSONObject;Ljava/lang/String;Ljava/lang/Boolean;)V
+SPLcom/ichi2/anki/common/json/JsonBooleanDelegate;-><init>(Lorg/json/JSONObject;Ljava/lang/String;Ljava/lang/Boolean;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/common/json/JsonLongDelegate;
+SPLcom/ichi2/anki/common/json/JsonLongDelegate;-><init>(Lorg/json/JSONObject;Ljava/lang/String;Ljava/lang/Long;)V
+SPLcom/ichi2/anki/common/json/JsonLongDelegate;-><init>(Lorg/json/JSONObject;Ljava/lang/String;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/common/json/JsonLongDelegate;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)J
+Lcom/ichi2/anki/common/json/JsonStringDelegate;
+SPLcom/ichi2/anki/common/json/JsonStringDelegate;-><init>(Lorg/json/JSONObject;Ljava/lang/String;Ljava/lang/String;)V
+SPLcom/ichi2/anki/common/json/JsonStringDelegate;-><init>(Lorg/json/JSONObject;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/common/permissions/PermissionsKt;
+SPLcom/ichi2/anki/common/permissions/PermissionsKt;->hasAllPermissions(Landroid/content/Context;Ljava/util/Collection;)Z
+SPLcom/ichi2/anki/common/permissions/PermissionsKt;->hasPermission(Landroid/content/Context;Ljava/lang/String;)Z
+Lcom/ichi2/anki/common/permissions/StoragePermissionsKt;
+SPLcom/ichi2/anki/common/permissions/StoragePermissionsKt;->hasLegacyStorageAccessPermission(Landroid/content/Context;)Z
+SPLcom/ichi2/anki/common/permissions/StoragePermissionsKt;->hasStorageReadAccessPermission(Landroid/content/Context;)Z
+Lcom/ichi2/anki/common/preferences/AnimationPreferences;
+Lcom/ichi2/anki/common/preferences/NotificationPreferences;
+Lcom/ichi2/anki/common/preferences/SharedPreferencesTestHook;
+SPLcom/ichi2/anki/common/preferences/SharedPreferencesTestHook;-><clinit>()V
+SPLcom/ichi2/anki/common/preferences/SharedPreferencesTestHook;-><init>()V
+SPLcom/ichi2/anki/common/preferences/SharedPreferencesTestHook;->getOverride()Lkotlin/jvm/functions/Function1;
+Lcom/ichi2/anki/common/preferences/SharedPrefsKt;
+SPLcom/ichi2/anki/common/preferences/SharedPrefsKt;->sharedPrefs(Landroid/content/Context;)Landroid/content/SharedPreferences;
+Lcom/ichi2/anki/common/storage/CollectionHelper;
+SPLcom/ichi2/anki/common/storage/CollectionHelper;-><clinit>()V
+SPLcom/ichi2/anki/common/storage/CollectionHelper;-><init>()V
+SPLcom/ichi2/anki/common/storage/CollectionHelper;->getAppSpecificExternalDirectories(Landroid/content/Context;)Ljava/util/List;
+SPLcom/ichi2/anki/common/storage/CollectionHelper;->getAppSpecificInternalAnkiDroidDirectory(Landroid/content/Context;)Ljava/lang/String;
+SPLcom/ichi2/anki/common/storage/CollectionHelper;->getCurrentAnkiDroidDirectory(Landroid/content/Context;)Ljava/io/File;
+SPLcom/ichi2/anki/common/storage/CollectionHelper;->getCurrentAnkiDroidDirectory(Landroid/content/SharedPreferences;)Ljava/io/File;
+SPLcom/ichi2/anki/common/storage/CollectionHelper;->getStorageDecisionTestOverride()Lcom/ichi2/anki/common/storage/StorageDecision;
+SPLcom/ichi2/anki/common/storage/CollectionHelper;->initializeAnkiDroidDirectory(Ljava/io/File;)V
+SPLcom/ichi2/anki/common/storage/CollectionHelper;->storageDecision(Landroid/content/SharedPreferences;)Lcom/ichi2/anki/common/storage/StorageDecision;
+Lcom/ichi2/anki/common/storage/LegacyStorageKt;
+SPLcom/ichi2/anki/common/storage/LegacyStorageKt;->grantedStoragePermissions(Landroid/content/Context;)Z
+SPLcom/ichi2/anki/common/storage/LegacyStorageKt;->grantedStoragePermissions(Landroid/content/Context;Z)Z
+SPLcom/ichi2/anki/common/storage/LegacyStorageKt;->isLegacyStorage(Landroid/content/Context;)Z
+SPLcom/ichi2/anki/common/storage/LegacyStorageKt;->isLegacyStorage(Landroid/content/Context;Z)Ljava/lang/Boolean;
+SPLcom/ichi2/anki/common/storage/LegacyStorageKt;->isLegacyStorage(Ljava/io/File;Landroid/content/Context;)Z
+Lcom/ichi2/anki/common/storage/StorageDecision;
+Lcom/ichi2/anki/common/storage/StorageDecision$Decided;
+SPLcom/ichi2/anki/common/storage/StorageDecision$Decided;-><clinit>()V
+SPLcom/ichi2/anki/common/storage/StorageDecision$Decided;-><init>()V
+SPLcom/ichi2/anki/common/storage/StorageDecision$Decided;->equals(Ljava/lang/Object;)Z
+Lcom/ichi2/anki/common/time/SystemTime;
+SPLcom/ichi2/anki/common/time/SystemTime;-><init>()V
+SPLcom/ichi2/anki/common/time/SystemTime;->intTimeMS()J
+Lcom/ichi2/anki/common/time/Time;
+SPLcom/ichi2/anki/common/time/Time;-><clinit>()V
+SPLcom/ichi2/anki/common/time/Time;-><init>()V
+SPLcom/ichi2/anki/common/time/Time;->intTime()J
+Lcom/ichi2/anki/common/time/Time$Companion;
+SPLcom/ichi2/anki/common/time/Time$Companion;-><init>()V
+SPLcom/ichi2/anki/common/time/Time$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/common/time/TimeManager;
+SPLcom/ichi2/anki/common/time/TimeManager;-><clinit>()V
+SPLcom/ichi2/anki/common/time/TimeManager;-><init>()V
+SPLcom/ichi2/anki/common/time/TimeManager;->getTime()Lcom/ichi2/anki/common/time/Time;
+Lcom/ichi2/anki/common/utils/ConfigProperty;
+SPLcom/ichi2/anki/common/utils/ConfigProperty;-><clinit>()V
+SPLcom/ichi2/anki/common/utils/ConfigProperty;-><init>(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)V
+SPLcom/ichi2/anki/common/utils/ConfigProperty;->getValue(Lcom/ichi2/anki/libanki/Config;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+SPLcom/ichi2/anki/common/utils/ConfigProperty;->mapped$lambda$0(Lkotlin/jvm/functions/Function1;Lcom/ichi2/anki/common/utils/ConfigProperty;Lcom/ichi2/anki/libanki/Config;)Ljava/lang/Object;
+SPLcom/ichi2/anki/common/utils/ConfigProperty;->mapped(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lcom/ichi2/anki/common/utils/ConfigProperty;
+Lcom/ichi2/anki/common/utils/ConfigProperty$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/common/utils/ConfigProperty$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/functions/Function1;Lcom/ichi2/anki/common/utils/ConfigProperty;)V
+SPLcom/ichi2/anki/common/utils/ConfigProperty$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/common/utils/ConfigProperty$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/common/utils/ConfigProperty$$ExternalSyntheticLambda1;-><init>(Lcom/ichi2/anki/common/utils/ConfigProperty;Lkotlin/jvm/functions/Function1;)V
+Lcom/ichi2/anki/common/utils/ConfigPropertyKt;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt;->configProperty(Lanki/config/ConfigKey$Bool;)Lcom/ichi2/anki/common/utils/ConfigProperty;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt;->configProperty(Lanki/config/ConfigKey$String;)Lcom/ichi2/anki/common/utils/ConfigProperty;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt;->orDefault$lambda$0(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt;->orDefault(Lcom/ichi2/anki/common/utils/ConfigProperty;Ljava/lang/Object;)Lcom/ichi2/anki/common/utils/ConfigProperty;
+Lcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda0;-><init>(Ljava/lang/Object;)V
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda1;-><init>()V
+Lcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda2;-><init>(Lanki/config/ConfigKey$String;)V
+Lcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda3;-><init>(Lanki/config/ConfigKey$String;)V
+Lcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda4;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda4;-><init>(Lanki/config/ConfigKey$Bool;)V
+Lcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda5;
+SPLcom/ichi2/anki/common/utils/ConfigPropertyKt$$ExternalSyntheticLambda5;-><init>(Lanki/config/ConfigKey$Bool;)V
+Lcom/ichi2/anki/common/utils/Dp;
+SPLcom/ichi2/anki/common/utils/Dp;->constructor-impl(F)F
+SPLcom/ichi2/anki/common/utils/Dp;->toPx-impl(FLandroid/content/Context;)I
+Lcom/ichi2/anki/common/utils/DpKt;
+SPLcom/ichi2/anki/common/utils/DpKt;->access$dpToPx(FLandroid/content/Context;)I
+SPLcom/ichi2/anki/common/utils/DpKt;->dpToPx(FLandroid/content/Context;)I
+SPLcom/ichi2/anki/common/utils/DpKt;->getDp(I)F
+Lcom/ichi2/anki/common/utils/android/HandlerUtils;
+SPLcom/ichi2/anki/common/utils/android/HandlerUtils;-><clinit>()V
+SPLcom/ichi2/anki/common/utils/android/HandlerUtils;-><init>()V
+SPLcom/ichi2/anki/common/utils/android/HandlerUtils;->getDefaultLooper()Landroid/os/Looper;
+Lcom/ichi2/anki/common/utils/android/TestUtilsKt;
+SPLcom/ichi2/anki/common/utils/android/TestUtilsKt;-><clinit>()V
+SPLcom/ichi2/anki/common/utils/android/TestUtilsKt;->isInstrumentationTest()Z
+SPLcom/ichi2/anki/common/utils/android/TestUtilsKt;->isRobolectric()Z
+Lcom/ichi2/anki/common/utils/android/ThemeUtilsKt;
+SPLcom/ichi2/anki/common/utils/android/ThemeUtilsKt;->systemIsInNightMode(Landroid/content/Context;)Z
+Lcom/ichi2/anki/common/utils/android/Threads;
+SPLcom/ichi2/anki/common/utils/android/Threads;-><clinit>()V
+SPLcom/ichi2/anki/common/utils/android/Threads;-><init>()V
+SPLcom/ichi2/anki/common/utils/android/Threads;->isOnMainThread()Z
+Lcom/ichi2/anki/common/utils/ext/ConfigKt;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt;-><clinit>()V
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt;->getFsrsEnabled(Lcom/ichi2/anki/libanki/Config;)Ljava/lang/Boolean;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt;->getSchedulerVersion(Lcom/ichi2/anki/libanki/Config;)J
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda0;-><init>()V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda1;-><init>()V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda2;-><init>()V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda3;-><init>()V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda4;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda4;-><init>()V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda5;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda5;-><init>()V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda6;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda6;-><init>()V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda7;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$$ExternalSyntheticLambda7;-><init>()V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$1;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$1;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$1;->invoke(Lcom/ichi2/anki/libanki/Config;)Ljava/lang/Object;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$2;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$2;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$1;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$1;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$10;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$10;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$11;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$11;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$12;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$12;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$13;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$13;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$14;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$14;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$15;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$15;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$16;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$16;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$17;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$17;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$18;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$18;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$19;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$19;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$2;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$2;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$20;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$20;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$3;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$3;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$3;->invoke(Lcom/ichi2/anki/libanki/Config;)Ljava/lang/Object;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$3;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$4;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$4;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$5;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$5;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$6;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$6;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$7;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$7;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$8;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$8;-><init>(Ljava/lang/String;)V
+Lcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$9;
+SPLcom/ichi2/anki/common/utils/ext/ConfigKt$special$$inlined$jsonConfigProperty$default$9;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lcom/ichi2/anki/common/utils/ext/JSONArrayKt;
+SPLcom/ichi2/anki/common/utils/ext/JSONArrayKt;->stringIterable(Lorg/json/JSONArray;)Ljava/lang/Iterable;
+SPLcom/ichi2/anki/common/utils/ext/JSONArrayKt;->stringIterator(Lorg/json/JSONArray;)Ljava/util/Iterator;
+Lcom/ichi2/anki/common/utils/ext/JSONArrayKt$stringIterable$$inlined$Iterable$1;
+SPLcom/ichi2/anki/common/utils/ext/JSONArrayKt$stringIterable$$inlined$Iterable$1;-><init>(Lorg/json/JSONArray;)V
+SPLcom/ichi2/anki/common/utils/ext/JSONArrayKt$stringIterable$$inlined$Iterable$1;->iterator()Ljava/util/Iterator;
+Lcom/ichi2/anki/common/utils/ext/JSONArrayKt$stringIterator$1;
+SPLcom/ichi2/anki/common/utils/ext/JSONArrayKt$stringIterator$1;-><init>(Lorg/json/JSONArray;)V
+SPLcom/ichi2/anki/common/utils/ext/JSONArrayKt$stringIterator$1;->hasNext()Z
+SPLcom/ichi2/anki/common/utils/ext/JSONArrayKt$stringIterator$1;->next()Ljava/lang/Object;
+SPLcom/ichi2/anki/common/utils/ext/JSONArrayKt$stringIterator$1;->next()Ljava/lang/String;
+Lcom/ichi2/anki/compat/BaseCompat;
+SPLcom/ichi2/anki/compat/BaseCompat;-><init>()V
+Lcom/ichi2/anki/compat/Compat;
+Lcom/ichi2/anki/compat/CompatHelper;
+SPLcom/ichi2/anki/compat/CompatHelper;-><clinit>()V
+SPLcom/ichi2/anki/compat/CompatHelper;-><init>()V
+SPLcom/ichi2/anki/compat/CompatHelper;->access$getCompatValue$p(Lcom/ichi2/anki/compat/CompatHelper;)Lcom/ichi2/anki/compat/Compat;
+SPLcom/ichi2/anki/compat/CompatHelper;->access$getInstance$delegate$cp()Lkotlin/Lazy;
+SPLcom/ichi2/anki/compat/CompatHelper;->instance_delegate$lambda$0()Lcom/ichi2/anki/compat/CompatHelper;
+Lcom/ichi2/anki/compat/CompatHelper$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/compat/CompatHelper$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/compat/CompatHelper$$ExternalSyntheticLambda0;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/compat/CompatHelper$Companion;
+SPLcom/ichi2/anki/compat/CompatHelper$Companion;-><init>()V
+SPLcom/ichi2/anki/compat/CompatHelper$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/compat/CompatHelper$Companion;->getCompat()Lcom/ichi2/anki/compat/Compat;
+SPLcom/ichi2/anki/compat/CompatHelper$Companion;->getInstance()Lcom/ichi2/anki/compat/CompatHelper;
+SPLcom/ichi2/anki/compat/CompatHelper$Companion;->getPackageInfoCompat(Landroid/content/Context;Ljava/lang/String;Lcom/ichi2/anki/compat/PackageInfoFlagsCompat;)Landroid/content/pm/PackageInfo;
+SPLcom/ichi2/anki/compat/CompatHelper$Companion;->getPackageInfoCompat(Landroid/content/pm/PackageManager;Ljava/lang/String;Lcom/ichi2/anki/compat/PackageInfoFlagsCompat;)Landroid/content/pm/PackageInfo;
+SPLcom/ichi2/anki/compat/CompatHelper$Companion;->getSdkVersion()I
+SPLcom/ichi2/anki/compat/CompatHelper$Companion;->queryIntentActivitiesCompat(Landroid/content/pm/PackageManager;Landroid/content/Intent;Lcom/ichi2/anki/compat/ResolveInfoFlagsCompat;)Ljava/util/List;
+SPLcom/ichi2/anki/compat/CompatHelper$Companion;->registerReceiverCompat(Landroid/content/Context;Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;I)Landroid/content/Intent;
+SPLcom/ichi2/anki/compat/CompatHelper$Companion;->resolveActivityCompat(Landroid/content/pm/PackageManager;Landroid/content/Intent;Lcom/ichi2/anki/compat/ResolveInfoFlagsCompat;)Landroid/content/pm/ResolveInfo;
+SPLcom/ichi2/anki/compat/CompatHelper$Companion;->resolveServiceCompat(Landroid/content/pm/PackageManager;Landroid/content/Intent;Lcom/ichi2/anki/compat/ResolveInfoFlagsCompat;)Landroid/content/pm/ResolveInfo;
+Lcom/ichi2/anki/compat/CompatHelperKt;
+SPLcom/ichi2/anki/compat/CompatHelperKt;->setDstOutBlendCompat(Landroid/graphics/Paint;)V
+SPLcom/ichi2/anki/compat/CompatHelperKt;->setTooltipTextCompat(Landroid/view/View;Ljava/lang/CharSequence;)V
+Lcom/ichi2/anki/compat/CompatV26;
+SPLcom/ichi2/anki/compat/CompatV26;-><init>()V
+Lcom/ichi2/anki/compat/CompatV29;
+SPLcom/ichi2/anki/compat/CompatV29;-><clinit>()V
+SPLcom/ichi2/anki/compat/CompatV29;-><init>()V
+SPLcom/ichi2/anki/compat/CompatV29;->setDstOutBlend(Landroid/graphics/Paint;)V
+Lcom/ichi2/anki/compat/CompatV29$Companion;
+SPLcom/ichi2/anki/compat/CompatV29$Companion;-><init>()V
+SPLcom/ichi2/anki/compat/CompatV29$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/compat/CompatV30;
+SPLcom/ichi2/anki/compat/CompatV30;-><init>()V
+Lcom/ichi2/anki/compat/CompatV31;
+SPLcom/ichi2/anki/compat/CompatV31;-><init>()V
+Lcom/ichi2/anki/compat/CompatV33;
+SPLcom/ichi2/anki/compat/CompatV33;-><init>()V
+SPLcom/ichi2/anki/compat/CompatV33;->getPackageInfo(Landroid/content/pm/PackageManager;Ljava/lang/String;Lcom/ichi2/anki/compat/PackageInfoFlagsCompat;)Landroid/content/pm/PackageInfo;
+SPLcom/ichi2/anki/compat/CompatV33;->queryIntentActivities(Landroid/content/pm/PackageManager;Landroid/content/Intent;Lcom/ichi2/anki/compat/ResolveInfoFlagsCompat;)Ljava/util/List;
+SPLcom/ichi2/anki/compat/CompatV33;->resolveActivity(Landroid/content/pm/PackageManager;Landroid/content/Intent;Lcom/ichi2/anki/compat/ResolveInfoFlagsCompat;)Landroid/content/pm/ResolveInfo;
+SPLcom/ichi2/anki/compat/CompatV33;->resolveService(Landroid/content/pm/PackageManager;Landroid/content/Intent;Lcom/ichi2/anki/compat/ResolveInfoFlagsCompat;)Landroid/content/pm/ResolveInfo;
+Lcom/ichi2/anki/compat/CompatV34;
+SPLcom/ichi2/anki/compat/CompatV34;-><init>()V
+Lcom/ichi2/anki/compat/Flags;
+SPLcom/ichi2/anki/compat/Flags;-><init>(J)V
+SPLcom/ichi2/anki/compat/Flags;->getValue()J
+Lcom/ichi2/anki/compat/PackageInfoFlagsCompat;
+SPLcom/ichi2/anki/compat/PackageInfoFlagsCompat;-><clinit>()V
+SPLcom/ichi2/anki/compat/PackageInfoFlagsCompat;-><init>(J)V
+SPLcom/ichi2/anki/compat/PackageInfoFlagsCompat;-><init>(JLkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/compat/PackageInfoFlagsCompat;->access$getEMPTY$cp()Lcom/ichi2/anki/compat/PackageInfoFlagsCompat;
+Lcom/ichi2/anki/compat/PackageInfoFlagsCompat$Companion;
+SPLcom/ichi2/anki/compat/PackageInfoFlagsCompat$Companion;-><init>()V
+SPLcom/ichi2/anki/compat/PackageInfoFlagsCompat$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/compat/PackageInfoFlagsCompat$Companion;->getEMPTY()Lcom/ichi2/anki/compat/PackageInfoFlagsCompat;
+SPLcom/ichi2/anki/compat/PackageInfoFlagsCompat$Companion;->of(J)Lcom/ichi2/anki/compat/PackageInfoFlagsCompat;
+Lcom/ichi2/anki/compat/ResolveInfoFlagsCompat;
+SPLcom/ichi2/anki/compat/ResolveInfoFlagsCompat;-><clinit>()V
+SPLcom/ichi2/anki/compat/ResolveInfoFlagsCompat;-><init>(J)V
+SPLcom/ichi2/anki/compat/ResolveInfoFlagsCompat;-><init>(JLkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/compat/ResolveInfoFlagsCompat$Companion;
+SPLcom/ichi2/anki/compat/ResolveInfoFlagsCompat$Companion;-><init>()V
+SPLcom/ichi2/anki/compat/ResolveInfoFlagsCompat$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/compat/ResolveInfoFlagsCompat$Companion;->getEMPTY()Lcom/ichi2/anki/compat/ResolveInfoFlagsCompat;
+Lcom/ichi2/anki/contextmenu/AnkiCardContextMenu;
+SPLcom/ichi2/anki/contextmenu/AnkiCardContextMenu;-><clinit>()V
+SPLcom/ichi2/anki/contextmenu/AnkiCardContextMenu;-><init>(Landroid/content/Context;)V
+SPLcom/ichi2/anki/contextmenu/AnkiCardContextMenu;->getActivityName()Ljava/lang/String;
+Lcom/ichi2/anki/contextmenu/AnkiCardContextMenu$Companion;
+SPLcom/ichi2/anki/contextmenu/AnkiCardContextMenu$Companion;-><init>()V
+SPLcom/ichi2/anki/contextmenu/AnkiCardContextMenu$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/contextmenu/AnkiCardContextMenu$Companion;->ensureConsistentStateWithPreferenceStatus(Landroid/content/Context;Z)V
+Lcom/ichi2/anki/contextmenu/CardBrowserContextMenu;
+SPLcom/ichi2/anki/contextmenu/CardBrowserContextMenu;-><clinit>()V
+SPLcom/ichi2/anki/contextmenu/CardBrowserContextMenu;-><init>(Landroid/content/Context;)V
+SPLcom/ichi2/anki/contextmenu/CardBrowserContextMenu;->getActivityName()Ljava/lang/String;
+Lcom/ichi2/anki/contextmenu/CardBrowserContextMenu$Companion;
+SPLcom/ichi2/anki/contextmenu/CardBrowserContextMenu$Companion;-><init>()V
+SPLcom/ichi2/anki/contextmenu/CardBrowserContextMenu$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/contextmenu/CardBrowserContextMenu$Companion;->ensureConsistentStateWithPreferenceStatus(Landroid/content/Context;Z)V
+Lcom/ichi2/anki/contextmenu/SystemContextMenu;
+SPLcom/ichi2/anki/contextmenu/SystemContextMenu;-><clinit>()V
+SPLcom/ichi2/anki/contextmenu/SystemContextMenu;-><init>(Landroid/content/Context;)V
+SPLcom/ichi2/anki/contextmenu/SystemContextMenu;->ensureConsistentStateWithPreferenceStatus(Z)V
+SPLcom/ichi2/anki/contextmenu/SystemContextMenu;->getComponentName()Landroid/content/ComponentName;
+SPLcom/ichi2/anki/contextmenu/SystemContextMenu;->getPackageManager()Landroid/content/pm/PackageManager;
+SPLcom/ichi2/anki/contextmenu/SystemContextMenu;->getSystemMenuStatus()Ljava/lang/Boolean;
+Lcom/ichi2/anki/databinding/ActivityHomescreenBinding;
+SPLcom/ichi2/anki/databinding/ActivityHomescreenBinding;-><init>(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroidx/fragment/app/FragmentContainerView;Lcom/google/android/material/bottomnavigation/BottomNavigationView;Landroid/widget/LinearLayout;Lcom/ichi2/anki/databinding/IncludeDeckPickerBinding;Lcom/ichi2/anki/ui/ResizablePaneLayout;Lcom/ichi2/anki/ui/ResizingDivider;Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroidx/fragment/app/FragmentContainerView;Landroid/widget/FrameLayout;)V
+SPLcom/ichi2/anki/databinding/ActivityHomescreenBinding;->bind(Landroid/view/View;)Lcom/ichi2/anki/databinding/ActivityHomescreenBinding;
+SPLcom/ichi2/anki/databinding/ActivityHomescreenBinding;->getRoot()Landroid/view/View;
+SPLcom/ichi2/anki/databinding/ActivityHomescreenBinding;->getRoot()Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+SPLcom/ichi2/anki/databinding/ActivityHomescreenBinding;->inflate(Landroid/view/LayoutInflater;)Lcom/ichi2/anki/databinding/ActivityHomescreenBinding;
+SPLcom/ichi2/anki/databinding/ActivityHomescreenBinding;->inflate(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Z)Lcom/ichi2/anki/databinding/ActivityHomescreenBinding;
+Lcom/ichi2/anki/databinding/IncludeDeckPickerBinding;
+SPLcom/ichi2/anki/databinding/IncludeDeckPickerBinding;-><init>(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/widget/ImageView;Landroid/widget/RelativeLayout;Landroid/widget/LinearLayout;Landroidx/recyclerview/widget/RecyclerView;Lcom/ichi2/anki/ui/BottomFadeFrameLayout;Lcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;Landroid/widget/LinearLayout;Landroidx/swiperefreshlayout/widget/SwipeRefreshLayout;Lcom/ichi2/ui/FixedTextView;Landroidx/coordinatorlayout/widget/CoordinatorLayout;)V
+SPLcom/ichi2/anki/databinding/IncludeDeckPickerBinding;->bind(Landroid/view/View;)Lcom/ichi2/anki/databinding/IncludeDeckPickerBinding;
+SPLcom/ichi2/anki/databinding/IncludeDeckPickerBinding;->getRoot()Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+Lcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;
+SPLcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;-><init>(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;Landroid/view/View;Landroid/widget/LinearLayout;Lcom/google/android/material/floatingactionbutton/ExtendedFloatingActionButton;)V
+SPLcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;->bind(Landroid/view/View;)Lcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;
+SPLcom/ichi2/anki/databinding/IncludeFloatingAddButtonBinding;->getRoot()Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+Lcom/ichi2/anki/databinding/ItemDeckBinding;
+SPLcom/ichi2/anki/databinding/ItemDeckBinding;-><init>(Landroid/widget/RelativeLayout;Landroid/widget/LinearLayout;Landroid/widget/ImageButton;Landroid/widget/RelativeLayout;Lcom/ichi2/ui/FixedTextView;Lcom/ichi2/ui/FixedTextView;Landroid/widget/LinearLayout;Lcom/ichi2/ui/FixedTextView;Lcom/ichi2/ui/FixedTextView;Landroid/widget/ImageButton;)V
+SPLcom/ichi2/anki/databinding/ItemDeckBinding;->bind(Landroid/view/View;)Lcom/ichi2/anki/databinding/ItemDeckBinding;
+SPLcom/ichi2/anki/databinding/ItemDeckBinding;->getRoot()Landroid/widget/RelativeLayout;
+SPLcom/ichi2/anki/databinding/ItemDeckBinding;->inflate(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Z)Lcom/ichi2/anki/databinding/ItemDeckBinding;
+Lcom/ichi2/anki/deckpicker/BackgroundImage;
+SPLcom/ichi2/anki/deckpicker/BackgroundImage;-><clinit>()V
+SPLcom/ichi2/anki/deckpicker/BackgroundImage;-><init>()V
+SPLcom/ichi2/anki/deckpicker/BackgroundImage;->resolve(Landroid/content/Context;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/BackgroundImage$ResolveResult;
+Lcom/ichi2/anki/deckpicker/BackgroundImage$ResolveResult$Failure;
+Lcom/ichi2/anki/deckpicker/BackgroundImage$ResolveResult$None;
+SPLcom/ichi2/anki/deckpicker/BackgroundImage$ResolveResult$None;-><clinit>()V
+SPLcom/ichi2/anki/deckpicker/BackgroundImage$ResolveResult$None;-><init>()V
+Lcom/ichi2/anki/deckpicker/BackgroundImage$ResolveResult$Ready;
+Lcom/ichi2/anki/deckpicker/BackgroundImage$resolve$1;
+SPLcom/ichi2/anki/deckpicker/BackgroundImage$resolve$1;-><init>(Lcom/ichi2/anki/deckpicker/BackgroundImage;Lkotlin/coroutines/Continuation;)V
+Lcom/ichi2/anki/deckpicker/DeckFilters;
+SPLcom/ichi2/anki/deckpicker/DeckFilters;-><clinit>()V
+SPLcom/ichi2/anki/deckpicker/DeckFilters;-><init>(Ljava/util/List;)V
+SPLcom/ichi2/anki/deckpicker/DeckFilters;->accept(Ljava/lang/String;)Z
+SPLcom/ichi2/anki/deckpicker/DeckFilters;->isActive()Z
+Lcom/ichi2/anki/deckpicker/DeckFilters$Companion;
+SPLcom/ichi2/anki/deckpicker/DeckFilters$Companion;-><init>()V
+SPLcom/ichi2/anki/deckpicker/DeckFilters$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/deckpicker/DeckFilters$Companion;->create(Ljava/lang/CharSequence;)Lcom/ichi2/anki/deckpicker/DeckFilters;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;-><clinit>()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;-><init>()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->access$getFlowOfRefreshDeckList$p(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;)Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->access$loadDeckList(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->access$refreshUndoMenuState(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->access$setDueTree(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lcom/ichi2/anki/libanki/sched/DeckNode;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->access$setSchedulerUpgradeDialogShownForVersion$p(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Ljava/lang/Long;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->fetchSyncIconState(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->findDeckPosition(J)I
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getDeckDeletedNotification()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getDueTree()Lcom/ichi2/anki/libanki/sched/DeckNode;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getEmptyCardsNotification()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfCardsDue()Lkotlinx/coroutines/flow/Flow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfCollectionHasNoCards()Lkotlinx/coroutines/flow/MutableStateFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfCreateShortcut()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfDeckCountsChanged()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfDeckList()Lkotlinx/coroutines/flow/StateFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfDeckListInInitialState()Lkotlinx/coroutines/flow/StateFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfDecksReloaded()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfDeleteDeckConfirmation()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfDestination()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfDisableShortcuts()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfExportDeck()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfFocusedDeck()Lkotlinx/coroutines/flow/MutableStateFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfNavigate()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfOptionsMenuState()Lkotlinx/coroutines/flow/MutableStateFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfPromptUserToUpdateScheduler()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfRenameDeck()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfResizingDividerVisible()Lkotlinx/coroutines/flow/Flow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfShowContextMenu()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfShowRightClickContextMenu()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfStartupResponse()Lkotlinx/coroutines/flow/MutableStateFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfStudiedTodayStats()Lkotlinx/coroutines/flow/MutableStateFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getFlowOfStudyDeck()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getOnError()Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getOptionsMenuState()Lcom/ichi2/anki/deckpicker/OptionsMenuState;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->getProgressManager()Lcom/ichi2/anki/progress/ProgressManager;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->handleStartup(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$AnkiDroidEnvironment;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->isDeckSearchExpanded()Z
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->loadDeckList(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->onScreenResumed()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->refreshMenuState$lambda$0(Lcom/ichi2/anki/libanki/Collection;)Lcom/ichi2/anki/deckpicker/OptionsMenuState;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->refreshMenuState(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->refreshUndoMenuState$lambda$0(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lcom/ichi2/anki/libanki/Collection;)Lkotlin/Unit;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->refreshUndoMenuState(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->reloadDeckCounts()Lkotlinx/coroutines/Job;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->setDueTree(Lcom/ichi2/anki/libanki/sched/DeckNode;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->setFocusedDeck(Ljava/lang/Long;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel;->updateDeckList()Lkotlinx/coroutines/Job;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$$ExternalSyntheticLambda1;-><init>(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$AnkiDroidEnvironment;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$Companion;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$Companion;-><init>()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;-><clinit>()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;-><init>(Ljava/util/List;Z)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;->access$getEmpty$cp()Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;->equals(Ljava/lang/Object;)Z
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;->getData()Ljava/util/List;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;->getHasSubDecks()Z
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList$Companion;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList$Companion;-><init>()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList$Companion;->getEmpty()Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$FlattenedDeckList;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse;-><clinit>()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse;-><init>()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse$FatalError;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse$RequestPermissions;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse$Success;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse$Success;-><clinit>()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse$Success;-><init>()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse$Success;->equals(Ljava/lang/Object;)Z
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$StartupResponse$Success;->toString()Ljava/lang/String;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$fetchSyncIconState$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$fetchSyncIconState$1;-><init>(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)V
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfCardsDue$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfCardsDue$1;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfCardsDue$1;->invoke(Lcom/ichi2/anki/libanki/sched/DeckNode;Ljava/lang/Boolean;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfCardsDue$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfCardsDue$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$1;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$1;->invoke(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$2;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$2;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$2;->invoke(Lcom/ichi2/anki/libanki/sched/DeckNode;Ljava/lang/String;Ljava/lang/Long;Lkotlin/Unit;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$2;->invokeSuspend$lambda$0(Lcom/ichi2/anki/libanki/Collection;)J
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$2$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$2$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckList$2$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckListInInitialState$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckListInInitialState$1;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckListInInitialState$1;->invoke(Lcom/ichi2/anki/libanki/sched/DeckNode;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckListInInitialState$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfDeckListInInitialState$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfResizingDividerVisible$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfResizingDividerVisible$1;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfResizingDividerVisible$1;->invoke(Ljava/lang/Boolean;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfResizingDividerVisible$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$flowOfResizingDividerVisible$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1;-><init>(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$AnkiDroidEnvironment;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$1;-><init>(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$failure$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$failure$1;-><init>(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$AnkiDroidEnvironment;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$failure$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$failure$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$failure$1$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$handleStartup$1$failure$1$1;-><init>(Ljava/lang/Object;)V
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$loadDeckList$2;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$loadDeckList$2;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$loadDeckList$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$loadDeckList$2;->invoke(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$loadDeckList$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$loadDeckList$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$refreshMenuState$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$refreshMenuState$1;-><init>(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$refreshMenuState$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$refreshUndoMenuState$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$refreshUndoMenuState$1;-><init>(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$refreshUndoMenuState$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1;-><init>(Lcom/ichi2/anki/deckpicker/DeckPickerViewModel;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1;->invokeSuspend$lambda$0(Lcom/ichi2/anki/libanki/Collection;)Lkotlin/Pair;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1;->invokeSuspend$lambda$1(Lcom/ichi2/anki/libanki/Collection;)Ljava/lang/String;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1;->invokeSuspend$lambda$2(Lcom/ichi2/anki/libanki/Collection;)J
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1;->invokeSuspend$lambda$3(Lcom/ichi2/anki/libanki/Collection;)J
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1$$ExternalSyntheticLambda1;-><init>()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1$$ExternalSyntheticLambda2;-><init>()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1$$ExternalSyntheticLambda2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1$$ExternalSyntheticLambda3;-><init>()V
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModel$reloadDeckCounts$loadDeckCounts$1$$ExternalSyntheticLambda3;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/deckpicker/DeckPickerViewModelKt;
+SPLcom/ichi2/anki/deckpicker/DeckPickerViewModelKt;->onlyHasDefaultDeck(Lcom/ichi2/anki/libanki/sched/DeckNode;)Z
+Lcom/ichi2/anki/deckpicker/DisplayDeckNode;
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;-><clinit>()V
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;-><init>(JLjava/lang/String;Ljava/lang/String;ZZIZIIIZ)V
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;-><init>(JLjava/lang/String;Ljava/lang/String;ZZIZIIIZLkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->equals(Ljava/lang/Object;)Z
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getCanCollapse()Z
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getCollapsed()Z
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getDepth()I
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getDid()J
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getFiltered()Z
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getLastDeckNameComponent()Ljava/lang/String;
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getLrnCount()I
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getNewCount()I
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->getRevCount()I
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->isSelected()Z
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode;->setDeckNode(Lcom/ichi2/anki/libanki/sched/DeckNode;)V
+Lcom/ichi2/anki/deckpicker/DisplayDeckNode$Companion;
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode$Companion;-><init>()V
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNode$Companion;->from(Lcom/ichi2/anki/libanki/sched/DeckNode;ZJ)Lcom/ichi2/anki/deckpicker/DisplayDeckNode;
+Lcom/ichi2/anki/deckpicker/DisplayDeckNodeKt;
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNodeKt;->addVisibleToList(Lcom/ichi2/anki/libanki/sched/DeckNode;Ljava/util/List;ZJ)V
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNodeKt;->filterAndFlattenDisplay(Lcom/ichi2/anki/libanki/sched/DeckNode;Lcom/ichi2/anki/deckpicker/DeckFilters;J)Ljava/util/List;
+SPLcom/ichi2/anki/deckpicker/DisplayDeckNodeKt;->filterAndFlattenDisplayInner(Lcom/ichi2/anki/libanki/sched/DeckNode;Lcom/ichi2/anki/deckpicker/DeckFilters;Ljava/util/List;ZJ)V
+Lcom/ichi2/anki/deckpicker/OptionsMenuState;
+SPLcom/ichi2/anki/deckpicker/OptionsMenuState;-><clinit>()V
+SPLcom/ichi2/anki/deckpicker/OptionsMenuState;-><init>(ZLjava/lang/String;Lcom/ichi2/anki/deckpicker/SyncIconState;ZZ)V
+SPLcom/ichi2/anki/deckpicker/OptionsMenuState;->copy$default(Lcom/ichi2/anki/deckpicker/OptionsMenuState;ZLjava/lang/String;Lcom/ichi2/anki/deckpicker/SyncIconState;ZZILjava/lang/Object;)Lcom/ichi2/anki/deckpicker/OptionsMenuState;
+SPLcom/ichi2/anki/deckpicker/OptionsMenuState;->copy(ZLjava/lang/String;Lcom/ichi2/anki/deckpicker/SyncIconState;ZZ)Lcom/ichi2/anki/deckpicker/OptionsMenuState;
+SPLcom/ichi2/anki/deckpicker/OptionsMenuState;->equals(Ljava/lang/Object;)Z
+SPLcom/ichi2/anki/deckpicker/OptionsMenuState;->getSearchIcon()Z
+SPLcom/ichi2/anki/deckpicker/OptionsMenuState;->getSyncIcon()Lcom/ichi2/anki/deckpicker/SyncIconState;
+SPLcom/ichi2/anki/deckpicker/OptionsMenuState;->getUndoAvailable()Z
+SPLcom/ichi2/anki/deckpicker/OptionsMenuState;->getUndoLabel()Ljava/lang/String;
+Lcom/ichi2/anki/deckpicker/SyncIconState;
+SPLcom/ichi2/anki/deckpicker/SyncIconState;->$values()[Lcom/ichi2/anki/deckpicker/SyncIconState;
+SPLcom/ichi2/anki/deckpicker/SyncIconState;-><clinit>()V
+SPLcom/ichi2/anki/deckpicker/SyncIconState;-><init>(Ljava/lang/String;I)V
+SPLcom/ichi2/anki/deckpicker/SyncIconState;->values()[Lcom/ichi2/anki/deckpicker/SyncIconState;
+Lcom/ichi2/anki/dialogs/BackupPromptDialog;
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog;-><clinit>()V
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog;-><init>(Landroid/content/Context;)V
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog;-><init>(Landroid/content/Context;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog;->access$shouldShowDialog(Lcom/ichi2/anki/dialogs/BackupPromptDialog;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog;->access$userIsNewToAnkiDroid(Lcom/ichi2/anki/dialogs/BackupPromptDialog;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog;->getFirstInstallTime()Ljava/lang/Long;
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog;->shouldShowDialog(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog;->userIsNewToAnkiDroid$lambda$0(Lcom/ichi2/anki/libanki/Collection;)Z
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog;->userIsNewToAnkiDroid(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/dialogs/BackupPromptDialog$$ExternalSyntheticLambda6;
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog$$ExternalSyntheticLambda6;-><init>()V
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog$$ExternalSyntheticLambda6;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/dialogs/BackupPromptDialog$Companion;
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog$Companion;-><init>()V
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog$Companion;->showIfAvailable(Lcom/ichi2/anki/DeckPicker;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/dialogs/BackupPromptDialog$Companion$showIfAvailable$1;
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog$Companion$showIfAvailable$1;-><init>(Lcom/ichi2/anki/dialogs/BackupPromptDialog$Companion;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog$Companion$showIfAvailable$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/dialogs/BackupPromptDialog$shouldShowDialog$1;
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog$shouldShowDialog$1;-><init>(Lcom/ichi2/anki/dialogs/BackupPromptDialog;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog$shouldShowDialog$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/dialogs/BackupPromptDialog$userIsNewToAnkiDroid$1;
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog$userIsNewToAnkiDroid$1;-><init>(Lcom/ichi2/anki/dialogs/BackupPromptDialog;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/dialogs/BackupPromptDialog$userIsNewToAnkiDroid$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/dialogs/DeckPickerContextMenu$DeckPickerContextMenuOption;
+SPLcom/ichi2/anki/dialogs/DeckPickerContextMenu$DeckPickerContextMenuOption;->$values()[Lcom/ichi2/anki/dialogs/DeckPickerContextMenu$DeckPickerContextMenuOption;
+SPLcom/ichi2/anki/dialogs/DeckPickerContextMenu$DeckPickerContextMenuOption;-><clinit>()V
+SPLcom/ichi2/anki/dialogs/DeckPickerContextMenu$DeckPickerContextMenuOption;-><init>(Ljava/lang/String;I)V
+SPLcom/ichi2/anki/dialogs/DeckPickerContextMenu$DeckPickerContextMenuOption;->values()[Lcom/ichi2/anki/dialogs/DeckPickerContextMenu$DeckPickerContextMenuOption;
+Lcom/ichi2/anki/dialogs/DeckPickerContextMenuKt;
+SPLcom/ichi2/anki/dialogs/DeckPickerContextMenuKt;->setDeckPickerContextMenuResultListener(Landroidx/fragment/app/FragmentActivity;Lkotlin/jvm/functions/Function1;)V
+Lcom/ichi2/anki/dialogs/DeckPickerContextMenuKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/dialogs/DeckPickerContextMenuKt$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/functions/Function1;)V
+Lcom/ichi2/anki/dialogs/DeckPickerMaintenanceDialog$Check;
+SPLcom/ichi2/anki/dialogs/DeckPickerMaintenanceDialog$Check;->$values()[Lcom/ichi2/anki/dialogs/DeckPickerMaintenanceDialog$Check;
+SPLcom/ichi2/anki/dialogs/DeckPickerMaintenanceDialog$Check;-><clinit>()V
+SPLcom/ichi2/anki/dialogs/DeckPickerMaintenanceDialog$Check;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+SPLcom/ichi2/anki/dialogs/DeckPickerMaintenanceDialog$Check;->getRequestKey()Ljava/lang/String;
+Lcom/ichi2/anki/dialogs/DialogHandler;
+SPLcom/ichi2/anki/dialogs/DialogHandler;-><clinit>()V
+SPLcom/ichi2/anki/dialogs/DialogHandler;-><init>(Lcom/ichi2/anki/AnkiActivity;)V
+SPLcom/ichi2/anki/dialogs/DialogHandler;->executeMessage()V
+SPLcom/ichi2/anki/dialogs/DialogHandler;->popMessage()Landroid/os/Message;
+Lcom/ichi2/anki/dialogs/DialogHandler$Companion;
+SPLcom/ichi2/anki/dialogs/DialogHandler$Companion;-><init>()V
+SPLcom/ichi2/anki/dialogs/DialogHandler$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/dialogs/ImportFileSelectionFragment$ApkgImportResultLauncherProvider;
+Lcom/ichi2/anki/dialogs/ImportFileSelectionFragment$CsvImportResultLauncherProvider;
+Lcom/ichi2/anki/dialogs/ImportViewModel;
+SPLcom/ichi2/anki/dialogs/ImportViewModel;-><clinit>()V
+SPLcom/ichi2/anki/dialogs/ImportViewModel;-><init>()V
+SPLcom/ichi2/anki/dialogs/ImportViewModel;->getImportAddFlow()Lkotlinx/coroutines/flow/SharedFlow;
+SPLcom/ichi2/anki/dialogs/ImportViewModel;->getImportReplaceFlow()Lkotlinx/coroutines/flow/SharedFlow;
+Lcom/ichi2/anki/dialogs/LoadingDialogFragment;
+Lcom/ichi2/anki/dialogs/LoadingDialogFragmentKt;
+SPLcom/ichi2/anki/dialogs/LoadingDialogFragmentKt;->dismissLoadingDialog(Lcom/ichi2/anki/AnkiActivity;Ljava/lang/String;)V
+SPLcom/ichi2/anki/dialogs/LoadingDialogFragmentKt;->removeImmediately(Lcom/ichi2/anki/AnkiActivity;Lcom/ichi2/anki/dialogs/LoadingDialogFragment;)V
+Lcom/ichi2/anki/dialogs/SyncErrorDialog$SyncErrorDialogListener;
+Lcom/ichi2/anki/dialogs/customstudy/CustomStudyDialog$CustomStudyAction;
+SPLcom/ichi2/anki/dialogs/customstudy/CustomStudyDialog$CustomStudyAction;->$values()[Lcom/ichi2/anki/dialogs/customstudy/CustomStudyDialog$CustomStudyAction;
+SPLcom/ichi2/anki/dialogs/customstudy/CustomStudyDialog$CustomStudyAction;-><clinit>()V
+SPLcom/ichi2/anki/dialogs/customstudy/CustomStudyDialog$CustomStudyAction;-><init>(Ljava/lang/String;I)V
+SPLcom/ichi2/anki/dialogs/customstudy/CustomStudyDialog$CustomStudyAction;->values()[Lcom/ichi2/anki/dialogs/customstudy/CustomStudyDialog$CustomStudyAction;
+Lcom/ichi2/anki/dialogs/customstudy/CustomStudyDialog$CustomStudyAction$Companion;
+SPLcom/ichi2/anki/dialogs/customstudy/CustomStudyDialog$CustomStudyAction$Companion;-><init>()V
+SPLcom/ichi2/anki/dialogs/customstudy/CustomStudyDialog$CustomStudyAction$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/dialogs/tags/TagsDialogListener;
+SPLcom/ichi2/anki/dialogs/tags/TagsDialogListener;-><clinit>()V
+Lcom/ichi2/anki/dialogs/tags/TagsDialogListener$Companion;
+SPLcom/ichi2/anki/dialogs/tags/TagsDialogListener$Companion;-><clinit>()V
+SPLcom/ichi2/anki/dialogs/tags/TagsDialogListener$Companion;-><init>()V
+Lcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel;
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel;-><clinit>()V
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel;-><init>(Landroidx/lifecycle/SavedStateHandle;)V
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel;->access$getFactory$cp()Landroidx/lifecycle/ViewModelProvider$Factory;
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel;->getExportReadyDestination()Lkotlinx/coroutines/flow/StateFlow;
+Lcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel$Companion;
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel$Companion;-><init>()V
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel$Companion;->getFactory()Landroidx/lifecycle/ViewModelProvider$Factory;
+Lcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel$special$$inlined$savedStateViewModelFactory$1;
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel$special$$inlined$savedStateViewModelFactory$1;-><init>()V
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel$special$$inlined$savedStateViewModelFactory$1;->invoke(Landroidx/lifecycle/viewmodel/CreationExtras;)Landroidx/lifecycle/ViewModel;
+SPLcom/ichi2/anki/dialogs/viewmodel/ExportReadyViewModel$special$$inlined$savedStateViewModelFactory$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/exception/CollectionLockedException;
+SPLcom/ichi2/anki/exception/CollectionLockedException;-><clinit>()V
+SPLcom/ichi2/anki/exception/CollectionLockedException;->access$setMessageProvider$cp(Lkotlin/jvm/functions/Function0;)V
+Lcom/ichi2/anki/exception/CollectionLockedException$Companion;
+SPLcom/ichi2/anki/exception/CollectionLockedException$Companion;-><init>()V
+SPLcom/ichi2/anki/exception/CollectionLockedException$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/exception/CollectionLockedException$Companion;->setMessageProvider(Lkotlin/jvm/functions/Function0;)V
+Lcom/ichi2/anki/exception/SanitizedReportCollector;
+SPLcom/ichi2/anki/exception/SanitizedReportCollector;-><clinit>()V
+SPLcom/ichi2/anki/exception/SanitizedReportCollector;-><init>()V
+SPLcom/ichi2/anki/exception/SanitizedReportCollector;->enabled(Lorg/acra/config/CoreConfiguration;)Z
+SPLcom/ichi2/anki/exception/SanitizedReportCollector;->getOrder()Lorg/acra/collector/Collector$Order;
+Lcom/ichi2/anki/exception/StorageAccessException;
+Lcom/ichi2/anki/exception/StorageNotConfiguredException;
+Lcom/ichi2/anki/exception/SystemStorageException;
+Lcom/ichi2/anki/i18n/LocaleCodesKt;
+SPLcom/ichi2/anki/i18n/LocaleCodesKt;-><clinit>()V
+SPLcom/ichi2/anki/i18n/LocaleCodesKt;->normalize(Ljava/util/Locale;)Ljava/util/Locale;
+SPLcom/ichi2/anki/i18n/LocaleCodesKt;->toAnkiTwoLetterCode(Ljava/util/Locale;)Ljava/lang/String;
+Lcom/ichi2/anki/i18n/LocaleCodesKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/i18n/LocaleCodesKt$$ExternalSyntheticLambda0;-><init>()V
+Lcom/ichi2/anki/introduction/CollectionPermissionScreenLauncher;
+SPLcom/ichi2/anki/introduction/CollectionPermissionScreenLauncher;->recreateActivityResultLauncher(Lcom/ichi2/anki/AnkiActivity;)Landroidx/activity/result/ActivityResultLauncher;
+Lcom/ichi2/anki/introduction/CollectionPermissionScreenLauncher$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/introduction/CollectionPermissionScreenLauncher$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/AnkiActivity;)V
+Lcom/ichi2/anki/introduction/CollectionPermissionScreenLauncherKt;
+SPLcom/ichi2/anki/introduction/CollectionPermissionScreenLauncherKt;->hasCollectionStoragePermissions(Lcom/ichi2/anki/AnkiActivity;)Z
+Lcom/ichi2/anki/libanki/BackendUndoKt;
+SPLcom/ichi2/anki/libanki/BackendUndoKt;->undoAvailable(Lcom/ichi2/anki/libanki/Collection;)Z
+SPLcom/ichi2/anki/libanki/BackendUndoKt;->undoLabel(Lcom/ichi2/anki/libanki/Collection;)Ljava/lang/String;
+Lcom/ichi2/anki/libanki/Collection;
+SPLcom/ichi2/anki/libanki/Collection;-><init>(Lcom/ichi2/anki/libanki/CollectionFiles;Lnet/ankiweb/rsdroid/Backend;Lkotlin/jvm/functions/Function1;)V
+SPLcom/ichi2/anki/libanki/Collection;->_loadScheduler()V
+SPLcom/ichi2/anki/libanki/Collection;->cardCount()I
+SPLcom/ichi2/anki/libanki/Collection;->createBackup(Ljava/lang/String;ZZ)Z
+SPLcom/ichi2/anki/libanki/Collection;->getBackend()Lnet/ankiweb/rsdroid/Backend;
+SPLcom/ichi2/anki/libanki/Collection;->getColDb()Ljava/io/File;
+SPLcom/ichi2/anki/libanki/Collection;->getCollectionFiles()Lcom/ichi2/anki/libanki/CollectionFiles;
+SPLcom/ichi2/anki/libanki/Collection;->getConfig()Lcom/ichi2/anki/libanki/Config;
+SPLcom/ichi2/anki/libanki/Collection;->getDb()Lcom/ichi2/anki/libanki/DB;
+SPLcom/ichi2/anki/libanki/Collection;->getDecks()Lcom/ichi2/anki/libanki/Decks;
+SPLcom/ichi2/anki/libanki/Collection;->getSched()Lcom/ichi2/anki/libanki/sched/Scheduler;
+SPLcom/ichi2/anki/libanki/Collection;->isDbClosed()Z
+SPLcom/ichi2/anki/libanki/Collection;->isEmpty()Z
+SPLcom/ichi2/anki/libanki/Collection;->load()V
+SPLcom/ichi2/anki/libanki/Collection;->reopen$default(Lcom/ichi2/anki/libanki/Collection;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Z
+SPLcom/ichi2/anki/libanki/Collection;->reopen(ZLkotlin/jvm/functions/Function1;)Z
+SPLcom/ichi2/anki/libanki/Collection;->schedVer()I
+SPLcom/ichi2/anki/libanki/Collection;->setConfig(Lcom/ichi2/anki/libanki/Config;)V
+SPLcom/ichi2/anki/libanki/Collection;->setDecks(Lcom/ichi2/anki/libanki/Decks;)V
+SPLcom/ichi2/anki/libanki/Collection;->setNotetypes(Lcom/ichi2/anki/libanki/Notetypes;)V
+SPLcom/ichi2/anki/libanki/Collection;->setSched(Lcom/ichi2/anki/libanki/sched/Scheduler;)V
+SPLcom/ichi2/anki/libanki/Collection;->undoStatus()Lcom/ichi2/anki/libanki/UndoStatus;
+Lcom/ichi2/anki/libanki/CollectionFiles;
+SPLcom/ichi2/anki/libanki/CollectionFiles;-><init>()V
+SPLcom/ichi2/anki/libanki/CollectionFiles;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/libanki/CollectionFiles;->requireDiskBasedCollection()Lcom/ichi2/anki/libanki/CollectionFiles$FolderBasedCollection;
+Lcom/ichi2/anki/libanki/CollectionFiles$FolderBasedCollection;
+SPLcom/ichi2/anki/libanki/CollectionFiles$FolderBasedCollection;-><init>(Ljava/io/File;Ljava/lang/String;)V
+SPLcom/ichi2/anki/libanki/CollectionFiles$FolderBasedCollection;-><init>(Ljava/io/File;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/libanki/CollectionFiles$FolderBasedCollection;->getColDb()Ljava/io/File;
+SPLcom/ichi2/anki/libanki/CollectionFiles$FolderBasedCollection;->getMediaFolder()Ljava/io/File;
+Lcom/ichi2/anki/libanki/CollectionFiles$InMemory;
+Lcom/ichi2/anki/libanki/CollectionFiles$InMemoryWithMedia;
+Lcom/ichi2/anki/libanki/CollectionKt;
+SPLcom/ichi2/anki/libanki/CollectionKt;->getMediaFolder(Lcom/ichi2/anki/libanki/Collection;)Ljava/io/File;
+Lcom/ichi2/anki/libanki/Config;
+SPLcom/ichi2/anki/libanki/Config;-><init>(Lnet/ankiweb/rsdroid/Backend;)V
+SPLcom/ichi2/anki/libanki/Config;->getBackend()Lnet/ankiweb/rsdroid/Backend;
+Lcom/ichi2/anki/libanki/DB;
+SPLcom/ichi2/anki/libanki/DB;-><clinit>()V
+SPLcom/ichi2/anki/libanki/DB;-><init>(Landroidx/sqlite/db/SupportSQLiteDatabase;)V
+SPLcom/ichi2/anki/libanki/DB;->queryScalar(Ljava/lang/String;[Ljava/lang/Object;)I
+Lcom/ichi2/anki/libanki/DB$Companion;
+SPLcom/ichi2/anki/libanki/DB$Companion;-><init>()V
+SPLcom/ichi2/anki/libanki/DB$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/libanki/Deck;
+SPLcom/ichi2/anki/libanki/Deck;-><clinit>()V
+SPLcom/ichi2/anki/libanki/Deck;-><init>(Lorg/json/JSONObject;)V
+SPLcom/ichi2/anki/libanki/Deck;->getId()J
+SPLcom/ichi2/anki/libanki/Deck;->getJsonObject()Lorg/json/JSONObject;
+Lcom/ichi2/anki/libanki/DeckNameId;
+SPLcom/ichi2/anki/libanki/DeckNameId;-><init>(Ljava/lang/String;J)V
+Lcom/ichi2/anki/libanki/Decks;
+SPLcom/ichi2/anki/libanki/Decks;-><clinit>()V
+SPLcom/ichi2/anki/libanki/Decks;-><init>(Lcom/ichi2/anki/libanki/Collection;)V
+SPLcom/ichi2/anki/libanki/Decks;->allNamesAndIds$default(Lcom/ichi2/anki/libanki/Decks;ZZILjava/lang/Object;)Ljava/util/List;
+SPLcom/ichi2/anki/libanki/Decks;->allNamesAndIds(ZZ)Ljava/util/List;
+SPLcom/ichi2/anki/libanki/Decks;->count()I
+SPLcom/ichi2/anki/libanki/Decks;->current()Lcom/ichi2/anki/libanki/Deck;
+SPLcom/ichi2/anki/libanki/Decks;->getCurrentId()J
+SPLcom/ichi2/anki/libanki/Decks;->getLegacy(J)Lcom/ichi2/anki/libanki/Deck;
+SPLcom/ichi2/anki/libanki/Decks;->selected()J
+Lcom/ichi2/anki/libanki/Decks$Companion;
+SPLcom/ichi2/anki/libanki/Decks$Companion;-><init>()V
+SPLcom/ichi2/anki/libanki/Decks$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/libanki/LibAnki;
+SPLcom/ichi2/anki/libanki/LibAnki;-><clinit>()V
+SPLcom/ichi2/anki/libanki/LibAnki;-><init>()V
+SPLcom/ichi2/anki/libanki/LibAnki;->getBackend()Lnet/ankiweb/rsdroid/Backend;
+SPLcom/ichi2/anki/libanki/LibAnki;->getCollection()Lcom/ichi2/anki/libanki/Collection;
+SPLcom/ichi2/anki/libanki/LibAnki;->setBackend(Lnet/ankiweb/rsdroid/Backend;)V
+SPLcom/ichi2/anki/libanki/LibAnki;->setCollection(Lcom/ichi2/anki/libanki/Collection;)V
+Lcom/ichi2/anki/libanki/Media;
+SPLcom/ichi2/anki/libanki/Media;-><clinit>()V
+SPLcom/ichi2/anki/libanki/Media;-><init>(Lcom/ichi2/anki/libanki/Collection;)V
+Lcom/ichi2/anki/libanki/Media$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/libanki/Media$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/libanki/Media;)V
+Lcom/ichi2/anki/libanki/Media$Companion;
+SPLcom/ichi2/anki/libanki/Media$Companion;-><init>()V
+SPLcom/ichi2/anki/libanki/Media$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/libanki/Notetypes;
+SPLcom/ichi2/anki/libanki/Notetypes;-><clinit>()V
+SPLcom/ichi2/anki/libanki/Notetypes;-><init>(Lcom/ichi2/anki/libanki/Collection;)V
+Lcom/ichi2/anki/libanki/Notetypes$Companion;
+SPLcom/ichi2/anki/libanki/Notetypes$Companion;-><init>()V
+SPLcom/ichi2/anki/libanki/Notetypes$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/libanki/Storage;
+SPLcom/ichi2/anki/libanki/Storage;-><clinit>()V
+SPLcom/ichi2/anki/libanki/Storage;-><init>()V
+SPLcom/ichi2/anki/libanki/Storage;->collection(Lcom/ichi2/anki/libanki/CollectionFiles;Lkotlin/jvm/functions/Function1;Lnet/ankiweb/rsdroid/Backend;)Lcom/ichi2/anki/libanki/Collection;
+SPLcom/ichi2/anki/libanki/Storage;->openDB$libanki(Lcom/ichi2/anki/libanki/Storage$OpenDbArgs;Lnet/ankiweb/rsdroid/Backend;ZLkotlin/jvm/functions/Function1;)Lkotlin/Pair;
+Lcom/ichi2/anki/libanki/Storage$OpenDbArgs;
+SPLcom/ichi2/anki/libanki/Storage$OpenDbArgs;-><init>()V
+SPLcom/ichi2/anki/libanki/Storage$OpenDbArgs;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/libanki/Storage$OpenDbArgs;->getCollectionPath()Ljava/lang/String;
+SPLcom/ichi2/anki/libanki/Storage$OpenDbArgs;->isNewDatabase()Z
+Lcom/ichi2/anki/libanki/Storage$OpenDbArgs$InMemory;
+Lcom/ichi2/anki/libanki/Storage$OpenDbArgs$Path;
+SPLcom/ichi2/anki/libanki/Storage$OpenDbArgs$Path;-><init>(Ljava/io/File;)V
+SPLcom/ichi2/anki/libanki/Storage$OpenDbArgs$Path;->getPath()Ljava/io/File;
+SPLcom/ichi2/anki/libanki/Storage$OpenDbArgs$Path;->toString()Ljava/lang/String;
+Lcom/ichi2/anki/libanki/Tags;
+SPLcom/ichi2/anki/libanki/Tags;-><init>(Lcom/ichi2/anki/libanki/Collection;)V
+Lcom/ichi2/anki/libanki/TemplateManager;
+SPLcom/ichi2/anki/libanki/TemplateManager;-><clinit>()V
+SPLcom/ichi2/anki/libanki/TemplateManager;->access$getFieldFilters$cp()Ljava/util/Map;
+Lcom/ichi2/anki/libanki/TemplateManager$Companion;
+SPLcom/ichi2/anki/libanki/TemplateManager$Companion;-><init>()V
+SPLcom/ichi2/anki/libanki/TemplateManager$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/libanki/TemplateManager$Companion;->getFieldFilters()Ljava/util/Map;
+Lcom/ichi2/anki/libanki/TemplateManager$FieldFilter;
+Lcom/ichi2/anki/libanki/TtsVoice;
+SPLcom/ichi2/anki/libanki/TtsVoice;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+Lcom/ichi2/anki/libanki/UndoStatus;
+SPLcom/ichi2/anki/libanki/UndoStatus;-><clinit>()V
+SPLcom/ichi2/anki/libanki/UndoStatus;-><init>(Ljava/lang/String;Ljava/lang/String;I)V
+SPLcom/ichi2/anki/libanki/UndoStatus;->getUndo()Ljava/lang/String;
+Lcom/ichi2/anki/libanki/UndoStatus$Companion;
+SPLcom/ichi2/anki/libanki/UndoStatus$Companion;-><init>()V
+SPLcom/ichi2/anki/libanki/UndoStatus$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/libanki/UndoStatus$Companion;->from(Lanki/collection/UndoStatus;)Lcom/ichi2/anki/libanki/UndoStatus;
+Lcom/ichi2/anki/libanki/backend/BackendUtils;
+SPLcom/ichi2/anki/libanki/backend/BackendUtils;-><clinit>()V
+SPLcom/ichi2/anki/libanki/backend/BackendUtils;-><init>()V
+SPLcom/ichi2/anki/libanki/backend/BackendUtils;->fromJsonBytes(Lcom/google/protobuf/ByteString;)Lorg/json/JSONObject;
+Lcom/ichi2/anki/libanki/exception/ConfirmModSchemaException;
+Lcom/ichi2/anki/libanki/exception/EmptyMediaException;
+Lcom/ichi2/anki/libanki/sched/DeckNode;
+SPLcom/ichi2/anki/libanki/sched/DeckNode;-><init>(Lanki/decks/DeckTreeNode;Ljava/lang/String;Ljava/lang/ref/WeakReference;)V
+SPLcom/ichi2/anki/libanki/sched/DeckNode;-><init>(Lanki/decks/DeckTreeNode;Ljava/lang/String;Ljava/lang/ref/WeakReference;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/libanki/sched/DeckNode;->find(J)Lcom/ichi2/anki/libanki/sched/DeckNode;
+SPLcom/ichi2/anki/libanki/sched/DeckNode;->getChildren()Ljava/util/List;
+SPLcom/ichi2/anki/libanki/sched/DeckNode;->getCollapsed()Z
+SPLcom/ichi2/anki/libanki/sched/DeckNode;->getDepth()I
+SPLcom/ichi2/anki/libanki/sched/DeckNode;->getDid()J
+SPLcom/ichi2/anki/libanki/sched/DeckNode;->getFiltered()Z
+SPLcom/ichi2/anki/libanki/sched/DeckNode;->getFullDeckName()Ljava/lang/String;
+SPLcom/ichi2/anki/libanki/sched/DeckNode;->getLastDeckNameComponent()Ljava/lang/String;
+SPLcom/ichi2/anki/libanki/sched/DeckNode;->getLrnCount()I
+SPLcom/ichi2/anki/libanki/sched/DeckNode;->getNewCount()I
+SPLcom/ichi2/anki/libanki/sched/DeckNode;->getParent()Ljava/lang/ref/WeakReference;
+SPLcom/ichi2/anki/libanki/sched/DeckNode;->getRevCount()I
+SPLcom/ichi2/anki/libanki/sched/DeckNode;->isSyntheticDeck()Z
+SPLcom/ichi2/anki/libanki/sched/DeckNode;->totalCardsDue()I
+Lcom/ichi2/anki/libanki/sched/Scheduler;
+SPLcom/ichi2/anki/libanki/sched/Scheduler;-><init>(Lcom/ichi2/anki/libanki/Collection;)V
+SPLcom/ichi2/anki/libanki/sched/Scheduler;->deckDueTree()Lcom/ichi2/anki/libanki/sched/DeckNode;
+SPLcom/ichi2/anki/libanki/sched/Scheduler;->deckTree(Z)Lcom/ichi2/anki/libanki/sched/DeckNode;
+SPLcom/ichi2/anki/libanki/sched/Scheduler;->getDayCutoff()J
+SPLcom/ichi2/anki/libanki/sched/Scheduler;->studiedToday()Ljava/lang/String;
+SPLcom/ichi2/anki/libanki/sched/Scheduler;->timingToday()Lanki/scheduler/SchedTimingTodayResponse;
+Lcom/ichi2/anki/libanki/utils/PythonExtensionsKt;
+SPLcom/ichi2/anki/libanki/utils/PythonExtensionsKt;->append(Ljava/util/List;Ljava/lang/Object;)V
+SPLcom/ichi2/anki/libanki/utils/PythonExtensionsKt;->len(Ljava/util/List;)I
+Lcom/ichi2/anki/logging/ActivityLaunchLoggerKt;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;-><clinit>()V
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->logActivityCreation$lambda$2(Landroid/content/Intent;)Ljava/lang/Object;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->logActivityCreation$lambda$3(Landroid/content/Intent;)Ljava/lang/Object;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->logActivityCreation$lambda$4(Landroid/app/Activity;)Ljava/lang/Object;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->logActivityCreation$lambda$5(Landroid/app/Activity;)Ljava/lang/Object;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->logActivityCreation$lambda$6(Landroid/app/Activity;)Ljava/lang/Object;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->logActivityCreation$lambda$7(Landroid/os/Bundle;)Ljava/lang/Object;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->logActivityCreation(Landroid/app/Activity;Landroid/os/Bundle;)V
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->readSafely(Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt;->summarizeNames(Ljava/util/Set;Ljava/util/Set;)Ljava/util/Map;
+Lcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda1;-><init>(Landroid/content/Intent;)V
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda1;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda2;-><init>(Landroid/content/Intent;)V
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda2;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda3;-><init>(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda3;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda4;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda4;-><init>(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda4;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda5;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda5;-><init>(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda5;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda6;
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda6;-><init>(Landroid/os/Bundle;)V
+SPLcom/ichi2/anki/logging/ActivityLaunchLoggerKt$$ExternalSyntheticLambda6;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/logging/FragmentLifecycleLogger;
+SPLcom/ichi2/anki/logging/FragmentLifecycleLogger;-><clinit>()V
+SPLcom/ichi2/anki/logging/FragmentLifecycleLogger;-><init>(Landroid/app/Activity;)V
+Lcom/ichi2/anki/logging/LogType;
+SPLcom/ichi2/anki/logging/LogType;->$values()[Lcom/ichi2/anki/logging/LogType;
+SPLcom/ichi2/anki/logging/LogType;-><clinit>()V
+SPLcom/ichi2/anki/logging/LogType;-><init>(Ljava/lang/String;I)V
+SPLcom/ichi2/anki/logging/LogType;->values()[Lcom/ichi2/anki/logging/LogType;
+Lcom/ichi2/anki/logging/LogType$Companion;
+SPLcom/ichi2/anki/logging/LogType$Companion;-><init>()V
+SPLcom/ichi2/anki/logging/LogType$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/logging/LogType$Companion;->getValue()Lcom/ichi2/anki/logging/LogType;
+Lcom/ichi2/anki/logging/ProductionCrashReportingTree;
+SPLcom/ichi2/anki/logging/ProductionCrashReportingTree;-><clinit>()V
+SPLcom/ichi2/anki/logging/ProductionCrashReportingTree;-><init>()V
+PLcom/ichi2/anki/logging/ProductionCrashReportingTree;->createStackElementTag(Ljava/lang/StackTraceElement;)Ljava/lang/String;
+PLcom/ichi2/anki/logging/ProductionCrashReportingTree;->getTag()Ljava/lang/String;
+SPLcom/ichi2/anki/logging/ProductionCrashReportingTree;->log(ILjava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+Lcom/ichi2/anki/logging/ProductionCrashReportingTree$Companion;
+SPLcom/ichi2/anki/logging/ProductionCrashReportingTree$Companion;-><init>()V
+SPLcom/ichi2/anki/logging/ProductionCrashReportingTree$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/logging/TimberLogger;
+SPLcom/ichi2/anki/logging/TimberLogger;-><init>(Ljava/lang/String;)V
+SPLcom/ichi2/anki/logging/TimberLogger;->handleNormalizedLoggingCall(Lorg/slf4j/event/Level;Lorg/slf4j/Marker;Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/Throwable;)V
+SPLcom/ichi2/anki/logging/TimberLogger;->isDebugEnabled()Z
+SPLcom/ichi2/anki/logging/TimberLogger;->isInfoEnabled()Z
+Lcom/ichi2/anki/logging/TimberLoggerFactory;
+SPLcom/ichi2/anki/logging/TimberLoggerFactory;-><init>()V
+SPLcom/ichi2/anki/logging/TimberLoggerFactory;->getLogger$lambda$0(Ljava/lang/String;)Lorg/slf4j/Logger;
+SPLcom/ichi2/anki/logging/TimberLoggerFactory;->getLogger$lambda$1(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Lorg/slf4j/Logger;
+SPLcom/ichi2/anki/logging/TimberLoggerFactory;->getLogger(Ljava/lang/String;)Lorg/slf4j/Logger;
+Lcom/ichi2/anki/logging/TimberLoggerFactory$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/logging/TimberLoggerFactory$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/logging/TimberLoggerFactory$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/logging/TimberLoggerFactory$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/logging/TimberLoggerFactory$$ExternalSyntheticLambda1;-><init>(Lkotlin/jvm/functions/Function1;)V
+SPLcom/ichi2/anki/logging/TimberLoggerFactory$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/logging/TimberServiceProvider;
+SPLcom/ichi2/anki/logging/TimberServiceProvider;-><clinit>()V
+SPLcom/ichi2/anki/logging/TimberServiceProvider;-><init>()V
+SPLcom/ichi2/anki/logging/TimberServiceProvider;->getLoggerFactory()Lorg/slf4j/ILoggerFactory;
+SPLcom/ichi2/anki/logging/TimberServiceProvider;->getMDCAdapter()Lorg/slf4j/spi/MDCAdapter;
+SPLcom/ichi2/anki/logging/TimberServiceProvider;->getRequestedApiVersion()Ljava/lang/String;
+SPLcom/ichi2/anki/logging/TimberServiceProvider;->initialize()V
+Lcom/ichi2/anki/logging/TimberServiceProviderKt;
+SPLcom/ichi2/anki/logging/TimberServiceProviderKt;->access$getPriority(Lorg/slf4j/event/Level;)I
+SPLcom/ichi2/anki/logging/TimberServiceProviderKt;->getPriority(Lorg/slf4j/event/Level;)I
+Lcom/ichi2/anki/logging/TimberServiceProviderKt$WhenMappings;
+SPLcom/ichi2/anki/logging/TimberServiceProviderKt$WhenMappings;-><clinit>()V
+Lcom/ichi2/anki/model/FieldFilter;
+Lcom/ichi2/anki/model/FieldFilters$NoSuggestFilter;
+SPLcom/ichi2/anki/model/FieldFilters$NoSuggestFilter;-><clinit>()V
+SPLcom/ichi2/anki/model/FieldFilters$NoSuggestFilter;-><init>()V
+SPLcom/ichi2/anki/model/FieldFilters$NoSuggestFilter;->ensureApplied()V
+SPLcom/ichi2/anki/model/FieldFilters$NoSuggestFilter;->getName()Ljava/lang/String;
+Lcom/ichi2/anki/multimedia/MultimediaArgsStorage;
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage;-><clinit>()V
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage;-><init>(Ljava/io/File;)V
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage;-><init>(Ljava/io/File;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage;->removeExpiredFiles$default(Lcom/ichi2/anki/multimedia/MultimediaArgsStorage;JILjava/lang/Object;)V
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage;->removeExpiredFiles$lambda$0(Ljava/io/File;Ljava/lang/String;)Z
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage;->removeExpiredFiles(J)V
+Lcom/ichi2/anki/multimedia/MultimediaArgsStorage$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage$$ExternalSyntheticLambda0;->accept(Ljava/io/File;Ljava/lang/String;)Z
+Lcom/ichi2/anki/multimedia/MultimediaArgsStorage$Companion;
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage$Companion;-><init>()V
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/multimedia/MultimediaArgsStorage$Companion;->create(Landroid/content/Context;)Lcom/ichi2/anki/multimedia/MultimediaArgsStorage;
+Lcom/ichi2/anki/multiprofile/AppRestartKt;
+SPLcom/ichi2/anki/multiprofile/AppRestartKt;->currentProcessName()Ljava/lang/String;
+SPLcom/ichi2/anki/multiprofile/AppRestartKt;->isPhoenixProcess()Z
+SPLcom/ichi2/anki/multiprofile/AppRestartKt;->isPhoenixProcessName(Ljava/lang/String;)Z
+Lcom/ichi2/anki/multiprofile/ProfileContextWrapper;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;-><clinit>()V
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;-><init>(Landroid/content/Context;Ljava/lang/String;Ljava/io/File;)V
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;-><init>(Landroid/content/Context;Ljava/lang/String;Ljava/io/File;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->access$requireCustomDirectories(Lcom/ichi2/anki/multiprofile/ProfileContextWrapper;)V
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->getCacheDir()Ljava/io/File;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->getDatabasePath(Ljava/lang/String;)Ljava/io/File;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->getDir(Ljava/lang/String;I)Ljava/io/File;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->getFilesDir()Ljava/io/File;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->getNoBackupFilesDir()Ljava/io/File;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->getProfileId-evi8WI0()Ljava/lang/String;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->getSharedPreferences(Ljava/lang/String;I)Landroid/content/SharedPreferences;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper;->requireCustomDirectories()V
+Lcom/ichi2/anki/multiprofile/ProfileContextWrapper$Companion;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper$Companion;-><init>()V
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper$Companion;->create-vKkjgeQ(Landroid/content/Context;Ljava/lang/String;Ljava/io/File;)Lcom/ichi2/anki/multiprofile/ProfileContextWrapper;
+SPLcom/ichi2/anki/multiprofile/ProfileContextWrapper$Companion;->requirePathInFilesDir(Ljava/io/File;Landroid/content/Context;)V
+Lcom/ichi2/anki/multiprofile/ProfileId;
+SPLcom/ichi2/anki/multiprofile/ProfileId;-><clinit>()V
+SPLcom/ichi2/anki/multiprofile/ProfileId;->constructor-impl(Ljava/lang/String;)Ljava/lang/String;
+SPLcom/ichi2/anki/multiprofile/ProfileId;->equals-impl0(Ljava/lang/String;Ljava/lang/String;)Z
+SPLcom/ichi2/anki/multiprofile/ProfileId;->isDefault-impl(Ljava/lang/String;)Z
+SPLcom/ichi2/anki/multiprofile/ProfileId;->toString-impl(Ljava/lang/String;)Ljava/lang/String;
+Lcom/ichi2/anki/multiprofile/ProfileId$Companion;
+SPLcom/ichi2/anki/multiprofile/ProfileId$Companion;-><init>()V
+SPLcom/ichi2/anki/multiprofile/ProfileId$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/multiprofile/ProfileManager;
+SPLcom/ichi2/anki/multiprofile/ProfileManager;-><clinit>()V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;-><init>(Landroid/content/Context;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;-><init>(Landroid/content/Context;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->access$getAttachError$cp()Ljava/lang/Throwable;
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->access$initializeActiveProfile(Lcom/ichi2/anki/multiprofile/ProfileManager;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->access$setAttachError$cp(Ljava/lang/Throwable;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->configureWebView-eoBvq2w(Ljava/lang/String;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->ensureProfileCollectionPath(Lcom/ichi2/anki/multiprofile/ProfileContextWrapper;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->getActiveProfileContext()Landroid/content/Context;
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->getGlobalProfilePrefs()Landroid/content/SharedPreferences;
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->getProfileRegistry()Lcom/ichi2/anki/multiprofile/ProfileManager$ProfileRegistry;
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->globalProfilePrefs_delegate$lambda$0(Lcom/ichi2/anki/multiprofile/ProfileManager;)Landroid/content/SharedPreferences;
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->initializeActiveProfile()V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->loadProfileData-eoBvq2w(Ljava/lang/String;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->profileRegistry_delegate$lambda$0(Lcom/ichi2/anki/multiprofile/ProfileManager;)Lcom/ichi2/anki/multiprofile/ProfileManager$ProfileRegistry;
+SPLcom/ichi2/anki/multiprofile/ProfileManager;->resolveProfileDirectory-TRoClbo(Ljava/lang/String;)Ljava/io/File;
+Lcom/ichi2/anki/multiprofile/ProfileManager$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/multiprofile/ProfileManager$$ExternalSyntheticLambda3;-><init>(Lcom/ichi2/anki/multiprofile/ProfileManager;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager$$ExternalSyntheticLambda3;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/multiprofile/ProfileManager$$ExternalSyntheticLambda4;
+SPLcom/ichi2/anki/multiprofile/ProfileManager$$ExternalSyntheticLambda4;-><init>(Lcom/ichi2/anki/multiprofile/ProfileManager;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager$$ExternalSyntheticLambda4;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/multiprofile/ProfileManager$Companion;
+SPLcom/ichi2/anki/multiprofile/ProfileManager$Companion;-><init>()V
+SPLcom/ichi2/anki/multiprofile/ProfileManager$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager$Companion;->create(Landroid/content/Context;)Lcom/ichi2/anki/multiprofile/ProfileManager;
+SPLcom/ichi2/anki/multiprofile/ProfileManager$Companion;->createOrNull(Landroid/content/Context;)Lcom/ichi2/anki/multiprofile/ProfileManager;
+SPLcom/ichi2/anki/multiprofile/ProfileManager$Companion;->getAttachError()Ljava/lang/Throwable;
+Lcom/ichi2/anki/multiprofile/ProfileManager$ProfileRegistry;
+SPLcom/ichi2/anki/multiprofile/ProfileManager$ProfileRegistry;-><init>(Landroid/content/SharedPreferences;)V
+SPLcom/ichi2/anki/multiprofile/ProfileManager$ProfileRegistry;->getLastActiveProfileId-K_c7ANI()Ljava/lang/String;
+Lcom/ichi2/anki/multiprofile/ProfileRestrictedDirectory;
+SPLcom/ichi2/anki/multiprofile/ProfileRestrictedDirectory;->constructor-impl(Ljava/io/File;)Ljava/io/File;
+Lcom/ichi2/anki/navigation/AnkiDroidNavigator;
+SPLcom/ichi2/anki/navigation/AnkiDroidNavigator;-><clinit>()V
+SPLcom/ichi2/anki/navigation/AnkiDroidNavigator;-><init>()V
+SPLcom/ichi2/anki/navigation/AnkiDroidNavigator;->initialize(Landroid/app/Application;)V
+SPLcom/ichi2/anki/navigation/AnkiDroidNavigator;->toIntent(Lcom/ichi2/anki/common/destinations/Destination;)Landroid/content/Intent;
+Lcom/ichi2/anki/navigation/AnkiDroidNavigatorKt;
+SPLcom/ichi2/anki/navigation/AnkiDroidNavigatorKt;->initializeNavigator(Landroid/app/Application;)V
+Lcom/ichi2/anki/noteeditor/NoteEditorDestinationKt;
+SPLcom/ichi2/anki/noteeditor/NoteEditorDestinationKt;->toIntent(Lcom/ichi2/anki/common/destinations/NoteEditorDestination;Landroid/content/Context;)Landroid/content/Intent;
+Lcom/ichi2/anki/noteeditor/NoteEditorFragmentDelegate;
+Lcom/ichi2/anki/observability/ChangeManager;
+SPLcom/ichi2/anki/observability/ChangeManager;-><clinit>()V
+SPLcom/ichi2/anki/observability/ChangeManager;-><init>()V
+SPLcom/ichi2/anki/observability/ChangeManager;->access$getSubscribers$p()Ljava/util/concurrent/CopyOnWriteArrayList;
+SPLcom/ichi2/anki/observability/ChangeManager;->setThrowOnDuplicateSubscription(Z)V
+SPLcom/ichi2/anki/observability/ChangeManager;->subscribe$default(Lcom/ichi2/anki/observability/ChangeManager;Lcom/ichi2/anki/observability/ChangeManager$Subscriber;Landroidx/lifecycle/LifecycleOwner;ILjava/lang/Object;)V
+SPLcom/ichi2/anki/observability/ChangeManager;->subscribe(Lcom/ichi2/anki/observability/ChangeManager$Subscriber;Landroidx/lifecycle/LifecycleOwner;)V
+Lcom/ichi2/anki/observability/ChangeManager$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/observability/ChangeManager$$ExternalSyntheticLambda0;-><init>()V
+Lcom/ichi2/anki/observability/ChangeManager$Subscriber;
+Lcom/ichi2/anki/observability/ChangeManager$subscribe$2;
+SPLcom/ichi2/anki/observability/ChangeManager$subscribe$2;-><init>(Ljava/lang/ref/WeakReference;Lcom/ichi2/anki/observability/ChangeManager$Subscriber;)V
+SPLcom/ichi2/anki/observability/ChangeManager$subscribe$2;->onCreate(Landroidx/lifecycle/LifecycleOwner;)V
+SPLcom/ichi2/anki/observability/ChangeManager$subscribe$2;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
+SPLcom/ichi2/anki/observability/ChangeManager$subscribe$2;->onStart(Landroidx/lifecycle/LifecycleOwner;)V
+Lcom/ichi2/anki/observability/OpChangesPublisher;
+SPLcom/ichi2/anki/observability/OpChangesPublisher;-><clinit>()V
+SPLcom/ichi2/anki/observability/OpChangesPublisher;-><init>(Lkotlin/jvm/functions/Function2;)V
+Lcom/ichi2/anki/pages/PostRequestHandler;
+Lcom/ichi2/anki/preferences/SharedPreferencesProvider;
+Lcom/ichi2/anki/progress/HasProgress;
+Lcom/ichi2/anki/progress/ProgressManager;
+SPLcom/ichi2/anki/progress/ProgressManager;-><clinit>()V
+SPLcom/ichi2/anki/progress/ProgressManager;-><init>()V
+SPLcom/ichi2/anki/progress/ProgressManager;->getProgress()Lkotlinx/coroutines/flow/StateFlow;
+Lcom/ichi2/anki/progress/ProgressObserverKt;
+SPLcom/ichi2/anki/progress/ProgressObserverKt;-><clinit>()V
+SPLcom/ichi2/anki/progress/ProgressObserverKt;->access$observeProgress_exY8QGI$unblockInput(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/ichi2/anki/AnkiActivity;)V
+SPLcom/ichi2/anki/progress/ProgressObserverKt;->blockTouches(Landroid/view/Window;)V
+SPLcom/ichi2/anki/progress/ProgressObserverKt;->observeProgress-exY8QGI$default(Lcom/ichi2/anki/AnkiActivity;Lcom/ichi2/anki/progress/HasProgress;JLkotlin/jvm/functions/Function2;ILjava/lang/Object;)V
+SPLcom/ichi2/anki/progress/ProgressObserverKt;->observeProgress-exY8QGI(Lcom/ichi2/anki/AnkiActivity;Lcom/ichi2/anki/progress/HasProgress;JLkotlin/jvm/functions/Function2;)V
+SPLcom/ichi2/anki/progress/ProgressObserverKt;->observeProgress_exY8QGI$unblockInput(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/ichi2/anki/AnkiActivity;)V
+SPLcom/ichi2/anki/progress/ProgressObserverKt;->unblockTouches(Landroid/view/Window;)V
+Lcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1;
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1;-><init>(Lcom/ichi2/anki/AnkiActivity;Lcom/ichi2/anki/progress/HasProgress;Lkotlin/jvm/internal/Ref$BooleanRef;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/internal/Ref$ObjectRef;JLkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1;
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1;-><init>(Lcom/ichi2/anki/progress/HasProgress;Lkotlin/jvm/internal/Ref$BooleanRef;Lcom/ichi2/anki/AnkiActivity;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/internal/Ref$ObjectRef;JLkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1$1;
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$BooleanRef;Lcom/ichi2/anki/AnkiActivity;Ljava/lang/String;Lkotlin/jvm/functions/Function2;Lcom/ichi2/anki/progress/HasProgress;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/internal/Ref$ObjectRef;J)V
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1$1;->emit(Lcom/ichi2/anki/progress/ViewModelProgress;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/progress/ProgressObserverKt$observeProgress$1$1$1;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/progress/ViewModelProgress;
+Lcom/ichi2/anki/progress/ViewModelProgress$Idle;
+SPLcom/ichi2/anki/progress/ViewModelProgress$Idle;-><clinit>()V
+SPLcom/ichi2/anki/progress/ViewModelProgress$Idle;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider;
+SPLcom/ichi2/anki/provider/CardContentProvider;-><clinit>()V
+SPLcom/ichi2/anki/provider/CardContentProvider;-><init>()V
+SPLcom/ichi2/anki/provider/CardContentProvider;->_init_$addUri(Ljava/lang/String;I)V
+SPLcom/ichi2/anki/provider/CardContentProvider;->onCreate()Z
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda0;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda1;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda10;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda10;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda11;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda11;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda12;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda12;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda13;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda13;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda14;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda14;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda15;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda15;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda16;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda16;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda17;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda17;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda18;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda18;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda19;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda19;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda2;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda21;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda21;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda22;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda22;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda23;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda23;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda24;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda24;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda25;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda25;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda26;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda26;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda27;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda27;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda28;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda28;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda3;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda4;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda4;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda5;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda5;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda6;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda6;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda7;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda7;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda8;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda8;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda9;
+SPLcom/ichi2/anki/provider/CardContentProvider$$ExternalSyntheticLambda9;-><init>()V
+Lcom/ichi2/anki/provider/CardContentProvider$Companion;
+SPLcom/ichi2/anki/provider/CardContentProvider$Companion;-><init>()V
+SPLcom/ichi2/anki/provider/CardContentProvider$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/provider/ContentProviderStartup;
+SPLcom/ichi2/anki/provider/ContentProviderStartup;-><clinit>()V
+SPLcom/ichi2/anki/provider/ContentProviderStartup;-><init>()V
+SPLcom/ichi2/anki/provider/ContentProviderStartup;->onProviderCreate$lambda$0(Lcom/ichi2/anki/provider/ContentProviderStartup;)V
+SPLcom/ichi2/anki/provider/ContentProviderStartup;->onProviderCreate()V
+Lcom/ichi2/anki/provider/ContentProviderStartup$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/provider/ContentProviderStartup$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/provider/ContentProviderStartup;)V
+SPLcom/ichi2/anki/provider/ContentProviderStartup$$ExternalSyntheticLambda0;->run()V
+Lcom/ichi2/anki/recorder/VoiceRecorder;
+SPLcom/ichi2/anki/recorder/VoiceRecorder;-><clinit>()V
+SPLcom/ichi2/anki/recorder/VoiceRecorder;->access$getRECORDING_RETENTION$cp()J
+Lcom/ichi2/anki/recorder/VoiceRecorder$Companion;
+SPLcom/ichi2/anki/recorder/VoiceRecorder$Companion;-><init>()V
+SPLcom/ichi2/anki/recorder/VoiceRecorder$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/recorder/VoiceRecorder$Companion;->recordingsDirectory(Landroid/content/Context;)Ljava/io/File;
+SPLcom/ichi2/anki/recorder/VoiceRecorder$Companion;->removeExpiredRecordings$default(Lcom/ichi2/anki/recorder/VoiceRecorder$Companion;Ljava/io/File;JILjava/lang/Object;)V
+SPLcom/ichi2/anki/recorder/VoiceRecorder$Companion;->removeExpiredRecordings(Ljava/io/File;J)V
+Lcom/ichi2/anki/recorder/VoiceRecorder$Companion$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/recorder/VoiceRecorder$Companion$$ExternalSyntheticLambda0;-><init>()V
+Lcom/ichi2/anki/reviewer/AutomaticAnswer$AutomaticallyAnswered;
+Lcom/ichi2/anki/reviewer/BindingProcessor;
+Lcom/ichi2/anki/reviewer/ReviewerUi;
+Lcom/ichi2/anki/reviewreminders/ReminderLogTree;
+SPLcom/ichi2/anki/reviewreminders/ReminderLogTree;-><clinit>()V
+SPLcom/ichi2/anki/reviewreminders/ReminderLogTree;-><init>(Landroid/content/Context;)V
+SPLcom/ichi2/anki/reviewreminders/ReminderLogTree;->isLoggable(Ljava/lang/String;I)Z
+SPLcom/ichi2/anki/reviewreminders/ReminderLogTree;->log(ILjava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+Lcom/ichi2/anki/reviewreminders/ReminderLogTree$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/reviewreminders/ReminderLogTree$$ExternalSyntheticLambda0;-><init>()V
+Lcom/ichi2/anki/reviewreminders/ReminderLogTree$Companion;
+SPLcom/ichi2/anki/reviewreminders/ReminderLogTree$Companion;-><init>()V
+SPLcom/ichi2/anki/reviewreminders/ReminderLogTree$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/reviewreminders/ReviewReminder;
+Lcom/ichi2/anki/reviewreminders/ReviewReminderSchema;
+Lcom/ichi2/anki/reviewreminders/ReviewReminderSchemaV1;
+Lcom/ichi2/anki/reviewreminders/ReviewReminderSchemaV2;
+Lcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion;
+SPLcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion;-><clinit>()V
+SPLcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion;-><init>(I)V
+SPLcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion;->box-impl(I)Lcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion;
+SPLcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion;->constructor-impl(I)I
+SPLcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion;->hashCode()I
+SPLcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion;->hashCode-impl(I)I
+Lcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion$Companion;
+SPLcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion$Companion;-><init>()V
+SPLcom/ichi2/anki/reviewreminders/ReviewReminderSchemaVersion$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/reviewreminders/ReviewRemindersDatabase;
+SPLcom/ichi2/anki/reviewreminders/ReviewRemindersDatabase;-><clinit>()V
+SPLcom/ichi2/anki/reviewreminders/ReviewRemindersDatabase;-><init>()V
+SPLcom/ichi2/anki/reviewreminders/ReviewRemindersDatabase;->checkDeserializationErrors(Landroid/content/Context;)V
+Lcom/ichi2/anki/servicelayer/DebugInfoService;
+SPLcom/ichi2/anki/servicelayer/DebugInfoService;-><clinit>()V
+SPLcom/ichi2/anki/servicelayer/DebugInfoService;-><init>()V
+SPLcom/ichi2/anki/servicelayer/DebugInfoService;->getDebugInfo(Landroid/content/Context;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/servicelayer/DebugInfoService;->isSendingCrashReports(Landroid/content/Context;)Z
+Lcom/ichi2/anki/servicelayer/DebugInfoService$getDebugInfo$1;
+SPLcom/ichi2/anki/servicelayer/DebugInfoService$getDebugInfo$1;-><init>(Lcom/ichi2/anki/servicelayer/DebugInfoService;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/servicelayer/DebugInfoService$getDebugInfo$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/servicelayer/DebugInfoServiceKt;
+SPLcom/ichi2/anki/servicelayer/DebugInfoServiceKt;->getFSRSStatus$lambda$0(Lcom/ichi2/anki/libanki/Collection;)Ljava/lang/Boolean;
+SPLcom/ichi2/anki/servicelayer/DebugInfoServiceKt;->getFSRSStatus(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/servicelayer/DebugInfoServiceKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/servicelayer/DebugInfoServiceKt$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/servicelayer/DebugInfoServiceKt$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/servicelayer/DebugInfoServiceKt$getFSRSStatus$1;
+SPLcom/ichi2/anki/servicelayer/DebugInfoServiceKt$getFSRSStatus$1;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/servicelayer/DebugInfoServiceKt$getFSRSStatus$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/servicelayer/ThrowableFilterService;
+SPLcom/ichi2/anki/servicelayer/ThrowableFilterService;-><clinit>()V
+SPLcom/ichi2/anki/servicelayer/ThrowableFilterService;-><init>()V
+SPLcom/ichi2/anki/servicelayer/ThrowableFilterService;->initialize()V
+SPLcom/ichi2/anki/servicelayer/ThrowableFilterService;->installDefaultExceptionHandler()V
+Lcom/ichi2/anki/servicelayer/ThrowableFilterService$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/servicelayer/ThrowableFilterService$$ExternalSyntheticLambda0;-><init>()V
+Lcom/ichi2/anki/servicelayer/ThrowableFilterService$FilteringExceptionHandler;
+Lcom/ichi2/anki/services/BootService;
+SPLcom/ichi2/anki/services/BootService;-><clinit>()V
+SPLcom/ichi2/anki/services/BootService;-><init>()V
+SPLcom/ichi2/anki/services/BootService;->catchAlarmManagerErrors(Landroid/content/Context;Ljava/lang/Runnable;)V
+SPLcom/ichi2/anki/services/BootService;->getColSafe()Lcom/ichi2/anki/libanki/Collection;
+SPLcom/ichi2/anki/services/BootService;->onReceiveBroadcast$lambda$1(Landroid/content/Context;)V
+SPLcom/ichi2/anki/services/BootService;->onReceiveBroadcast(Landroid/content/Context;Landroid/content/Intent;)V
+Lcom/ichi2/anki/services/BootService$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/services/BootService$$ExternalSyntheticLambda0;-><init>(Landroid/content/Context;)V
+SPLcom/ichi2/anki/services/BootService$$ExternalSyntheticLambda0;->run()V
+Lcom/ichi2/anki/services/BootService$Companion;
+SPLcom/ichi2/anki/services/BootService$Companion;-><init>()V
+SPLcom/ichi2/anki/services/BootService$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/services/BootService$Companion;->scheduleNotification(Lcom/ichi2/anki/common/time/Time;Landroid/content/Context;)V
+Lcom/ichi2/anki/settings/Prefs;
+SPLcom/ichi2/anki/settings/Prefs;-><clinit>()V
+SPLcom/ichi2/anki/settings/Prefs;-><init>()V
+Lcom/ichi2/anki/settings/PrefsRepository;
+SPLcom/ichi2/anki/settings/PrefsRepository;-><clinit>()V
+SPLcom/ichi2/anki/settings/PrefsRepository;-><init>(Landroid/content/Context;)V
+SPLcom/ichi2/anki/settings/PrefsRepository;-><init>(Landroid/content/SharedPreferences;Landroid/content/res/Resources;)V
+SPLcom/ichi2/anki/settings/PrefsRepository;-><init>(Lcom/ichi2/anki/preferences/SharedPreferencesProvider;Landroid/content/res/Resources;)V
+SPLcom/ichi2/anki/settings/PrefsRepository;->_init_$lambda$0(Landroid/content/SharedPreferences;)Landroid/content/SharedPreferences;
+SPLcom/ichi2/anki/settings/PrefsRepository;->booleanPref(IZ)Lkotlin/properties/ReadWriteProperty;
+SPLcom/ichi2/anki/settings/PrefsRepository;->booleanPref(Ljava/lang/String;Z)Lkotlin/properties/ReadWriteProperty;
+SPLcom/ichi2/anki/settings/PrefsRepository;->enumPref(ILjava/lang/Enum;)Lkotlin/properties/ReadWriteProperty;
+SPLcom/ichi2/anki/settings/PrefsRepository;->getAppTheme()Lcom/ichi2/anki/settings/enums/AppTheme;
+SPLcom/ichi2/anki/settings/PrefsRepository;->getBoolean(IZ)Z
+SPLcom/ichi2/anki/settings/PrefsRepository;->getCurrentSyncUri()Ljava/lang/String;
+SPLcom/ichi2/anki/settings/PrefsRepository;->getCustomSyncCertificate()Ljava/lang/String;
+SPLcom/ichi2/anki/settings/PrefsRepository;->getDayTheme()Lcom/ichi2/anki/settings/enums/DayTheme;
+SPLcom/ichi2/anki/settings/PrefsRepository;->getDevBottomNavEnabled()Z
+SPLcom/ichi2/anki/settings/PrefsRepository;->getDisplaySyncStatus()Z
+SPLcom/ichi2/anki/settings/PrefsRepository;->getEnum(ILjava/lang/Enum;)Ljava/lang/Enum;
+SPLcom/ichi2/anki/settings/PrefsRepository;->getExitViaDoubleTapBack()Z
+SPLcom/ichi2/anki/settings/PrefsRepository;->getHkey()Ljava/lang/String;
+SPLcom/ichi2/anki/settings/PrefsRepository;->getNewReviewRemindersEnabled()Z
+SPLcom/ichi2/anki/settings/PrefsRepository;->getRemoveAppAnimations()Z
+SPLcom/ichi2/anki/settings/PrefsRepository;->getReviewReminderDeserializationErrors()Ljava/lang/String;
+SPLcom/ichi2/anki/settings/PrefsRepository;->getSharedPrefs()Landroid/content/SharedPreferences;
+SPLcom/ichi2/anki/settings/PrefsRepository;->getString(ILjava/lang/String;)Ljava/lang/String;
+SPLcom/ichi2/anki/settings/PrefsRepository;->intPref(II)Lkotlin/properties/ReadWriteProperty;
+SPLcom/ichi2/anki/settings/PrefsRepository;->isAutoSyncEnabled()Z
+SPLcom/ichi2/anki/settings/PrefsRepository;->isBackgroundEnabled()Z
+SPLcom/ichi2/anki/settings/PrefsRepository;->isCustomSyncEnabled()Z
+SPLcom/ichi2/anki/settings/PrefsRepository;->isNewStudyScreenEnabled()Z
+SPLcom/ichi2/anki/settings/PrefsRepository;->isWebDebugEnabled()Z
+SPLcom/ichi2/anki/settings/PrefsRepository;->key(I)Ljava/lang/String;
+SPLcom/ichi2/anki/settings/PrefsRepository;->longPref(IJ)Lkotlin/properties/ReadWriteProperty;
+SPLcom/ichi2/anki/settings/PrefsRepository;->stringPref$default(Lcom/ichi2/anki/settings/PrefsRepository;ILjava/lang/String;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty;
+SPLcom/ichi2/anki/settings/PrefsRepository;->stringPref(ILjava/lang/String;)Lkotlin/properties/ReadWriteProperty;
+Lcom/ichi2/anki/settings/PrefsRepository$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/settings/PrefsRepository$$ExternalSyntheticLambda0;-><init>(Landroid/content/SharedPreferences;)V
+SPLcom/ichi2/anki/settings/PrefsRepository$$ExternalSyntheticLambda0;->sharedPrefs()Landroid/content/SharedPreferences;
+Lcom/ichi2/anki/settings/PrefsRepository$Companion;
+SPLcom/ichi2/anki/settings/PrefsRepository$Companion;-><init>()V
+SPLcom/ichi2/anki/settings/PrefsRepository$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/settings/PrefsRepository$booleanPref$1;
+SPLcom/ichi2/anki/settings/PrefsRepository$booleanPref$1;-><init>(Lcom/ichi2/anki/settings/PrefsRepository;Ljava/lang/String;Z)V
+SPLcom/ichi2/anki/settings/PrefsRepository$booleanPref$1;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Boolean;
+SPLcom/ichi2/anki/settings/PrefsRepository$booleanPref$1;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+Lcom/ichi2/anki/settings/PrefsRepository$enumPref$1;
+SPLcom/ichi2/anki/settings/PrefsRepository$enumPref$1;-><init>(Lcom/ichi2/anki/settings/PrefsRepository;ILjava/lang/Enum;)V
+SPLcom/ichi2/anki/settings/PrefsRepository$enumPref$1;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Enum;
+SPLcom/ichi2/anki/settings/PrefsRepository$enumPref$1;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+Lcom/ichi2/anki/settings/PrefsRepository$intPref$1;
+SPLcom/ichi2/anki/settings/PrefsRepository$intPref$1;-><init>(Lcom/ichi2/anki/settings/PrefsRepository;II)V
+Lcom/ichi2/anki/settings/PrefsRepository$longPref$1;
+SPLcom/ichi2/anki/settings/PrefsRepository$longPref$1;-><init>(Lcom/ichi2/anki/settings/PrefsRepository;IJ)V
+Lcom/ichi2/anki/settings/PrefsRepository$stringPref$1;
+SPLcom/ichi2/anki/settings/PrefsRepository$stringPref$1;-><init>(Lcom/ichi2/anki/settings/PrefsRepository;ILjava/lang/String;)V
+SPLcom/ichi2/anki/settings/PrefsRepository$stringPref$1;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+SPLcom/ichi2/anki/settings/PrefsRepository$stringPref$1;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/String;
+Lcom/ichi2/anki/settings/enums/AppTheme;
+SPLcom/ichi2/anki/settings/enums/AppTheme;->$values()[Lcom/ichi2/anki/settings/enums/AppTheme;
+SPLcom/ichi2/anki/settings/enums/AppTheme;-><clinit>()V
+SPLcom/ichi2/anki/settings/enums/AppTheme;-><init>(Ljava/lang/String;II)V
+SPLcom/ichi2/anki/settings/enums/AppTheme;->getEntryResId()I
+SPLcom/ichi2/anki/settings/enums/AppTheme;->values()[Lcom/ichi2/anki/settings/enums/AppTheme;
+Lcom/ichi2/anki/settings/enums/DayTheme;
+SPLcom/ichi2/anki/settings/enums/DayTheme;->$values()[Lcom/ichi2/anki/settings/enums/DayTheme;
+SPLcom/ichi2/anki/settings/enums/DayTheme;-><clinit>()V
+SPLcom/ichi2/anki/settings/enums/DayTheme;-><init>(Ljava/lang/String;III)V
+SPLcom/ichi2/anki/settings/enums/DayTheme;->getEntryResId()I
+SPLcom/ichi2/anki/settings/enums/DayTheme;->getStyleResId()I
+SPLcom/ichi2/anki/settings/enums/DayTheme;->values()[Lcom/ichi2/anki/settings/enums/DayTheme;
+Lcom/ichi2/anki/settings/enums/FrameStyle;
+SPLcom/ichi2/anki/settings/enums/FrameStyle;->$values()[Lcom/ichi2/anki/settings/enums/FrameStyle;
+SPLcom/ichi2/anki/settings/enums/FrameStyle;-><clinit>()V
+SPLcom/ichi2/anki/settings/enums/FrameStyle;-><init>(Ljava/lang/String;II)V
+Lcom/ichi2/anki/settings/enums/HideSystemBars;
+SPLcom/ichi2/anki/settings/enums/HideSystemBars;->$values()[Lcom/ichi2/anki/settings/enums/HideSystemBars;
+SPLcom/ichi2/anki/settings/enums/HideSystemBars;-><clinit>()V
+SPLcom/ichi2/anki/settings/enums/HideSystemBars;-><init>(Ljava/lang/String;II)V
+Lcom/ichi2/anki/settings/enums/NightTheme;
+SPLcom/ichi2/anki/settings/enums/NightTheme;->$values()[Lcom/ichi2/anki/settings/enums/NightTheme;
+SPLcom/ichi2/anki/settings/enums/NightTheme;-><clinit>()V
+SPLcom/ichi2/anki/settings/enums/NightTheme;-><init>(Ljava/lang/String;III)V
+Lcom/ichi2/anki/settings/enums/PrefEnum;
+Lcom/ichi2/anki/settings/enums/Theme;
+Lcom/ichi2/anki/settings/enums/ToolbarPosition;
+SPLcom/ichi2/anki/settings/enums/ToolbarPosition;->$values()[Lcom/ichi2/anki/settings/enums/ToolbarPosition;
+SPLcom/ichi2/anki/settings/enums/ToolbarPosition;-><clinit>()V
+SPLcom/ichi2/anki/settings/enums/ToolbarPosition;-><init>(Ljava/lang/String;II)V
+Lcom/ichi2/anki/snackbar/BaseSnackbarBuilderProvider;
+Lcom/ichi2/anki/startup/BackendSetupKt;
+SPLcom/ichi2/anki/startup/BackendSetupKt;->configureBackendTemporaryDirectory(Landroid/content/Context;)V
+SPLcom/ichi2/anki/startup/BackendSetupKt;->isUsableTemporaryDirectory(Ljava/lang/String;)Z
+Lcom/ichi2/anki/startup/SetupStorageKt;
+SPLcom/ichi2/anki/startup/SetupStorageKt;->ensureCollectionPathSet(Landroid/content/Context;)V
+Lcom/ichi2/anki/ui/BottomFadeFrameLayout;
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout;-><clinit>()V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout;->dispatchDraw(Landroid/graphics/Canvas;)V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout;->setAnchorView(Landroid/view/View;)V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout;->setup(Landroid/view/Window;)V
+Lcom/ichi2/anki/ui/BottomFadeFrameLayout$Companion;
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout$Companion;-><init>()V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout$Companion;->navigationBarStyle$lambda$0(Landroid/content/res/Resources;)Z
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout$Companion;->navigationBarStyle()Landroidx/activity/SystemBarStyle;
+Lcom/ichi2/anki/ui/BottomFadeFrameLayout$Companion$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout$Companion$$ExternalSyntheticLambda0;-><init>()V
+SPLcom/ichi2/anki/ui/BottomFadeFrameLayout$Companion$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/ui/DoubleTapListener;
+SPLcom/ichi2/anki/ui/DoubleTapListener;-><clinit>()V
+SPLcom/ichi2/anki/ui/DoubleTapListener;-><init>(Landroid/content/Context;)V
+Lcom/ichi2/anki/ui/DoubleTapListener$detector$1;
+SPLcom/ichi2/anki/ui/DoubleTapListener$detector$1;-><init>(Landroid/content/Context;Lcom/ichi2/anki/ui/DoubleTapListener$detector$2;)V
+Lcom/ichi2/anki/ui/DoubleTapListener$detector$2;
+SPLcom/ichi2/anki/ui/DoubleTapListener$detector$2;-><init>(Lcom/ichi2/anki/ui/DoubleTapListener;)V
+Lcom/ichi2/anki/ui/ResizablePaneLayout;
+Lcom/ichi2/anki/ui/ResizingDivider;
+Lcom/ichi2/anki/ui/animations/ViewAnimationsKt;
+SPLcom/ichi2/anki/ui/animations/ViewAnimationsKt;->fadeIn$default(Landroid/view/View;IFLjava/lang/Runnable;ILjava/lang/Object;)Landroid/view/ViewPropertyAnimator;
+SPLcom/ichi2/anki/ui/animations/ViewAnimationsKt;->fadeIn$lambda$0(Landroid/view/View;)V
+SPLcom/ichi2/anki/ui/animations/ViewAnimationsKt;->fadeIn(Landroid/view/View;IFLjava/lang/Runnable;)Landroid/view/ViewPropertyAnimator;
+SPLcom/ichi2/anki/ui/animations/ViewAnimationsKt;->fadeOut$default(Landroid/view/View;IFLjava/lang/Runnable;ILjava/lang/Object;)Landroid/view/ViewPropertyAnimator;
+SPLcom/ichi2/anki/ui/animations/ViewAnimationsKt;->fadeOut$lambda$0(Landroid/view/View;)V
+SPLcom/ichi2/anki/ui/animations/ViewAnimationsKt;->fadeOut(Landroid/view/View;IFLjava/lang/Runnable;)Landroid/view/ViewPropertyAnimator;
+Lcom/ichi2/anki/ui/animations/ViewAnimationsKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/ui/animations/ViewAnimationsKt$$ExternalSyntheticLambda0;-><init>(Landroid/view/View;)V
+SPLcom/ichi2/anki/ui/animations/ViewAnimationsKt$$ExternalSyntheticLambda0;->run()V
+Lcom/ichi2/anki/ui/animations/ViewAnimationsKt$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/ui/animations/ViewAnimationsKt$$ExternalSyntheticLambda1;-><init>(Landroid/view/View;)V
+SPLcom/ichi2/anki/ui/animations/ViewAnimationsKt$$ExternalSyntheticLambda1;->run()V
+Lcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs;
+SPLcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs;-><clinit>()V
+SPLcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs;-><init>(Landroid/app/Application;)V
+SPLcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs;-><init>(Landroid/app/Application;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs;->access$getStartedActivityStack$p(Lcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs;)Ljava/util/List;
+SPLcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs;->access$registerCallbacks(Lcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs;)V
+SPLcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs;->registerCallbacks()V
+Lcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs$Companion;
+SPLcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs$Companion;-><init>()V
+SPLcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs$Companion;->register(Landroid/app/Application;)Lcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs;
+Lcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs$registerCallbacks$1;
+SPLcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs$registerCallbacks$1;-><init>(Lcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs;)V
+SPLcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs$registerCallbacks$1;->onActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
+SPLcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs$registerCallbacks$1;->onActivityDestroyed(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs$registerCallbacks$1;->onActivityResumed(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/ui/dialogs/ActivityAgnosticDialogs$registerCallbacks$1;->onActivityStarted(Landroid/app/Activity;)V
+Lcom/ichi2/anki/ui/dialogs/DefaultActivityLifecycleCallbacks;
+SPLcom/ichi2/anki/ui/dialogs/DefaultActivityLifecycleCallbacks;->onActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
+SPLcom/ichi2/anki/ui/dialogs/DefaultActivityLifecycleCallbacks;->onActivityDestroyed(Landroid/app/Activity;)V
+SPLcom/ichi2/anki/ui/dialogs/DefaultActivityLifecycleCallbacks;->onActivityResumed(Landroid/app/Activity;)V
+Lcom/ichi2/anki/ui/internationalization/SentenceCase;
+SPLcom/ichi2/anki/ui/internationalization/SentenceCase;-><clinit>()V
+SPLcom/ichi2/anki/ui/internationalization/SentenceCase;-><init>()V
+SPLcom/ichi2/anki/ui/internationalization/SentenceCase;->getCheckDatabase(Landroid/content/Context;)Ljava/lang/String;
+SPLcom/ichi2/anki/ui/internationalization/SentenceCase;->getCheckMediaAction(Landroid/content/Context;)Ljava/lang/String;
+SPLcom/ichi2/anki/ui/internationalization/SentenceCase;->getCreateDeck(Landroid/content/Context;)Ljava/lang/String;
+SPLcom/ichi2/anki/ui/internationalization/SentenceCase;->getEmptyCards(Landroid/content/Context;)Ljava/lang/String;
+Lcom/ichi2/anki/ui/internationalization/SentenceCaseKt;
+SPLcom/ichi2/anki/ui/internationalization/SentenceCaseKt;->getSentenceCase(Lanki/i18n/GeneratedTranslations;)Lcom/ichi2/anki/ui/internationalization/SentenceCase;
+SPLcom/ichi2/anki/ui/internationalization/SentenceCaseKt;->matchesSentenceCaseResource(Ljava/lang/String;Ljava/lang/String;)Z
+SPLcom/ichi2/anki/ui/internationalization/SentenceCaseKt;->toSentenceCase(Landroid/content/Context;Ljava/lang/String;I)Ljava/lang/String;
+SPLcom/ichi2/anki/ui/internationalization/SentenceCaseKt;->toSentenceCase(Ljava/lang/String;Landroid/content/Context;I)Ljava/lang/String;
+Lcom/ichi2/anki/ui/windows/permissions/InternetPermissionFragment;
+Lcom/ichi2/anki/ui/windows/permissions/PermissionsFragment;
+Lcom/ichi2/anki/ui/windows/permissions/PermissionsStartingAt30Fragment;
+Lcom/ichi2/anki/ui/windows/permissions/PermissionsUntil29Fragment;
+Lcom/ichi2/anki/utils/ExceptionsKt;
+SPLcom/ichi2/anki/utils/ExceptionsKt;->runWithOOMCheck(Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+Lcom/ichi2/anki/utils/MimeTypeUtils;
+SPLcom/ichi2/anki/utils/MimeTypeUtils;-><clinit>()V
+SPLcom/ichi2/anki/utils/MimeTypeUtils;-><init>()V
+SPLcom/ichi2/anki/utils/MimeTypeUtils;->getCSV_TSV_MIME_TYPES()[Ljava/lang/String;
+Lcom/ichi2/anki/utils/ext/FlowKt;
+SPLcom/ichi2/anki/utils/ext/FlowKt;->launchCollectionInLifecycleScope(Lcom/ichi2/anki/AnkiActivity;Lkotlinx/coroutines/flow/Flow;Landroidx/lifecycle/Lifecycle$State;Lkotlin/jvm/functions/Function2;)V
+SPLcom/ichi2/anki/utils/ext/FlowKt;->launchCollectionInLifecycleScope(Lcom/ichi2/anki/AnkiActivity;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;)V
+SPLcom/ichi2/anki/utils/ext/FlowKt;->launchCollectionInLifecycleScope(Lcom/ichi2/anki/AnkiActivity;Lkotlinx/coroutines/flow/StateFlow;Lkotlin/jvm/functions/Function2;)V
+Lcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2;
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2;-><init>(Lcom/ichi2/anki/AnkiActivity;Landroidx/lifecycle/Lifecycle$State;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1;
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1;-><init>(Lkotlinx/coroutines/flow/Flow;Lcom/ichi2/anki/AnkiActivity;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1$1;
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1$1;-><init>(Lcom/ichi2/anki/AnkiActivity;Lkotlin/jvm/functions/Function2;)V
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$2$1$1;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3;
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3;-><init>(Lcom/ichi2/anki/AnkiActivity;Lkotlinx/coroutines/flow/StateFlow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1;
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1;-><init>(Lkotlinx/coroutines/flow/StateFlow;Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/ichi2/anki/AnkiActivity;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1$1;
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/ichi2/anki/AnkiActivity;Lkotlin/jvm/functions/Function2;)V
+SPLcom/ichi2/anki/utils/ext/FlowKt$launchCollectionInLifecycleScope$3$1$1;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/anki/utils/ext/FragmentResultKt;
+SPLcom/ichi2/anki/utils/ext/FragmentResultKt;->setFragmentResultListener(Landroidx/fragment/app/FragmentActivity;Ljava/lang/String;Lkotlin/jvm/functions/Function2;)V
+Lcom/ichi2/anki/utils/ext/FragmentResultKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/utils/ext/FragmentResultKt$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/functions/Function2;)V
+Lcom/ichi2/anki/utils/ext/ImageViewKt;
+SPLcom/ichi2/anki/utils/ext/ImageViewKt;->setImageDrawableSafe$lambda$1(Landroid/widget/ImageView;Landroid/graphics/drawable/Drawable;)Z
+SPLcom/ichi2/anki/utils/ext/ImageViewKt;->setImageDrawableSafe(Landroid/widget/ImageView;Landroid/graphics/drawable/Drawable;Lkotlin/jvm/functions/Function1;)Z
+Lcom/ichi2/anki/utils/ext/ImageViewKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/utils/ext/ImageViewKt$$ExternalSyntheticLambda0;-><init>(Landroid/widget/ImageView;Landroid/graphics/drawable/Drawable;)V
+SPLcom/ichi2/anki/utils/ext/ImageViewKt$$ExternalSyntheticLambda0;->invoke()Ljava/lang/Object;
+Lcom/ichi2/anki/utils/ext/LinearLayoutManagerKt;
+SPLcom/ichi2/anki/utils/ext/LinearLayoutManagerKt;->getVisibleItemPositions(Landroidx/recyclerview/widget/LinearLayoutManager;)Lkotlin/ranges/IntRange;
+SPLcom/ichi2/anki/utils/ext/LinearLayoutManagerKt;->positionIsVisible(Landroidx/recyclerview/widget/LinearLayoutManager;I)Z
+Lcom/ichi2/anki/utils/ext/ViewKt;
+SPLcom/ichi2/anki/utils/ext/ViewKt;->onGlobalLayout$lambda$0(Lkotlin/jvm/functions/Function0;)V
+SPLcom/ichi2/anki/utils/ext/ViewKt;->onGlobalLayout(Landroid/view/View;Landroidx/lifecycle/LifecycleOwner;Lkotlin/jvm/functions/Function0;)V
+Lcom/ichi2/anki/utils/ext/ViewKt$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/utils/ext/ViewKt$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/functions/Function0;)V
+SPLcom/ichi2/anki/utils/ext/ViewKt$$ExternalSyntheticLambda0;->onGlobalLayout()V
+Lcom/ichi2/anki/utils/ext/ViewKt$onGlobalLayout$1;
+SPLcom/ichi2/anki/utils/ext/ViewKt$onGlobalLayout$1;-><init>(Landroid/view/View;Landroid/view/ViewTreeObserver$OnGlobalLayoutListener;)V
+SPLcom/ichi2/anki/utils/ext/ViewKt$onGlobalLayout$1;->onCreate(Landroidx/lifecycle/LifecycleOwner;)V
+SPLcom/ichi2/anki/utils/ext/ViewKt$onGlobalLayout$1;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
+SPLcom/ichi2/anki/utils/ext/ViewKt$onGlobalLayout$1;->onStart(Landroidx/lifecycle/LifecycleOwner;)V
+Lcom/ichi2/anki/widget/WidgetRegistryKt;
+SPLcom/ichi2/anki/widget/WidgetRegistryKt;-><clinit>()V
+SPLcom/ichi2/anki/widget/WidgetRegistryKt;->getRECURRING_WIDGETS()Ljava/util/List;
+Lcom/ichi2/anki/widgets/DeckAdapter;
+SPLcom/ichi2/anki/widgets/DeckAdapter;-><clinit>()V
+SPLcom/ichi2/anki/widgets/DeckAdapter;-><init>(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)V
+SPLcom/ichi2/anki/widgets/DeckAdapter;->access$setDeckExpander(Lcom/ichi2/anki/widgets/DeckAdapter;Landroid/widget/ImageButton;Landroid/widget/ImageButton;Lcom/ichi2/anki/deckpicker/DisplayDeckNode;)V
+SPLcom/ichi2/anki/widgets/DeckAdapter;->onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
+SPLcom/ichi2/anki/widgets/DeckAdapter;->onBindViewHolder(Lcom/ichi2/anki/widgets/DeckAdapter$ViewHolder;I)V
+SPLcom/ichi2/anki/widgets/DeckAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+SPLcom/ichi2/anki/widgets/DeckAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/ichi2/anki/widgets/DeckAdapter$ViewHolder;
+SPLcom/ichi2/anki/widgets/DeckAdapter;->setActivityHasBackground(Z)V
+SPLcom/ichi2/anki/widgets/DeckAdapter;->setDeckExpander(Landroid/widget/ImageButton;Landroid/widget/ImageButton;Lcom/ichi2/anki/deckpicker/DisplayDeckNode;)V
+SPLcom/ichi2/anki/widgets/DeckAdapter;->submit(Ljava/util/List;Z)V
+Lcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda0;
+SPLcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda0;-><init>(Lcom/ichi2/anki/widgets/DeckAdapter;Lcom/ichi2/anki/deckpicker/DisplayDeckNode;)V
+Lcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda1;
+SPLcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda1;-><init>(Lcom/ichi2/anki/widgets/DeckAdapter;Lcom/ichi2/anki/deckpicker/DisplayDeckNode;)V
+Lcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda2;
+SPLcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda2;-><init>(Lcom/ichi2/anki/widgets/DeckAdapter;Lcom/ichi2/anki/deckpicker/DisplayDeckNode;)V
+Lcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda3;
+SPLcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda3;-><init>(Lcom/ichi2/anki/widgets/DeckAdapter;Lcom/ichi2/anki/deckpicker/DisplayDeckNode;)V
+Lcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda4;
+SPLcom/ichi2/anki/widgets/DeckAdapter$$ExternalSyntheticLambda4;-><init>(Lcom/ichi2/anki/widgets/DeckAdapter;Lcom/ichi2/anki/deckpicker/DisplayDeckNode;)V
+Lcom/ichi2/anki/widgets/DeckAdapter$Companion;
+SPLcom/ichi2/anki/widgets/DeckAdapter$Companion;-><init>()V
+SPLcom/ichi2/anki/widgets/DeckAdapter$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/anki/widgets/DeckAdapter$ViewHolder;
+SPLcom/ichi2/anki/widgets/DeckAdapter$ViewHolder;-><clinit>()V
+SPLcom/ichi2/anki/widgets/DeckAdapter$ViewHolder;-><init>(Lcom/ichi2/anki/databinding/ItemDeckBinding;)V
+SPLcom/ichi2/anki/widgets/DeckAdapter$ViewHolder;->getBinding()Lcom/ichi2/anki/databinding/ItemDeckBinding;
+Lcom/ichi2/anki/widgets/DeckAdapter$onBindViewHolder$1;
+SPLcom/ichi2/anki/widgets/DeckAdapter$onBindViewHolder$1;-><init>(Lcom/ichi2/anki/widgets/DeckAdapter;Lcom/ichi2/anki/databinding/ItemDeckBinding;Lcom/ichi2/anki/widgets/DeckAdapter$ViewHolder;Lcom/ichi2/anki/deckpicker/DisplayDeckNode;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/anki/widgets/DeckAdapter$onBindViewHolder$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/anki/widgets/DeckAdapter$onBindViewHolder$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/anki/widgets/DeckAdapterKt;
+SPLcom/ichi2/anki/widgets/DeckAdapterKt;-><clinit>()V
+SPLcom/ichi2/anki/widgets/DeckAdapterKt;->access$getDeckNodeDiffCallback$p()Lcom/ichi2/anki/widgets/DeckAdapterKt$deckNodeDiffCallback$1;
+Lcom/ichi2/anki/widgets/DeckAdapterKt$deckNodeDiffCallback$1;
+SPLcom/ichi2/anki/widgets/DeckAdapterKt$deckNodeDiffCallback$1;-><init>()V
+Lcom/ichi2/anki/widgets/R$id;
+Lcom/ichi2/anki/widgets/R$layout;
+Lcom/ichi2/anki/workarounds/AppLoadedFromBackupWorkaround;
+SPLcom/ichi2/anki/workarounds/AppLoadedFromBackupWorkaround;-><clinit>()V
+SPLcom/ichi2/anki/workarounds/AppLoadedFromBackupWorkaround;-><init>()V
+SPLcom/ichi2/anki/workarounds/AppLoadedFromBackupWorkaround;->showedActivityFailedScreen(Landroid/app/Activity;Landroid/os/Bundle;Lkotlin/jvm/functions/Function1;)Z
+Lcom/ichi2/anki/worker/SyncWorker;
+SPLcom/ichi2/anki/worker/SyncWorker;-><clinit>()V
+Lcom/ichi2/anki/worker/SyncWorker$Companion;
+SPLcom/ichi2/anki/worker/SyncWorker$Companion;-><init>()V
+SPLcom/ichi2/anki/worker/SyncWorker$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/anki/worker/SyncWorker$Companion;->cancel(Landroid/content/Context;)V
+Lcom/ichi2/compat/customtabs/CustomTabActivityHelper;
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;-><clinit>()V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;-><init>(Lkotlinx/coroutines/CoroutineScope;Lkotlinx/coroutines/CoroutineDispatcher;)V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;-><init>(Lkotlinx/coroutines/CoroutineScope;Lkotlinx/coroutines/CoroutineDispatcher;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->access$getIoDispatcher$p(Lcom/ichi2/compat/customtabs/CustomTabActivityHelper;)Lkotlinx/coroutines/CoroutineDispatcher;
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->access$setCustomTabsSession$p(Lcom/ichi2/compat/customtabs/CustomTabActivityHelper;Landroidx/browser/customtabs/CustomTabsSession;)V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->access$warmup(Lcom/ichi2/compat/customtabs/CustomTabActivityHelper;Landroidx/browser/customtabs/CustomTabsClient;)V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->bindCustomTabsService(Landroid/app/Activity;)V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->getProviderInfo(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/String;
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->onServiceConnected(Landroidx/browser/customtabs/CustomTabsClient;)V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->onServiceDisconnected()V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper;->warmup(Landroidx/browser/customtabs/CustomTabsClient;)V
+Lcom/ichi2/compat/customtabs/CustomTabActivityHelper$Companion;
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper$Companion;-><init>()V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/compat/customtabs/CustomTabActivityHelper$onServiceConnected$1;
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper$onServiceConnected$1;-><init>(Lcom/ichi2/compat/customtabs/CustomTabActivityHelper;Landroidx/browser/customtabs/CustomTabsClient;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper$onServiceConnected$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper$onServiceConnected$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/compat/customtabs/CustomTabActivityHelper$onServiceConnected$1$1;
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper$onServiceConnected$1$1;-><init>(Lcom/ichi2/compat/customtabs/CustomTabActivityHelper;Landroidx/browser/customtabs/CustomTabsClient;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper$onServiceConnected$1$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/compat/customtabs/CustomTabActivityHelper$onServiceConnected$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/compat/customtabs/CustomTabsHelper;
+SPLcom/ichi2/compat/customtabs/CustomTabsHelper;-><clinit>()V
+SPLcom/ichi2/compat/customtabs/CustomTabsHelper;-><init>()V
+SPLcom/ichi2/compat/customtabs/CustomTabsHelper;->getPackageNameToUse$lambda$0(Landroid/content/pm/PackageManager;Landroid/content/Intent;)Landroid/content/pm/ResolveInfo;
+SPLcom/ichi2/compat/customtabs/CustomTabsHelper;->getPackageNameToUse(Landroid/content/Context;)Ljava/lang/String;
+Lcom/ichi2/compat/customtabs/CustomTabsHelper$$ExternalSyntheticLambda0;
+SPLcom/ichi2/compat/customtabs/CustomTabsHelper$$ExternalSyntheticLambda0;-><init>(Landroid/content/pm/PackageManager;Landroid/content/Intent;)V
+SPLcom/ichi2/compat/customtabs/CustomTabsHelper$$ExternalSyntheticLambda0;->invoke()Ljava/lang/Object;
+Lcom/ichi2/compat/customtabs/ServiceConnection;
+SPLcom/ichi2/compat/customtabs/ServiceConnection;-><clinit>()V
+SPLcom/ichi2/compat/customtabs/ServiceConnection;-><init>(Lcom/ichi2/compat/customtabs/ServiceConnectionCallback;)V
+SPLcom/ichi2/compat/customtabs/ServiceConnection;->onCustomTabsServiceConnected(Landroid/content/ComponentName;Landroidx/browser/customtabs/CustomTabsClient;)V
+Lcom/ichi2/compat/customtabs/ServiceConnectionCallback;
+Lcom/ichi2/themes/Themes;
+SPLcom/ichi2/themes/Themes;-><clinit>()V
+SPLcom/ichi2/themes/Themes;-><init>()V
+SPLcom/ichi2/themes/Themes;->getCurrentTheme()Lcom/ichi2/anki/settings/enums/Theme;
+SPLcom/ichi2/themes/Themes;->isNightTheme()Z
+SPLcom/ichi2/themes/Themes;->setTheme(Landroid/app/Activity;Landroid/os/Bundle;)V
+SPLcom/ichi2/themes/Themes;->setTheme(Landroid/content/Context;)V
+SPLcom/ichi2/themes/Themes;->updateCurrentTheme(Landroid/content/Context;)V
+Lcom/ichi2/themes/Themes$WhenMappings;
+SPLcom/ichi2/themes/Themes$WhenMappings;-><clinit>()V
+Lcom/ichi2/ui/AccessibleSearchView;
+SPLcom/ichi2/ui/AccessibleSearchView;-><clinit>()V
+SPLcom/ichi2/ui/AccessibleSearchView;-><init>(Landroid/content/Context;)V
+Lcom/ichi2/ui/BadgeDrawable;
+SPLcom/ichi2/ui/BadgeDrawable;-><clinit>()V
+SPLcom/ichi2/ui/BadgeDrawable;-><init>(Landroid/graphics/drawable/Drawable;)V
+SPLcom/ichi2/ui/BadgeDrawable;->draw(Landroid/graphics/Canvas;)V
+SPLcom/ichi2/ui/BadgeDrawable;->getBottom()D
+SPLcom/ichi2/ui/BadgeDrawable;->getIconScale()D
+SPLcom/ichi2/ui/BadgeDrawable;->getLeft()D
+SPLcom/ichi2/ui/BadgeDrawable;->invalidateSize()V
+SPLcom/ichi2/ui/BadgeDrawable;->isShowingText()Z
+SPLcom/ichi2/ui/BadgeDrawable;->setBadgeDrawable(Landroid/graphics/drawable/Drawable;)V
+SPLcom/ichi2/ui/BadgeDrawable;->setText(C)V
+Lcom/ichi2/ui/BadgeDrawable$Companion;
+SPLcom/ichi2/ui/BadgeDrawable$Companion;-><init>()V
+SPLcom/ichi2/ui/BadgeDrawable$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/ui/BadgeDrawableBuilder;
+SPLcom/ichi2/ui/BadgeDrawableBuilder;-><clinit>()V
+SPLcom/ichi2/ui/BadgeDrawableBuilder;-><init>(Landroid/content/Context;)V
+SPLcom/ichi2/ui/BadgeDrawableBuilder;->replaceBadge(Lcom/ichi2/anki/SyncActionProvider;)V
+SPLcom/ichi2/ui/BadgeDrawableBuilder;->withColorAttr(I)Lcom/ichi2/ui/BadgeDrawableBuilder;
+SPLcom/ichi2/ui/BadgeDrawableBuilder;->withText(C)Lcom/ichi2/ui/BadgeDrawableBuilder;
+Lcom/ichi2/ui/BadgeDrawableBuilder$Companion;
+SPLcom/ichi2/ui/BadgeDrawableBuilder$Companion;-><init>()V
+SPLcom/ichi2/ui/BadgeDrawableBuilder$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/ui/FixedTextView;
+SPLcom/ichi2/ui/FixedTextView;-><clinit>()V
+SPLcom/ichi2/ui/FixedTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+SPLcom/ichi2/ui/FixedTextView;->onDraw(Landroid/graphics/Canvas;)V
+SPLcom/ichi2/ui/FixedTextView;->onMeasure(II)V
+SPLcom/ichi2/ui/FixedTextView;->setText(Ljava/lang/CharSequence;Landroid/widget/TextView$BufferType;)V
+Lcom/ichi2/ui/RtlCompliantActionProvider;
+SPLcom/ichi2/ui/RtlCompliantActionProvider;-><clinit>()V
+Lcom/ichi2/ui/RtlCompliantActionProvider$Companion;
+SPLcom/ichi2/ui/RtlCompliantActionProvider$Companion;-><init>()V
+SPLcom/ichi2/ui/RtlCompliantActionProvider$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/ui/RtlCompliantActionProvider$Companion;->unwrapContext(Landroid/content/Context;)Landroid/app/Activity;
+Lcom/ichi2/utils/ClipboardUtil;
+SPLcom/ichi2/utils/ClipboardUtil;-><clinit>()V
+SPLcom/ichi2/utils/ClipboardUtil;-><init>()V
+SPLcom/ichi2/utils/ClipboardUtil;->getIMPORT_MIME_TYPES()[Ljava/lang/String;
+Lcom/ichi2/utils/FileUtil;
+SPLcom/ichi2/utils/FileUtil;-><clinit>()V
+SPLcom/ichi2/utils/FileUtil;-><init>()V
+SPLcom/ichi2/utils/FileUtil;->getFreeDiskSpace(Ljava/io/File;J)J
+Lcom/ichi2/utils/LanguageDebugInfo;
+SPLcom/ichi2/utils/LanguageDebugInfo;-><clinit>()V
+SPLcom/ichi2/utils/LanguageDebugInfo;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/util/List;)V
+SPLcom/ichi2/utils/LanguageDebugInfo;->getAppLocale()Ljava/lang/String;
+SPLcom/ichi2/utils/LanguageDebugInfo;->getBackendLocales()Ljava/util/List;
+SPLcom/ichi2/utils/LanguageDebugInfo;->getSystemLocale()Ljava/lang/String;
+Lcom/ichi2/utils/LanguageUtil;
+SPLcom/ichi2/utils/LanguageUtil;-><clinit>()V
+SPLcom/ichi2/utils/LanguageUtil;-><init>()V
+SPLcom/ichi2/utils/LanguageUtil;->getLocaleCompat(Landroid/content/res/Resources;)Ljava/util/Locale;
+SPLcom/ichi2/utils/LanguageUtil;->getSystemLocale()Ljava/util/Locale;
+SPLcom/ichi2/utils/LanguageUtil;->setDefaultBackendLanguages$default(Lcom/ichi2/utils/LanguageUtil;Ljava/lang/String;ILjava/lang/Object;)V
+SPLcom/ichi2/utils/LanguageUtil;->setDefaultBackendLanguages(Ljava/lang/String;)V
+Lcom/ichi2/utils/LanguageUtilKt;
+SPLcom/ichi2/utils/LanguageUtilKt;->getLanguageDebugInfo(Landroid/content/Context;)Lcom/ichi2/utils/LanguageDebugInfo;
+Lcom/ichi2/utils/Permissions;
+SPLcom/ichi2/utils/Permissions;-><clinit>()V
+SPLcom/ichi2/utils/Permissions;-><init>()V
+SPLcom/ichi2/utils/Permissions;->getAppPrivateStartupPermissions()Ljava/util/List;
+SPLcom/ichi2/utils/Permissions;->getExternalManagerStorageAccessStartupPermissions()Ljava/util/List;
+SPLcom/ichi2/utils/Permissions;->getLegacyStorageAccessStartupPermissions()Ljava/util/List;
+Lcom/ichi2/utils/VersionUtils;
+SPLcom/ichi2/utils/VersionUtils;-><clinit>()V
+SPLcom/ichi2/utils/VersionUtils;-><init>()V
+SPLcom/ichi2/utils/VersionUtils;->getApplicationInstance()Landroid/content/Context;
+SPLcom/ichi2/utils/VersionUtils;->getPkgVersionName()Ljava/lang/String;
+Lcom/ichi2/utils/ViewUtilsKt;
+SPLcom/ichi2/utils/ViewUtilsKt;->configureView(Landroid/view/View;Landroid/app/Activity;[Ljava/lang/String;Landroidx/draganddrop/DropHelper$Options;Landroidx/core/view/OnReceiveContentListener;)V
+SPLcom/ichi2/utils/ViewUtilsKt;->isRtl(Landroid/content/res/Resources;)Z
+SPLcom/ichi2/utils/ViewUtilsKt;->isRtl(Landroid/view/View;)Z
+Lcom/ichi2/utils/WebViewInfo;
+SPLcom/ichi2/utils/WebViewInfo;-><clinit>()V
+SPLcom/ichi2/utils/WebViewInfo;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)V
+SPLcom/ichi2/utils/WebViewInfo;->getPackageName()Ljava/lang/String;
+SPLcom/ichi2/utils/WebViewInfo;->getUserAgent()Ljava/lang/String;
+SPLcom/ichi2/utils/WebViewInfo;->getVersionCode()Ljava/lang/Long;
+Lcom/ichi2/utils/WebViewUtilsKt;
+SPLcom/ichi2/utils/WebViewUtilsKt;-><clinit>()V
+SPLcom/ichi2/utils/WebViewUtilsKt;->checkWebViewVersionComponents-kAAzjZc(Ljava/lang/String;Ljava/lang/String;JLjava/lang/String;I)Ljava/lang/Integer;
+SPLcom/ichi2/utils/WebViewUtilsKt;->getChromeLikeWebViewVersionIfOutdated-3O3hvnY(Landroid/content/Context;I)Ljava/lang/Integer;
+SPLcom/ichi2/utils/WebViewUtilsKt;->getWebViewInfo(Landroid/content/Context;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/utils/WebViewUtilsKt;->getWebviewUserAgent(Landroid/content/Context;)Ljava/lang/String;
+SPLcom/ichi2/utils/WebViewUtilsKt;->setWebContentsDebuggingEnabled(Z)V
+SPLcom/ichi2/utils/WebViewUtilsKt;->showDialogIfWebViewOutdated-DpGE9L0$default(Landroid/content/Context;ILkotlin/jvm/functions/Function0;ILjava/lang/Object;)Z
+SPLcom/ichi2/utils/WebViewUtilsKt;->showDialogIfWebViewOutdated-DpGE9L0(Landroid/content/Context;ILkotlin/jvm/functions/Function0;)Z
+Lcom/ichi2/utils/WebViewUtilsKt$$ExternalSyntheticLambda1;
+SPLcom/ichi2/utils/WebViewUtilsKt$$ExternalSyntheticLambda1;-><init>()V
+Lcom/ichi2/utils/WebViewUtilsKt$getWebViewInfo$2;
+SPLcom/ichi2/utils/WebViewUtilsKt$getWebViewInfo$2;-><init>(Landroid/content/Context;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/utils/WebViewUtilsKt$getWebViewInfo$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/utils/WebViewUtilsKt$getWebViewInfo$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/utils/WebViewVersion;
+SPLcom/ichi2/utils/WebViewVersion;->constructor-impl(I)I
+Lcom/ichi2/utils/WebViewVersionCode;
+SPLcom/ichi2/utils/WebViewVersionCode;->constructor-impl(J)J
+Lcom/ichi2/widget/AddNoteWidget;
+SPLcom/ichi2/widget/AddNoteWidget;-><clinit>()V
+Lcom/ichi2/widget/AddNoteWidget$Companion;
+SPLcom/ichi2/widget/AddNoteWidget$Companion;-><init>()V
+SPLcom/ichi2/widget/AddNoteWidget$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/widget/AddNoteWidget$Companion;->updateWidgets-g9s5mYc(Landroid/content/Context;Landroid/appwidget/AppWidgetManager;[I)V
+Lcom/ichi2/widget/AnalyticsWidgetProvider;
+Lcom/ichi2/widget/AnkiDroidWidgetSmall;
+Lcom/ichi2/widget/AppWidgetIds;
+SPLcom/ichi2/widget/AppWidgetIds;-><clinit>()V
+SPLcom/ichi2/widget/AppWidgetIds;->constructor-impl([I)[I
+Lcom/ichi2/widget/AppWidgetIds$Companion;
+SPLcom/ichi2/widget/AppWidgetIds$Companion;-><init>()V
+SPLcom/ichi2/widget/AppWidgetIds$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lcom/ichi2/widget/DayRolloverAlarm;
+SPLcom/ichi2/widget/DayRolloverAlarm;-><clinit>()V
+Lcom/ichi2/widget/DayRolloverAlarm$Companion;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;-><init>()V
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;->access$nextFutureCutoffMs(Lcom/ichi2/widget/DayRolloverAlarm$Companion;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;->buildPendingIntent(Landroid/content/Context;Ljava/lang/String;)Landroid/app/PendingIntent;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;->nextFutureCutoffMs$lambda$0(Lcom/ichi2/anki/libanki/Collection;)J
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;->nextFutureCutoffMs(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;->scheduleNext(Landroid/content/Context;)V
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;->scheduleNextInternal$lambda$0(JLandroid/app/PendingIntent;Landroid/app/AlarmManager;)Lkotlin/Unit;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion;->scheduleNextInternal(Landroid/content/Context;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lcom/ichi2/widget/DayRolloverAlarm$Companion$$ExternalSyntheticLambda0;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$$ExternalSyntheticLambda0;-><init>(JLandroid/app/PendingIntent;)V
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/widget/DayRolloverAlarm$Companion$$ExternalSyntheticLambda1;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$$ExternalSyntheticLambda1;-><init>()V
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/widget/DayRolloverAlarm$Companion$nextFutureCutoffMs$1;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$nextFutureCutoffMs$1;-><init>(Lcom/ichi2/widget/DayRolloverAlarm$Companion;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$nextFutureCutoffMs$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNext$1;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNext$1;-><init>(Landroid/content/Context;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNext$1;->create(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNext$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNext$1;->invoke(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNext$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNextInternal$1;
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNextInternal$1;-><init>(Lcom/ichi2/widget/DayRolloverAlarm$Companion;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/widget/DayRolloverAlarm$Companion$scheduleNextInternal$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/widget/DayRolloverAlarmKt;
+SPLcom/ichi2/widget/DayRolloverAlarmKt;->access$launchCatchingIoWithReport(Lkotlinx/coroutines/CoroutineScope;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+SPLcom/ichi2/widget/DayRolloverAlarmKt;->launchCatchingIoWithReport(Lkotlinx/coroutines/CoroutineScope;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+Lcom/ichi2/widget/DayRolloverAlarmKt$launchCatchingIoWithReport$1;
+SPLcom/ichi2/widget/DayRolloverAlarmKt$launchCatchingIoWithReport$1;-><init>(Ljava/lang/String;Lkotlin/coroutines/Continuation;)V
+Lcom/ichi2/widget/DayRolloverAlarmKt$launchCatchingIoWithReport$2;
+SPLcom/ichi2/widget/DayRolloverAlarmKt$launchCatchingIoWithReport$2;-><init>(Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)V
+SPLcom/ichi2/widget/DayRolloverAlarmKt$launchCatchingIoWithReport$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLcom/ichi2/widget/DayRolloverAlarmKt$launchCatchingIoWithReport$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLcom/ichi2/widget/DayRolloverAlarmKt$launchCatchingIoWithReport$2;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLcom/ichi2/widget/DayRolloverAlarmKt$launchCatchingIoWithReport$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lcom/ichi2/widget/IdKt;
+SPLcom/ichi2/widget/IdKt;->getAppWidgetIdsEx(Landroid/appwidget/AppWidgetManager;Landroid/content/ComponentName;)[I
+SPLcom/ichi2/widget/IdKt;->updateAppWidget-DMUWGG8(Landroid/appwidget/AppWidgetManager;[ILandroid/widget/RemoteViews;)V
+Lcom/ichi2/widget/WidgetAlarmKt;
+SPLcom/ichi2/widget/WidgetAlarmKt;->getAppWidgetIds(Landroid/appwidget/AppWidgetManager;Landroid/content/Context;Ljava/lang/Class;)Ljava/util/List;
+SPLcom/ichi2/widget/WidgetAlarmKt;->restoreRecurringAlarms(Landroid/content/Context;Ljava/util/List;)V
+Lcom/ichi2/widget/WidgetNotificationScheduler;
+SPLcom/ichi2/widget/WidgetNotificationScheduler;-><clinit>()V
+Lcom/ichi2/widget/WidgetNotificationScheduler$Companion;
+SPLcom/ichi2/widget/WidgetNotificationScheduler$Companion;-><clinit>()V
+SPLcom/ichi2/widget/WidgetNotificationScheduler$Companion;-><init>()V
+SPLcom/ichi2/widget/WidgetNotificationScheduler$Companion;->register(Lcom/ichi2/widget/WidgetNotificationScheduler;)V
+Lcom/ichi2/widget/WidgetNotificationSchedulerKt;
+SPLcom/ichi2/widget/WidgetNotificationSchedulerKt;->access$setWidgetNotificationScheduler$p(Lcom/ichi2/widget/WidgetNotificationScheduler;)V
+Lcom/ichi2/widget/WidgetPermissionReceiver;
+SPLcom/ichi2/widget/WidgetPermissionReceiver;-><init>()V
+SPLcom/ichi2/widget/WidgetPermissionReceiver;->onReceiveBroadcast(Landroid/content/Context;Landroid/content/Intent;)V
+Lcom/ichi2/widget/WidgetRepository;
+SPLcom/ichi2/widget/WidgetRepository;-><clinit>()V
+Lcom/ichi2/widget/WidgetRepository$Companion;
+SPLcom/ichi2/widget/WidgetRepository$Companion;-><clinit>()V
+SPLcom/ichi2/widget/WidgetRepository$Companion;-><init>()V
+SPLcom/ichi2/widget/WidgetRepository$Companion;->register(Lcom/ichi2/widget/WidgetRepository;)V
+Lcom/ichi2/widget/WidgetRepositoryKt;
+SPLcom/ichi2/widget/WidgetRepositoryKt;->access$setWidgetRepository$p(Lcom/ichi2/widget/WidgetRepository;)V
+Lcom/ichi2/widget/WidgetStatus;
+SPLcom/ichi2/widget/WidgetStatus;-><clinit>()V
+SPLcom/ichi2/widget/WidgetStatus;-><init>()V
+SPLcom/ichi2/widget/WidgetStatus;->register(Landroid/app/Application;Lcom/ichi2/anki/common/preferences/NotificationPreferences;Lkotlin/jvm/functions/Function1;)V
+Lcom/ichi2/widget/WidgetUtilsKt;
+SPLcom/ichi2/widget/WidgetUtilsKt;->getAppWidgetManager(Landroid/content/Context;)Landroid/appwidget/AppWidgetManager;
+Lcom/ichi2/widget/cardanalysis/CardAnalysisWidget;
+Lcom/ichi2/widget/deckpicker/DeckPickerWidget;
+Lio/github/oshai/kotlinlogging/DelegatingKLogger;
+Lio/github/oshai/kotlinlogging/KLogger;
+Lio/github/oshai/kotlinlogging/KLogger$DefaultImpls;
+SPLio/github/oshai/kotlinlogging/KLogger$DefaultImpls;->at$default(Lio/github/oshai/kotlinlogging/KLogger;Lio/github/oshai/kotlinlogging/Level;Lio/github/oshai/kotlinlogging/Marker;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+SPLio/github/oshai/kotlinlogging/KLogger$DefaultImpls;->info(Lio/github/oshai/kotlinlogging/KLogger;Lkotlin/jvm/functions/Function0;)V
+Lio/github/oshai/kotlinlogging/KLogger$info$1;
+SPLio/github/oshai/kotlinlogging/KLogger$info$1;-><init>(Lkotlin/jvm/functions/Function0;)V
+SPLio/github/oshai/kotlinlogging/KLogger$info$1;->invoke(Lio/github/oshai/kotlinlogging/KLoggingEventBuilder;)V
+SPLio/github/oshai/kotlinlogging/KLogger$info$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lio/github/oshai/kotlinlogging/KLoggingEventBuilder;
+SPLio/github/oshai/kotlinlogging/KLoggingEventBuilder;-><init>()V
+SPLio/github/oshai/kotlinlogging/KLoggingEventBuilder;->getCause()Ljava/lang/Throwable;
+SPLio/github/oshai/kotlinlogging/KLoggingEventBuilder;->getMessage()Ljava/lang/String;
+SPLio/github/oshai/kotlinlogging/KLoggingEventBuilder;->getPayload()Ljava/util/Map;
+SPLio/github/oshai/kotlinlogging/KLoggingEventBuilder;->setMessage(Ljava/lang/String;)V
+Lio/github/oshai/kotlinlogging/KotlinLogging;
+SPLio/github/oshai/kotlinlogging/KotlinLogging;-><clinit>()V
+SPLio/github/oshai/kotlinlogging/KotlinLogging;-><init>()V
+SPLio/github/oshai/kotlinlogging/KotlinLogging;->logger(Ljava/lang/String;)Lio/github/oshai/kotlinlogging/KLogger;
+SPLio/github/oshai/kotlinlogging/KotlinLogging;->logger(Lkotlin/jvm/functions/Function0;)Lio/github/oshai/kotlinlogging/KLogger;
+Lio/github/oshai/kotlinlogging/Level;
+SPLio/github/oshai/kotlinlogging/Level;->$values()[Lio/github/oshai/kotlinlogging/Level;
+SPLio/github/oshai/kotlinlogging/Level;-><clinit>()V
+SPLio/github/oshai/kotlinlogging/Level;-><init>(Ljava/lang/String;IILjava/lang/String;)V
+SPLio/github/oshai/kotlinlogging/Level;->values()[Lio/github/oshai/kotlinlogging/Level;
+Lio/github/oshai/kotlinlogging/internal/KLoggerFactory;
+SPLio/github/oshai/kotlinlogging/internal/KLoggerFactory;-><clinit>()V
+SPLio/github/oshai/kotlinlogging/internal/KLoggerFactory;-><init>()V
+SPLio/github/oshai/kotlinlogging/internal/KLoggerFactory;->logger$kotlin_logging(Ljava/lang/String;)Lio/github/oshai/kotlinlogging/KLogger;
+Lio/github/oshai/kotlinlogging/internal/KLoggerNameResolver;
+SPLio/github/oshai/kotlinlogging/internal/KLoggerNameResolver;-><clinit>()V
+SPLio/github/oshai/kotlinlogging/internal/KLoggerNameResolver;-><init>()V
+SPLio/github/oshai/kotlinlogging/internal/KLoggerNameResolver;->name$kotlin_logging(Lkotlin/jvm/functions/Function0;)Ljava/lang/String;
+Lio/github/oshai/kotlinlogging/internal/MessageInvokerKt;
+SPLio/github/oshai/kotlinlogging/internal/MessageInvokerKt;->toStringSafe(Lkotlin/jvm/functions/Function0;)Ljava/lang/String;
+Lio/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger;
+SPLio/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger;-><init>(Lorg/slf4j/Logger;)V
+SPLio/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger;->at(Lio/github/oshai/kotlinlogging/Level;Lio/github/oshai/kotlinlogging/Marker;Lkotlin/jvm/functions/Function1;)V
+SPLio/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger;->getUnderlyingLogger()Lorg/slf4j/Logger;
+SPLio/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger;->isLoggingEnabledFor(Lio/github/oshai/kotlinlogging/Level;Lio/github/oshai/kotlinlogging/Marker;)Z
+SPLio/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger;->logWithoutPayload(Lio/github/oshai/kotlinlogging/KLoggingEventBuilder;Lio/github/oshai/kotlinlogging/Level;Lio/github/oshai/kotlinlogging/Marker;)V
+Lio/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger$WhenMappings;
+SPLio/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger$WhenMappings;-><clinit>()V
+Lio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLogger;
+SPLio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLogger;-><init>()V
+SPLio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLogger;->info(Lkotlin/jvm/functions/Function0;)V
+SPLio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLogger;->isLoggingEnabledFor(Lorg/slf4j/Logger;Lio/github/oshai/kotlinlogging/Level;Lio/github/oshai/kotlinlogging/Marker;)Z
+Lio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLogger$WhenMappings;
+SPLio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLogger$WhenMappings;-><clinit>()V
+Lio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLoggerFactory;
+SPLio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLoggerFactory;-><clinit>()V
+SPLio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLoggerFactory;-><init>()V
+SPLio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLoggerFactory;->jLogger$kotlin_logging(Ljava/lang/String;)Lorg/slf4j/Logger;
+SPLio/github/oshai/kotlinlogging/slf4j/internal/Slf4jLoggerFactory;->wrapJLogger$kotlin_logging(Lorg/slf4j/Logger;)Lio/github/oshai/kotlinlogging/KLogger;
+Lj$/util/DesugarTimeZone;
+SPLj$/util/DesugarTimeZone;->getTimeZone(Ljava/lang/String;)Ljava/util/TimeZone;
+Lkotlin/Function;
+Lkotlin/InitializedLazyImpl;
+SPLkotlin/InitializedLazyImpl;-><init>(Ljava/lang/Object;)V
+Lkotlin/Lazy;
+Lkotlin/LazyKt;
+Lkotlin/LazyKt__LazyJVMKt;
+SPLkotlin/LazyKt__LazyJVMKt;->lazy(Lkotlin/LazyThreadSafetyMode;Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
+SPLkotlin/LazyKt__LazyJVMKt;->lazy(Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
+Lkotlin/LazyKt__LazyJVMKt$WhenMappings;
+SPLkotlin/LazyKt__LazyJVMKt$WhenMappings;-><clinit>()V
+Lkotlin/LazyKt__LazyKt;
+SPLkotlin/LazyKt__LazyKt;->lazyOf(Ljava/lang/Object;)Lkotlin/Lazy;
+Lkotlin/LazyThreadSafetyMode;
+SPLkotlin/LazyThreadSafetyMode;->$values()[Lkotlin/LazyThreadSafetyMode;
+SPLkotlin/LazyThreadSafetyMode;-><clinit>()V
+SPLkotlin/LazyThreadSafetyMode;-><init>(Ljava/lang/String;I)V
+SPLkotlin/LazyThreadSafetyMode;->values()[Lkotlin/LazyThreadSafetyMode;
+Lkotlin/Metadata;
+Lkotlin/NotImplementedError;
+Lkotlin/Pair;
+SPLkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+SPLkotlin/Pair;->component1()Ljava/lang/Object;
+SPLkotlin/Pair;->component2()Ljava/lang/Object;
+SPLkotlin/Pair;->getFirst()Ljava/lang/Object;
+SPLkotlin/Pair;->getSecond()Ljava/lang/Object;
+SPLkotlin/Pair;->hashCode()I
+Lkotlin/Result;
+SPLkotlin/Result;-><clinit>()V
+SPLkotlin/Result;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlin/Result;->exceptionOrNull-impl(Ljava/lang/Object;)Ljava/lang/Throwable;
+SPLkotlin/Result;->isFailure-impl(Ljava/lang/Object;)Z
+SPLkotlin/Result;->isSuccess-impl(Ljava/lang/Object;)Z
+Lkotlin/Result$Companion;
+SPLkotlin/Result$Companion;-><init>()V
+SPLkotlin/Result$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/Result$Failure;
+SPLkotlin/Result$Failure;-><init>(Ljava/lang/Throwable;)V
+Lkotlin/ResultKt;
+SPLkotlin/ResultKt;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
+SPLkotlin/ResultKt;->throwOnFailure(Ljava/lang/Object;)V
+Lkotlin/SafePublicationLazyImpl;
+SPLkotlin/SafePublicationLazyImpl;-><clinit>()V
+SPLkotlin/SafePublicationLazyImpl;-><init>(Lkotlin/jvm/functions/Function0;)V
+SPLkotlin/SafePublicationLazyImpl;->getValue()Ljava/lang/Object;
+Lkotlin/SafePublicationLazyImpl$Companion;
+SPLkotlin/SafePublicationLazyImpl$Companion;-><init>()V
+SPLkotlin/SafePublicationLazyImpl$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/SynchronizedLazyImpl;
+SPLkotlin/SynchronizedLazyImpl;-><init>(Lkotlin/jvm/functions/Function0;Ljava/lang/Object;)V
+SPLkotlin/SynchronizedLazyImpl;-><init>(Lkotlin/jvm/functions/Function0;Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlin/SynchronizedLazyImpl;->getValue()Ljava/lang/Object;
+SPLkotlin/SynchronizedLazyImpl;->isInitialized()Z
+Lkotlin/TuplesKt;
+SPLkotlin/TuplesKt;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+Lkotlin/UByte;
+SPLkotlin/UByte;-><clinit>()V
+Lkotlin/UByte$$ExternalSyntheticBackport0;
+SPLkotlin/UByte$$ExternalSyntheticBackport0;->m(JJ)I
+SPLkotlin/UByte$$ExternalSyntheticBackport0;->m(Ljava/lang/Object;)Ljava/util/List;
+SPLkotlin/UByte$$ExternalSyntheticBackport0;->m(Ljava/lang/Object;)V
+SPLkotlin/UByte$$ExternalSyntheticBackport0;->m([Ljava/lang/Object;)Ljava/util/List;
+Lkotlin/UByte$Companion;
+SPLkotlin/UByte$Companion;-><init>()V
+SPLkotlin/UByte$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/UByteArray;
+Lkotlin/UInt;
+SPLkotlin/UInt;-><clinit>()V
+Lkotlin/UInt$Companion;
+SPLkotlin/UInt$Companion;-><init>()V
+SPLkotlin/UInt$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/UIntArray;
+Lkotlin/ULong;
+SPLkotlin/ULong;-><clinit>()V
+SPLkotlin/ULong;->constructor-impl(J)J
+Lkotlin/ULong$Companion;
+SPLkotlin/ULong$Companion;-><init>()V
+SPLkotlin/ULong$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/ULongArray;
+Lkotlin/UNINITIALIZED_VALUE;
+SPLkotlin/UNINITIALIZED_VALUE;-><clinit>()V
+SPLkotlin/UNINITIALIZED_VALUE;-><init>()V
+Lkotlin/UShort;
+SPLkotlin/UShort;-><clinit>()V
+Lkotlin/UShort$Companion;
+SPLkotlin/UShort$Companion;-><init>()V
+SPLkotlin/UShort$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/UShortArray;
+Lkotlin/Unit;
+SPLkotlin/Unit;-><clinit>()V
+SPLkotlin/Unit;-><init>()V
+Lkotlin/annotation/MustBeDocumented;
+Lkotlin/annotation/Retention;
+Lkotlin/annotation/Target;
+Lkotlin/collections/AbstractCollection;
+SPLkotlin/collections/AbstractCollection;-><init>()V
+SPLkotlin/collections/AbstractCollection;->size()I
+Lkotlin/collections/AbstractList;
+SPLkotlin/collections/AbstractList;-><clinit>()V
+SPLkotlin/collections/AbstractList;-><init>()V
+SPLkotlin/collections/AbstractList;->iterator()Ljava/util/Iterator;
+Lkotlin/collections/AbstractList$Companion;
+SPLkotlin/collections/AbstractList$Companion;-><init>()V
+SPLkotlin/collections/AbstractList$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlin/collections/AbstractList$Companion;->checkElementIndex$kotlin_stdlib(II)V
+SPLkotlin/collections/AbstractList$Companion;->newCapacity$kotlin_stdlib(II)I
+Lkotlin/collections/AbstractList$IteratorImpl;
+SPLkotlin/collections/AbstractList$IteratorImpl;-><init>(Lkotlin/collections/AbstractList;)V
+SPLkotlin/collections/AbstractList$IteratorImpl;->hasNext()Z
+SPLkotlin/collections/AbstractList$IteratorImpl;->next()Ljava/lang/Object;
+Lkotlin/collections/AbstractMutableList;
+SPLkotlin/collections/AbstractMutableList;-><init>()V
+SPLkotlin/collections/AbstractMutableList;->size()I
+Lkotlin/collections/AbstractMutableSet;
+SPLkotlin/collections/AbstractMutableSet;-><init>()V
+SPLkotlin/collections/AbstractMutableSet;->size()I
+Lkotlin/collections/ArrayAsCollection;
+SPLkotlin/collections/ArrayAsCollection;-><init>([Ljava/lang/Object;Z)V
+SPLkotlin/collections/ArrayAsCollection;->toArray()[Ljava/lang/Object;
+Lkotlin/collections/ArrayDeque;
+SPLkotlin/collections/ArrayDeque;-><clinit>()V
+SPLkotlin/collections/ArrayDeque;-><init>()V
+SPLkotlin/collections/ArrayDeque;->addFirst(Ljava/lang/Object;)V
+SPLkotlin/collections/ArrayDeque;->addLast(Ljava/lang/Object;)V
+SPLkotlin/collections/ArrayDeque;->decremented(I)I
+SPLkotlin/collections/ArrayDeque;->ensureCapacity(I)V
+SPLkotlin/collections/ArrayDeque;->get(I)Ljava/lang/Object;
+SPLkotlin/collections/ArrayDeque;->getSize()I
+SPLkotlin/collections/ArrayDeque;->incremented(I)I
+SPLkotlin/collections/ArrayDeque;->isEmpty()Z
+SPLkotlin/collections/ArrayDeque;->positiveMod(I)I
+SPLkotlin/collections/ArrayDeque;->registerModification()V
+SPLkotlin/collections/ArrayDeque;->removeFirst()Ljava/lang/Object;
+SPLkotlin/collections/ArrayDeque;->removeFirstOrNull()Ljava/lang/Object;
+Lkotlin/collections/ArrayDeque$Companion;
+SPLkotlin/collections/ArrayDeque$Companion;-><init>()V
+SPLkotlin/collections/ArrayDeque$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/collections/ArraysKt;
+Lkotlin/collections/ArraysKt__ArraysJVMKt;
+SPLkotlin/collections/ArraysKt__ArraysJVMKt;->copyOfRangeToIndexCheck(II)V
+Lkotlin/collections/ArraysKt__ArraysKt;
+Lkotlin/collections/ArraysKt___ArraysJvmKt;
+SPLkotlin/collections/ArraysKt___ArraysJvmKt;->asList([Ljava/lang/Object;)Ljava/util/List;
+SPLkotlin/collections/ArraysKt___ArraysJvmKt;->copyInto$default([I[IIIIILjava/lang/Object;)[I
+SPLkotlin/collections/ArraysKt___ArraysJvmKt;->copyInto$default([Ljava/lang/Object;[Ljava/lang/Object;IIIILjava/lang/Object;)[Ljava/lang/Object;
+SPLkotlin/collections/ArraysKt___ArraysJvmKt;->copyInto([I[IIII)[I
+SPLkotlin/collections/ArraysKt___ArraysJvmKt;->copyInto([Ljava/lang/Object;[Ljava/lang/Object;III)[Ljava/lang/Object;
+SPLkotlin/collections/ArraysKt___ArraysJvmKt;->copyOfRange([Ljava/lang/Object;II)[Ljava/lang/Object;
+SPLkotlin/collections/ArraysKt___ArraysJvmKt;->fill$default([JJIIILjava/lang/Object;)V
+SPLkotlin/collections/ArraysKt___ArraysJvmKt;->fill$default([Ljava/lang/Object;Ljava/lang/Object;IIILjava/lang/Object;)V
+SPLkotlin/collections/ArraysKt___ArraysJvmKt;->fill([JJII)V
+SPLkotlin/collections/ArraysKt___ArraysJvmKt;->fill([Ljava/lang/Object;Ljava/lang/Object;II)V
+SPLkotlin/collections/ArraysKt___ArraysJvmKt;->sortWith([Ljava/lang/Object;Ljava/util/Comparator;)V
+Lkotlin/collections/ArraysKt___ArraysKt;
+SPLkotlin/collections/ArraysKt___ArraysKt;->filterNotNull([Ljava/lang/Object;)Ljava/util/List;
+SPLkotlin/collections/ArraysKt___ArraysKt;->filterNotNullTo([Ljava/lang/Object;Ljava/util/Collection;)Ljava/util/Collection;
+SPLkotlin/collections/ArraysKt___ArraysKt;->getLastIndex([Ljava/lang/Object;)I
+SPLkotlin/collections/ArraysKt___ArraysKt;->sortedArrayWith([Ljava/lang/Object;Ljava/util/Comparator;)[Ljava/lang/Object;
+SPLkotlin/collections/ArraysKt___ArraysKt;->sortedWith([Ljava/lang/Object;Ljava/util/Comparator;)Ljava/util/List;
+SPLkotlin/collections/ArraysKt___ArraysKt;->toCollection([Ljava/lang/Object;Ljava/util/Collection;)Ljava/util/Collection;
+SPLkotlin/collections/ArraysKt___ArraysKt;->toList([Ljava/lang/Object;)Ljava/util/List;
+SPLkotlin/collections/ArraysKt___ArraysKt;->toSet([Ljava/lang/Object;)Ljava/util/Set;
+Lkotlin/collections/ArraysUtilJVM;
+SPLkotlin/collections/ArraysUtilJVM;->asList([Ljava/lang/Object;)Ljava/util/List;
+Lkotlin/collections/CollectionsKt;
+Lkotlin/collections/CollectionsKt__CollectionsJVMKt;
+SPLkotlin/collections/CollectionsKt__CollectionsJVMKt;->build(Ljava/util/List;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt__CollectionsJVMKt;->copyToArrayOfAny([Ljava/lang/Object;Z)[Ljava/lang/Object;
+SPLkotlin/collections/CollectionsKt__CollectionsJVMKt;->createListBuilder()Ljava/util/List;
+SPLkotlin/collections/CollectionsKt__CollectionsJVMKt;->listOf(Ljava/lang/Object;)Ljava/util/List;
+Lkotlin/collections/CollectionsKt__CollectionsKt;
+SPLkotlin/collections/CollectionsKt__CollectionsKt;->asCollection([Ljava/lang/Object;Z)Ljava/util/Collection;
+SPLkotlin/collections/CollectionsKt__CollectionsKt;->emptyList()Ljava/util/List;
+SPLkotlin/collections/CollectionsKt__CollectionsKt;->getLastIndex(Ljava/util/List;)I
+SPLkotlin/collections/CollectionsKt__CollectionsKt;->listOf([Ljava/lang/Object;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt__CollectionsKt;->listOfNotNull(Ljava/lang/Object;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt__CollectionsKt;->listOfNotNull([Ljava/lang/Object;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt__CollectionsKt;->mutableListOf([Ljava/lang/Object;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt__CollectionsKt;->optimizeReadOnlyList(Ljava/util/List;)Ljava/util/List;
+Lkotlin/collections/CollectionsKt__IterablesKt;
+SPLkotlin/collections/CollectionsKt__IterablesKt;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+SPLkotlin/collections/CollectionsKt__IterablesKt;->collectionSizeOrNull(Ljava/lang/Iterable;)Ljava/lang/Integer;
+Lkotlin/collections/CollectionsKt__IteratorsJVMKt;
+Lkotlin/collections/CollectionsKt__IteratorsKt;
+Lkotlin/collections/CollectionsKt__MutableCollectionsJVMKt;
+Lkotlin/collections/CollectionsKt__MutableCollectionsKt;
+SPLkotlin/collections/CollectionsKt__MutableCollectionsKt;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
+SPLkotlin/collections/CollectionsKt__MutableCollectionsKt;->addAll(Ljava/util/Collection;[Ljava/lang/Object;)Z
+SPLkotlin/collections/CollectionsKt__MutableCollectionsKt;->removeLastOrNull(Ljava/util/List;)Ljava/lang/Object;
+Lkotlin/collections/CollectionsKt__ReversedViewsKt;
+Lkotlin/collections/CollectionsKt___CollectionsJvmKt;
+Lkotlin/collections/CollectionsKt___CollectionsKt;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->any(Ljava/lang/Iterable;)Z
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->distinct(Ljava/lang/Iterable;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->joinTo$default(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/Appendable;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->joinTo(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Ljava/lang/Appendable;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/String;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->joinToString(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Ljava/lang/String;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->lastOrNull(Ljava/util/List;)Ljava/lang/Object;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->minOrNull(Ljava/lang/Iterable;)Ljava/lang/Comparable;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->plus(Ljava/util/Collection;[Ljava/lang/Object;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->singleOrNull(Ljava/util/List;)Ljava/lang/Object;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->toCollection(Ljava/lang/Iterable;Ljava/util/Collection;)Ljava/util/Collection;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->toList(Ljava/lang/Iterable;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->toMutableList(Ljava/lang/Iterable;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->toMutableSet(Ljava/lang/Iterable;)Ljava/util/Set;
+SPLkotlin/collections/CollectionsKt___CollectionsKt;->toSet(Ljava/lang/Iterable;)Ljava/util/Set;
+Lkotlin/collections/EmptyIterator;
+SPLkotlin/collections/EmptyIterator;-><clinit>()V
+SPLkotlin/collections/EmptyIterator;-><init>()V
+SPLkotlin/collections/EmptyIterator;->hasNext()Z
+Lkotlin/collections/EmptyList;
+SPLkotlin/collections/EmptyList;-><clinit>()V
+SPLkotlin/collections/EmptyList;-><init>()V
+SPLkotlin/collections/EmptyList;->contains(Ljava/lang/Object;)Z
+SPLkotlin/collections/EmptyList;->equals(Ljava/lang/Object;)Z
+SPLkotlin/collections/EmptyList;->getSize()I
+SPLkotlin/collections/EmptyList;->isEmpty()Z
+SPLkotlin/collections/EmptyList;->iterator()Ljava/util/Iterator;
+SPLkotlin/collections/EmptyList;->listIterator()Ljava/util/ListIterator;
+SPLkotlin/collections/EmptyList;->size()I
+Lkotlin/collections/EmptyMap;
+SPLkotlin/collections/EmptyMap;-><clinit>()V
+SPLkotlin/collections/EmptyMap;-><init>()V
+SPLkotlin/collections/EmptyMap;->getKeys()Ljava/util/Set;
+SPLkotlin/collections/EmptyMap;->getSize()I
+SPLkotlin/collections/EmptyMap;->isEmpty()Z
+SPLkotlin/collections/EmptyMap;->keySet()Ljava/util/Set;
+SPLkotlin/collections/EmptyMap;->size()I
+Lkotlin/collections/EmptySet;
+SPLkotlin/collections/EmptySet;-><clinit>()V
+SPLkotlin/collections/EmptySet;-><init>()V
+SPLkotlin/collections/EmptySet;->iterator()Ljava/util/Iterator;
+Lkotlin/collections/IndexedValue;
+SPLkotlin/collections/IndexedValue;-><init>(ILjava/lang/Object;)V
+SPLkotlin/collections/IndexedValue;->getIndex()I
+SPLkotlin/collections/IndexedValue;->getValue()Ljava/lang/Object;
+Lkotlin/collections/MapsKt;
+Lkotlin/collections/MapsKt__MapWithDefaultKt;
+Lkotlin/collections/MapsKt__MapsJVMKt;
+SPLkotlin/collections/MapsKt__MapsJVMKt;->build(Ljava/util/Map;)Ljava/util/Map;
+SPLkotlin/collections/MapsKt__MapsJVMKt;->createMapBuilder()Ljava/util/Map;
+SPLkotlin/collections/MapsKt__MapsJVMKt;->createMapBuilder(I)Ljava/util/Map;
+SPLkotlin/collections/MapsKt__MapsJVMKt;->mapCapacity(I)I
+SPLkotlin/collections/MapsKt__MapsJVMKt;->mapOf(Lkotlin/Pair;)Ljava/util/Map;
+Lkotlin/collections/MapsKt__MapsKt;
+SPLkotlin/collections/MapsKt__MapsKt;->emptyMap()Ljava/util/Map;
+SPLkotlin/collections/MapsKt__MapsKt;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
+SPLkotlin/collections/MapsKt__MapsKt;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
+SPLkotlin/collections/MapsKt__MapsKt;->putAll(Ljava/util/Map;Ljava/lang/Iterable;)V
+SPLkotlin/collections/MapsKt__MapsKt;->putAll(Ljava/util/Map;[Lkotlin/Pair;)V
+SPLkotlin/collections/MapsKt__MapsKt;->toMap(Ljava/lang/Iterable;)Ljava/util/Map;
+SPLkotlin/collections/MapsKt__MapsKt;->toMap(Ljava/lang/Iterable;Ljava/util/Map;)Ljava/util/Map;
+SPLkotlin/collections/MapsKt__MapsKt;->toMap(Ljava/util/Map;)Ljava/util/Map;
+SPLkotlin/collections/MapsKt__MapsKt;->toMap([Lkotlin/Pair;Ljava/util/Map;)Ljava/util/Map;
+SPLkotlin/collections/MapsKt__MapsKt;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
+Lkotlin/collections/MapsKt___MapsJvmKt;
+Lkotlin/collections/MapsKt___MapsKt;
+Lkotlin/collections/SetsKt;
+Lkotlin/collections/SetsKt__SetsJVMKt;
+SPLkotlin/collections/SetsKt__SetsJVMKt;->build(Ljava/util/Set;)Ljava/util/Set;
+SPLkotlin/collections/SetsKt__SetsJVMKt;->createSetBuilder()Ljava/util/Set;
+SPLkotlin/collections/SetsKt__SetsJVMKt;->setOf(Ljava/lang/Object;)Ljava/util/Set;
+Lkotlin/collections/SetsKt__SetsKt;
+SPLkotlin/collections/SetsKt__SetsKt;->emptySet()Ljava/util/Set;
+SPLkotlin/collections/SetsKt__SetsKt;->setOf([Ljava/lang/Object;)Ljava/util/Set;
+Lkotlin/collections/SetsKt___SetsKt;
+SPLkotlin/collections/SetsKt___SetsKt;->plus(Ljava/util/Set;Ljava/lang/Iterable;)Ljava/util/Set;
+SPLkotlin/collections/SetsKt___SetsKt;->plus(Ljava/util/Set;Ljava/lang/Object;)Ljava/util/Set;
+Lkotlin/collections/builders/ListBuilder;
+SPLkotlin/collections/builders/ListBuilder;-><clinit>()V
+SPLkotlin/collections/builders/ListBuilder;-><init>(I)V
+SPLkotlin/collections/builders/ListBuilder;-><init>(IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlin/collections/builders/ListBuilder;->add(Ljava/lang/Object;)Z
+SPLkotlin/collections/builders/ListBuilder;->addAll(Ljava/util/Collection;)Z
+SPLkotlin/collections/builders/ListBuilder;->addAllInternal(ILjava/util/Collection;I)V
+SPLkotlin/collections/builders/ListBuilder;->addAtInternal(ILjava/lang/Object;)V
+SPLkotlin/collections/builders/ListBuilder;->build()Ljava/util/List;
+SPLkotlin/collections/builders/ListBuilder;->checkIsMutable()V
+SPLkotlin/collections/builders/ListBuilder;->ensureCapacityInternal(I)V
+SPLkotlin/collections/builders/ListBuilder;->ensureExtraCapacity(I)V
+SPLkotlin/collections/builders/ListBuilder;->getSize()I
+SPLkotlin/collections/builders/ListBuilder;->insertAtInternal(II)V
+SPLkotlin/collections/builders/ListBuilder;->isEmpty()Z
+SPLkotlin/collections/builders/ListBuilder;->registerModification()V
+Lkotlin/collections/builders/ListBuilder$Companion;
+SPLkotlin/collections/builders/ListBuilder$Companion;-><init>()V
+SPLkotlin/collections/builders/ListBuilder$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/collections/builders/ListBuilderKt;
+SPLkotlin/collections/builders/ListBuilderKt;->arrayOfUninitializedElements(I)[Ljava/lang/Object;
+SPLkotlin/collections/builders/ListBuilderKt;->copyOfUninitializedElements([Ljava/lang/Object;I)[Ljava/lang/Object;
+Lkotlin/collections/builders/MapBuilder;
+SPLkotlin/collections/builders/MapBuilder;-><clinit>()V
+SPLkotlin/collections/builders/MapBuilder;-><init>()V
+SPLkotlin/collections/builders/MapBuilder;-><init>(I)V
+SPLkotlin/collections/builders/MapBuilder;-><init>([Ljava/lang/Object;[Ljava/lang/Object;[I[III)V
+SPLkotlin/collections/builders/MapBuilder;->access$getEmpty$cp()Lkotlin/collections/builders/MapBuilder;
+SPLkotlin/collections/builders/MapBuilder;->access$getKeysArray$p(Lkotlin/collections/builders/MapBuilder;)[Ljava/lang/Object;
+SPLkotlin/collections/builders/MapBuilder;->access$getLength$p(Lkotlin/collections/builders/MapBuilder;)I
+SPLkotlin/collections/builders/MapBuilder;->access$getModCount$p(Lkotlin/collections/builders/MapBuilder;)I
+SPLkotlin/collections/builders/MapBuilder;->access$getPresenceArray$p(Lkotlin/collections/builders/MapBuilder;)[I
+SPLkotlin/collections/builders/MapBuilder;->addKey$kotlin_stdlib(Ljava/lang/Object;)I
+SPLkotlin/collections/builders/MapBuilder;->allocateValuesArray()[Ljava/lang/Object;
+SPLkotlin/collections/builders/MapBuilder;->build()Ljava/util/Map;
+SPLkotlin/collections/builders/MapBuilder;->checkIsMutable$kotlin_stdlib()V
+SPLkotlin/collections/builders/MapBuilder;->ensureCapacity(I)V
+SPLkotlin/collections/builders/MapBuilder;->ensureExtraCapacity(I)V
+SPLkotlin/collections/builders/MapBuilder;->findKey(Ljava/lang/Object;)I
+SPLkotlin/collections/builders/MapBuilder;->get(Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlin/collections/builders/MapBuilder;->getCapacity$kotlin_stdlib()I
+SPLkotlin/collections/builders/MapBuilder;->getHashSize()I
+SPLkotlin/collections/builders/MapBuilder;->getSize()I
+SPLkotlin/collections/builders/MapBuilder;->hash(Ljava/lang/Object;)I
+SPLkotlin/collections/builders/MapBuilder;->isEmpty()Z
+SPLkotlin/collections/builders/MapBuilder;->keysIterator$kotlin_stdlib()Lkotlin/collections/builders/MapBuilder$KeysItr;
+SPLkotlin/collections/builders/MapBuilder;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlin/collections/builders/MapBuilder;->putRehash(I)Z
+SPLkotlin/collections/builders/MapBuilder;->registerModification()V
+SPLkotlin/collections/builders/MapBuilder;->rehash(I)V
+SPLkotlin/collections/builders/MapBuilder;->shouldCompact(I)Z
+SPLkotlin/collections/builders/MapBuilder;->size()I
+Lkotlin/collections/builders/MapBuilder$Companion;
+SPLkotlin/collections/builders/MapBuilder$Companion;-><init>()V
+SPLkotlin/collections/builders/MapBuilder$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlin/collections/builders/MapBuilder$Companion;->access$computeHashSize(Lkotlin/collections/builders/MapBuilder$Companion;I)I
+SPLkotlin/collections/builders/MapBuilder$Companion;->access$computeShift(Lkotlin/collections/builders/MapBuilder$Companion;I)I
+SPLkotlin/collections/builders/MapBuilder$Companion;->computeHashSize(I)I
+SPLkotlin/collections/builders/MapBuilder$Companion;->computeShift(I)I
+SPLkotlin/collections/builders/MapBuilder$Companion;->getEmpty$kotlin_stdlib()Lkotlin/collections/builders/MapBuilder;
+Lkotlin/collections/builders/MapBuilder$Itr;
+SPLkotlin/collections/builders/MapBuilder$Itr;-><init>(Lkotlin/collections/builders/MapBuilder;)V
+SPLkotlin/collections/builders/MapBuilder$Itr;->checkForComodification$kotlin_stdlib()V
+SPLkotlin/collections/builders/MapBuilder$Itr;->getIndex$kotlin_stdlib()I
+SPLkotlin/collections/builders/MapBuilder$Itr;->getLastIndex$kotlin_stdlib()I
+SPLkotlin/collections/builders/MapBuilder$Itr;->getMap$kotlin_stdlib()Lkotlin/collections/builders/MapBuilder;
+SPLkotlin/collections/builders/MapBuilder$Itr;->hasNext()Z
+SPLkotlin/collections/builders/MapBuilder$Itr;->initNext$kotlin_stdlib()V
+SPLkotlin/collections/builders/MapBuilder$Itr;->setIndex$kotlin_stdlib(I)V
+SPLkotlin/collections/builders/MapBuilder$Itr;->setLastIndex$kotlin_stdlib(I)V
+Lkotlin/collections/builders/MapBuilder$KeysItr;
+SPLkotlin/collections/builders/MapBuilder$KeysItr;-><init>(Lkotlin/collections/builders/MapBuilder;)V
+SPLkotlin/collections/builders/MapBuilder$KeysItr;->next()Ljava/lang/Object;
+Lkotlin/collections/builders/SetBuilder;
+SPLkotlin/collections/builders/SetBuilder;-><clinit>()V
+SPLkotlin/collections/builders/SetBuilder;-><init>()V
+SPLkotlin/collections/builders/SetBuilder;-><init>(Lkotlin/collections/builders/MapBuilder;)V
+SPLkotlin/collections/builders/SetBuilder;->add(Ljava/lang/Object;)Z
+SPLkotlin/collections/builders/SetBuilder;->build()Ljava/util/Set;
+SPLkotlin/collections/builders/SetBuilder;->getSize()I
+SPLkotlin/collections/builders/SetBuilder;->isEmpty()Z
+SPLkotlin/collections/builders/SetBuilder;->iterator()Ljava/util/Iterator;
+Lkotlin/collections/builders/SetBuilder$Companion;
+SPLkotlin/collections/builders/SetBuilder$Companion;-><init>()V
+SPLkotlin/collections/builders/SetBuilder$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/comparisons/ComparisonsKt;
+Lkotlin/comparisons/ComparisonsKt__ComparisonsKt;
+SPLkotlin/comparisons/ComparisonsKt__ComparisonsKt;->compareValues(Ljava/lang/Comparable;Ljava/lang/Comparable;)I
+Lkotlin/comparisons/ComparisonsKt___ComparisonsJvmKt;
+Lkotlin/comparisons/ComparisonsKt___ComparisonsKt;
+Lkotlin/coroutines/AbstractCoroutineContextElement;
+SPLkotlin/coroutines/AbstractCoroutineContextElement;-><init>(Lkotlin/coroutines/CoroutineContext$Key;)V
+SPLkotlin/coroutines/AbstractCoroutineContextElement;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+SPLkotlin/coroutines/AbstractCoroutineContextElement;->get(Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
+SPLkotlin/coroutines/AbstractCoroutineContextElement;->getKey()Lkotlin/coroutines/CoroutineContext$Key;
+SPLkotlin/coroutines/AbstractCoroutineContextElement;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+Lkotlin/coroutines/AbstractCoroutineContextKey;
+SPLkotlin/coroutines/AbstractCoroutineContextKey;-><init>(Lkotlin/coroutines/CoroutineContext$Key;Lkotlin/jvm/functions/Function1;)V
+Lkotlin/coroutines/CombinedContext;
+SPLkotlin/coroutines/CombinedContext;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext$Element;)V
+SPLkotlin/coroutines/CombinedContext;->contains(Lkotlin/coroutines/CoroutineContext$Element;)Z
+SPLkotlin/coroutines/CombinedContext;->containsAll(Lkotlin/coroutines/CombinedContext;)Z
+SPLkotlin/coroutines/CombinedContext;->equals(Ljava/lang/Object;)Z
+SPLkotlin/coroutines/CombinedContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+SPLkotlin/coroutines/CombinedContext;->get(Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
+SPLkotlin/coroutines/CombinedContext;->minusKey(Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext;
+SPLkotlin/coroutines/CombinedContext;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+SPLkotlin/coroutines/CombinedContext;->size()I
+Lkotlin/coroutines/Continuation;
+Lkotlin/coroutines/ContinuationInterceptor;
+SPLkotlin/coroutines/ContinuationInterceptor;-><clinit>()V
+Lkotlin/coroutines/ContinuationInterceptor$DefaultImpls;
+HSPLkotlin/coroutines/ContinuationInterceptor$DefaultImpls;->get(Lkotlin/coroutines/ContinuationInterceptor;Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
+SPLkotlin/coroutines/ContinuationInterceptor$DefaultImpls;->minusKey(Lkotlin/coroutines/ContinuationInterceptor;Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext;
+Lkotlin/coroutines/ContinuationInterceptor$Key;
+SPLkotlin/coroutines/ContinuationInterceptor$Key;-><clinit>()V
+SPLkotlin/coroutines/ContinuationInterceptor$Key;-><init>()V
+Lkotlin/coroutines/ContinuationKt;
+SPLkotlin/coroutines/ContinuationKt;->startCoroutine(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
+Lkotlin/coroutines/CoroutineContext;
+Lkotlin/coroutines/CoroutineContext$DefaultImpls;
+HSPLkotlin/coroutines/CoroutineContext$DefaultImpls;->plus$lambda$0(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext$Element;)Lkotlin/coroutines/CoroutineContext;
+SPLkotlin/coroutines/CoroutineContext$DefaultImpls;->plus(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+Lkotlin/coroutines/CoroutineContext$DefaultImpls$$ExternalSyntheticLambda0;
+SPLkotlin/coroutines/CoroutineContext$DefaultImpls$$ExternalSyntheticLambda0;-><init>()V
+SPLkotlin/coroutines/CoroutineContext$DefaultImpls$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlin/coroutines/CoroutineContext$Element;
+Lkotlin/coroutines/CoroutineContext$Element$DefaultImpls;
+SPLkotlin/coroutines/CoroutineContext$Element$DefaultImpls;->fold(Lkotlin/coroutines/CoroutineContext$Element;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+SPLkotlin/coroutines/CoroutineContext$Element$DefaultImpls;->get(Lkotlin/coroutines/CoroutineContext$Element;Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
+SPLkotlin/coroutines/CoroutineContext$Element$DefaultImpls;->minusKey(Lkotlin/coroutines/CoroutineContext$Element;Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext;
+SPLkotlin/coroutines/CoroutineContext$Element$DefaultImpls;->plus(Lkotlin/coroutines/CoroutineContext$Element;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+Lkotlin/coroutines/CoroutineContext$Key;
+Lkotlin/coroutines/EmptyCoroutineContext;
+SPLkotlin/coroutines/EmptyCoroutineContext;-><clinit>()V
+SPLkotlin/coroutines/EmptyCoroutineContext;-><init>()V
+SPLkotlin/coroutines/EmptyCoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+SPLkotlin/coroutines/EmptyCoroutineContext;->get(Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
+SPLkotlin/coroutines/EmptyCoroutineContext;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+Lkotlin/coroutines/intrinsics/CoroutineSingletons;
+SPLkotlin/coroutines/intrinsics/CoroutineSingletons;->$values()[Lkotlin/coroutines/intrinsics/CoroutineSingletons;
+SPLkotlin/coroutines/intrinsics/CoroutineSingletons;-><clinit>()V
+SPLkotlin/coroutines/intrinsics/CoroutineSingletons;-><init>(Ljava/lang/String;I)V
+Lkotlin/coroutines/intrinsics/IntrinsicsKt;
+Lkotlin/coroutines/intrinsics/IntrinsicsKt__IntrinsicsJvmKt;
+SPLkotlin/coroutines/intrinsics/IntrinsicsKt__IntrinsicsJvmKt;->createCoroutineUnintercepted(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLkotlin/coroutines/intrinsics/IntrinsicsKt__IntrinsicsJvmKt;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+Lkotlin/coroutines/intrinsics/IntrinsicsKt__IntrinsicsKt;
+SPLkotlin/coroutines/intrinsics/IntrinsicsKt__IntrinsicsKt;->getCOROUTINE_SUSPENDED()Ljava/lang/Object;
+Lkotlin/coroutines/jvm/internal/BaseContinuationImpl;
+SPLkotlin/coroutines/jvm/internal/BaseContinuationImpl;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLkotlin/coroutines/jvm/internal/BaseContinuationImpl;->resumeWith(Ljava/lang/Object;)V
+Lkotlin/coroutines/jvm/internal/Boxing;
+SPLkotlin/coroutines/jvm/internal/Boxing;->boxBoolean(Z)Ljava/lang/Boolean;
+SPLkotlin/coroutines/jvm/internal/Boxing;->boxInt(I)Ljava/lang/Integer;
+SPLkotlin/coroutines/jvm/internal/Boxing;->boxLong(J)Ljava/lang/Long;
+Lkotlin/coroutines/jvm/internal/CompletedContinuation;
+SPLkotlin/coroutines/jvm/internal/CompletedContinuation;-><clinit>()V
+SPLkotlin/coroutines/jvm/internal/CompletedContinuation;-><init>()V
+Lkotlin/coroutines/jvm/internal/ContinuationImpl;
+SPLkotlin/coroutines/jvm/internal/ContinuationImpl;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLkotlin/coroutines/jvm/internal/ContinuationImpl;-><init>(Lkotlin/coroutines/Continuation;Lkotlin/coroutines/CoroutineContext;)V
+SPLkotlin/coroutines/jvm/internal/ContinuationImpl;->getContext()Lkotlin/coroutines/CoroutineContext;
+SPLkotlin/coroutines/jvm/internal/ContinuationImpl;->intercepted()Lkotlin/coroutines/Continuation;
+SPLkotlin/coroutines/jvm/internal/ContinuationImpl;->releaseIntercepted()V
+Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+Lkotlin/coroutines/jvm/internal/DebugProbesKt;
+SPLkotlin/coroutines/jvm/internal/DebugProbesKt;->probeCoroutineCreated(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLkotlin/coroutines/jvm/internal/DebugProbesKt;->probeCoroutineResumed(Lkotlin/coroutines/Continuation;)V
+SPLkotlin/coroutines/jvm/internal/DebugProbesKt;->probeCoroutineSuspended(Lkotlin/coroutines/Continuation;)V
+Lkotlin/coroutines/jvm/internal/SpillingKt;
+SPLkotlin/coroutines/jvm/internal/SpillingKt;->nullOutSpilledVariable(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlin/coroutines/jvm/internal/SuspendFunction;
+Lkotlin/coroutines/jvm/internal/SuspendLambda;
+SPLkotlin/coroutines/jvm/internal/SuspendLambda;-><init>(ILkotlin/coroutines/Continuation;)V
+SPLkotlin/coroutines/jvm/internal/SuspendLambda;->getArity()I
+Lkotlin/enums/EnumEntries;
+Lkotlin/enums/EnumEntriesKt;
+SPLkotlin/enums/EnumEntriesKt;->enumEntries([Ljava/lang/Enum;)Lkotlin/enums/EnumEntries;
+Lkotlin/enums/EnumEntriesList;
+SPLkotlin/enums/EnumEntriesList;-><init>([Ljava/lang/Enum;)V
+SPLkotlin/enums/EnumEntriesList;->get(I)Ljava/lang/Enum;
+SPLkotlin/enums/EnumEntriesList;->get(I)Ljava/lang/Object;
+SPLkotlin/enums/EnumEntriesList;->getSize()I
+Lkotlin/internal/PlatformImplementations;
+SPLkotlin/internal/PlatformImplementations;-><init>()V
+Lkotlin/internal/PlatformImplementationsKt;
+SPLkotlin/internal/PlatformImplementationsKt;-><clinit>()V
+Lkotlin/internal/ProgressionUtilKt;
+SPLkotlin/internal/ProgressionUtilKt;->getProgressionLastElement(III)I
+Lkotlin/internal/jdk7/JDK7PlatformImplementations;
+SPLkotlin/internal/jdk7/JDK7PlatformImplementations;-><init>()V
+Lkotlin/internal/jdk8/JDK8PlatformImplementations;
+SPLkotlin/internal/jdk8/JDK8PlatformImplementations;-><init>()V
+SPLkotlin/internal/jdk8/JDK8PlatformImplementations;->defaultPlatformRandom()Lkotlin/random/Random;
+SPLkotlin/internal/jdk8/JDK8PlatformImplementations;->sdkIsNullOrAtLeast(I)Z
+Lkotlin/internal/jdk8/JDK8PlatformImplementations$ReflectSdkVersion;
+SPLkotlin/internal/jdk8/JDK8PlatformImplementations$ReflectSdkVersion;-><clinit>()V
+SPLkotlin/internal/jdk8/JDK8PlatformImplementations$ReflectSdkVersion;-><init>()V
+Lkotlin/io/CloseableKt;
+SPLkotlin/io/CloseableKt;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+Lkotlin/io/FileSystemException;
+Lkotlin/io/FilesKt;
+Lkotlin/io/FilesKt__FilePathComponentsKt;
+Lkotlin/io/FilesKt__FileReadWriteKt;
+SPLkotlin/io/FilesKt__FileReadWriteKt;->readText$default(Ljava/io/File;Ljava/nio/charset/Charset;ILjava/lang/Object;)Ljava/lang/String;
+SPLkotlin/io/FilesKt__FileReadWriteKt;->readText(Ljava/io/File;Ljava/nio/charset/Charset;)Ljava/lang/String;
+Lkotlin/io/FilesKt__FileTreeWalkKt;
+Lkotlin/io/FilesKt__UtilsKt;
+Lkotlin/io/TerminateException;
+Lkotlin/io/TextStreamsKt;
+SPLkotlin/io/TextStreamsKt;->copyTo$default(Ljava/io/Reader;Ljava/io/Writer;IILjava/lang/Object;)J
+SPLkotlin/io/TextStreamsKt;->copyTo(Ljava/io/Reader;Ljava/io/Writer;I)J
+SPLkotlin/io/TextStreamsKt;->readText(Ljava/io/Reader;)Ljava/lang/String;
+Lkotlin/jdk7/AutoCloseableKt;
+SPLkotlin/jdk7/AutoCloseableKt;->closeFinally(Ljava/lang/AutoCloseable;Ljava/lang/Throwable;)V
+Lkotlin/jvm/JvmClassMappingKt;
+SPLkotlin/jvm/JvmClassMappingKt;->getJavaClass(Lkotlin/reflect/KClass;)Ljava/lang/Class;
+SPLkotlin/jvm/JvmClassMappingKt;->getJavaObjectType(Lkotlin/reflect/KClass;)Ljava/lang/Class;
+SPLkotlin/jvm/JvmClassMappingKt;->getJavaPrimitiveType(Lkotlin/reflect/KClass;)Ljava/lang/Class;
+SPLkotlin/jvm/JvmClassMappingKt;->getKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/KClass;
+Lkotlin/jvm/functions/Function0;
+Lkotlin/jvm/functions/Function1;
+Lkotlin/jvm/functions/Function10;
+Lkotlin/jvm/functions/Function11;
+Lkotlin/jvm/functions/Function12;
+Lkotlin/jvm/functions/Function13;
+Lkotlin/jvm/functions/Function14;
+Lkotlin/jvm/functions/Function15;
+Lkotlin/jvm/functions/Function16;
+Lkotlin/jvm/functions/Function17;
+Lkotlin/jvm/functions/Function18;
+Lkotlin/jvm/functions/Function19;
+Lkotlin/jvm/functions/Function2;
+Lkotlin/jvm/functions/Function20;
+Lkotlin/jvm/functions/Function21;
+Lkotlin/jvm/functions/Function22;
+Lkotlin/jvm/functions/Function3;
+Lkotlin/jvm/functions/Function4;
+Lkotlin/jvm/functions/Function5;
+Lkotlin/jvm/functions/Function6;
+Lkotlin/jvm/functions/Function7;
+Lkotlin/jvm/functions/Function8;
+Lkotlin/jvm/functions/Function9;
+Lkotlin/jvm/internal/AdaptedFunctionReference;
+SPLkotlin/jvm/internal/AdaptedFunctionReference;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+SPLkotlin/jvm/internal/AdaptedFunctionReference;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+Lkotlin/jvm/internal/BooleanCompanionObject;
+SPLkotlin/jvm/internal/BooleanCompanionObject;-><clinit>()V
+SPLkotlin/jvm/internal/BooleanCompanionObject;-><init>()V
+Lkotlin/jvm/internal/ByteCompanionObject;
+SPLkotlin/jvm/internal/ByteCompanionObject;-><clinit>()V
+SPLkotlin/jvm/internal/ByteCompanionObject;-><init>()V
+Lkotlin/jvm/internal/CallableReference;
+SPLkotlin/jvm/internal/CallableReference;-><clinit>()V
+SPLkotlin/jvm/internal/CallableReference;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Z)V
+SPLkotlin/jvm/internal/CallableReference;->getName()Ljava/lang/String;
+SPLkotlin/jvm/internal/CallableReference;->getOwner()Lkotlin/reflect/KDeclarationContainer;
+SPLkotlin/jvm/internal/CallableReference;->getSignature()Ljava/lang/String;
+Lkotlin/jvm/internal/CallableReference$NoReceiver;
+SPLkotlin/jvm/internal/CallableReference$NoReceiver;-><clinit>()V
+SPLkotlin/jvm/internal/CallableReference$NoReceiver;-><init>()V
+SPLkotlin/jvm/internal/CallableReference$NoReceiver;->access$000()Lkotlin/jvm/internal/CallableReference$NoReceiver;
+Lkotlin/jvm/internal/CharCompanionObject;
+SPLkotlin/jvm/internal/CharCompanionObject;-><clinit>()V
+SPLkotlin/jvm/internal/CharCompanionObject;-><init>()V
+Lkotlin/jvm/internal/ClassBasedDeclarationContainer;
+Lkotlin/jvm/internal/DefaultConstructorMarker;
+Lkotlin/jvm/internal/DoubleCompanionObject;
+SPLkotlin/jvm/internal/DoubleCompanionObject;-><clinit>()V
+SPLkotlin/jvm/internal/DoubleCompanionObject;-><init>()V
+Lkotlin/jvm/internal/FloatCompanionObject;
+SPLkotlin/jvm/internal/FloatCompanionObject;-><clinit>()V
+SPLkotlin/jvm/internal/FloatCompanionObject;-><init>()V
+Lkotlin/jvm/internal/FunctionAdapter;
+Lkotlin/jvm/internal/FunctionBase;
+Lkotlin/jvm/internal/FunctionReference;
+SPLkotlin/jvm/internal/FunctionReference;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+SPLkotlin/jvm/internal/FunctionReference;->getArity()I
+Lkotlin/jvm/internal/FunctionReferenceImpl;
+SPLkotlin/jvm/internal/FunctionReferenceImpl;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+SPLkotlin/jvm/internal/FunctionReferenceImpl;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+Lkotlin/jvm/internal/IntCompanionObject;
+SPLkotlin/jvm/internal/IntCompanionObject;-><clinit>()V
+SPLkotlin/jvm/internal/IntCompanionObject;-><init>()V
+Lkotlin/jvm/internal/Intrinsics;
+HSPLkotlin/jvm/internal/Intrinsics;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+SPLkotlin/jvm/internal/Intrinsics;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+SPLkotlin/jvm/internal/Intrinsics;->checkNotNull(Ljava/lang/Object;)V
+SPLkotlin/jvm/internal/Intrinsics;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+SPLkotlin/jvm/internal/Intrinsics;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+SPLkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+SPLkotlin/jvm/internal/Intrinsics;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+SPLkotlin/jvm/internal/Intrinsics;->compare(II)I
+Lkotlin/jvm/internal/Intrinsics$Kotlin;
+Lkotlin/jvm/internal/KTypeBase;
+Lkotlin/jvm/internal/KotlinGenericDeclaration;
+Lkotlin/jvm/internal/Lambda;
+SPLkotlin/jvm/internal/Lambda;-><init>(I)V
+Lkotlin/jvm/internal/LongCompanionObject;
+SPLkotlin/jvm/internal/LongCompanionObject;-><clinit>()V
+SPLkotlin/jvm/internal/LongCompanionObject;-><init>()V
+Lkotlin/jvm/internal/MagicApiIntrinsics;
+SPLkotlin/jvm/internal/MagicApiIntrinsics;->voidMagicApiCall(Ljava/lang/Object;)V
+Lkotlin/jvm/internal/MutablePropertyReference;
+SPLkotlin/jvm/internal/MutablePropertyReference;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+Lkotlin/jvm/internal/MutablePropertyReference1;
+SPLkotlin/jvm/internal/MutablePropertyReference1;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+Lkotlin/jvm/internal/MutablePropertyReference1Impl;
+SPLkotlin/jvm/internal/MutablePropertyReference1Impl;-><init>(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+Lkotlin/jvm/internal/PropertyReference;
+SPLkotlin/jvm/internal/PropertyReference;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+Lkotlin/jvm/internal/PropertyReference1;
+SPLkotlin/jvm/internal/PropertyReference1;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+Lkotlin/jvm/internal/PropertyReference1Impl;
+SPLkotlin/jvm/internal/PropertyReference1Impl;-><init>(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+Lkotlin/jvm/internal/Ref$BooleanRef;
+SPLkotlin/jvm/internal/Ref$BooleanRef;-><init>()V
+Lkotlin/jvm/internal/Ref$IntRef;
+SPLkotlin/jvm/internal/Ref$IntRef;-><init>()V
+Lkotlin/jvm/internal/Ref$ObjectRef;
+SPLkotlin/jvm/internal/Ref$ObjectRef;-><init>()V
+Lkotlin/jvm/internal/Reflection;
+SPLkotlin/jvm/internal/Reflection;-><clinit>()V
+SPLkotlin/jvm/internal/Reflection;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/KClass;
+SPLkotlin/jvm/internal/Reflection;->mutableProperty1(Lkotlin/jvm/internal/MutablePropertyReference1;)Lkotlin/reflect/KMutableProperty1;
+SPLkotlin/jvm/internal/Reflection;->nullableTypeOf(Ljava/lang/Class;)Lkotlin/reflect/KType;
+Lkotlin/jvm/internal/ReflectionFactory;
+SPLkotlin/jvm/internal/ReflectionFactory;-><init>()V
+Lkotlin/jvm/internal/ShortCompanionObject;
+SPLkotlin/jvm/internal/ShortCompanionObject;-><clinit>()V
+SPLkotlin/jvm/internal/ShortCompanionObject;-><init>()V
+Lkotlin/jvm/internal/SpreadBuilder;
+SPLkotlin/jvm/internal/SpreadBuilder;-><init>(I)V
+SPLkotlin/jvm/internal/SpreadBuilder;->addSpread(Ljava/lang/Object;)V
+SPLkotlin/jvm/internal/SpreadBuilder;->size()I
+SPLkotlin/jvm/internal/SpreadBuilder;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
+Lkotlin/jvm/internal/StringCompanionObject;
+SPLkotlin/jvm/internal/StringCompanionObject;-><clinit>()V
+SPLkotlin/jvm/internal/StringCompanionObject;-><init>()V
+Lkotlin/jvm/internal/TypeIntrinsics;
+SPLkotlin/jvm/internal/TypeIntrinsics;->beforeCheckcastToFunctionOfArity(Ljava/lang/Object;I)Ljava/lang/Object;
+SPLkotlin/jvm/internal/TypeIntrinsics;->getFunctionArity(Ljava/lang/Object;)I
+SPLkotlin/jvm/internal/TypeIntrinsics;->isFunctionOfArity(Ljava/lang/Object;I)Z
+Lkotlin/jvm/internal/markers/KMappedMarker;
+Lkotlin/jvm/internal/markers/KMutableCollection;
+Lkotlin/jvm/internal/markers/KMutableIterable;
+Lkotlin/jvm/internal/markers/KMutableIterator;
+Lkotlin/jvm/internal/markers/KMutableList;
+Lkotlin/jvm/internal/markers/KMutableMap;
+Lkotlin/jvm/internal/markers/KMutableSet;
+Lkotlin/properties/Delegates;
+SPLkotlin/properties/Delegates;-><clinit>()V
+SPLkotlin/properties/Delegates;-><init>()V
+Lkotlin/properties/ObservableProperty;
+SPLkotlin/properties/ObservableProperty;-><init>(Ljava/lang/Object;)V
+SPLkotlin/properties/ObservableProperty;->beforeChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)Z
+SPLkotlin/properties/ObservableProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+SPLkotlin/properties/ObservableProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
+Lkotlin/properties/ReadOnlyProperty;
+Lkotlin/properties/ReadWriteProperty;
+Lkotlin/random/AbstractPlatformRandom;
+SPLkotlin/random/AbstractPlatformRandom;-><init>()V
+SPLkotlin/random/AbstractPlatformRandom;->nextInt(I)I
+Lkotlin/random/Random;
+SPLkotlin/random/Random;-><clinit>()V
+SPLkotlin/random/Random;-><init>()V
+SPLkotlin/random/Random;->access$getDefaultRandom$cp()Lkotlin/random/Random;
+Lkotlin/random/Random$Default;
+SPLkotlin/random/Random$Default;-><init>()V
+SPLkotlin/random/Random$Default;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlin/random/Random$Default;->nextInt(I)I
+SPLkotlin/random/Random$Default;->nextInt(II)I
+Lkotlin/random/jdk8/PlatformThreadLocalRandom;
+SPLkotlin/random/jdk8/PlatformThreadLocalRandom;-><init>()V
+SPLkotlin/random/jdk8/PlatformThreadLocalRandom;->getImpl()Ljava/util/Random;
+SPLkotlin/random/jdk8/PlatformThreadLocalRandom;->nextInt(II)I
+Lkotlin/ranges/ClosedRange;
+Lkotlin/ranges/IntProgression;
+SPLkotlin/ranges/IntProgression;-><clinit>()V
+SPLkotlin/ranges/IntProgression;-><init>(III)V
+SPLkotlin/ranges/IntProgression;->getFirst()I
+SPLkotlin/ranges/IntProgression;->getLast()I
+Lkotlin/ranges/IntProgression$Companion;
+SPLkotlin/ranges/IntProgression$Companion;-><init>()V
+SPLkotlin/ranges/IntProgression$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/ranges/IntRange;
+SPLkotlin/ranges/IntRange;-><clinit>()V
+SPLkotlin/ranges/IntRange;-><init>(II)V
+SPLkotlin/ranges/IntRange;->access$getEMPTY$cp()Lkotlin/ranges/IntRange;
+Lkotlin/ranges/IntRange$Companion;
+SPLkotlin/ranges/IntRange$Companion;-><init>()V
+SPLkotlin/ranges/IntRange$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlin/ranges/IntRange$Companion;->getEMPTY()Lkotlin/ranges/IntRange;
+Lkotlin/ranges/OpenEndRange;
+Lkotlin/ranges/RangesKt;
+Lkotlin/ranges/RangesKt__RangesKt;
+Lkotlin/ranges/RangesKt___RangesKt;
+SPLkotlin/ranges/RangesKt___RangesKt;->coerceAtLeast(II)I
+SPLkotlin/ranges/RangesKt___RangesKt;->coerceAtLeast(JJ)J
+SPLkotlin/ranges/RangesKt___RangesKt;->coerceAtMost(II)I
+SPLkotlin/ranges/RangesKt___RangesKt;->coerceAtMost(JJ)J
+Lkotlin/reflect/KAnnotatedElement;
+Lkotlin/reflect/KCallable;
+Lkotlin/reflect/KClass;
+Lkotlin/reflect/KClassifier;
+Lkotlin/reflect/KDeclarationContainer;
+Lkotlin/reflect/KFunction;
+Lkotlin/reflect/KMutableProperty;
+Lkotlin/reflect/KMutableProperty1;
+Lkotlin/reflect/KProperty;
+Lkotlin/reflect/KProperty1;
+Lkotlin/reflect/KType;
+Lkotlin/reflect/full/KClassifiers;
+SPLkotlin/reflect/full/KClassifiers;->createTypeImpl$default(Lkotlin/reflect/KClassifier;Ljava/util/List;ZLjava/util/List;Lkotlin/reflect/KClass;ILjava/lang/Object;)Lkotlin/reflect/jvm/internal/types/AbstractKType;
+SPLkotlin/reflect/full/KClassifiers;->createTypeImpl(Lkotlin/reflect/KClassifier;Ljava/util/List;ZLjava/util/List;Lkotlin/reflect/KClass;)Lkotlin/reflect/jvm/internal/types/AbstractKType;
+Lkotlin/reflect/jvm/internal/CacheByClass;
+SPLkotlin/reflect/jvm/internal/CacheByClass;-><init>()V
+Lkotlin/reflect/jvm/internal/CacheByClassKt;
+SPLkotlin/reflect/jvm/internal/CacheByClassKt;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/CacheByClassKt;->createCache(Lkotlin/jvm/functions/Function1;)Lkotlin/reflect/jvm/internal/CacheByClass;
+Lkotlin/reflect/jvm/internal/CachesKt;
+SPLkotlin/reflect/jvm/internal/CachesKt;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/CachesKt;->CACHE_FOR_NULLABLE_BASE_CLASSIFIERS$lambda$0(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/types/AbstractKType;
+SPLkotlin/reflect/jvm/internal/CachesKt;->K_CLASS_CACHE$lambda$0(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/KClassImpl;
+SPLkotlin/reflect/jvm/internal/CachesKt;->accessor$CachesKt$lambda0(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/KClassImpl;
+SPLkotlin/reflect/jvm/internal/CachesKt;->accessor$CachesKt$lambda3(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/types/AbstractKType;
+SPLkotlin/reflect/jvm/internal/CachesKt;->getOrCreateKType(Ljava/lang/Class;Ljava/util/List;Z)Lkotlin/reflect/KType;
+SPLkotlin/reflect/jvm/internal/CachesKt;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/KClassImpl;
+Lkotlin/reflect/jvm/internal/CachesKt$$Lambda$0;
+SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$0;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$0;-><init>()V
+SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlin/reflect/jvm/internal/CachesKt$$Lambda$1;
+SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$1;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$1;-><init>()V
+Lkotlin/reflect/jvm/internal/CachesKt$$Lambda$2;
+SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$2;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$2;-><init>()V
+Lkotlin/reflect/jvm/internal/CachesKt$$Lambda$3;
+SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$3;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$3;-><init>()V
+SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$3;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlin/reflect/jvm/internal/CachesKt$$Lambda$4;
+SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$4;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/CachesKt$$Lambda$4;-><init>()V
+Lkotlin/reflect/jvm/internal/ClassValueCache;
+SPLkotlin/reflect/jvm/internal/ClassValueCache;-><init>(Lkotlin/jvm/functions/Function1;)V
+SPLkotlin/reflect/jvm/internal/ClassValueCache;->get(Ljava/lang/Class;)Ljava/lang/Object;
+Lkotlin/reflect/jvm/internal/ClassValueCache$$ExternalSyntheticApiModelOutline0;
+SPLkotlin/reflect/jvm/internal/ClassValueCache$$ExternalSyntheticApiModelOutline0;->m(Lkotlin/reflect/jvm/internal/ComputableClassValue;Ljava/lang/Class;)Ljava/lang/Object;
+Lkotlin/reflect/jvm/internal/ComputableClassValue;
+SPLkotlin/reflect/jvm/internal/ComputableClassValue;-><init>(Lkotlin/jvm/functions/Function1;)V
+SPLkotlin/reflect/jvm/internal/ComputableClassValue;->computeValue(Ljava/lang/Class;)Ljava/lang/Object;
+SPLkotlin/reflect/jvm/internal/ComputableClassValue;->computeValue(Ljava/lang/Class;)Ljava/lang/ref/SoftReference;
+Lkotlin/reflect/jvm/internal/KClassImpl;
+SPLkotlin/reflect/jvm/internal/KClassImpl;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/KClassImpl;-><init>(Ljava/lang/Class;)V
+SPLkotlin/reflect/jvm/internal/KClassImpl;->accessor$KClassImpl$lambda0(Lkotlin/reflect/jvm/internal/KClassImpl;)Lkotlin/reflect/jvm/internal/KClassImpl$Data;
+SPLkotlin/reflect/jvm/internal/KClassImpl;->data$lambda$0(Lkotlin/reflect/jvm/internal/KClassImpl;)Lkotlin/reflect/jvm/internal/KClassImpl$Data;
+SPLkotlin/reflect/jvm/internal/KClassImpl;->equals(Ljava/lang/Object;)Z
+SPLkotlin/reflect/jvm/internal/KClassImpl;->getClassId$kotlin_reflection()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/KClassImpl;->getJClass()Ljava/lang/Class;
+SPLkotlin/reflect/jvm/internal/KClassImpl;->getQualifiedName()Ljava/lang/String;
+SPLkotlin/reflect/jvm/internal/KClassImpl;->getSimpleName()Ljava/lang/String;
+SPLkotlin/reflect/jvm/internal/KClassImpl;->hashCode()I
+SPLkotlin/reflect/jvm/internal/KClassImpl;->isInstance(Ljava/lang/Object;)Z
+Lkotlin/reflect/jvm/internal/KClassImpl$$Lambda$0;
+SPLkotlin/reflect/jvm/internal/KClassImpl$$Lambda$0;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;)V
+SPLkotlin/reflect/jvm/internal/KClassImpl$$Lambda$0;->invoke()Ljava/lang/Object;
+Lkotlin/reflect/jvm/internal/KClassImpl$Companion;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Companion;-><init>()V
+SPLkotlin/reflect/jvm/internal/KClassImpl$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/reflect/jvm/internal/KClassImpl$Data;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;)V
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data;->accessor$KClassImpl$Data$lambda3(Lkotlin/reflect/jvm/internal/KClassImpl;Lkotlin/reflect/jvm/internal/KClassImpl$Data;)Ljava/lang/String;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data;->accessor$KClassImpl$Data$lambda4(Lkotlin/reflect/jvm/internal/KClassImpl;)Ljava/lang/String;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data;->getQualifiedName()Ljava/lang/String;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data;->getSimpleName()Ljava/lang/String;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data;->qualifiedName_delegate$lambda$0(Lkotlin/reflect/jvm/internal/KClassImpl;)Ljava/lang/String;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data;->simpleName_delegate$lambda$0(Lkotlin/reflect/jvm/internal/KClassImpl;Lkotlin/reflect/jvm/internal/KClassImpl$Data;)Ljava/lang/String;
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$0;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$0;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;Lkotlin/reflect/jvm/internal/KClassImpl$Data;)V
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$1;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$1;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;)V
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$10;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$10;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;Lkotlin/reflect/jvm/internal/KClassImpl$Data;)V
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$11;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$11;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;Lkotlin/reflect/jvm/internal/KClassImpl$Data;)V
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$12;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$12;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl$Data;Lkotlin/reflect/jvm/internal/KClassImpl;)V
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$13;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$13;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;)V
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$14;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$14;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;Lkotlin/reflect/jvm/internal/KClassImpl$Data;)V
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$2;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$2;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;Lkotlin/reflect/jvm/internal/KClassImpl$Data;)V
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$3;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$3;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;Lkotlin/reflect/jvm/internal/KClassImpl$Data;)V
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$3;->invoke()Ljava/lang/Object;
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$4;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$4;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;)V
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$4;->invoke()Ljava/lang/Object;
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$5;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$5;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl;Lkotlin/reflect/jvm/internal/KClassImpl$Data;)V
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$6;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$6;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl$Data;Lkotlin/reflect/jvm/internal/KClassImpl;)V
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$7;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$7;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl$Data;Lkotlin/reflect/jvm/internal/KClassImpl;)V
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$8;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$8;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl$Data;Lkotlin/reflect/jvm/internal/KClassImpl;)V
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$9;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$$Lambda$9;-><init>(Lkotlin/reflect/jvm/internal/KClassImpl$Data;Lkotlin/reflect/jvm/internal/KClassImpl;)V
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$allMembers$2;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$allMembers$2;-><init>(Ljava/lang/Object;)V
+Lkotlin/reflect/jvm/internal/KClassImpl$Data$declaredMembers$2;
+SPLkotlin/reflect/jvm/internal/KClassImpl$Data$declaredMembers$2;-><init>(Ljava/lang/Object;)V
+Lkotlin/reflect/jvm/internal/KClassMembersKt;
+Lkotlin/reflect/jvm/internal/KDeclarationContainerImpl;
+SPLkotlin/reflect/jvm/internal/KDeclarationContainerImpl;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/KDeclarationContainerImpl;-><init>()V
+Lkotlin/reflect/jvm/internal/KDeclarationContainerImpl$Companion;
+SPLkotlin/reflect/jvm/internal/KDeclarationContainerImpl$Companion;-><init>()V
+SPLkotlin/reflect/jvm/internal/KDeclarationContainerImpl$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/reflect/jvm/internal/KDeclarationContainerImpl$Data;
+SPLkotlin/reflect/jvm/internal/KDeclarationContainerImpl$Data;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/KDeclarationContainerImpl$Data;-><init>(Lkotlin/reflect/jvm/internal/KDeclarationContainerImpl;)V
+Lkotlin/reflect/jvm/internal/KDeclarationContainerImpl$Data$$Lambda$0;
+SPLkotlin/reflect/jvm/internal/KDeclarationContainerImpl$Data$$Lambda$0;-><init>(Lkotlin/reflect/jvm/internal/KDeclarationContainerImpl;)V
+Lkotlin/reflect/jvm/internal/KTypeParameterOwnerImpl;
+Lkotlin/reflect/jvm/internal/LazyKMutableProperty1;
+SPLkotlin/reflect/jvm/internal/LazyKMutableProperty1;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
+Lkotlin/reflect/jvm/internal/LazyKProperty;
+SPLkotlin/reflect/jvm/internal/LazyKProperty;-><init>(Lkotlin/jvm/functions/Function0;)V
+Lkotlin/reflect/jvm/internal/LazyKProperty1;
+SPLkotlin/reflect/jvm/internal/LazyKProperty1;-><init>(Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
+Lkotlin/reflect/jvm/internal/ReflectProperties;
+SPLkotlin/reflect/jvm/internal/ReflectProperties;->lazySoft(Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)Lkotlin/reflect/jvm/internal/ReflectProperties$LazySoftVal;
+SPLkotlin/reflect/jvm/internal/ReflectProperties;->lazySoft(Lkotlin/jvm/functions/Function0;)Lkotlin/reflect/jvm/internal/ReflectProperties$LazySoftVal;
+Lkotlin/reflect/jvm/internal/ReflectProperties$LazySoftVal;
+SPLkotlin/reflect/jvm/internal/ReflectProperties$LazySoftVal;-><init>(Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)V
+SPLkotlin/reflect/jvm/internal/ReflectProperties$LazySoftVal;->invoke()Ljava/lang/Object;
+Lkotlin/reflect/jvm/internal/ReflectProperties$Val;
+SPLkotlin/reflect/jvm/internal/ReflectProperties$Val;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/ReflectProperties$Val;-><init>()V
+SPLkotlin/reflect/jvm/internal/ReflectProperties$Val;->escape(Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlin/reflect/jvm/internal/ReflectProperties$Val;->getValue(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlin/reflect/jvm/internal/ReflectProperties$Val;->unescape(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlin/reflect/jvm/internal/ReflectProperties$Val$1;
+SPLkotlin/reflect/jvm/internal/ReflectProperties$Val$1;-><init>()V
+Lkotlin/reflect/jvm/internal/ReflectionFactoryImpl;
+SPLkotlin/reflect/jvm/internal/ReflectionFactoryImpl;-><init>()V
+SPLkotlin/reflect/jvm/internal/ReflectionFactoryImpl;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/KClass;
+SPLkotlin/reflect/jvm/internal/ReflectionFactoryImpl;->getOwner(Lkotlin/jvm/internal/CallableReference;)Lkotlin/reflect/jvm/internal/KDeclarationContainerImpl;
+SPLkotlin/reflect/jvm/internal/ReflectionFactoryImpl;->mutableProperty1(Lkotlin/jvm/internal/MutablePropertyReference1;)Lkotlin/reflect/KMutableProperty1;
+SPLkotlin/reflect/jvm/internal/ReflectionFactoryImpl;->typeOf(Lkotlin/reflect/KClassifier;Ljava/util/List;Z)Lkotlin/reflect/KType;
+Lkotlin/reflect/jvm/internal/ReflectionFactoryImpl$$Lambda$3;
+SPLkotlin/reflect/jvm/internal/ReflectionFactoryImpl$$Lambda$3;-><init>(Lkotlin/reflect/jvm/internal/KDeclarationContainerImpl;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/internal/MutablePropertyReference1;)V
+Lkotlin/reflect/jvm/internal/RuntimeTypeMapper;
+SPLkotlin/reflect/jvm/internal/RuntimeTypeMapper;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/RuntimeTypeMapper;-><init>()V
+SPLkotlin/reflect/jvm/internal/RuntimeTypeMapper;->getPrimitiveType(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType;
+SPLkotlin/reflect/jvm/internal/RuntimeTypeMapper;->mapJvmClassToKotlinClassId(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+Lkotlin/reflect/jvm/internal/SystemPropertiesKt;
+SPLkotlin/reflect/jvm/internal/SystemPropertiesKt;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/SystemPropertiesKt;->getUseK1Implementation()Z
+Lkotlin/reflect/jvm/internal/impl/SpecialJvmAnnotations;
+SPLkotlin/reflect/jvm/internal/impl/SpecialJvmAnnotations;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/SpecialJvmAnnotations;-><init>()V
+SPLkotlin/reflect/jvm/internal/impl/SpecialJvmAnnotations;->getSPECIAL_ANNOTATIONS()Ljava/util/Set;
+Lkotlin/reflect/jvm/internal/impl/builtins/CompanionObjectMapping;
+SPLkotlin/reflect/jvm/internal/impl/builtins/CompanionObjectMapping;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/CompanionObjectMapping;-><init>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/CompanionObjectMapping;->allClassesWithIntrinsicCompanions()Ljava/util/Set;
+Lkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType;
+SPLkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType;->$values()[Lkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType;
+SPLkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+SPLkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType;->getArrayTypeName()Lkotlin/reflect/jvm/internal/impl/name/Name;
+SPLkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType;->getTypeName()Lkotlin/reflect/jvm/internal/impl/name/Name;
+SPLkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType;->values()[Lkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType;
+Lkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType$$Lambda$0;
+SPLkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType$$Lambda$0;-><init>(Lkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType;)V
+Lkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType$$Lambda$1;
+SPLkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType$$Lambda$1;-><init>(Lkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType;)V
+Lkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType$Companion;
+SPLkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType$Companion;-><init>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/reflect/jvm/internal/impl/builtins/StandardNames;
+SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames;-><init>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames;->getFunctionClassId(I)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames;->getFunctionName(I)Ljava/lang/String;
+SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames;->getPrimitiveFqName(Lkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType;)Lkotlin/reflect/jvm/internal/impl/name/FqName;
+Lkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;
+SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;-><init>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->annotationName(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->collectionsFqName(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->concurrentAtomics(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->fqName(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->fqNameUnsafe(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;
+SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->internalName(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->rangesFqName(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;
+SPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->reflect(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;
+Lkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;-><init>(Lkotlin/reflect/jvm/internal/impl/name/FqName;Ljava/lang/String;ZLkotlin/reflect/jvm/internal/impl/name/ClassId;ZI)V
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;-><init>(Lkotlin/reflect/jvm/internal/impl/name/FqName;Ljava/lang/String;ZLkotlin/reflect/jvm/internal/impl/name/ClassId;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;->getClassNamePrefix()Ljava/lang/String;
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;->getMaxArity()I
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;->getPackageFqName()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+Lkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$Companion;
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$Companion;-><init>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$Function;
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$Function;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$Function;-><init>()V
+Lkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$KFunction;
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$KFunction;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$KFunction;-><init>()V
+Lkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$KSuspendFunction;
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$KSuspendFunction;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$KSuspendFunction;-><init>()V
+Lkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$SuspendFunction;
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$SuspendFunction;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$SuspendFunction;-><init>()V
+Lkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap;
+SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap;-><init>()V
+SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap;->add(Lkotlin/reflect/jvm/internal/impl/name/ClassId;Lkotlin/reflect/jvm/internal/impl/name/ClassId;)V
+SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap;->addJavaToKotlin(Lkotlin/reflect/jvm/internal/impl/name/ClassId;Lkotlin/reflect/jvm/internal/impl/name/ClassId;)V
+SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap;->addKotlinToJava(Lkotlin/reflect/jvm/internal/impl/name/FqName;Lkotlin/reflect/jvm/internal/impl/name/ClassId;)V
+SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap;->addMapping(Lkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap$PlatformMutabilityMapping;)V
+SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap;->addTopLevel(Ljava/lang/Class;Lkotlin/reflect/jvm/internal/impl/name/FqName;)V
+SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap;->addTopLevel(Ljava/lang/Class;Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;)V
+SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap;->classId(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap;->mapJavaToKotlin(Lkotlin/reflect/jvm/internal/impl/name/FqName;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+Lkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap$PlatformMutabilityMapping;
+SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap$PlatformMutabilityMapping;-><init>(Lkotlin/reflect/jvm/internal/impl/name/ClassId;Lkotlin/reflect/jvm/internal/impl/name/ClassId;Lkotlin/reflect/jvm/internal/impl/name/ClassId;)V
+SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap$PlatformMutabilityMapping;->getJavaClass()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap$PlatformMutabilityMapping;->getKotlinMutable()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap$PlatformMutabilityMapping;->getKotlinReadOnly()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+Lkotlin/reflect/jvm/internal/impl/descriptors/runtime/structure/ReflectClassUtilKt;
+SPLkotlin/reflect/jvm/internal/impl/descriptors/runtime/structure/ReflectClassUtilKt;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/descriptors/runtime/structure/ReflectClassUtilKt;->getClassId(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/descriptors/runtime/structure/ReflectClassUtilKt;->getFunctionClassArity(Ljava/lang/Class;)Ljava/lang/Integer;
+SPLkotlin/reflect/jvm/internal/impl/descriptors/runtime/structure/ReflectClassUtilKt;->getWrapperByPrimitive(Ljava/lang/Class;)Ljava/lang/Class;
+Lkotlin/reflect/jvm/internal/impl/load/java/JvmAnnotationNames;
+SPLkotlin/reflect/jvm/internal/impl/load/java/JvmAnnotationNames;-><clinit>()V
+Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/ClassId;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/name/ClassId;-><init>(Lkotlin/reflect/jvm/internal/impl/name/FqName;Lkotlin/reflect/jvm/internal/impl/name/FqName;Z)V
+SPLkotlin/reflect/jvm/internal/impl/name/ClassId;-><init>(Lkotlin/reflect/jvm/internal/impl/name/FqName;Lkotlin/reflect/jvm/internal/impl/name/Name;)V
+SPLkotlin/reflect/jvm/internal/impl/name/ClassId;->asSingleFqName()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/name/ClassId;->createNestedClassId(Lkotlin/reflect/jvm/internal/impl/name/Name;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/ClassId;->getPackageFqName()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/name/ClassId;->getShortClassName()Lkotlin/reflect/jvm/internal/impl/name/Name;
+SPLkotlin/reflect/jvm/internal/impl/name/ClassId;->hashCode()I
+SPLkotlin/reflect/jvm/internal/impl/name/ClassId;->isLocal()Z
+Lkotlin/reflect/jvm/internal/impl/name/ClassId$Companion;
+SPLkotlin/reflect/jvm/internal/impl/name/ClassId$Companion;-><init>()V
+SPLkotlin/reflect/jvm/internal/impl/name/ClassId$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlin/reflect/jvm/internal/impl/name/ClassId$Companion;->topLevel(Lkotlin/reflect/jvm/internal/impl/name/FqName;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/name/FqName;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/name/FqName;-><init>(Ljava/lang/String;)V
+SPLkotlin/reflect/jvm/internal/impl/name/FqName;-><init>(Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;)V
+SPLkotlin/reflect/jvm/internal/impl/name/FqName;-><init>(Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;Lkotlin/reflect/jvm/internal/impl/name/FqName;)V
+SPLkotlin/reflect/jvm/internal/impl/name/FqName;->asString()Ljava/lang/String;
+SPLkotlin/reflect/jvm/internal/impl/name/FqName;->child(Lkotlin/reflect/jvm/internal/impl/name/Name;)Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/name/FqName;->equals(Ljava/lang/Object;)Z
+SPLkotlin/reflect/jvm/internal/impl/name/FqName;->hashCode()I
+SPLkotlin/reflect/jvm/internal/impl/name/FqName;->isRoot()Z
+SPLkotlin/reflect/jvm/internal/impl/name/FqName;->parent()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/name/FqName;->shortName()Lkotlin/reflect/jvm/internal/impl/name/Name;
+SPLkotlin/reflect/jvm/internal/impl/name/FqName;->toString()Ljava/lang/String;
+SPLkotlin/reflect/jvm/internal/impl/name/FqName;->toUnsafe()Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;
+Lkotlin/reflect/jvm/internal/impl/name/FqName$Companion;
+SPLkotlin/reflect/jvm/internal/impl/name/FqName$Companion;-><init>()V
+SPLkotlin/reflect/jvm/internal/impl/name/FqName$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlin/reflect/jvm/internal/impl/name/FqName$Companion;->topLevel(Lkotlin/reflect/jvm/internal/impl/name/Name;)Lkotlin/reflect/jvm/internal/impl/name/FqName;
+Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;-><init>(Ljava/lang/String;)V
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;-><init>(Ljava/lang/String;Lkotlin/reflect/jvm/internal/impl/name/FqName;)V
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;-><init>(Ljava/lang/String;Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;Lkotlin/reflect/jvm/internal/impl/name/Name;)V
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;-><init>(Ljava/lang/String;Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;Lkotlin/reflect/jvm/internal/impl/name/Name;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;->asString()Ljava/lang/String;
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;->child(Lkotlin/reflect/jvm/internal/impl/name/Name;)Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;->compute()V
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;->equals(Ljava/lang/Object;)Z
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;->hashCode()I
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;->indexOfLastDotWithBackticksSupport(Ljava/lang/String;)I
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;->isRoot()Z
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;->parent()Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;->shortName()Lkotlin/reflect/jvm/internal/impl/name/Name;
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;->toSafe()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;->toString()Ljava/lang/String;
+Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe$Companion;
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe$Companion;-><init>()V
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe$Companion;->topLevel(Lkotlin/reflect/jvm/internal/impl/name/Name;)Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;
+Lkotlin/reflect/jvm/internal/impl/name/FqNamesUtilKt;
+SPLkotlin/reflect/jvm/internal/impl/name/FqNamesUtilKt;->isSubpackageOf(Ljava/lang/String;Ljava/lang/String;)Z
+SPLkotlin/reflect/jvm/internal/impl/name/FqNamesUtilKt;->isSubpackageOf(Lkotlin/reflect/jvm/internal/impl/name/FqName;Lkotlin/reflect/jvm/internal/impl/name/FqName;)Z
+SPLkotlin/reflect/jvm/internal/impl/name/FqNamesUtilKt;->tail(Lkotlin/reflect/jvm/internal/impl/name/FqName;Lkotlin/reflect/jvm/internal/impl/name/FqName;)Lkotlin/reflect/jvm/internal/impl/name/FqName;
+Lkotlin/reflect/jvm/internal/impl/name/Name;
+SPLkotlin/reflect/jvm/internal/impl/name/Name;-><init>(Ljava/lang/String;Z)V
+SPLkotlin/reflect/jvm/internal/impl/name/Name;->asString()Ljava/lang/String;
+SPLkotlin/reflect/jvm/internal/impl/name/Name;->getIdentifier()Ljava/lang/String;
+SPLkotlin/reflect/jvm/internal/impl/name/Name;->guessByFirstCharacter(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/Name;
+SPLkotlin/reflect/jvm/internal/impl/name/Name;->hashCode()I
+SPLkotlin/reflect/jvm/internal/impl/name/Name;->identifier(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/Name;
+SPLkotlin/reflect/jvm/internal/impl/name/Name;->special(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/Name;
+Lkotlin/reflect/jvm/internal/impl/name/SpecialNames;
+SPLkotlin/reflect/jvm/internal/impl/name/SpecialNames;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/name/SpecialNames;-><init>()V
+Lkotlin/reflect/jvm/internal/impl/name/StandardClassIds;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;-><init>()V
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getArray()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getBASE_ANNOTATION_PACKAGE()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getBASE_COLLECTIONS_PACKAGE()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getBASE_CONCURRENT_ATOMICS_PACKAGE()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getBASE_COROUTINES_PACKAGE()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getBASE_ENUMS_PACKAGE()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getBASE_KOTLIN_PACKAGE()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getBASE_RANGES_PACKAGE()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getBASE_REFLECT_PACKAGE()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getBASE_SEQUENCES_PACKAGE()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getKClass()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIds;->getKFunction()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+Lkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$annotationId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$atomicsId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$baseId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$collectionsId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$coroutinesId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$enumsId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$inverseMap(Ljava/util/Map;)Ljava/util/Map;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$primitiveArrayId(Lkotlin/reflect/jvm/internal/impl/name/Name;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$rangesId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$reflectId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$sequencesId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->access$unsignedId(Lkotlin/reflect/jvm/internal/impl/name/ClassId;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->annotationId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->atomicsId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->baseId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->collectionsId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->coroutinesId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->enumsId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->inverseMap(Ljava/util/Map;)Ljava/util/Map;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->primitiveArrayId(Lkotlin/reflect/jvm/internal/impl/name/Name;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->rangesId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->reflectId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->sequencesId(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+SPLkotlin/reflect/jvm/internal/impl/name/StandardClassIdsKt;->unsignedId(Lkotlin/reflect/jvm/internal/impl/name/ClassId;)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
+Lkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmClassName;
+SPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmClassName;-><init>(Ljava/lang/String;)V
+SPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmClassName;->byFqNameWithoutInnerClasses(Lkotlin/reflect/jvm/internal/impl/name/FqName;)Lkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmClassName;
+SPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmClassName;->getInternalName()Ljava/lang/String;
+Lkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmPrimitiveType;
+SPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmPrimitiveType;-><clinit>()V
+SPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmPrimitiveType;-><init>(Ljava/lang/String;ILkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+SPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmPrimitiveType;->getDesc()Ljava/lang/String;
+SPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmPrimitiveType;->getJavaKeywordName()Ljava/lang/String;
+SPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmPrimitiveType;->getPrimitiveType()Lkotlin/reflect/jvm/internal/impl/builtins/PrimitiveType;
+SPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmPrimitiveType;->getWrapperFqName()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+SPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmPrimitiveType;->values()[Lkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmPrimitiveType;
+Lkotlin/reflect/jvm/internal/impl/types/model/DefinitelyNotNullTypeMarker;
+Lkotlin/reflect/jvm/internal/impl/types/model/FlexibleTypeMarker;
+Lkotlin/reflect/jvm/internal/impl/types/model/KotlinTypeMarker;
+Lkotlin/reflect/jvm/internal/impl/types/model/RigidTypeMarker;
+Lkotlin/reflect/jvm/internal/impl/types/model/SimpleTypeMarker;
+Lkotlin/reflect/jvm/internal/impl/types/model/TypeArgumentListMarker;
+Lkotlin/reflect/jvm/internal/impl/types/model/TypeConstructorMarker;
+Lkotlin/reflect/jvm/internal/impl/utils/CollectionsKt;
+SPLkotlin/reflect/jvm/internal/impl/utils/CollectionsKt;->capacity(I)I
+SPLkotlin/reflect/jvm/internal/impl/utils/CollectionsKt;->newHashMapWithExpectedSize(I)Ljava/util/HashMap;
+SPLkotlin/reflect/jvm/internal/impl/utils/CollectionsKt;->newHashSetWithExpectedSize(I)Ljava/util/HashSet;
+Lkotlin/reflect/jvm/internal/types/AbstractKType;
+SPLkotlin/reflect/jvm/internal/types/AbstractKType;-><init>(Lkotlin/jvm/functions/Function0;)V
+Lkotlin/reflect/jvm/internal/types/SimpleKType;
+SPLkotlin/reflect/jvm/internal/types/SimpleKType;-><init>(Lkotlin/reflect/KClassifier;Ljava/util/List;ZLkotlin/Lazy;Lkotlin/reflect/KType;ZZZLkotlin/reflect/KClass;Lkotlin/jvm/functions/Function0;)V
+SPLkotlin/reflect/jvm/internal/types/SimpleKType;-><init>(Lkotlin/reflect/KClassifier;Ljava/util/List;ZLkotlin/Lazy;Lkotlin/reflect/KType;ZZZLkotlin/reflect/KClass;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlin/reflect/jvm/internal/types/SimpleKType;->getArguments()Ljava/util/List;
+SPLkotlin/reflect/jvm/internal/types/SimpleKType;->getClassifier()Lkotlin/reflect/KClassifier;
+SPLkotlin/reflect/jvm/internal/types/SimpleKType;->isMarkedNullable()Z
+Lkotlin/sequences/ConstrainedOnceSequence;
+SPLkotlin/sequences/ConstrainedOnceSequence;-><init>(Lkotlin/sequences/Sequence;)V
+SPLkotlin/sequences/ConstrainedOnceSequence;->iterator()Ljava/util/Iterator;
+Lkotlin/sequences/GeneratorSequence;
+SPLkotlin/sequences/GeneratorSequence;-><init>(Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V
+SPLkotlin/sequences/GeneratorSequence;->access$getGetInitialValue$p(Lkotlin/sequences/GeneratorSequence;)Lkotlin/jvm/functions/Function0;
+SPLkotlin/sequences/GeneratorSequence;->iterator()Ljava/util/Iterator;
+Lkotlin/sequences/GeneratorSequence$iterator$1;
+SPLkotlin/sequences/GeneratorSequence$iterator$1;-><init>(Lkotlin/sequences/GeneratorSequence;)V
+SPLkotlin/sequences/GeneratorSequence$iterator$1;->calcNext()V
+SPLkotlin/sequences/GeneratorSequence$iterator$1;->hasNext()Z
+SPLkotlin/sequences/GeneratorSequence$iterator$1;->next()Ljava/lang/Object;
+Lkotlin/sequences/Sequence;
+Lkotlin/sequences/SequencesKt;
+Lkotlin/sequences/SequencesKt__SequenceBuilderKt;
+Lkotlin/sequences/SequencesKt__SequencesJVMKt;
+Lkotlin/sequences/SequencesKt__SequencesKt;
+SPLkotlin/sequences/SequencesKt__SequencesKt;->constrainOnce(Lkotlin/sequences/Sequence;)Lkotlin/sequences/Sequence;
+SPLkotlin/sequences/SequencesKt__SequencesKt;->generateSequence(Lkotlin/jvm/functions/Function0;)Lkotlin/sequences/Sequence;
+Lkotlin/sequences/SequencesKt__SequencesKt$$ExternalSyntheticLambda1;
+SPLkotlin/sequences/SequencesKt__SequencesKt$$ExternalSyntheticLambda1;-><init>(Lkotlin/jvm/functions/Function0;)V
+Lkotlin/sequences/SequencesKt___SequencesJvmKt;
+Lkotlin/sequences/SequencesKt___SequencesKt;
+SPLkotlin/sequences/SequencesKt___SequencesKt;->toList(Lkotlin/sequences/Sequence;)Ljava/util/List;
+Lkotlin/text/CharsKt;
+Lkotlin/text/CharsKt__CharJVMKt;
+SPLkotlin/text/CharsKt__CharJVMKt;->isWhitespace(C)Z
+Lkotlin/text/CharsKt__CharKt;
+Lkotlin/text/Charsets;
+SPLkotlin/text/Charsets;-><clinit>()V
+SPLkotlin/text/Charsets;-><init>()V
+Lkotlin/text/LinesIterator;
+SPLkotlin/text/LinesIterator;-><clinit>()V
+SPLkotlin/text/LinesIterator;-><init>(Ljava/lang/CharSequence;)V
+SPLkotlin/text/LinesIterator;->hasNext()Z
+SPLkotlin/text/LinesIterator;->next()Ljava/lang/Object;
+SPLkotlin/text/LinesIterator;->next()Ljava/lang/String;
+Lkotlin/text/LinesIterator$State;
+SPLkotlin/text/LinesIterator$State;-><init>()V
+SPLkotlin/text/LinesIterator$State;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/text/MatchGroupCollection;
+Lkotlin/text/MatchNamedGroupCollection;
+Lkotlin/text/MatchResult;
+Lkotlin/text/MatcherMatchResult;
+SPLkotlin/text/MatcherMatchResult;-><init>(Ljava/util/regex/Matcher;Ljava/lang/CharSequence;)V
+SPLkotlin/text/MatcherMatchResult;->access$getMatchResult(Lkotlin/text/MatcherMatchResult;)Ljava/util/regex/MatchResult;
+SPLkotlin/text/MatcherMatchResult;->getGroupValues()Ljava/util/List;
+SPLkotlin/text/MatcherMatchResult;->getMatchResult()Ljava/util/regex/MatchResult;
+Lkotlin/text/MatcherMatchResult$groupValues$1;
+SPLkotlin/text/MatcherMatchResult$groupValues$1;-><init>(Lkotlin/text/MatcherMatchResult;)V
+SPLkotlin/text/MatcherMatchResult$groupValues$1;->get(I)Ljava/lang/Object;
+SPLkotlin/text/MatcherMatchResult$groupValues$1;->get(I)Ljava/lang/String;
+Lkotlin/text/MatcherMatchResult$groups$1;
+SPLkotlin/text/MatcherMatchResult$groups$1;-><init>(Lkotlin/text/MatcherMatchResult;)V
+Lkotlin/text/Regex;
+SPLkotlin/text/Regex;-><clinit>()V
+SPLkotlin/text/Regex;-><init>(Ljava/lang/String;)V
+SPLkotlin/text/Regex;-><init>(Ljava/util/regex/Pattern;)V
+SPLkotlin/text/Regex;->find$default(Lkotlin/text/Regex;Ljava/lang/CharSequence;IILjava/lang/Object;)Lkotlin/text/MatchResult;
+SPLkotlin/text/Regex;->find(Ljava/lang/CharSequence;I)Lkotlin/text/MatchResult;
+SPLkotlin/text/Regex;->matchAt(Ljava/lang/CharSequence;I)Lkotlin/text/MatchResult;
+SPLkotlin/text/Regex;->matches(Ljava/lang/CharSequence;)Z
+SPLkotlin/text/Regex;->split(Ljava/lang/CharSequence;I)Ljava/util/List;
+Lkotlin/text/Regex$Companion;
+SPLkotlin/text/Regex$Companion;-><init>()V
+SPLkotlin/text/Regex$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/text/RegexKt;
+SPLkotlin/text/RegexKt;->access$findNext(Ljava/util/regex/Matcher;ILjava/lang/CharSequence;)Lkotlin/text/MatchResult;
+SPLkotlin/text/RegexKt;->findNext(Ljava/util/regex/Matcher;ILjava/lang/CharSequence;)Lkotlin/text/MatchResult;
+Lkotlin/text/StringsKt;
+Lkotlin/text/StringsKt__AppendableKt;
+SPLkotlin/text/StringsKt__AppendableKt;->appendElement(Ljava/lang/Appendable;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)V
+Lkotlin/text/StringsKt__IndentKt;
+SPLkotlin/text/StringsKt__IndentKt;->$r8$lambda$3BvvMery65JEhzYBhCrX5rYm0VE(Ljava/lang/String;)Ljava/lang/String;
+SPLkotlin/text/StringsKt__IndentKt;->getIndentFunction$StringsKt__IndentKt(Ljava/lang/String;)Lkotlin/jvm/functions/Function1;
+SPLkotlin/text/StringsKt__IndentKt;->getIndentFunction$lambda$0$StringsKt__IndentKt(Ljava/lang/String;)Ljava/lang/String;
+SPLkotlin/text/StringsKt__IndentKt;->indentWidth$StringsKt__IndentKt(Ljava/lang/String;)I
+SPLkotlin/text/StringsKt__IndentKt;->replaceIndent(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+SPLkotlin/text/StringsKt__IndentKt;->trimIndent(Ljava/lang/String;)Ljava/lang/String;
+Lkotlin/text/StringsKt__IndentKt$$ExternalSyntheticLambda1;
+SPLkotlin/text/StringsKt__IndentKt$$ExternalSyntheticLambda1;-><init>()V
+SPLkotlin/text/StringsKt__IndentKt$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlin/text/StringsKt__RegexExtensionsJVMKt;
+Lkotlin/text/StringsKt__RegexExtensionsKt;
+Lkotlin/text/StringsKt__StringBuilderJVMKt;
+Lkotlin/text/StringsKt__StringBuilderKt;
+Lkotlin/text/StringsKt__StringNumberConversionsJVMKt;
+Lkotlin/text/StringsKt__StringNumberConversionsKt;
+Lkotlin/text/StringsKt__StringsJVMKt;
+SPLkotlin/text/StringsKt__StringsJVMKt;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Z
+SPLkotlin/text/StringsKt__StringsJVMKt;->endsWith(Ljava/lang/String;Ljava/lang/String;Z)Z
+SPLkotlin/text/StringsKt__StringsJVMKt;->equals$default(Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Z
+SPLkotlin/text/StringsKt__StringsJVMKt;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+SPLkotlin/text/StringsKt__StringsJVMKt;->replace$default(Ljava/lang/String;CCZILjava/lang/Object;)Ljava/lang/String;
+SPLkotlin/text/StringsKt__StringsJVMKt;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/String;
+SPLkotlin/text/StringsKt__StringsJVMKt;->replace(Ljava/lang/String;CCZ)Ljava/lang/String;
+SPLkotlin/text/StringsKt__StringsJVMKt;->replace(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;
+SPLkotlin/text/StringsKt__StringsJVMKt;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Z
+SPLkotlin/text/StringsKt__StringsJVMKt;->startsWith(Ljava/lang/String;Ljava/lang/String;Z)Z
+Lkotlin/text/StringsKt__StringsKt;
+SPLkotlin/text/StringsKt__StringsKt;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZILjava/lang/Object;)Z
+SPLkotlin/text/StringsKt__StringsKt;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+SPLkotlin/text/StringsKt__StringsKt;->endsWith$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZILjava/lang/Object;)Z
+SPLkotlin/text/StringsKt__StringsKt;->endsWith(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+SPLkotlin/text/StringsKt__StringsKt;->getLastIndex(Ljava/lang/CharSequence;)I
+SPLkotlin/text/StringsKt__StringsKt;->indexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZILjava/lang/Object;)I
+SPLkotlin/text/StringsKt__StringsKt;->indexOf(Ljava/lang/CharSequence;Ljava/lang/String;IZ)I
+SPLkotlin/text/StringsKt__StringsKt;->isBlank(Ljava/lang/CharSequence;)Z
+SPLkotlin/text/StringsKt__StringsKt;->lastIndexOf$default(Ljava/lang/CharSequence;CIZILjava/lang/Object;)I
+SPLkotlin/text/StringsKt__StringsKt;->lastIndexOf(Ljava/lang/CharSequence;CIZ)I
+SPLkotlin/text/StringsKt__StringsKt;->lineSequence(Ljava/lang/CharSequence;)Lkotlin/sequences/Sequence;
+SPLkotlin/text/StringsKt__StringsKt;->lines(Ljava/lang/CharSequence;)Ljava/util/List;
+SPLkotlin/text/StringsKt__StringsKt;->padStart(Ljava/lang/CharSequence;IC)Ljava/lang/CharSequence;
+SPLkotlin/text/StringsKt__StringsKt;->padStart(Ljava/lang/String;IC)Ljava/lang/String;
+SPLkotlin/text/StringsKt__StringsKt;->removePrefix(Ljava/lang/String;Ljava/lang/CharSequence;)Ljava/lang/String;
+SPLkotlin/text/StringsKt__StringsKt;->removeSuffix(Ljava/lang/String;Ljava/lang/CharSequence;)Ljava/lang/String;
+SPLkotlin/text/StringsKt__StringsKt;->requireNonNegativeLimit(I)V
+SPLkotlin/text/StringsKt__StringsKt;->startsWith$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZILjava/lang/Object;)Z
+SPLkotlin/text/StringsKt__StringsKt;->startsWith(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+SPLkotlin/text/StringsKt__StringsKt;->substringAfterLast$default(Ljava/lang/String;CLjava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
+SPLkotlin/text/StringsKt__StringsKt;->substringAfterLast(Ljava/lang/String;CLjava/lang/String;)Ljava/lang/String;
+SPLkotlin/text/StringsKt__StringsKt;->substringBefore$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;
+SPLkotlin/text/StringsKt__StringsKt;->substringBefore(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+SPLkotlin/text/StringsKt__StringsKt;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+Lkotlin/text/StringsKt__StringsKt$lineSequence$$inlined$Sequence$1;
+SPLkotlin/text/StringsKt__StringsKt$lineSequence$$inlined$Sequence$1;-><init>(Ljava/lang/CharSequence;)V
+SPLkotlin/text/StringsKt__StringsKt$lineSequence$$inlined$Sequence$1;->iterator()Ljava/util/Iterator;
+Lkotlin/text/StringsKt___StringsJvmKt;
+Lkotlin/text/StringsKt___StringsKt;
+SPLkotlin/text/StringsKt___StringsKt;->drop(Ljava/lang/String;I)Ljava/lang/String;
+Lkotlin/time/ComparableTimeMark;
+Lkotlin/time/Duration;
+SPLkotlin/time/Duration;-><clinit>()V
+SPLkotlin/time/Duration;-><init>(J)V
+SPLkotlin/time/Duration;->appendFractional-impl(JLjava/lang/StringBuilder;IIILjava/lang/String;Z)V
+SPLkotlin/time/Duration;->box-impl(J)Lkotlin/time/Duration;
+SPLkotlin/time/Duration;->constructor-impl(J)J
+SPLkotlin/time/Duration;->getAbsoluteValue-UwyO8pc(J)J
+SPLkotlin/time/Duration;->getHoursComponent-impl(J)I
+SPLkotlin/time/Duration;->getInWholeDays-impl(J)J
+SPLkotlin/time/Duration;->getInWholeHours-impl(J)J
+SPLkotlin/time/Duration;->getInWholeMilliseconds-impl(J)J
+SPLkotlin/time/Duration;->getInWholeMinutes-impl(J)J
+SPLkotlin/time/Duration;->getInWholeSeconds-impl(J)J
+SPLkotlin/time/Duration;->getMinutesComponent-impl(J)I
+SPLkotlin/time/Duration;->getNanosecondsComponent-impl(J)I
+SPLkotlin/time/Duration;->getSecondsComponent-impl(J)I
+SPLkotlin/time/Duration;->getStorageUnit-impl(J)Lkotlin/time/DurationUnit;
+SPLkotlin/time/Duration;->getValue-impl(J)J
+SPLkotlin/time/Duration;->isInMillis-impl(J)Z
+SPLkotlin/time/Duration;->isInNanos-impl(J)Z
+SPLkotlin/time/Duration;->isInfinite-impl(J)Z
+SPLkotlin/time/Duration;->isNegative-impl(J)Z
+SPLkotlin/time/Duration;->isPositive-impl(J)Z
+SPLkotlin/time/Duration;->plus-LRDsOJo(JJ)J
+SPLkotlin/time/Duration;->toLong-impl(JLkotlin/time/DurationUnit;)J
+SPLkotlin/time/Duration;->toString()Ljava/lang/String;
+SPLkotlin/time/Duration;->toString-impl(J)Ljava/lang/String;
+SPLkotlin/time/Duration;->unbox-impl()J
+Lkotlin/time/Duration$Companion;
+SPLkotlin/time/Duration$Companion;-><init>()V
+SPLkotlin/time/Duration$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlin/time/Duration$Companion;->fromRawValue-UwyO8pc$kotlin_stdlib(J)J
+Lkotlin/time/DurationJvmKt;
+SPLkotlin/time/DurationJvmKt;-><clinit>()V
+SPLkotlin/time/DurationJvmKt;->getDurationAssertionsEnabled()Z
+Lkotlin/time/DurationKt;
+SPLkotlin/time/DurationKt;->access$durationOfMillis(J)J
+SPLkotlin/time/DurationKt;->access$durationOfNanosNormalized(J)J
+SPLkotlin/time/DurationKt;->durationOfMillis(J)J
+SPLkotlin/time/DurationKt;->durationOfNanos(J)J
+SPLkotlin/time/DurationKt;->durationOfNanosNormalized(J)J
+SPLkotlin/time/DurationKt;->toDuration(ILkotlin/time/DurationUnit;)J
+SPLkotlin/time/DurationKt;->toDuration(JLkotlin/time/DurationUnit;)J
+Lkotlin/time/DurationUnit;
+SPLkotlin/time/DurationUnit;->$values()[Lkotlin/time/DurationUnit;
+SPLkotlin/time/DurationUnit;-><clinit>()V
+SPLkotlin/time/DurationUnit;-><init>(Ljava/lang/String;ILjava/util/concurrent/TimeUnit;)V
+SPLkotlin/time/DurationUnit;->getTimeUnit$kotlin_stdlib()Ljava/util/concurrent/TimeUnit;
+Lkotlin/time/DurationUnitKt;
+Lkotlin/time/DurationUnitKt__DurationUnitJvmKt;
+SPLkotlin/time/DurationUnitKt__DurationUnitJvmKt;->convertDurationUnit(JLkotlin/time/DurationUnit;Lkotlin/time/DurationUnit;)J
+SPLkotlin/time/DurationUnitKt__DurationUnitJvmKt;->convertDurationUnitOverflow(JLkotlin/time/DurationUnit;Lkotlin/time/DurationUnit;)J
+Lkotlin/time/DurationUnitKt__DurationUnitKt;
+Lkotlin/time/Instant;
+SPLkotlin/time/Instant;-><clinit>()V
+SPLkotlin/time/Instant;-><init>(JI)V
+Lkotlin/time/Instant$Companion;
+SPLkotlin/time/Instant$Companion;-><init>()V
+SPLkotlin/time/Instant$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlin/time/LongSaturatedMathKt;
+SPLkotlin/time/LongSaturatedMathKt;->saturatingDiff(JJLkotlin/time/DurationUnit;)J
+SPLkotlin/time/LongSaturatedMathKt;->saturatingFiniteDiff(JJLkotlin/time/DurationUnit;)J
+Lkotlin/time/MonotonicTimeSource;
+SPLkotlin/time/MonotonicTimeSource;-><clinit>()V
+SPLkotlin/time/MonotonicTimeSource;-><init>()V
+SPLkotlin/time/MonotonicTimeSource;->elapsedFrom-6eNON_k(J)J
+SPLkotlin/time/MonotonicTimeSource;->markNow-z9LOYto()J
+SPLkotlin/time/MonotonicTimeSource;->read()J
+Lkotlin/time/TimeMark;
+Lkotlin/time/TimeSource;
+Lkotlin/time/TimeSource$Monotonic;
+SPLkotlin/time/TimeSource$Monotonic;-><clinit>()V
+SPLkotlin/time/TimeSource$Monotonic;-><init>()V
+SPLkotlin/time/TimeSource$Monotonic;->markNow-z9LOYto()J
+Lkotlin/time/TimeSource$Monotonic$ValueTimeMark;
+SPLkotlin/time/TimeSource$Monotonic$ValueTimeMark;->constructor-impl(J)J
+SPLkotlin/time/TimeSource$Monotonic$ValueTimeMark;->elapsedNow-UwyO8pc(J)J
+Lkotlin/time/TimeSource$WithComparableMarks;
+Lkotlin/uuid/Uuid;
+SPLkotlin/uuid/Uuid;-><clinit>()V
+SPLkotlin/uuid/Uuid;-><init>(JJ)V
+Lkotlin/uuid/Uuid$Companion;
+SPLkotlin/uuid/Uuid$Companion;-><init>()V
+SPLkotlin/uuid/Uuid$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/coroutines/AbstractCoroutine;
+SPLkotlinx/coroutines/AbstractCoroutine;-><init>(Lkotlin/coroutines/CoroutineContext;ZZ)V
+SPLkotlinx/coroutines/AbstractCoroutine;->afterResume(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/AbstractCoroutine;->cancellationExceptionMessage()Ljava/lang/String;
+SPLkotlinx/coroutines/AbstractCoroutine;->getContext()Lkotlin/coroutines/CoroutineContext;
+SPLkotlinx/coroutines/AbstractCoroutine;->getCoroutineContext()Lkotlin/coroutines/CoroutineContext;
+SPLkotlinx/coroutines/AbstractCoroutine;->isActive()Z
+SPLkotlinx/coroutines/AbstractCoroutine;->onCancelled(Ljava/lang/Throwable;Z)V
+SPLkotlinx/coroutines/AbstractCoroutine;->onCompleted(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/AbstractCoroutine;->onCompletionInternal(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/AbstractCoroutine;->resumeWith(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/AbstractCoroutine;->start(Lkotlinx/coroutines/CoroutineStart;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)V
+Lkotlinx/coroutines/AbstractTimeSourceKt;
+SPLkotlinx/coroutines/AbstractTimeSourceKt;-><clinit>()V
+SPLkotlinx/coroutines/AbstractTimeSourceKt;->access$getTimeSource$p()Lkotlinx/coroutines/AbstractTimeSource;
+Lkotlinx/coroutines/Active;
+SPLkotlinx/coroutines/Active;-><clinit>()V
+SPLkotlinx/coroutines/Active;-><init>()V
+Lkotlinx/coroutines/BlockingCoroutine;
+SPLkotlinx/coroutines/BlockingCoroutine;-><init>(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Thread;Lkotlinx/coroutines/EventLoop;)V
+SPLkotlinx/coroutines/BlockingCoroutine;->afterCompletion(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/BlockingCoroutine;->joinBlocking()Ljava/lang/Object;
+Lkotlinx/coroutines/BlockingEventLoop;
+SPLkotlinx/coroutines/BlockingEventLoop;-><init>(Ljava/lang/Thread;)V
+SPLkotlinx/coroutines/BlockingEventLoop;->getThread()Ljava/lang/Thread;
+Lkotlinx/coroutines/BuildersKt;
+SPLkotlinx/coroutines/BuildersKt;->launch$default(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/CoroutineStart;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+SPLkotlinx/coroutines/BuildersKt;->launch(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/CoroutineStart;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
+SPLkotlinx/coroutines/BuildersKt;->runBlocking$default(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/BuildersKt;->runBlocking(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+SPLkotlinx/coroutines/BuildersKt;->runBlockingImpl(Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/EventLoop;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+SPLkotlinx/coroutines/BuildersKt;->runBlockingK$default(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/BuildersKt;->runBlockingK(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+SPLkotlinx/coroutines/BuildersKt;->withContext(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/BuildersKt__BuildersKt;
+SPLkotlinx/coroutines/BuildersKt__BuildersKt;->runBlocking$default(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/BuildersKt__BuildersKt;->runBlocking(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+SPLkotlinx/coroutines/BuildersKt__BuildersKt;->runBlockingImpl(Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/EventLoop;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+Lkotlinx/coroutines/BuildersKt__Builders_commonKt;
+SPLkotlinx/coroutines/BuildersKt__Builders_commonKt;->launch$default(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/CoroutineStart;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+SPLkotlinx/coroutines/BuildersKt__Builders_commonKt;->launch(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/CoroutineStart;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
+SPLkotlinx/coroutines/BuildersKt__Builders_commonKt;->withContext(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/BuildersKt__Builders_concurrentKt;
+SPLkotlinx/coroutines/BuildersKt__Builders_concurrentKt;->runBlockingK$default(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/BuildersKt__Builders_concurrentKt;->runBlockingK(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+Lkotlinx/coroutines/CancelHandler;
+Lkotlinx/coroutines/CancelHandler$UserSupplied;
+SPLkotlinx/coroutines/CancelHandler$UserSupplied;-><init>(Lkotlin/jvm/functions/Function1;)V
+Lkotlinx/coroutines/CancellableContinuation;
+Lkotlinx/coroutines/CancellableContinuationImpl;
+SPLkotlinx/coroutines/CancellableContinuationImpl;-><clinit>()V
+SPLkotlinx/coroutines/CancellableContinuationImpl;-><init>(Lkotlin/coroutines/Continuation;I)V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->callSegmentOnCancellation(Lkotlinx/coroutines/internal/Segment;Ljava/lang/Throwable;)V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->cancel(Ljava/lang/Throwable;)Z
+SPLkotlinx/coroutines/CancellableContinuationImpl;->cancelLater(Ljava/lang/Throwable;)Z
+SPLkotlinx/coroutines/CancellableContinuationImpl;->completeResume(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->detachChild$kotlinx_coroutines_core()V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->detachChildIfNonReusable()V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->dispatchResume(I)V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->getContext()Lkotlin/coroutines/CoroutineContext;
+SPLkotlinx/coroutines/CancellableContinuationImpl;->getContinuationCancellationCause(Lkotlinx/coroutines/Job;)Ljava/lang/Throwable;
+SPLkotlinx/coroutines/CancellableContinuationImpl;->getDelegate$kotlinx_coroutines_core()Lkotlin/coroutines/Continuation;
+SPLkotlinx/coroutines/CancellableContinuationImpl;->getExceptionalResult$kotlinx_coroutines_core(Ljava/lang/Object;)Ljava/lang/Throwable;
+SPLkotlinx/coroutines/CancellableContinuationImpl;->getParentHandle()Lkotlinx/coroutines/DisposableHandle;
+SPLkotlinx/coroutines/CancellableContinuationImpl;->getResult()Ljava/lang/Object;
+SPLkotlinx/coroutines/CancellableContinuationImpl;->getState$kotlinx_coroutines_core()Ljava/lang/Object;
+SPLkotlinx/coroutines/CancellableContinuationImpl;->getSuccessfulResult$kotlinx_coroutines_core(Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/CancellableContinuationImpl;->get_decisionAndIndex$volatile$FU()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+SPLkotlinx/coroutines/CancellableContinuationImpl;->get_parentHandle$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/CancellableContinuationImpl;->get_state$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/CancellableContinuationImpl;->initCancellability()V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->installParentHandle()Lkotlinx/coroutines/DisposableHandle;
+SPLkotlinx/coroutines/CancellableContinuationImpl;->invokeOnCancellation(Lkotlin/jvm/functions/Function1;)V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->invokeOnCancellation(Lkotlinx/coroutines/internal/Segment;I)V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->invokeOnCancellationImpl(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->invokeOnCancellationInternal$kotlinx_coroutines_core(Lkotlinx/coroutines/CancelHandler;)V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->isCompleted()Z
+SPLkotlinx/coroutines/CancellableContinuationImpl;->isReusable()Z
+SPLkotlinx/coroutines/CancellableContinuationImpl;->parentCancelled$kotlinx_coroutines_core(Ljava/lang/Throwable;)V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->releaseClaimedReusableContinuation$kotlinx_coroutines_core()V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->resetStateReusable()Z
+SPLkotlinx/coroutines/CancellableContinuationImpl;->resumeImpl$kotlinx_coroutines_core$default(Lkotlinx/coroutines/CancellableContinuationImpl;Ljava/lang/Object;ILkotlin/jvm/functions/Function3;ILjava/lang/Object;)V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->resumeImpl$kotlinx_coroutines_core(Ljava/lang/Object;ILkotlin/jvm/functions/Function3;)V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->resumeUndispatched(Lkotlinx/coroutines/CoroutineDispatcher;Ljava/lang/Object;)V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->resumeWith(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/CancellableContinuationImpl;->resumedState(Lkotlinx/coroutines/NotCompleted;Ljava/lang/Object;ILkotlin/jvm/functions/Function3;Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/CancellableContinuationImpl;->takeState$kotlinx_coroutines_core()Ljava/lang/Object;
+SPLkotlinx/coroutines/CancellableContinuationImpl;->tryResume()Z
+SPLkotlinx/coroutines/CancellableContinuationImpl;->tryResume(Ljava/lang/Object;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)Ljava/lang/Object;
+SPLkotlinx/coroutines/CancellableContinuationImpl;->tryResumeImpl(Ljava/lang/Object;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/CancellableContinuationImpl;->trySuspend()Z
+Lkotlinx/coroutines/CancellableContinuationImplKt;
+SPLkotlinx/coroutines/CancellableContinuationImplKt;-><clinit>()V
+Lkotlinx/coroutines/CancellableContinuationKt;
+SPLkotlinx/coroutines/CancellableContinuationKt;->disposeOnCancellation(Lkotlinx/coroutines/CancellableContinuation;Lkotlinx/coroutines/DisposableHandle;)V
+SPLkotlinx/coroutines/CancellableContinuationKt;->getOrCreateCancellableContinuation(Lkotlin/coroutines/Continuation;)Lkotlinx/coroutines/CancellableContinuationImpl;
+SPLkotlinx/coroutines/CancellableContinuationKt;->invokeOnCancellation(Lkotlinx/coroutines/CancellableContinuation;Lkotlinx/coroutines/CancelHandler;)V
+Lkotlinx/coroutines/CancelledContinuation;
+SPLkotlinx/coroutines/CancelledContinuation;-><clinit>()V
+SPLkotlinx/coroutines/CancelledContinuation;-><init>(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;Z)V
+Lkotlinx/coroutines/ChildContinuation;
+SPLkotlinx/coroutines/ChildContinuation;-><init>(Lkotlinx/coroutines/CancellableContinuationImpl;)V
+SPLkotlinx/coroutines/ChildContinuation;->getOnCancelling()Z
+SPLkotlinx/coroutines/ChildContinuation;->invoke(Ljava/lang/Throwable;)V
+Lkotlinx/coroutines/ChildHandle;
+Lkotlinx/coroutines/ChildHandleNode;
+SPLkotlinx/coroutines/ChildHandleNode;-><init>(Lkotlinx/coroutines/ChildJob;)V
+SPLkotlinx/coroutines/ChildHandleNode;->childCancelled(Ljava/lang/Throwable;)Z
+SPLkotlinx/coroutines/ChildHandleNode;->getOnCancelling()Z
+SPLkotlinx/coroutines/ChildHandleNode;->invoke(Ljava/lang/Throwable;)V
+Lkotlinx/coroutines/ChildJob;
+Lkotlinx/coroutines/CompletableDeferred;
+Lkotlinx/coroutines/CompletableDeferredImpl;
+SPLkotlinx/coroutines/CompletableDeferredImpl;-><init>(Lkotlinx/coroutines/Job;)V
+SPLkotlinx/coroutines/CompletableDeferredImpl;->complete(Ljava/lang/Object;)Z
+SPLkotlinx/coroutines/CompletableDeferredImpl;->getCompleted()Ljava/lang/Object;
+Lkotlinx/coroutines/CompletableDeferredKt;
+SPLkotlinx/coroutines/CompletableDeferredKt;->CompletableDeferred$default(Lkotlinx/coroutines/Job;ILjava/lang/Object;)Lkotlinx/coroutines/CompletableDeferred;
+SPLkotlinx/coroutines/CompletableDeferredKt;->CompletableDeferred(Lkotlinx/coroutines/Job;)Lkotlinx/coroutines/CompletableDeferred;
+SPLkotlinx/coroutines/CompletableDeferredKt;->completeWith(Lkotlinx/coroutines/CompletableDeferred;Ljava/lang/Object;)Z
+Lkotlinx/coroutines/CompletableJob;
+Lkotlinx/coroutines/CompletedContinuation;
+SPLkotlinx/coroutines/CompletedContinuation;-><init>(Ljava/lang/Object;Lkotlinx/coroutines/CancelHandler;Lkotlin/jvm/functions/Function3;Ljava/lang/Object;Ljava/lang/Throwable;)V
+SPLkotlinx/coroutines/CompletedContinuation;-><init>(Ljava/lang/Object;Lkotlinx/coroutines/CancelHandler;Lkotlin/jvm/functions/Function3;Ljava/lang/Object;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/coroutines/CompletedExceptionally;
+SPLkotlinx/coroutines/CompletedExceptionally;-><clinit>()V
+SPLkotlinx/coroutines/CompletedExceptionally;-><init>(Ljava/lang/Throwable;Z)V
+SPLkotlinx/coroutines/CompletedExceptionally;-><init>(Ljava/lang/Throwable;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlinx/coroutines/CompletedExceptionally;->getHandled()Z
+SPLkotlinx/coroutines/CompletedExceptionally;->get_handled$volatile$FU()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+SPLkotlinx/coroutines/CompletedExceptionally;->makeHandled()Z
+Lkotlinx/coroutines/CompletionStateKt;
+SPLkotlinx/coroutines/CompletionStateKt;->recoverResult(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/CompletionStateKt;->toState(Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/CompletionStateKt;->toState(Ljava/lang/Object;Lkotlinx/coroutines/CancellableContinuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/CopyableThreadContextElement;
+Lkotlinx/coroutines/CopyableThrowable;
+Lkotlinx/coroutines/CoroutineContextKt;
+SPLkotlinx/coroutines/CoroutineContextKt;->foldCopies(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;Z)Lkotlin/coroutines/CoroutineContext;
+SPLkotlinx/coroutines/CoroutineContextKt;->hasCopyableElements$lambda$0(ZLkotlin/coroutines/CoroutineContext$Element;)Z
+SPLkotlinx/coroutines/CoroutineContextKt;->hasCopyableElements(Lkotlin/coroutines/CoroutineContext;)Z
+SPLkotlinx/coroutines/CoroutineContextKt;->newCoroutineContext(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+SPLkotlinx/coroutines/CoroutineContextKt;->newCoroutineContext(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+Lkotlinx/coroutines/CoroutineContextKt$$ExternalSyntheticLambda0;
+SPLkotlinx/coroutines/CoroutineContextKt$$ExternalSyntheticLambda0;-><init>()V
+SPLkotlinx/coroutines/CoroutineContextKt$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/CoroutineDispatcher;
+SPLkotlinx/coroutines/CoroutineDispatcher;-><clinit>()V
+SPLkotlinx/coroutines/CoroutineDispatcher;-><init>()V
+SPLkotlinx/coroutines/CoroutineDispatcher;->dispatchYield(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+SPLkotlinx/coroutines/CoroutineDispatcher;->get(Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
+SPLkotlinx/coroutines/CoroutineDispatcher;->interceptContinuation(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLkotlinx/coroutines/CoroutineDispatcher;->isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
+SPLkotlinx/coroutines/CoroutineDispatcher;->limitedParallelism$default(Lkotlinx/coroutines/CoroutineDispatcher;ILjava/lang/String;ILjava/lang/Object;)Lkotlinx/coroutines/CoroutineDispatcher;
+SPLkotlinx/coroutines/CoroutineDispatcher;->limitedParallelism(ILjava/lang/String;)Lkotlinx/coroutines/CoroutineDispatcher;
+SPLkotlinx/coroutines/CoroutineDispatcher;->minusKey(Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext;
+SPLkotlinx/coroutines/CoroutineDispatcher;->releaseInterceptedContinuation(Lkotlin/coroutines/Continuation;)V
+Lkotlinx/coroutines/CoroutineDispatcher$Key;
+SPLkotlinx/coroutines/CoroutineDispatcher$Key;-><init>()V
+SPLkotlinx/coroutines/CoroutineDispatcher$Key;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/coroutines/CoroutineDispatcher$Key$$ExternalSyntheticLambda0;
+SPLkotlinx/coroutines/CoroutineDispatcher$Key$$ExternalSyntheticLambda0;-><init>()V
+Lkotlinx/coroutines/CoroutineId;
+Lkotlinx/coroutines/CoroutineName;
+SPLkotlinx/coroutines/CoroutineName;-><clinit>()V
+SPLkotlinx/coroutines/CoroutineName;-><init>(Ljava/lang/String;)V
+Lkotlinx/coroutines/CoroutineName$Key;
+SPLkotlinx/coroutines/CoroutineName$Key;-><init>()V
+SPLkotlinx/coroutines/CoroutineName$Key;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/coroutines/CoroutineScope;
+Lkotlinx/coroutines/CoroutineScopeKt;
+SPLkotlinx/coroutines/CoroutineScopeKt;->CoroutineScope(Lkotlin/coroutines/CoroutineContext;)Lkotlinx/coroutines/CoroutineScope;
+SPLkotlinx/coroutines/CoroutineScopeKt;->MainScope()Lkotlinx/coroutines/CoroutineScope;
+SPLkotlinx/coroutines/CoroutineScopeKt;->cancel$default(Lkotlinx/coroutines/CoroutineScope;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+SPLkotlinx/coroutines/CoroutineScopeKt;->cancel(Lkotlinx/coroutines/CoroutineScope;Ljava/util/concurrent/CancellationException;)V
+SPLkotlinx/coroutines/CoroutineScopeKt;->coroutineScope(Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/CoroutineScopeKt;->ensureActive(Lkotlinx/coroutines/CoroutineScope;)V
+Lkotlinx/coroutines/CoroutineStart;
+SPLkotlinx/coroutines/CoroutineStart;->$values()[Lkotlinx/coroutines/CoroutineStart;
+SPLkotlinx/coroutines/CoroutineStart;-><clinit>()V
+SPLkotlinx/coroutines/CoroutineStart;-><init>(Ljava/lang/String;I)V
+SPLkotlinx/coroutines/CoroutineStart;->invoke(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/CoroutineStart;->isLazy()Z
+SPLkotlinx/coroutines/CoroutineStart;->values()[Lkotlinx/coroutines/CoroutineStart;
+Lkotlinx/coroutines/CoroutineStart$WhenMappings;
+SPLkotlinx/coroutines/CoroutineStart$WhenMappings;-><clinit>()V
+Lkotlinx/coroutines/DebugKt;
+SPLkotlinx/coroutines/DebugKt;-><clinit>()V
+SPLkotlinx/coroutines/DebugKt;->getASSERTIONS_ENABLED()Z
+SPLkotlinx/coroutines/DebugKt;->getDEBUG()Z
+SPLkotlinx/coroutines/DebugKt;->getRECOVER_STACK_TRACES()Z
+Lkotlinx/coroutines/DebugStringsKt;
+SPLkotlinx/coroutines/DebugStringsKt;->getClassSimpleName(Ljava/lang/Object;)Ljava/lang/String;
+Lkotlinx/coroutines/DefaultExecutor;
+SPLkotlinx/coroutines/DefaultExecutor;-><clinit>()V
+SPLkotlinx/coroutines/DefaultExecutor;-><init>()V
+SPLkotlinx/coroutines/DefaultExecutor;->acknowledgeShutdownIfNeeded()V
+SPLkotlinx/coroutines/DefaultExecutor;->createThreadSync()Ljava/lang/Thread;
+SPLkotlinx/coroutines/DefaultExecutor;->getThread()Ljava/lang/Thread;
+SPLkotlinx/coroutines/DefaultExecutor;->isShutdownRequested()Z
+SPLkotlinx/coroutines/DefaultExecutor;->notifyStartup()Z
+SPLkotlinx/coroutines/DefaultExecutor;->run()V
+Lkotlinx/coroutines/DefaultExecutorKt;
+SPLkotlinx/coroutines/DefaultExecutorKt;-><clinit>()V
+SPLkotlinx/coroutines/DefaultExecutorKt;->getDefaultDelay()Lkotlinx/coroutines/Delay;
+SPLkotlinx/coroutines/DefaultExecutorKt;->initializeDefaultDelay()Lkotlinx/coroutines/Delay;
+Lkotlinx/coroutines/Deferred;
+Lkotlinx/coroutines/Delay;
+Lkotlinx/coroutines/DelayKt;
+SPLkotlinx/coroutines/DelayKt;->awaitCancellation(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/DelayKt;->delay(JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/DelayKt;->delay-VtjQ1oo(JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/DelayKt;->getDelay(Lkotlin/coroutines/CoroutineContext;)Lkotlinx/coroutines/Delay;
+SPLkotlinx/coroutines/DelayKt;->toDelayMillis-LRDsOJo(J)J
+Lkotlinx/coroutines/DelayKt$awaitCancellation$1;
+SPLkotlinx/coroutines/DelayKt$awaitCancellation$1;-><init>(Lkotlin/coroutines/Continuation;)V
+Lkotlinx/coroutines/DispatchException;
+Lkotlinx/coroutines/DispatchedCoroutine;
+SPLkotlinx/coroutines/DispatchedCoroutine;-><clinit>()V
+SPLkotlinx/coroutines/DispatchedCoroutine;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/DispatchedCoroutine;->afterResume(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/DispatchedCoroutine;->getResult$kotlinx_coroutines_core()Ljava/lang/Object;
+SPLkotlinx/coroutines/DispatchedCoroutine;->get_decision$volatile$FU()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+SPLkotlinx/coroutines/DispatchedCoroutine;->tryResume()Z
+SPLkotlinx/coroutines/DispatchedCoroutine;->trySuspend()Z
+Lkotlinx/coroutines/DispatchedTask;
+SPLkotlinx/coroutines/DispatchedTask;-><init>(I)V
+SPLkotlinx/coroutines/DispatchedTask;->cancelCompletedResult$kotlinx_coroutines_core(Ljava/lang/Object;Ljava/lang/Throwable;)V
+SPLkotlinx/coroutines/DispatchedTask;->getExceptionalResult$kotlinx_coroutines_core(Ljava/lang/Object;)Ljava/lang/Throwable;
+SPLkotlinx/coroutines/DispatchedTask;->getSuccessfulResult$kotlinx_coroutines_core(Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/DispatchedTask;->run()V
+Lkotlinx/coroutines/DispatchedTaskKt;
+SPLkotlinx/coroutines/DispatchedTaskKt;->dispatch(Lkotlinx/coroutines/DispatchedTask;I)V
+SPLkotlinx/coroutines/DispatchedTaskKt;->isCancellableMode(I)Z
+SPLkotlinx/coroutines/DispatchedTaskKt;->isReusableMode(I)Z
+SPLkotlinx/coroutines/DispatchedTaskKt;->resume(Lkotlinx/coroutines/DispatchedTask;Lkotlin/coroutines/Continuation;Z)V
+SPLkotlinx/coroutines/DispatchedTaskKt;->resumeUnconfined(Lkotlinx/coroutines/DispatchedTask;)V
+Lkotlinx/coroutines/DispatcherExecutor;
+SPLkotlinx/coroutines/DispatcherExecutor;-><init>(Lkotlinx/coroutines/CoroutineDispatcher;)V
+Lkotlinx/coroutines/Dispatchers;
+SPLkotlinx/coroutines/Dispatchers;-><clinit>()V
+SPLkotlinx/coroutines/Dispatchers;-><init>()V
+SPLkotlinx/coroutines/Dispatchers;->getDefault()Lkotlinx/coroutines/CoroutineDispatcher;
+SPLkotlinx/coroutines/Dispatchers;->getIO()Lkotlinx/coroutines/CoroutineDispatcher;
+SPLkotlinx/coroutines/Dispatchers;->getMain()Lkotlinx/coroutines/MainCoroutineDispatcher;
+Lkotlinx/coroutines/DisposableHandle;
+Lkotlinx/coroutines/DisposeOnCancel;
+SPLkotlinx/coroutines/DisposeOnCancel;-><init>(Lkotlinx/coroutines/DisposableHandle;)V
+Lkotlinx/coroutines/Empty;
+SPLkotlinx/coroutines/Empty;-><init>(Z)V
+SPLkotlinx/coroutines/Empty;->getList()Lkotlinx/coroutines/NodeList;
+SPLkotlinx/coroutines/Empty;->isActive()Z
+Lkotlinx/coroutines/EventLoop;
+SPLkotlinx/coroutines/EventLoop;-><init>()V
+SPLkotlinx/coroutines/EventLoop;->decrementUseCount$default(Lkotlinx/coroutines/EventLoop;ZILjava/lang/Object;)V
+SPLkotlinx/coroutines/EventLoop;->decrementUseCount(Z)V
+SPLkotlinx/coroutines/EventLoop;->delta(Z)J
+SPLkotlinx/coroutines/EventLoop;->dispatchUnconfined(Lkotlinx/coroutines/DispatchedTask;)V
+SPLkotlinx/coroutines/EventLoop;->getNextTime()J
+SPLkotlinx/coroutines/EventLoop;->incrementUseCount$default(Lkotlinx/coroutines/EventLoop;ZILjava/lang/Object;)V
+SPLkotlinx/coroutines/EventLoop;->incrementUseCount(Z)V
+SPLkotlinx/coroutines/EventLoop;->isUnconfinedLoopActive()Z
+SPLkotlinx/coroutines/EventLoop;->isUnconfinedQueueEmpty()Z
+SPLkotlinx/coroutines/EventLoop;->processUnconfinedEvent()Z
+Lkotlinx/coroutines/EventLoopImplBase;
+SPLkotlinx/coroutines/EventLoopImplBase;-><clinit>()V
+SPLkotlinx/coroutines/EventLoopImplBase;-><init>()V
+SPLkotlinx/coroutines/EventLoopImplBase;->access$isCompleted(Lkotlinx/coroutines/EventLoopImplBase;)Z
+SPLkotlinx/coroutines/EventLoopImplBase;->closeQueue()V
+SPLkotlinx/coroutines/EventLoopImplBase;->dequeue()Ljava/lang/Runnable;
+SPLkotlinx/coroutines/EventLoopImplBase;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+SPLkotlinx/coroutines/EventLoopImplBase;->enqueue(Ljava/lang/Runnable;)V
+SPLkotlinx/coroutines/EventLoopImplBase;->enqueueDelayedTasks()V
+SPLkotlinx/coroutines/EventLoopImplBase;->enqueueImpl(Ljava/lang/Runnable;)Z
+SPLkotlinx/coroutines/EventLoopImplBase;->getNextTime()J
+SPLkotlinx/coroutines/EventLoopImplBase;->get_delayed$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/EventLoopImplBase;->get_isCompleted$volatile$FU()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+SPLkotlinx/coroutines/EventLoopImplBase;->get_queue$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/EventLoopImplBase;->isCompleted()Z
+SPLkotlinx/coroutines/EventLoopImplBase;->isEmpty()Z
+SPLkotlinx/coroutines/EventLoopImplBase;->processNextEvent()J
+SPLkotlinx/coroutines/EventLoopImplBase;->rescheduleAllDelayed()V
+SPLkotlinx/coroutines/EventLoopImplBase;->schedule(JLkotlinx/coroutines/EventLoopImplBase$DelayedTask;)V
+SPLkotlinx/coroutines/EventLoopImplBase;->scheduleImpl(JLkotlinx/coroutines/EventLoopImplBase$DelayedTask;)I
+SPLkotlinx/coroutines/EventLoopImplBase;->scheduleResumeAfterDelay(JLkotlinx/coroutines/CancellableContinuation;)V
+SPLkotlinx/coroutines/EventLoopImplBase;->setCompleted(Z)V
+SPLkotlinx/coroutines/EventLoopImplBase;->shouldUnpark(Lkotlinx/coroutines/EventLoopImplBase$DelayedTask;)Z
+SPLkotlinx/coroutines/EventLoopImplBase;->shutdown()V
+Lkotlinx/coroutines/EventLoopImplBase$DelayedResumeTask;
+SPLkotlinx/coroutines/EventLoopImplBase$DelayedResumeTask;-><init>(Lkotlinx/coroutines/EventLoopImplBase;JLkotlinx/coroutines/CancellableContinuation;)V
+SPLkotlinx/coroutines/EventLoopImplBase$DelayedResumeTask;->run()V
+Lkotlinx/coroutines/EventLoopImplBase$DelayedTask;
+SPLkotlinx/coroutines/EventLoopImplBase$DelayedTask;-><init>(J)V
+SPLkotlinx/coroutines/EventLoopImplBase$DelayedTask;->scheduleTask(JLkotlinx/coroutines/EventLoopImplBase$DelayedTaskQueue;Lkotlinx/coroutines/EventLoopImplBase;)I
+SPLkotlinx/coroutines/EventLoopImplBase$DelayedTask;->setHeap(Lkotlinx/coroutines/internal/ThreadSafeHeap;)V
+SPLkotlinx/coroutines/EventLoopImplBase$DelayedTask;->setIndex(I)V
+SPLkotlinx/coroutines/EventLoopImplBase$DelayedTask;->timeToExecute(J)Z
+Lkotlinx/coroutines/EventLoopImplBase$DelayedTaskQueue;
+SPLkotlinx/coroutines/EventLoopImplBase$DelayedTaskQueue;-><init>(J)V
+Lkotlinx/coroutines/EventLoopImplPlatform;
+SPLkotlinx/coroutines/EventLoopImplPlatform;-><init>()V
+SPLkotlinx/coroutines/EventLoopImplPlatform;->unpark()V
+Lkotlinx/coroutines/EventLoopKt;
+SPLkotlinx/coroutines/EventLoopKt;->createEventLoop()Lkotlinx/coroutines/EventLoop;
+Lkotlinx/coroutines/EventLoop_commonKt;
+SPLkotlinx/coroutines/EventLoop_commonKt;-><clinit>()V
+SPLkotlinx/coroutines/EventLoop_commonKt;->access$getCLOSED_EMPTY$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/EventLoop_commonKt;->access$getDISPOSED_TASK$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/EventLoop_commonKt;->delayToNanos(J)J
+Lkotlinx/coroutines/ExecutorCoroutineDispatcher;
+SPLkotlinx/coroutines/ExecutorCoroutineDispatcher;-><clinit>()V
+SPLkotlinx/coroutines/ExecutorCoroutineDispatcher;-><init>()V
+Lkotlinx/coroutines/ExecutorCoroutineDispatcher$Key;
+SPLkotlinx/coroutines/ExecutorCoroutineDispatcher$Key;-><init>()V
+SPLkotlinx/coroutines/ExecutorCoroutineDispatcher$Key;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/coroutines/ExecutorCoroutineDispatcher$Key$$ExternalSyntheticLambda0;
+SPLkotlinx/coroutines/ExecutorCoroutineDispatcher$Key$$ExternalSyntheticLambda0;-><init>()V
+Lkotlinx/coroutines/ExecutorCoroutineDispatcherImpl;
+SPLkotlinx/coroutines/ExecutorCoroutineDispatcherImpl;-><init>(Ljava/util/concurrent/Executor;)V
+SPLkotlinx/coroutines/ExecutorCoroutineDispatcherImpl;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+SPLkotlinx/coroutines/ExecutorCoroutineDispatcherImpl;->equals(Ljava/lang/Object;)Z
+SPLkotlinx/coroutines/ExecutorCoroutineDispatcherImpl;->getExecutor()Ljava/util/concurrent/Executor;
+Lkotlinx/coroutines/ExecutorsKt;
+SPLkotlinx/coroutines/ExecutorsKt;->asExecutor(Lkotlinx/coroutines/CoroutineDispatcher;)Ljava/util/concurrent/Executor;
+SPLkotlinx/coroutines/ExecutorsKt;->from(Ljava/util/concurrent/Executor;)Lkotlinx/coroutines/CoroutineDispatcher;
+Lkotlinx/coroutines/GlobalScope;
+SPLkotlinx/coroutines/GlobalScope;-><clinit>()V
+SPLkotlinx/coroutines/GlobalScope;-><init>()V
+SPLkotlinx/coroutines/GlobalScope;->getCoroutineContext()Lkotlin/coroutines/CoroutineContext;
+Lkotlinx/coroutines/InactiveNodeList;
+Lkotlinx/coroutines/Incomplete;
+Lkotlinx/coroutines/IncompleteStateBox;
+Lkotlinx/coroutines/Job;
+SPLkotlinx/coroutines/Job;-><clinit>()V
+SPLkotlinx/coroutines/Job;->cancel$default(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+Lkotlinx/coroutines/Job$DefaultImpls;
+SPLkotlinx/coroutines/Job$DefaultImpls;->cancel$default(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+SPLkotlinx/coroutines/Job$DefaultImpls;->fold(Lkotlinx/coroutines/Job;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+SPLkotlinx/coroutines/Job$DefaultImpls;->get(Lkotlinx/coroutines/Job;Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
+SPLkotlinx/coroutines/Job$DefaultImpls;->minusKey(Lkotlinx/coroutines/Job;Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext;
+SPLkotlinx/coroutines/Job$DefaultImpls;->plus(Lkotlinx/coroutines/Job;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+Lkotlinx/coroutines/Job$Key;
+SPLkotlinx/coroutines/Job$Key;-><clinit>()V
+SPLkotlinx/coroutines/Job$Key;-><init>()V
+Lkotlinx/coroutines/JobCancellationException;
+SPLkotlinx/coroutines/JobCancellationException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;Lkotlinx/coroutines/Job;)V
+SPLkotlinx/coroutines/JobCancellationException;->equals(Ljava/lang/Object;)Z
+SPLkotlinx/coroutines/JobCancellationException;->fillInStackTrace()Ljava/lang/Throwable;
+Lkotlinx/coroutines/JobImpl;
+SPLkotlinx/coroutines/JobImpl;-><init>(Lkotlinx/coroutines/Job;)V
+SPLkotlinx/coroutines/JobImpl;->complete()Z
+SPLkotlinx/coroutines/JobImpl;->getOnCancelComplete$kotlinx_coroutines_core()Z
+SPLkotlinx/coroutines/JobImpl;->handlesException()Z
+Lkotlinx/coroutines/JobKt;
+SPLkotlinx/coroutines/JobKt;->Job$default(Lkotlinx/coroutines/Job;ILjava/lang/Object;)Lkotlinx/coroutines/CompletableJob;
+SPLkotlinx/coroutines/JobKt;->Job(Lkotlinx/coroutines/Job;)Lkotlinx/coroutines/CompletableJob;
+SPLkotlinx/coroutines/JobKt;->ensureActive(Lkotlin/coroutines/CoroutineContext;)V
+SPLkotlinx/coroutines/JobKt;->ensureActive(Lkotlinx/coroutines/Job;)V
+SPLkotlinx/coroutines/JobKt;->invokeOnCompletion$default(Lkotlinx/coroutines/Job;ZLkotlinx/coroutines/JobNode;ILjava/lang/Object;)Lkotlinx/coroutines/DisposableHandle;
+SPLkotlinx/coroutines/JobKt;->invokeOnCompletion(Lkotlinx/coroutines/Job;ZLkotlinx/coroutines/JobNode;)Lkotlinx/coroutines/DisposableHandle;
+Lkotlinx/coroutines/JobKt__JobKt;
+SPLkotlinx/coroutines/JobKt__JobKt;->Job$default(Lkotlinx/coroutines/Job;ILjava/lang/Object;)Lkotlinx/coroutines/CompletableJob;
+SPLkotlinx/coroutines/JobKt__JobKt;->Job(Lkotlinx/coroutines/Job;)Lkotlinx/coroutines/CompletableJob;
+SPLkotlinx/coroutines/JobKt__JobKt;->ensureActive(Lkotlin/coroutines/CoroutineContext;)V
+SPLkotlinx/coroutines/JobKt__JobKt;->ensureActive(Lkotlinx/coroutines/Job;)V
+SPLkotlinx/coroutines/JobKt__JobKt;->invokeOnCompletion$default(Lkotlinx/coroutines/Job;ZLkotlinx/coroutines/JobNode;ILjava/lang/Object;)Lkotlinx/coroutines/DisposableHandle;
+SPLkotlinx/coroutines/JobKt__JobKt;->invokeOnCompletion(Lkotlinx/coroutines/Job;ZLkotlinx/coroutines/JobNode;)Lkotlinx/coroutines/DisposableHandle;
+Lkotlinx/coroutines/JobNode;
+SPLkotlinx/coroutines/JobNode;-><init>()V
+SPLkotlinx/coroutines/JobNode;->dispose()V
+SPLkotlinx/coroutines/JobNode;->getJob()Lkotlinx/coroutines/JobSupport;
+SPLkotlinx/coroutines/JobNode;->getList()Lkotlinx/coroutines/NodeList;
+SPLkotlinx/coroutines/JobNode;->isActive()Z
+SPLkotlinx/coroutines/JobNode;->setJob(Lkotlinx/coroutines/JobSupport;)V
+Lkotlinx/coroutines/JobSupport;
+SPLkotlinx/coroutines/JobSupport;-><clinit>()V
+SPLkotlinx/coroutines/JobSupport;-><init>(Z)V
+SPLkotlinx/coroutines/JobSupport;->access$cancellationExceptionMessage(Lkotlinx/coroutines/JobSupport;)Ljava/lang/String;
+SPLkotlinx/coroutines/JobSupport;->access$continueCompleting(Lkotlinx/coroutines/JobSupport;Lkotlinx/coroutines/JobSupport$Finishing;Lkotlinx/coroutines/ChildHandleNode;Ljava/lang/Object;)V
+SPLkotlinx/coroutines/JobSupport;->addSuppressedExceptions(Ljava/lang/Throwable;Ljava/util/List;)V
+SPLkotlinx/coroutines/JobSupport;->afterCompletion(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/JobSupport;->attachChild(Lkotlinx/coroutines/ChildJob;)Lkotlinx/coroutines/ChildHandle;
+SPLkotlinx/coroutines/JobSupport;->cancel(Ljava/util/concurrent/CancellationException;)V
+SPLkotlinx/coroutines/JobSupport;->cancelImpl$kotlinx_coroutines_core(Ljava/lang/Object;)Z
+SPLkotlinx/coroutines/JobSupport;->cancelInternal(Ljava/lang/Throwable;)V
+SPLkotlinx/coroutines/JobSupport;->cancelMakeCompleting(Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/JobSupport;->cancelParent(Ljava/lang/Throwable;)Z
+SPLkotlinx/coroutines/JobSupport;->cancellationExceptionMessage()Ljava/lang/String;
+SPLkotlinx/coroutines/JobSupport;->childCancelled(Ljava/lang/Throwable;)Z
+SPLkotlinx/coroutines/JobSupport;->completeStateFinalization(Lkotlinx/coroutines/Incomplete;Ljava/lang/Object;)V
+SPLkotlinx/coroutines/JobSupport;->continueCompleting(Lkotlinx/coroutines/JobSupport$Finishing;Lkotlinx/coroutines/ChildHandleNode;Ljava/lang/Object;)V
+SPLkotlinx/coroutines/JobSupport;->createCauseException(Ljava/lang/Object;)Ljava/lang/Throwable;
+SPLkotlinx/coroutines/JobSupport;->finalizeFinishingState(Lkotlinx/coroutines/JobSupport$Finishing;Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/JobSupport;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+SPLkotlinx/coroutines/JobSupport;->get(Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
+SPLkotlinx/coroutines/JobSupport;->getCancellationException()Ljava/util/concurrent/CancellationException;
+SPLkotlinx/coroutines/JobSupport;->getChildJobCancellationCause()Ljava/util/concurrent/CancellationException;
+SPLkotlinx/coroutines/JobSupport;->getCompletedInternal$kotlinx_coroutines_core()Ljava/lang/Object;
+SPLkotlinx/coroutines/JobSupport;->getFinalRootCause(Lkotlinx/coroutines/JobSupport$Finishing;Ljava/util/List;)Ljava/lang/Throwable;
+SPLkotlinx/coroutines/JobSupport;->getKey()Lkotlin/coroutines/CoroutineContext$Key;
+SPLkotlinx/coroutines/JobSupport;->getOnCancelComplete$kotlinx_coroutines_core()Z
+SPLkotlinx/coroutines/JobSupport;->getOrPromoteCancellingList(Lkotlinx/coroutines/Incomplete;)Lkotlinx/coroutines/NodeList;
+SPLkotlinx/coroutines/JobSupport;->getParentHandle$kotlinx_coroutines_core()Lkotlinx/coroutines/ChildHandle;
+SPLkotlinx/coroutines/JobSupport;->getState$kotlinx_coroutines_core()Ljava/lang/Object;
+SPLkotlinx/coroutines/JobSupport;->get_parentHandle$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/JobSupport;->get_state$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/JobSupport;->initParentJob(Lkotlinx/coroutines/Job;)V
+SPLkotlinx/coroutines/JobSupport;->invokeOnCompletionInternal$kotlinx_coroutines_core(ZLkotlinx/coroutines/JobNode;)Lkotlinx/coroutines/DisposableHandle;
+SPLkotlinx/coroutines/JobSupport;->isActive()Z
+SPLkotlinx/coroutines/JobSupport;->isCancelled()Z
+SPLkotlinx/coroutines/JobSupport;->isCompleted()Z
+SPLkotlinx/coroutines/JobSupport;->isScopedCoroutine()Z
+SPLkotlinx/coroutines/JobSupport;->join(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/JobSupport;->joinInternal()Z
+SPLkotlinx/coroutines/JobSupport;->joinSuspend(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/JobSupport;->makeCancelling(Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/JobSupport;->makeCompleting$kotlinx_coroutines_core(Ljava/lang/Object;)Z
+SPLkotlinx/coroutines/JobSupport;->makeCompletingOnce$kotlinx_coroutines_core(Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/JobSupport;->minusKey(Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext;
+SPLkotlinx/coroutines/JobSupport;->nextChild(Lkotlinx/coroutines/internal/LockFreeLinkedListNode;)Lkotlinx/coroutines/ChildHandleNode;
+SPLkotlinx/coroutines/JobSupport;->notifyCancelling(Lkotlinx/coroutines/NodeList;Ljava/lang/Throwable;)V
+SPLkotlinx/coroutines/JobSupport;->notifyCompletion(Lkotlinx/coroutines/NodeList;Ljava/lang/Throwable;)V
+SPLkotlinx/coroutines/JobSupport;->onCancelling(Ljava/lang/Throwable;)V
+SPLkotlinx/coroutines/JobSupport;->onCompletionInternal(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/JobSupport;->parentCancelled(Lkotlinx/coroutines/ParentJob;)V
+SPLkotlinx/coroutines/JobSupport;->plus(Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+SPLkotlinx/coroutines/JobSupport;->promoteSingleToNodeList(Lkotlinx/coroutines/JobNode;)V
+SPLkotlinx/coroutines/JobSupport;->removeNode$kotlinx_coroutines_core(Lkotlinx/coroutines/JobNode;)V
+SPLkotlinx/coroutines/JobSupport;->setParentHandle$kotlinx_coroutines_core(Lkotlinx/coroutines/ChildHandle;)V
+SPLkotlinx/coroutines/JobSupport;->start()Z
+SPLkotlinx/coroutines/JobSupport;->startInternal(Ljava/lang/Object;)I
+SPLkotlinx/coroutines/JobSupport;->toCancellationException(Ljava/lang/Throwable;Ljava/lang/String;)Ljava/util/concurrent/CancellationException;
+SPLkotlinx/coroutines/JobSupport;->tryFinalizeSimpleState(Lkotlinx/coroutines/Incomplete;Ljava/lang/Object;)Z
+SPLkotlinx/coroutines/JobSupport;->tryMakeCancelling(Lkotlinx/coroutines/Incomplete;Ljava/lang/Throwable;)Z
+SPLkotlinx/coroutines/JobSupport;->tryMakeCompleting(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/JobSupport;->tryMakeCompletingSlowPath(Lkotlinx/coroutines/Incomplete;Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/JobSupport;->tryWaitForChild(Lkotlinx/coroutines/JobSupport$Finishing;Lkotlinx/coroutines/ChildHandleNode;Ljava/lang/Object;)Z
+Lkotlinx/coroutines/JobSupport$ChildCompletion;
+SPLkotlinx/coroutines/JobSupport$ChildCompletion;-><init>(Lkotlinx/coroutines/JobSupport;Lkotlinx/coroutines/JobSupport$Finishing;Lkotlinx/coroutines/ChildHandleNode;Ljava/lang/Object;)V
+SPLkotlinx/coroutines/JobSupport$ChildCompletion;->getOnCancelling()Z
+SPLkotlinx/coroutines/JobSupport$ChildCompletion;->invoke(Ljava/lang/Throwable;)V
+Lkotlinx/coroutines/JobSupport$Finishing;
+SPLkotlinx/coroutines/JobSupport$Finishing;-><clinit>()V
+SPLkotlinx/coroutines/JobSupport$Finishing;-><init>(Lkotlinx/coroutines/NodeList;ZLjava/lang/Throwable;)V
+SPLkotlinx/coroutines/JobSupport$Finishing;->addExceptionLocked(Ljava/lang/Throwable;)V
+SPLkotlinx/coroutines/JobSupport$Finishing;->allocateList()Ljava/util/ArrayList;
+SPLkotlinx/coroutines/JobSupport$Finishing;->getExceptionsHolder()Ljava/lang/Object;
+SPLkotlinx/coroutines/JobSupport$Finishing;->getList()Lkotlinx/coroutines/NodeList;
+SPLkotlinx/coroutines/JobSupport$Finishing;->getRootCause()Ljava/lang/Throwable;
+SPLkotlinx/coroutines/JobSupport$Finishing;->get_exceptionsHolder$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/JobSupport$Finishing;->get_isCompleting$volatile$FU()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+SPLkotlinx/coroutines/JobSupport$Finishing;->get_rootCause$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/JobSupport$Finishing;->isActive()Z
+SPLkotlinx/coroutines/JobSupport$Finishing;->isCancelling()Z
+SPLkotlinx/coroutines/JobSupport$Finishing;->isCompleting()Z
+SPLkotlinx/coroutines/JobSupport$Finishing;->isSealed()Z
+SPLkotlinx/coroutines/JobSupport$Finishing;->sealLocked(Ljava/lang/Throwable;)Ljava/util/List;
+SPLkotlinx/coroutines/JobSupport$Finishing;->setCompleting(Z)V
+SPLkotlinx/coroutines/JobSupport$Finishing;->setExceptionsHolder(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/JobSupport$Finishing;->setRootCause(Ljava/lang/Throwable;)V
+Lkotlinx/coroutines/JobSupportKt;
+SPLkotlinx/coroutines/JobSupportKt;-><clinit>()V
+SPLkotlinx/coroutines/JobSupportKt;->access$getCOMPLETING_ALREADY$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/JobSupportKt;->access$getCOMPLETING_RETRY$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/JobSupportKt;->access$getEMPTY_ACTIVE$p()Lkotlinx/coroutines/Empty;
+SPLkotlinx/coroutines/JobSupportKt;->access$getSEALED$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/JobSupportKt;->access$getTOO_LATE_TO_CANCEL$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/JobSupportKt;->boxIncomplete(Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/JobSupportKt;->unboxState(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/MainCoroutineDispatcher;
+SPLkotlinx/coroutines/MainCoroutineDispatcher;-><init>()V
+Lkotlinx/coroutines/NodeList;
+SPLkotlinx/coroutines/NodeList;-><init>()V
+SPLkotlinx/coroutines/NodeList;->getList()Lkotlinx/coroutines/NodeList;
+SPLkotlinx/coroutines/NodeList;->isActive()Z
+Lkotlinx/coroutines/NonDisposableHandle;
+SPLkotlinx/coroutines/NonDisposableHandle;-><clinit>()V
+SPLkotlinx/coroutines/NonDisposableHandle;-><init>()V
+SPLkotlinx/coroutines/NonDisposableHandle;->dispose()V
+Lkotlinx/coroutines/NotCompleted;
+Lkotlinx/coroutines/ParentJob;
+Lkotlinx/coroutines/ResumeOnCompletion;
+SPLkotlinx/coroutines/ResumeOnCompletion;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/ResumeOnCompletion;->invoke(Ljava/lang/Throwable;)V
+Lkotlinx/coroutines/StandaloneCoroutine;
+SPLkotlinx/coroutines/StandaloneCoroutine;-><init>(Lkotlin/coroutines/CoroutineContext;Z)V
+Lkotlinx/coroutines/SupervisorJobImpl;
+SPLkotlinx/coroutines/SupervisorJobImpl;-><init>(Lkotlinx/coroutines/Job;)V
+SPLkotlinx/coroutines/SupervisorJobImpl;->childCancelled(Ljava/lang/Throwable;)Z
+Lkotlinx/coroutines/SupervisorKt;
+SPLkotlinx/coroutines/SupervisorKt;->SupervisorJob$default(Lkotlinx/coroutines/Job;ILjava/lang/Object;)Lkotlinx/coroutines/CompletableJob;
+SPLkotlinx/coroutines/SupervisorKt;->SupervisorJob(Lkotlinx/coroutines/Job;)Lkotlinx/coroutines/CompletableJob;
+Lkotlinx/coroutines/ThreadContextElement;
+Lkotlinx/coroutines/ThreadLocalEventLoop;
+SPLkotlinx/coroutines/ThreadLocalEventLoop;-><clinit>()V
+SPLkotlinx/coroutines/ThreadLocalEventLoop;-><init>()V
+SPLkotlinx/coroutines/ThreadLocalEventLoop;->getEventLoop$kotlinx_coroutines_core()Lkotlinx/coroutines/EventLoop;
+SPLkotlinx/coroutines/ThreadLocalEventLoop;->resetEventLoop$kotlinx_coroutines_core()V
+SPLkotlinx/coroutines/ThreadLocalEventLoop;->setEventLoop$kotlinx_coroutines_core(Lkotlinx/coroutines/EventLoop;)V
+Lkotlinx/coroutines/TimeoutCancellationException;
+Lkotlinx/coroutines/Unconfined;
+SPLkotlinx/coroutines/Unconfined;-><clinit>()V
+SPLkotlinx/coroutines/Unconfined;-><init>()V
+Lkotlinx/coroutines/UndispatchedCoroutine;
+SPLkotlinx/coroutines/UndispatchedCoroutine;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/UndispatchedCoroutine;->afterCompletionUndispatched()V
+SPLkotlinx/coroutines/UndispatchedCoroutine;->afterResume(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/UndispatchedCoroutine;->clearThreadLocal()V
+Lkotlinx/coroutines/UndispatchedMarker;
+SPLkotlinx/coroutines/UndispatchedMarker;-><clinit>()V
+SPLkotlinx/coroutines/UndispatchedMarker;-><init>()V
+SPLkotlinx/coroutines/UndispatchedMarker;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+SPLkotlinx/coroutines/UndispatchedMarker;->get(Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
+SPLkotlinx/coroutines/UndispatchedMarker;->getKey()Lkotlin/coroutines/CoroutineContext$Key;
+Lkotlinx/coroutines/Waiter;
+Lkotlinx/coroutines/YieldContext;
+SPLkotlinx/coroutines/YieldContext;-><clinit>()V
+SPLkotlinx/coroutines/YieldContext;-><init>()V
+Lkotlinx/coroutines/YieldContext$Key;
+SPLkotlinx/coroutines/YieldContext$Key;-><init>()V
+SPLkotlinx/coroutines/YieldContext$Key;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/coroutines/YieldKt;
+SPLkotlinx/coroutines/YieldKt;->yield(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/android/AndroidDispatcherFactory;
+SPLkotlinx/coroutines/android/AndroidDispatcherFactory;-><init>()V
+SPLkotlinx/coroutines/android/AndroidDispatcherFactory;->createDispatcher(Ljava/util/List;)Lkotlinx/coroutines/MainCoroutineDispatcher;
+Lkotlinx/coroutines/android/HandlerContext;
+SPLkotlinx/coroutines/android/HandlerContext;-><init>(Landroid/os/Handler;Ljava/lang/String;)V
+SPLkotlinx/coroutines/android/HandlerContext;-><init>(Landroid/os/Handler;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlinx/coroutines/android/HandlerContext;-><init>(Landroid/os/Handler;Ljava/lang/String;Z)V
+SPLkotlinx/coroutines/android/HandlerContext;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+SPLkotlinx/coroutines/android/HandlerContext;->equals(Ljava/lang/Object;)Z
+SPLkotlinx/coroutines/android/HandlerContext;->getImmediate()Lkotlinx/coroutines/MainCoroutineDispatcher;
+SPLkotlinx/coroutines/android/HandlerContext;->getImmediate()Lkotlinx/coroutines/android/HandlerContext;
+SPLkotlinx/coroutines/android/HandlerContext;->isDispatchNeeded(Lkotlin/coroutines/CoroutineContext;)Z
+Lkotlinx/coroutines/android/HandlerDispatcher;
+SPLkotlinx/coroutines/android/HandlerDispatcher;-><init>()V
+SPLkotlinx/coroutines/android/HandlerDispatcher;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/coroutines/android/HandlerDispatcherKt;
+SPLkotlinx/coroutines/android/HandlerDispatcherKt;-><clinit>()V
+SPLkotlinx/coroutines/android/HandlerDispatcherKt;->asHandler(Landroid/os/Looper;Z)Landroid/os/Handler;
+Lkotlinx/coroutines/channels/BufferOverflow;
+SPLkotlinx/coroutines/channels/BufferOverflow;->$values()[Lkotlinx/coroutines/channels/BufferOverflow;
+SPLkotlinx/coroutines/channels/BufferOverflow;-><clinit>()V
+SPLkotlinx/coroutines/channels/BufferOverflow;-><init>(Ljava/lang/String;I)V
+Lkotlinx/coroutines/channels/BufferedChannel;
+SPLkotlinx/coroutines/channels/BufferedChannel;-><clinit>()V
+SPLkotlinx/coroutines/channels/BufferedChannel;-><init>(ILkotlin/jvm/functions/Function1;)V
+SPLkotlinx/coroutines/channels/BufferedChannel;->access$getReceiveSegment$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/channels/BufferedChannel;->access$getReceivers$volatile$FU()Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+SPLkotlinx/coroutines/channels/BufferedChannel;->access$getSendSegment$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/channels/BufferedChannel;->access$getSendersAndCloseStatus$volatile$FU()Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+SPLkotlinx/coroutines/channels/BufferedChannel;->access$isClosedForSend0(Lkotlinx/coroutines/channels/BufferedChannel;J)Z
+SPLkotlinx/coroutines/channels/BufferedChannel;->access$prepareReceiverForSuspension(Lkotlinx/coroutines/channels/BufferedChannel;Lkotlinx/coroutines/Waiter;Lkotlinx/coroutines/channels/ChannelSegment;I)V
+SPLkotlinx/coroutines/channels/BufferedChannel;->access$receiveCatchingOnNoWaiterSuspend-GKJJFZk(Lkotlinx/coroutines/channels/BufferedChannel;Lkotlinx/coroutines/channels/ChannelSegment;IJLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/BufferedChannel;->access$updateCellReceive(Lkotlinx/coroutines/channels/BufferedChannel;Lkotlinx/coroutines/channels/ChannelSegment;IJLjava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/BufferedChannel;->access$updateCellSend(Lkotlinx/coroutines/channels/BufferedChannel;Lkotlinx/coroutines/channels/ChannelSegment;ILjava/lang/Object;JLjava/lang/Object;Z)I
+SPLkotlinx/coroutines/channels/BufferedChannel;->bufferOrRendezvousSend(J)Z
+SPLkotlinx/coroutines/channels/BufferedChannel;->cancelSuspendedReceiveRequests(Lkotlinx/coroutines/channels/ChannelSegment;J)V
+SPLkotlinx/coroutines/channels/BufferedChannel;->close(Ljava/lang/Throwable;)Z
+SPLkotlinx/coroutines/channels/BufferedChannel;->closeLinkedList()Lkotlinx/coroutines/channels/ChannelSegment;
+SPLkotlinx/coroutines/channels/BufferedChannel;->closeOrCancelImpl(Ljava/lang/Throwable;Z)Z
+SPLkotlinx/coroutines/channels/BufferedChannel;->completeClose(J)Lkotlinx/coroutines/channels/ChannelSegment;
+SPLkotlinx/coroutines/channels/BufferedChannel;->completeCloseOrCancel()V
+SPLkotlinx/coroutines/channels/BufferedChannel;->expandBuffer()V
+SPLkotlinx/coroutines/channels/BufferedChannel;->getBufferEnd$volatile$FU()Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+SPLkotlinx/coroutines/channels/BufferedChannel;->getBufferEndCounter()J
+SPLkotlinx/coroutines/channels/BufferedChannel;->getBufferEndSegment$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/channels/BufferedChannel;->getCloseCause()Ljava/lang/Throwable;
+SPLkotlinx/coroutines/channels/BufferedChannel;->getCloseHandler$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/channels/BufferedChannel;->getCompletedExpandBuffersAndPauseFlag$volatile$FU()Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+SPLkotlinx/coroutines/channels/BufferedChannel;->getReceiveSegment$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/channels/BufferedChannel;->getReceivers$volatile$FU()Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+SPLkotlinx/coroutines/channels/BufferedChannel;->getReceiversCounter$kotlinx_coroutines_core()J
+SPLkotlinx/coroutines/channels/BufferedChannel;->getSendSegment$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/channels/BufferedChannel;->getSendersAndCloseStatus$volatile$FU()Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+SPLkotlinx/coroutines/channels/BufferedChannel;->getSendersCounter$kotlinx_coroutines_core()J
+SPLkotlinx/coroutines/channels/BufferedChannel;->get_closeCause$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/channels/BufferedChannel;->incCompletedExpandBufferAttempts$default(Lkotlinx/coroutines/channels/BufferedChannel;JILjava/lang/Object;)V
+SPLkotlinx/coroutines/channels/BufferedChannel;->incCompletedExpandBufferAttempts(J)V
+SPLkotlinx/coroutines/channels/BufferedChannel;->invokeCloseHandler()V
+SPLkotlinx/coroutines/channels/BufferedChannel;->isClosed(JZ)Z
+SPLkotlinx/coroutines/channels/BufferedChannel;->isClosedForReceive()Z
+SPLkotlinx/coroutines/channels/BufferedChannel;->isClosedForReceive0(J)Z
+SPLkotlinx/coroutines/channels/BufferedChannel;->isClosedForSend()Z
+SPLkotlinx/coroutines/channels/BufferedChannel;->isClosedForSend0(J)Z
+SPLkotlinx/coroutines/channels/BufferedChannel;->isConflatedDropOldest()Z
+SPLkotlinx/coroutines/channels/BufferedChannel;->isRendezvousOrUnlimited()Z
+SPLkotlinx/coroutines/channels/BufferedChannel;->iterator()Lkotlinx/coroutines/channels/ChannelIterator;
+SPLkotlinx/coroutines/channels/BufferedChannel;->markAllEmptyCellsAsClosed(Lkotlinx/coroutines/channels/ChannelSegment;)J
+SPLkotlinx/coroutines/channels/BufferedChannel;->markClosed()V
+SPLkotlinx/coroutines/channels/BufferedChannel;->onClosedIdempotent()V
+SPLkotlinx/coroutines/channels/BufferedChannel;->onReceiveDequeued()V
+SPLkotlinx/coroutines/channels/BufferedChannel;->onReceiveEnqueued()V
+SPLkotlinx/coroutines/channels/BufferedChannel;->prepareReceiverForSuspension(Lkotlinx/coroutines/Waiter;Lkotlinx/coroutines/channels/ChannelSegment;I)V
+SPLkotlinx/coroutines/channels/BufferedChannel;->receiveCatching-JP2dKIU$suspendImpl(Lkotlinx/coroutines/channels/BufferedChannel;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/BufferedChannel;->receiveCatching-JP2dKIU(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/BufferedChannel;->receiveCatchingOnNoWaiterSuspend-GKJJFZk(Lkotlinx/coroutines/channels/ChannelSegment;IJLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/BufferedChannel;->resumeReceiverOnClosedChannel(Lkotlinx/coroutines/Waiter;)V
+SPLkotlinx/coroutines/channels/BufferedChannel;->resumeWaiterOnClosedChannel(Lkotlinx/coroutines/Waiter;Z)V
+SPLkotlinx/coroutines/channels/BufferedChannel;->send$suspendImpl(Lkotlinx/coroutines/channels/BufferedChannel;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/BufferedChannel;->send(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/BufferedChannel;->tryReceive-PtdJZtk()Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/BufferedChannel;->tryResumeReceiver(Ljava/lang/Object;Ljava/lang/Object;)Z
+SPLkotlinx/coroutines/channels/BufferedChannel;->updateCellReceive(Lkotlinx/coroutines/channels/ChannelSegment;IJLjava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/BufferedChannel;->updateCellSend(Lkotlinx/coroutines/channels/ChannelSegment;ILjava/lang/Object;JLjava/lang/Object;Z)I
+SPLkotlinx/coroutines/channels/BufferedChannel;->waitExpandBufferCompletion$kotlinx_coroutines_core(J)V
+Lkotlinx/coroutines/channels/BufferedChannel$BufferedChannelIterator;
+SPLkotlinx/coroutines/channels/BufferedChannel$BufferedChannelIterator;-><init>(Lkotlinx/coroutines/channels/BufferedChannel;)V
+SPLkotlinx/coroutines/channels/BufferedChannel$BufferedChannelIterator;->access$setContinuation$p(Lkotlinx/coroutines/channels/BufferedChannel$BufferedChannelIterator;Lkotlinx/coroutines/CancellableContinuationImpl;)V
+SPLkotlinx/coroutines/channels/BufferedChannel$BufferedChannelIterator;->hasNext(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/BufferedChannel$BufferedChannelIterator;->hasNextOnNoWaiterSuspend(Lkotlinx/coroutines/channels/ChannelSegment;IJLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/BufferedChannel$BufferedChannelIterator;->invokeOnCancellation(Lkotlinx/coroutines/internal/Segment;I)V
+SPLkotlinx/coroutines/channels/BufferedChannel$BufferedChannelIterator;->next()Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/BufferedChannel$BufferedChannelIterator;->tryResumeHasNext(Ljava/lang/Object;)Z
+SPLkotlinx/coroutines/channels/BufferedChannel$BufferedChannelIterator;->tryResumeHasNextOnClosedChannel()V
+Lkotlinx/coroutines/channels/BufferedChannel$SendBroadcast;
+Lkotlinx/coroutines/channels/BufferedChannel$receiveCatching$1;
+SPLkotlinx/coroutines/channels/BufferedChannel$receiveCatching$1;-><init>(Lkotlinx/coroutines/channels/BufferedChannel;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/channels/BufferedChannel$receiveCatching$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/channels/BufferedChannel$receiveCatchingOnNoWaiterSuspend$1;
+SPLkotlinx/coroutines/channels/BufferedChannel$receiveCatchingOnNoWaiterSuspend$1;-><init>(Lkotlinx/coroutines/channels/BufferedChannel;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/channels/BufferedChannel$receiveCatchingOnNoWaiterSuspend$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/channels/BufferedChannelKt;
+SPLkotlinx/coroutines/channels/BufferedChannelKt;-><clinit>()V
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$constructSendersAndCloseStatus(JI)J
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getCLOSE_HANDLER_CLOSED$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getDONE_RCV$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getEXPAND_BUFFER_COMPLETION_WAIT_ITERATIONS$p()I
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getFAILED$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getINTERRUPTED_RCV$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getIN_BUFFER$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getNO_CLOSE_CAUSE$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getNO_RECEIVE_RESULT$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getNULL_SEGMENT$p()Lkotlinx/coroutines/channels/ChannelSegment;
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getSUSPEND$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$getSUSPEND_NO_WAITER$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$initialBufferEnd(I)J
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->access$tryResume0(Lkotlinx/coroutines/CancellableContinuation;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)Z
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->constructSendersAndCloseStatus(JI)J
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->getCHANNEL_CLOSED()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->initialBufferEnd(I)J
+SPLkotlinx/coroutines/channels/BufferedChannelKt;->tryResume0(Lkotlinx/coroutines/CancellableContinuation;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;)Z
+Lkotlinx/coroutines/channels/Channel;
+SPLkotlinx/coroutines/channels/Channel;-><clinit>()V
+Lkotlinx/coroutines/channels/Channel$Factory;
+SPLkotlinx/coroutines/channels/Channel$Factory;-><clinit>()V
+SPLkotlinx/coroutines/channels/Channel$Factory;-><init>()V
+SPLkotlinx/coroutines/channels/Channel$Factory;->getCHANNEL_DEFAULT_CAPACITY$kotlinx_coroutines_core()I
+Lkotlinx/coroutines/channels/ChannelCoroutine;
+SPLkotlinx/coroutines/channels/ChannelCoroutine;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/channels/Channel;ZZ)V
+SPLkotlinx/coroutines/channels/ChannelCoroutine;->cancel(Ljava/util/concurrent/CancellationException;)V
+SPLkotlinx/coroutines/channels/ChannelCoroutine;->get_channel()Lkotlinx/coroutines/channels/Channel;
+SPLkotlinx/coroutines/channels/ChannelCoroutine;->iterator()Lkotlinx/coroutines/channels/ChannelIterator;
+SPLkotlinx/coroutines/channels/ChannelCoroutine;->send(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/channels/ChannelIterator;
+Lkotlinx/coroutines/channels/ChannelKt;
+SPLkotlinx/coroutines/channels/ChannelKt;->Channel$default(ILkotlinx/coroutines/channels/BufferOverflow;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/channels/Channel;
+SPLkotlinx/coroutines/channels/ChannelKt;->Channel(ILkotlinx/coroutines/channels/BufferOverflow;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/channels/Channel;
+Lkotlinx/coroutines/channels/ChannelResult;
+SPLkotlinx/coroutines/channels/ChannelResult;-><clinit>()V
+SPLkotlinx/coroutines/channels/ChannelResult;-><init>(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/channels/ChannelResult;->access$getFailed$cp()Lkotlinx/coroutines/channels/ChannelResult$Failed;
+SPLkotlinx/coroutines/channels/ChannelResult;->box-impl(Ljava/lang/Object;)Lkotlinx/coroutines/channels/ChannelResult;
+SPLkotlinx/coroutines/channels/ChannelResult;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/ChannelResult;->getOrNull-impl(Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/ChannelResult;->unbox-impl()Ljava/lang/Object;
+Lkotlinx/coroutines/channels/ChannelResult$Closed;
+Lkotlinx/coroutines/channels/ChannelResult$Companion;
+SPLkotlinx/coroutines/channels/ChannelResult$Companion;-><init>()V
+SPLkotlinx/coroutines/channels/ChannelResult$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlinx/coroutines/channels/ChannelResult$Companion;->failure-PtdJZtk()Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/ChannelResult$Companion;->success-JP2dKIU(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/channels/ChannelResult$Failed;
+SPLkotlinx/coroutines/channels/ChannelResult$Failed;-><init>()V
+Lkotlinx/coroutines/channels/ChannelSegment;
+SPLkotlinx/coroutines/channels/ChannelSegment;-><init>(JLkotlinx/coroutines/channels/ChannelSegment;Lkotlinx/coroutines/channels/BufferedChannel;I)V
+SPLkotlinx/coroutines/channels/ChannelSegment;->casState$kotlinx_coroutines_core(ILjava/lang/Object;Ljava/lang/Object;)Z
+SPLkotlinx/coroutines/channels/ChannelSegment;->cleanElement$kotlinx_coroutines_core(I)V
+SPLkotlinx/coroutines/channels/ChannelSegment;->getChannel()Lkotlinx/coroutines/channels/BufferedChannel;
+SPLkotlinx/coroutines/channels/ChannelSegment;->getData()Ljava/util/concurrent/atomic/AtomicReferenceArray;
+SPLkotlinx/coroutines/channels/ChannelSegment;->getElement$kotlinx_coroutines_core(I)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/ChannelSegment;->getNumberOfSlots()I
+SPLkotlinx/coroutines/channels/ChannelSegment;->getState$kotlinx_coroutines_core(I)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/ChannelSegment;->onCancellation(ILjava/lang/Throwable;Lkotlin/coroutines/CoroutineContext;)V
+SPLkotlinx/coroutines/channels/ChannelSegment;->onCancelledRequest(IZ)V
+SPLkotlinx/coroutines/channels/ChannelSegment;->retrieveElement$kotlinx_coroutines_core(I)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/ChannelSegment;->setElementLazy(ILjava/lang/Object;)V
+SPLkotlinx/coroutines/channels/ChannelSegment;->setState$kotlinx_coroutines_core(ILjava/lang/Object;)V
+SPLkotlinx/coroutines/channels/ChannelSegment;->storeElement$kotlinx_coroutines_core(ILjava/lang/Object;)V
+Lkotlinx/coroutines/channels/ChannelsKt;
+SPLkotlinx/coroutines/channels/ChannelsKt;->cancelConsumed(Lkotlinx/coroutines/channels/ReceiveChannel;Ljava/lang/Throwable;)V
+Lkotlinx/coroutines/channels/ChannelsKt__Channels_commonKt;
+SPLkotlinx/coroutines/channels/ChannelsKt__Channels_commonKt;->cancelConsumed(Lkotlinx/coroutines/channels/ReceiveChannel;Ljava/lang/Throwable;)V
+Lkotlinx/coroutines/channels/ConflatedBufferedChannel;
+SPLkotlinx/coroutines/channels/ConflatedBufferedChannel;-><init>(ILkotlinx/coroutines/channels/BufferOverflow;Lkotlin/jvm/functions/Function1;)V
+SPLkotlinx/coroutines/channels/ConflatedBufferedChannel;->isConflatedDropOldest()Z
+SPLkotlinx/coroutines/channels/ConflatedBufferedChannel;->send$suspendImpl(Lkotlinx/coroutines/channels/ConflatedBufferedChannel;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/ConflatedBufferedChannel;->send(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/ConflatedBufferedChannel;->trySendDropOldest-JP2dKIU(Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/channels/ConflatedBufferedChannel;->trySendImpl-Mj0NB7M(Ljava/lang/Object;Z)Ljava/lang/Object;
+Lkotlinx/coroutines/channels/ProduceKt;
+SPLkotlinx/coroutines/channels/ProduceKt;->produce$default(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILkotlinx/coroutines/channels/BufferOverflow;Lkotlinx/coroutines/CoroutineStart;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/channels/ReceiveChannel;
+SPLkotlinx/coroutines/channels/ProduceKt;->produce(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;ILkotlinx/coroutines/channels/BufferOverflow;Lkotlinx/coroutines/CoroutineStart;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/channels/ReceiveChannel;
+Lkotlinx/coroutines/channels/ProducerCoroutine;
+SPLkotlinx/coroutines/channels/ProducerCoroutine;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/channels/Channel;)V
+SPLkotlinx/coroutines/channels/ProducerCoroutine;->isActive()Z
+SPLkotlinx/coroutines/channels/ProducerCoroutine;->onCancelled(Ljava/lang/Throwable;Z)V
+Lkotlinx/coroutines/channels/ProducerScope;
+Lkotlinx/coroutines/channels/ReceiveCatching;
+SPLkotlinx/coroutines/channels/ReceiveCatching;-><init>(Lkotlinx/coroutines/CancellableContinuationImpl;)V
+SPLkotlinx/coroutines/channels/ReceiveCatching;->invokeOnCancellation(Lkotlinx/coroutines/internal/Segment;I)V
+Lkotlinx/coroutines/channels/ReceiveChannel;
+Lkotlinx/coroutines/channels/SendChannel;
+Lkotlinx/coroutines/channels/WaiterEB;
+Lkotlinx/coroutines/flow/AbstractFlow;
+SPLkotlinx/coroutines/flow/AbstractFlow;-><init>()V
+SPLkotlinx/coroutines/flow/AbstractFlow;->collect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/AbstractFlow$collect$1;
+SPLkotlinx/coroutines/flow/AbstractFlow$collect$1;-><init>(Lkotlinx/coroutines/flow/AbstractFlow;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/flow/AbstractFlow$collect$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/CallbackFlowBuilder;
+SPLkotlinx/coroutines/flow/CallbackFlowBuilder;-><init>(Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;ILkotlinx/coroutines/channels/BufferOverflow;)V
+SPLkotlinx/coroutines/flow/CallbackFlowBuilder;-><init>(Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;ILkotlinx/coroutines/channels/BufferOverflow;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlinx/coroutines/flow/CallbackFlowBuilder;->collectTo(Lkotlinx/coroutines/channels/ProducerScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/CallbackFlowBuilder$collectTo$1;
+SPLkotlinx/coroutines/flow/CallbackFlowBuilder$collectTo$1;-><init>(Lkotlinx/coroutines/flow/CallbackFlowBuilder;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/flow/CallbackFlowBuilder$collectTo$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/CancellableFlow;
+Lkotlinx/coroutines/flow/ChannelFlowBuilder;
+SPLkotlinx/coroutines/flow/ChannelFlowBuilder;-><init>(Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/CoroutineContext;ILkotlinx/coroutines/channels/BufferOverflow;)V
+SPLkotlinx/coroutines/flow/ChannelFlowBuilder;->collectTo$suspendImpl(Lkotlinx/coroutines/flow/ChannelFlowBuilder;Lkotlinx/coroutines/channels/ProducerScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/ChannelFlowBuilder;->collectTo(Lkotlinx/coroutines/channels/ProducerScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/DistinctFlowImpl;
+SPLkotlinx/coroutines/flow/DistinctFlowImpl;-><init>(Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)V
+SPLkotlinx/coroutines/flow/DistinctFlowImpl;->collect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/DistinctFlowImpl$collect$2;
+SPLkotlinx/coroutines/flow/DistinctFlowImpl$collect$2;-><init>(Lkotlinx/coroutines/flow/DistinctFlowImpl;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlinx/coroutines/flow/FlowCollector;)V
+SPLkotlinx/coroutines/flow/DistinctFlowImpl$collect$2;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/DistinctFlowImpl$collect$2$emit$1;
+SPLkotlinx/coroutines/flow/DistinctFlowImpl$collect$2$emit$1;-><init>(Lkotlinx/coroutines/flow/DistinctFlowImpl$collect$2;Lkotlin/coroutines/Continuation;)V
+Lkotlinx/coroutines/flow/Flow;
+Lkotlinx/coroutines/flow/FlowCollector;
+Lkotlinx/coroutines/flow/FlowKt;
+SPLkotlinx/coroutines/flow/FlowKt;->asStateFlow(Lkotlinx/coroutines/flow/MutableStateFlow;)Lkotlinx/coroutines/flow/StateFlow;
+SPLkotlinx/coroutines/flow/FlowKt;->buffer$default(Lkotlinx/coroutines/flow/Flow;ILkotlinx/coroutines/channels/BufferOverflow;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt;->buffer(Lkotlinx/coroutines/flow/Flow;ILkotlinx/coroutines/channels/BufferOverflow;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt;->callbackFlow(Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt;->catchImpl(Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt;->collect(Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt;->collectLatest(Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt;->combine(Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function3;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt;->combine(Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function5;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt;->conflate(Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt;->distinctUntilChanged(Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt;->emitAll(Lkotlinx/coroutines/flow/FlowCollector;Lkotlinx/coroutines/channels/ReceiveChannel;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt;->ensureActive(Lkotlinx/coroutines/flow/FlowCollector;)V
+SPLkotlinx/coroutines/flow/FlowKt;->filterNotNull(Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt;->flow(Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt;->flowCombine(Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function3;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt;->flowOn(Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/CoroutineContext;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt;->launchIn(Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/CoroutineScope;)Lkotlinx/coroutines/Job;
+SPLkotlinx/coroutines/flow/FlowKt;->mapLatest(Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt;->onEach(Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt;->onStart(Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt;->retryWhen(Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function4;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt;->stateIn(Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/CoroutineScope;Lkotlinx/coroutines/flow/SharingStarted;Ljava/lang/Object;)Lkotlinx/coroutines/flow/StateFlow;
+SPLkotlinx/coroutines/flow/FlowKt;->transformLatest(Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function3;)Lkotlinx/coroutines/flow/Flow;
+Lkotlinx/coroutines/flow/FlowKt__BuildersKt;
+SPLkotlinx/coroutines/flow/FlowKt__BuildersKt;->callbackFlow(Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt__BuildersKt;->flow(Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
+Lkotlinx/coroutines/flow/FlowKt__ChannelsKt;
+SPLkotlinx/coroutines/flow/FlowKt__ChannelsKt;->access$emitAllImpl$FlowKt__ChannelsKt(Lkotlinx/coroutines/flow/FlowCollector;Lkotlinx/coroutines/channels/ReceiveChannel;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt__ChannelsKt;->emitAll(Lkotlinx/coroutines/flow/FlowCollector;Lkotlinx/coroutines/channels/ReceiveChannel;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt__ChannelsKt;->emitAllImpl$FlowKt__ChannelsKt(Lkotlinx/coroutines/flow/FlowCollector;Lkotlinx/coroutines/channels/ReceiveChannel;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__ChannelsKt$emitAllImpl$1;
+SPLkotlinx/coroutines/flow/FlowKt__ChannelsKt$emitAllImpl$1;-><init>(Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/flow/FlowKt__ChannelsKt$emitAllImpl$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__CollectKt;
+SPLkotlinx/coroutines/flow/FlowKt__CollectKt;->collect(Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt__CollectKt;->collectLatest(Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt__CollectKt;->launchIn(Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/CoroutineScope;)Lkotlinx/coroutines/Job;
+Lkotlinx/coroutines/flow/FlowKt__CollectKt$launchIn$1;
+SPLkotlinx/coroutines/flow/FlowKt__CollectKt$launchIn$1;-><init>(Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/flow/FlowKt__CollectKt$launchIn$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLkotlinx/coroutines/flow/FlowKt__CollectKt$launchIn$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__ContextKt;
+SPLkotlinx/coroutines/flow/FlowKt__ContextKt;->buffer$default(Lkotlinx/coroutines/flow/Flow;ILkotlinx/coroutines/channels/BufferOverflow;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt__ContextKt;->buffer(Lkotlinx/coroutines/flow/Flow;ILkotlinx/coroutines/channels/BufferOverflow;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt__ContextKt;->checkFlowContext$FlowKt__ContextKt(Lkotlin/coroutines/CoroutineContext;)V
+SPLkotlinx/coroutines/flow/FlowKt__ContextKt;->conflate(Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt__ContextKt;->flowOn(Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/CoroutineContext;)Lkotlinx/coroutines/flow/Flow;
+Lkotlinx/coroutines/flow/FlowKt__DistinctKt;
+SPLkotlinx/coroutines/flow/FlowKt__DistinctKt;->$r8$lambda$mgidQTCZEwPL4AoZywC2sds_69k(Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt__DistinctKt;-><clinit>()V
+SPLkotlinx/coroutines/flow/FlowKt__DistinctKt;->defaultKeySelector$lambda$0$FlowKt__DistinctKt(Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt__DistinctKt;->distinctUntilChanged(Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt__DistinctKt;->distinctUntilChangedBy$FlowKt__DistinctKt(Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
+Lkotlinx/coroutines/flow/FlowKt__DistinctKt$$ExternalSyntheticLambda0;
+SPLkotlinx/coroutines/flow/FlowKt__DistinctKt$$ExternalSyntheticLambda0;-><init>()V
+SPLkotlinx/coroutines/flow/FlowKt__DistinctKt$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__DistinctKt$$ExternalSyntheticLambda1;
+SPLkotlinx/coroutines/flow/FlowKt__DistinctKt$$ExternalSyntheticLambda1;-><init>()V
+Lkotlinx/coroutines/flow/FlowKt__EmittersKt;
+SPLkotlinx/coroutines/flow/FlowKt__EmittersKt;->ensureActive(Lkotlinx/coroutines/flow/FlowCollector;)V
+SPLkotlinx/coroutines/flow/FlowKt__EmittersKt;->onStart(Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
+Lkotlinx/coroutines/flow/FlowKt__EmittersKt$onStart$$inlined$unsafeFlow$1;
+SPLkotlinx/coroutines/flow/FlowKt__EmittersKt$onStart$$inlined$unsafeFlow$1;-><init>(Lkotlin/jvm/functions/Function2;Lkotlinx/coroutines/flow/Flow;)V
+SPLkotlinx/coroutines/flow/FlowKt__EmittersKt$onStart$$inlined$unsafeFlow$1;->collect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__EmittersKt$onStart$$inlined$unsafeFlow$1$1;
+SPLkotlinx/coroutines/flow/FlowKt__EmittersKt$onStart$$inlined$unsafeFlow$1$1;-><init>(Lkotlinx/coroutines/flow/FlowKt__EmittersKt$onStart$$inlined$unsafeFlow$1;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/flow/FlowKt__EmittersKt$onStart$$inlined$unsafeFlow$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__ErrorsKt;
+SPLkotlinx/coroutines/flow/FlowKt__ErrorsKt;->catchImpl(Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt__ErrorsKt;->retryWhen(Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function4;)Lkotlinx/coroutines/flow/Flow;
+Lkotlinx/coroutines/flow/FlowKt__ErrorsKt$catchImpl$1;
+SPLkotlinx/coroutines/flow/FlowKt__ErrorsKt$catchImpl$1;-><init>(Lkotlin/coroutines/Continuation;)V
+Lkotlinx/coroutines/flow/FlowKt__ErrorsKt$catchImpl$2;
+SPLkotlinx/coroutines/flow/FlowKt__ErrorsKt$catchImpl$2;-><init>(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/jvm/internal/Ref$ObjectRef;)V
+SPLkotlinx/coroutines/flow/FlowKt__ErrorsKt$catchImpl$2;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__ErrorsKt$catchImpl$2$emit$1;
+SPLkotlinx/coroutines/flow/FlowKt__ErrorsKt$catchImpl$2$emit$1;-><init>(Lkotlinx/coroutines/flow/FlowKt__ErrorsKt$catchImpl$2;Lkotlin/coroutines/Continuation;)V
+Lkotlinx/coroutines/flow/FlowKt__ErrorsKt$retryWhen$$inlined$unsafeFlow$1;
+SPLkotlinx/coroutines/flow/FlowKt__ErrorsKt$retryWhen$$inlined$unsafeFlow$1;-><init>(Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function4;)V
+SPLkotlinx/coroutines/flow/FlowKt__ErrorsKt$retryWhen$$inlined$unsafeFlow$1;->collect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__ErrorsKt$retryWhen$$inlined$unsafeFlow$1$1;
+SPLkotlinx/coroutines/flow/FlowKt__ErrorsKt$retryWhen$$inlined$unsafeFlow$1$1;-><init>(Lkotlinx/coroutines/flow/FlowKt__ErrorsKt$retryWhen$$inlined$unsafeFlow$1;Lkotlin/coroutines/Continuation;)V
+Lkotlinx/coroutines/flow/FlowKt__MergeKt;
+SPLkotlinx/coroutines/flow/FlowKt__MergeKt;-><clinit>()V
+SPLkotlinx/coroutines/flow/FlowKt__MergeKt;->mapLatest(Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt__MergeKt;->transformLatest(Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function3;)Lkotlinx/coroutines/flow/Flow;
+Lkotlinx/coroutines/flow/FlowKt__MergeKt$mapLatest$1;
+SPLkotlinx/coroutines/flow/FlowKt__MergeKt$mapLatest$1;-><init>(Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/flow/FlowKt__MergeKt$mapLatest$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt__MergeKt$mapLatest$1;->invoke(Lkotlinx/coroutines/flow/FlowCollector;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt__MergeKt$mapLatest$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__ShareKt;
+SPLkotlinx/coroutines/flow/FlowKt__ShareKt;->asStateFlow(Lkotlinx/coroutines/flow/MutableStateFlow;)Lkotlinx/coroutines/flow/StateFlow;
+SPLkotlinx/coroutines/flow/FlowKt__ShareKt;->configureSharing$FlowKt__ShareKt(Lkotlinx/coroutines/flow/Flow;I)Lkotlinx/coroutines/flow/SharingConfig;
+SPLkotlinx/coroutines/flow/FlowKt__ShareKt;->launchSharing$FlowKt__ShareKt(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/MutableSharedFlow;Lkotlinx/coroutines/flow/SharingStarted;Ljava/lang/Object;)Lkotlinx/coroutines/Job;
+SPLkotlinx/coroutines/flow/FlowKt__ShareKt;->stateIn(Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/CoroutineScope;Lkotlinx/coroutines/flow/SharingStarted;Ljava/lang/Object;)Lkotlinx/coroutines/flow/StateFlow;
+Lkotlinx/coroutines/flow/FlowKt__ShareKt$launchSharing$1;
+SPLkotlinx/coroutines/flow/FlowKt__ShareKt$launchSharing$1;-><init>(Lkotlinx/coroutines/flow/SharingStarted;Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/MutableSharedFlow;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/flow/FlowKt__ShareKt$launchSharing$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLkotlinx/coroutines/flow/FlowKt__ShareKt$launchSharing$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__TransformKt;
+SPLkotlinx/coroutines/flow/FlowKt__TransformKt;->filterNotNull(Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt__TransformKt;->onEach(Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
+Lkotlinx/coroutines/flow/FlowKt__TransformKt$filterNotNull$$inlined$unsafeTransform$1;
+SPLkotlinx/coroutines/flow/FlowKt__TransformKt$filterNotNull$$inlined$unsafeTransform$1;-><init>(Lkotlinx/coroutines/flow/Flow;)V
+SPLkotlinx/coroutines/flow/FlowKt__TransformKt$filterNotNull$$inlined$unsafeTransform$1;->collect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__TransformKt$filterNotNull$$inlined$unsafeTransform$1$2;
+SPLkotlinx/coroutines/flow/FlowKt__TransformKt$filterNotNull$$inlined$unsafeTransform$1$2;-><init>(Lkotlinx/coroutines/flow/FlowCollector;)V
+SPLkotlinx/coroutines/flow/FlowKt__TransformKt$filterNotNull$$inlined$unsafeTransform$1$2;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__TransformKt$filterNotNull$$inlined$unsafeTransform$1$2$1;
+SPLkotlinx/coroutines/flow/FlowKt__TransformKt$filterNotNull$$inlined$unsafeTransform$1$2$1;-><init>(Lkotlinx/coroutines/flow/FlowKt__TransformKt$filterNotNull$$inlined$unsafeTransform$1$2;Lkotlin/coroutines/Continuation;)V
+Lkotlinx/coroutines/flow/FlowKt__TransformKt$onEach$$inlined$unsafeTransform$1;
+SPLkotlinx/coroutines/flow/FlowKt__TransformKt$onEach$$inlined$unsafeTransform$1;-><init>(Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;)V
+SPLkotlinx/coroutines/flow/FlowKt__TransformKt$onEach$$inlined$unsafeTransform$1;->collect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__TransformKt$onEach$$inlined$unsafeTransform$1$2;
+SPLkotlinx/coroutines/flow/FlowKt__TransformKt$onEach$$inlined$unsafeTransform$1$2;-><init>(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/jvm/functions/Function2;)V
+SPLkotlinx/coroutines/flow/FlowKt__TransformKt$onEach$$inlined$unsafeTransform$1$2;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__TransformKt$onEach$$inlined$unsafeTransform$1$2$1;
+SPLkotlinx/coroutines/flow/FlowKt__TransformKt$onEach$$inlined$unsafeTransform$1$2$1;-><init>(Lkotlinx/coroutines/flow/FlowKt__TransformKt$onEach$$inlined$unsafeTransform$1$2;Lkotlin/coroutines/Continuation;)V
+Lkotlinx/coroutines/flow/FlowKt__ZipKt;
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt;->access$nullArrayFactory()Lkotlin/jvm/functions/Function0;
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt;->combine(Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function3;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt;->combine(Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function5;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt;->flowCombine(Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function3;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt;->nullArrayFactory$FlowKt__ZipKt()Lkotlin/jvm/functions/Function0;
+Lkotlinx/coroutines/flow/FlowKt__ZipKt$combine$$inlined$combineUnsafe$FlowKt__ZipKt$2;
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt$combine$$inlined$combineUnsafe$FlowKt__ZipKt$2;-><init>([Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function5;)V
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt$combine$$inlined$combineUnsafe$FlowKt__ZipKt$2;->collect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__ZipKt$combine$$inlined$combineUnsafe$FlowKt__ZipKt$2$2;
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt$combine$$inlined$combineUnsafe$FlowKt__ZipKt$2$2;-><init>(Lkotlin/coroutines/Continuation;Lkotlin/jvm/functions/Function5;)V
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt$combine$$inlined$combineUnsafe$FlowKt__ZipKt$2$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt$combine$$inlined$combineUnsafe$FlowKt__ZipKt$2$2;->invoke(Lkotlinx/coroutines/flow/FlowCollector;[Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt$combine$$inlined$combineUnsafe$FlowKt__ZipKt$2$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__ZipKt$combine$$inlined$unsafeFlow$1;
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt$combine$$inlined$unsafeFlow$1;-><init>(Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function3;)V
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt$combine$$inlined$unsafeFlow$1;->collect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__ZipKt$combine$1$1;
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt$combine$1$1;-><init>(Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt$combine$1$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt$combine$1$1;->invoke(Lkotlinx/coroutines/flow/FlowCollector;[Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt$combine$1$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/FlowKt__ZipKt$nullArrayFactory$1;
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt$nullArrayFactory$1;-><clinit>()V
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt$nullArrayFactory$1;-><init>()V
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt$nullArrayFactory$1;->invoke()Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/FlowKt__ZipKt$nullArrayFactory$1;->invoke()Ljava/lang/Void;
+Lkotlinx/coroutines/flow/MutableSharedFlow;
+Lkotlinx/coroutines/flow/MutableStateFlow;
+Lkotlinx/coroutines/flow/ReadonlyStateFlow;
+SPLkotlinx/coroutines/flow/ReadonlyStateFlow;-><init>(Lkotlinx/coroutines/flow/StateFlow;Lkotlinx/coroutines/Job;)V
+SPLkotlinx/coroutines/flow/ReadonlyStateFlow;->collect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/ReadonlyStateFlow;->getValue()Ljava/lang/Object;
+Lkotlinx/coroutines/flow/SafeFlow;
+SPLkotlinx/coroutines/flow/SafeFlow;-><init>(Lkotlin/jvm/functions/Function2;)V
+SPLkotlinx/coroutines/flow/SafeFlow;->collectSafely(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/SharedFlow;
+Lkotlinx/coroutines/flow/SharedFlowImpl;
+SPLkotlinx/coroutines/flow/SharedFlowImpl;-><init>(IILkotlinx/coroutines/channels/BufferOverflow;)V
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->access$tryPeekLocked(Lkotlinx/coroutines/flow/SharedFlowImpl;Lkotlinx/coroutines/flow/SharedFlowSlot;)J
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->awaitValue(Lkotlinx/coroutines/flow/SharedFlowSlot;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->cleanupTailLocked()V
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->collect$suspendImpl(Lkotlinx/coroutines/flow/SharedFlowImpl;Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->collect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->createSlot()Lkotlinx/coroutines/flow/SharedFlowSlot;
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->createSlot()Lkotlinx/coroutines/flow/internal/AbstractSharedFlowSlot;
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->createSlotArray(I)[Lkotlinx/coroutines/flow/SharedFlowSlot;
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->createSlotArray(I)[Lkotlinx/coroutines/flow/internal/AbstractSharedFlowSlot;
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->emit$suspendImpl(Lkotlinx/coroutines/flow/SharedFlowImpl;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->enqueueLocked(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->findSlotsToResumeLocked([Lkotlin/coroutines/Continuation;)[Lkotlin/coroutines/Continuation;
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->getBufferEndIndex()J
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->getHead()J
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->getPeekedValueLockedAt(J)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->getQueueEndIndex()J
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->getReplaySize()I
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->getTotalSize()I
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->growBuffer([Ljava/lang/Object;II)[Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->tryEmit(Ljava/lang/Object;)Z
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->tryEmitLocked(Ljava/lang/Object;)Z
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->tryPeekLocked(Lkotlinx/coroutines/flow/SharedFlowSlot;)J
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->tryTakeValue(Lkotlinx/coroutines/flow/SharedFlowSlot;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->updateBufferLocked(JJJJ)V
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->updateCollectorIndexLocked$kotlinx_coroutines_core(J)[Lkotlin/coroutines/Continuation;
+SPLkotlinx/coroutines/flow/SharedFlowImpl;->updateNewCollectorIndexLocked$kotlinx_coroutines_core()J
+Lkotlinx/coroutines/flow/SharedFlowImpl$Emitter;
+Lkotlinx/coroutines/flow/SharedFlowImpl$collect$1;
+SPLkotlinx/coroutines/flow/SharedFlowImpl$collect$1;-><init>(Lkotlinx/coroutines/flow/SharedFlowImpl;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/flow/SharedFlowImpl$collect$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/SharedFlowKt;
+SPLkotlinx/coroutines/flow/SharedFlowKt;-><clinit>()V
+SPLkotlinx/coroutines/flow/SharedFlowKt;->MutableSharedFlow$default(IILkotlinx/coroutines/channels/BufferOverflow;ILjava/lang/Object;)Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLkotlinx/coroutines/flow/SharedFlowKt;->MutableSharedFlow(IILkotlinx/coroutines/channels/BufferOverflow;)Lkotlinx/coroutines/flow/MutableSharedFlow;
+SPLkotlinx/coroutines/flow/SharedFlowKt;->access$getBufferAt([Ljava/lang/Object;J)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/SharedFlowKt;->access$setBufferAt([Ljava/lang/Object;JLjava/lang/Object;)V
+SPLkotlinx/coroutines/flow/SharedFlowKt;->getBufferAt([Ljava/lang/Object;J)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/SharedFlowKt;->setBufferAt([Ljava/lang/Object;JLjava/lang/Object;)V
+Lkotlinx/coroutines/flow/SharedFlowSlot;
+SPLkotlinx/coroutines/flow/SharedFlowSlot;-><init>()V
+SPLkotlinx/coroutines/flow/SharedFlowSlot;->allocateLocked(Ljava/lang/Object;)Z
+SPLkotlinx/coroutines/flow/SharedFlowSlot;->allocateLocked(Lkotlinx/coroutines/flow/SharedFlowImpl;)Z
+Lkotlinx/coroutines/flow/SharingConfig;
+SPLkotlinx/coroutines/flow/SharingConfig;-><init>(Lkotlinx/coroutines/flow/Flow;ILkotlinx/coroutines/channels/BufferOverflow;Lkotlin/coroutines/CoroutineContext;)V
+Lkotlinx/coroutines/flow/SharingStarted;
+SPLkotlinx/coroutines/flow/SharingStarted;-><clinit>()V
+Lkotlinx/coroutines/flow/SharingStarted$Companion;
+SPLkotlinx/coroutines/flow/SharingStarted$Companion;-><clinit>()V
+SPLkotlinx/coroutines/flow/SharingStarted$Companion;-><init>()V
+SPLkotlinx/coroutines/flow/SharingStarted$Companion;->getEagerly()Lkotlinx/coroutines/flow/SharingStarted;
+Lkotlinx/coroutines/flow/StartedEagerly;
+SPLkotlinx/coroutines/flow/StartedEagerly;-><init>()V
+Lkotlinx/coroutines/flow/StartedLazily;
+SPLkotlinx/coroutines/flow/StartedLazily;-><init>()V
+Lkotlinx/coroutines/flow/StateFlow;
+Lkotlinx/coroutines/flow/StateFlowImpl;
+SPLkotlinx/coroutines/flow/StateFlowImpl;-><clinit>()V
+SPLkotlinx/coroutines/flow/StateFlowImpl;-><init>(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/flow/StateFlowImpl;->collect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/StateFlowImpl;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;)Z
+SPLkotlinx/coroutines/flow/StateFlowImpl;->createSlot()Lkotlinx/coroutines/flow/StateFlowSlot;
+SPLkotlinx/coroutines/flow/StateFlowImpl;->createSlot()Lkotlinx/coroutines/flow/internal/AbstractSharedFlowSlot;
+SPLkotlinx/coroutines/flow/StateFlowImpl;->createSlotArray(I)[Lkotlinx/coroutines/flow/StateFlowSlot;
+SPLkotlinx/coroutines/flow/StateFlowImpl;->createSlotArray(I)[Lkotlinx/coroutines/flow/internal/AbstractSharedFlowSlot;
+SPLkotlinx/coroutines/flow/StateFlowImpl;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/StateFlowImpl;->getValue()Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/StateFlowImpl;->get_state$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/flow/StateFlowImpl;->setValue(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/flow/StateFlowImpl;->updateState(Ljava/lang/Object;Ljava/lang/Object;)Z
+Lkotlinx/coroutines/flow/StateFlowImpl$collect$1;
+SPLkotlinx/coroutines/flow/StateFlowImpl$collect$1;-><init>(Lkotlinx/coroutines/flow/StateFlowImpl;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/flow/StateFlowImpl$collect$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/StateFlowKt;
+SPLkotlinx/coroutines/flow/StateFlowKt;-><clinit>()V
+SPLkotlinx/coroutines/flow/StateFlowKt;->MutableStateFlow(Ljava/lang/Object;)Lkotlinx/coroutines/flow/MutableStateFlow;
+SPLkotlinx/coroutines/flow/StateFlowKt;->access$getNONE$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/flow/StateFlowKt;->access$getPENDING$p()Lkotlinx/coroutines/internal/Symbol;
+Lkotlinx/coroutines/flow/StateFlowSlot;
+SPLkotlinx/coroutines/flow/StateFlowSlot;-><init>()V
+SPLkotlinx/coroutines/flow/StateFlowSlot;->access$get_state$p(Lkotlinx/coroutines/flow/StateFlowSlot;)Ljava/util/concurrent/atomic/AtomicReference;
+SPLkotlinx/coroutines/flow/StateFlowSlot;->allocateLocked(Ljava/lang/Object;)Z
+SPLkotlinx/coroutines/flow/StateFlowSlot;->allocateLocked(Lkotlinx/coroutines/flow/StateFlowImpl;)Z
+SPLkotlinx/coroutines/flow/StateFlowSlot;->awaitPending(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/StateFlowSlot;->freeLocked(Ljava/lang/Object;)[Lkotlin/coroutines/Continuation;
+SPLkotlinx/coroutines/flow/StateFlowSlot;->freeLocked(Lkotlinx/coroutines/flow/StateFlowImpl;)[Lkotlin/coroutines/Continuation;
+SPLkotlinx/coroutines/flow/StateFlowSlot;->makePending()V
+SPLkotlinx/coroutines/flow/StateFlowSlot;->takePending()Z
+Lkotlinx/coroutines/flow/SubscribedFlowCollector;
+Lkotlinx/coroutines/flow/ThrowingCollector;
+Lkotlinx/coroutines/flow/internal/AbstractSharedFlow;
+SPLkotlinx/coroutines/flow/internal/AbstractSharedFlow;-><init>()V
+SPLkotlinx/coroutines/flow/internal/AbstractSharedFlow;->access$getNCollectors(Lkotlinx/coroutines/flow/internal/AbstractSharedFlow;)I
+SPLkotlinx/coroutines/flow/internal/AbstractSharedFlow;->access$getSlots(Lkotlinx/coroutines/flow/internal/AbstractSharedFlow;)[Lkotlinx/coroutines/flow/internal/AbstractSharedFlowSlot;
+SPLkotlinx/coroutines/flow/internal/AbstractSharedFlow;->allocateSlot()Lkotlinx/coroutines/flow/internal/AbstractSharedFlowSlot;
+SPLkotlinx/coroutines/flow/internal/AbstractSharedFlow;->freeSlot(Lkotlinx/coroutines/flow/internal/AbstractSharedFlowSlot;)V
+SPLkotlinx/coroutines/flow/internal/AbstractSharedFlow;->getNCollectors()I
+SPLkotlinx/coroutines/flow/internal/AbstractSharedFlow;->getSlots()[Lkotlinx/coroutines/flow/internal/AbstractSharedFlowSlot;
+Lkotlinx/coroutines/flow/internal/AbstractSharedFlowKt;
+SPLkotlinx/coroutines/flow/internal/AbstractSharedFlowKt;-><clinit>()V
+Lkotlinx/coroutines/flow/internal/AbstractSharedFlowSlot;
+SPLkotlinx/coroutines/flow/internal/AbstractSharedFlowSlot;-><init>()V
+Lkotlinx/coroutines/flow/internal/ChannelFlow;
+SPLkotlinx/coroutines/flow/internal/ChannelFlow;-><init>(Lkotlin/coroutines/CoroutineContext;ILkotlinx/coroutines/channels/BufferOverflow;)V
+SPLkotlinx/coroutines/flow/internal/ChannelFlow;->collect$suspendImpl(Lkotlinx/coroutines/flow/internal/ChannelFlow;Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/internal/ChannelFlow;->collect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/internal/ChannelFlow;->fuse(Lkotlin/coroutines/CoroutineContext;ILkotlinx/coroutines/channels/BufferOverflow;)Lkotlinx/coroutines/flow/Flow;
+SPLkotlinx/coroutines/flow/internal/ChannelFlow;->getCollectToFun$kotlinx_coroutines_core()Lkotlin/jvm/functions/Function2;
+SPLkotlinx/coroutines/flow/internal/ChannelFlow;->getProduceCapacity$kotlinx_coroutines_core()I
+SPLkotlinx/coroutines/flow/internal/ChannelFlow;->produceImpl(Lkotlinx/coroutines/CoroutineScope;)Lkotlinx/coroutines/channels/ReceiveChannel;
+Lkotlinx/coroutines/flow/internal/ChannelFlow$collect$2;
+SPLkotlinx/coroutines/flow/internal/ChannelFlow$collect$2;-><init>(Lkotlinx/coroutines/flow/FlowCollector;Lkotlinx/coroutines/flow/internal/ChannelFlow;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/flow/internal/ChannelFlow$collect$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLkotlinx/coroutines/flow/internal/ChannelFlow$collect$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/internal/ChannelFlow$collect$2;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/internal/ChannelFlow$collect$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/ChannelFlow$collectToFun$1;
+SPLkotlinx/coroutines/flow/internal/ChannelFlow$collectToFun$1;-><init>(Lkotlinx/coroutines/flow/internal/ChannelFlow;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/flow/internal/ChannelFlow$collectToFun$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLkotlinx/coroutines/flow/internal/ChannelFlow$collectToFun$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/ChannelFlowOperator;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowOperator;-><init>(Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/CoroutineContext;ILkotlinx/coroutines/channels/BufferOverflow;)V
+SPLkotlinx/coroutines/flow/internal/ChannelFlowOperator;->collect$suspendImpl(Lkotlinx/coroutines/flow/internal/ChannelFlowOperator;Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowOperator;->collect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowOperator;->collectTo$suspendImpl(Lkotlinx/coroutines/flow/internal/ChannelFlowOperator;Lkotlinx/coroutines/channels/ProducerScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowOperator;->collectTo(Lkotlinx/coroutines/channels/ProducerScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/ChannelFlowOperatorImpl;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowOperatorImpl;-><init>(Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/CoroutineContext;ILkotlinx/coroutines/channels/BufferOverflow;)V
+SPLkotlinx/coroutines/flow/internal/ChannelFlowOperatorImpl;-><init>(Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/CoroutineContext;ILkotlinx/coroutines/channels/BufferOverflow;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlinx/coroutines/flow/internal/ChannelFlowOperatorImpl;->flowCollect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest;-><init>(Lkotlin/jvm/functions/Function3;Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/CoroutineContext;ILkotlinx/coroutines/channels/BufferOverflow;)V
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest;-><init>(Lkotlin/jvm/functions/Function3;Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/CoroutineContext;ILkotlinx/coroutines/channels/BufferOverflow;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest;->access$getTransform$p(Lkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest;)Lkotlin/jvm/functions/Function3;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest;->create(Lkotlin/coroutines/CoroutineContext;ILkotlinx/coroutines/channels/BufferOverflow;)Lkotlinx/coroutines/flow/internal/ChannelFlow;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest;->flowCollect(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3;-><init>(Lkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest;Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3$1;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3$1;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlinx/coroutines/CoroutineScope;Lkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest;Lkotlinx/coroutines/flow/FlowCollector;)V
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3$1;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3$1$2;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3$1$2;-><init>(Lkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest;Lkotlinx/coroutines/flow/FlowCollector;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3$1$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3$1$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3$1$2;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3$1$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3$1$emit$1;
+SPLkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3$1$emit$1;-><init>(Lkotlinx/coroutines/flow/internal/ChannelFlowTransformLatest$flowCollect$3$1;Lkotlin/coroutines/Continuation;)V
+Lkotlinx/coroutines/flow/internal/CombineKt;
+SPLkotlinx/coroutines/flow/internal/CombineKt;->combineInternal(Lkotlinx/coroutines/flow/FlowCollector;[Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/CombineKt$combineInternal$2;
+SPLkotlinx/coroutines/flow/internal/CombineKt$combineInternal$2;-><init>([Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function3;Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/flow/internal/CombineKt$combineInternal$2;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLkotlinx/coroutines/flow/internal/CombineKt$combineInternal$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/internal/CombineKt$combineInternal$2;->invoke(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/internal/CombineKt$combineInternal$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/CombineKt$combineInternal$2$1;
+SPLkotlinx/coroutines/flow/internal/CombineKt$combineInternal$2$1;-><init>([Lkotlinx/coroutines/flow/Flow;ILjava/util/concurrent/atomic/AtomicInteger;Lkotlinx/coroutines/channels/Channel;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/flow/internal/CombineKt$combineInternal$2$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
+SPLkotlinx/coroutines/flow/internal/CombineKt$combineInternal$2$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/CombineKt$combineInternal$2$1$1;
+SPLkotlinx/coroutines/flow/internal/CombineKt$combineInternal$2$1$1;-><init>(Lkotlinx/coroutines/channels/Channel;I)V
+SPLkotlinx/coroutines/flow/internal/CombineKt$combineInternal$2$1$1;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/CombineKt$combineInternal$2$1$1$emit$1;
+SPLkotlinx/coroutines/flow/internal/CombineKt$combineInternal$2$1$1$emit$1;-><init>(Lkotlinx/coroutines/flow/internal/CombineKt$combineInternal$2$1$1;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/flow/internal/CombineKt$combineInternal$2$1$1$emit$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/DownstreamExceptionContext;
+Lkotlinx/coroutines/flow/internal/FlowCoroutine;
+SPLkotlinx/coroutines/flow/internal/FlowCoroutine;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
+Lkotlinx/coroutines/flow/internal/FlowCoroutineKt;
+SPLkotlinx/coroutines/flow/internal/FlowCoroutineKt;->flowScope(Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/FusibleFlow;
+SPLkotlinx/coroutines/flow/internal/FusibleFlow;->fuse$default(Lkotlinx/coroutines/flow/internal/FusibleFlow;Lkotlin/coroutines/CoroutineContext;ILkotlinx/coroutines/channels/BufferOverflow;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
+Lkotlinx/coroutines/flow/internal/NoOpContinuation;
+SPLkotlinx/coroutines/flow/internal/NoOpContinuation;-><clinit>()V
+SPLkotlinx/coroutines/flow/internal/NoOpContinuation;-><init>()V
+Lkotlinx/coroutines/flow/internal/NopCollector;
+SPLkotlinx/coroutines/flow/internal/NopCollector;-><clinit>()V
+SPLkotlinx/coroutines/flow/internal/NopCollector;-><init>()V
+SPLkotlinx/coroutines/flow/internal/NopCollector;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/NullSurrogateKt;
+SPLkotlinx/coroutines/flow/internal/NullSurrogateKt;-><clinit>()V
+Lkotlinx/coroutines/flow/internal/SafeCollector;
+SPLkotlinx/coroutines/flow/internal/SafeCollector;-><init>(Lkotlinx/coroutines/flow/FlowCollector;Lkotlin/coroutines/CoroutineContext;)V
+SPLkotlinx/coroutines/flow/internal/SafeCollector;->checkContext(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+SPLkotlinx/coroutines/flow/internal/SafeCollector;->collectContextSize$lambda$0(ILkotlin/coroutines/CoroutineContext$Element;)I
+SPLkotlinx/coroutines/flow/internal/SafeCollector;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/internal/SafeCollector;->emit(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/internal/SafeCollector;->getContext()Lkotlin/coroutines/CoroutineContext;
+SPLkotlinx/coroutines/flow/internal/SafeCollector;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/internal/SafeCollector;->releaseIntercepted()V
+Lkotlinx/coroutines/flow/internal/SafeCollector$$ExternalSyntheticLambda0;
+SPLkotlinx/coroutines/flow/internal/SafeCollector$$ExternalSyntheticLambda0;-><init>()V
+SPLkotlinx/coroutines/flow/internal/SafeCollector$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/SafeCollectorKt;
+SPLkotlinx/coroutines/flow/internal/SafeCollectorKt;-><clinit>()V
+SPLkotlinx/coroutines/flow/internal/SafeCollectorKt;->access$getEmitFun$p()Lkotlin/jvm/functions/Function3;
+Lkotlinx/coroutines/flow/internal/SafeCollectorKt$emitFun$1;
+SPLkotlinx/coroutines/flow/internal/SafeCollectorKt$emitFun$1;-><clinit>()V
+SPLkotlinx/coroutines/flow/internal/SafeCollectorKt$emitFun$1;-><init>()V
+SPLkotlinx/coroutines/flow/internal/SafeCollectorKt$emitFun$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/flow/internal/SafeCollectorKt$emitFun$1;->invoke(Lkotlinx/coroutines/flow/FlowCollector;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/SafeCollector_commonKt;
+SPLkotlinx/coroutines/flow/internal/SafeCollector_commonKt;->checkContext$lambda$0(Lkotlinx/coroutines/flow/internal/SafeCollector;ILkotlin/coroutines/CoroutineContext$Element;)I
+SPLkotlinx/coroutines/flow/internal/SafeCollector_commonKt;->checkContext(Lkotlinx/coroutines/flow/internal/SafeCollector;Lkotlin/coroutines/CoroutineContext;)V
+SPLkotlinx/coroutines/flow/internal/SafeCollector_commonKt;->transitiveCoroutineParent(Lkotlinx/coroutines/Job;Lkotlinx/coroutines/Job;)Lkotlinx/coroutines/Job;
+Lkotlinx/coroutines/flow/internal/SafeCollector_commonKt$$ExternalSyntheticLambda0;
+SPLkotlinx/coroutines/flow/internal/SafeCollector_commonKt$$ExternalSyntheticLambda0;-><init>(Lkotlinx/coroutines/flow/internal/SafeCollector;)V
+SPLkotlinx/coroutines/flow/internal/SafeCollector_commonKt$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/flow/internal/SendingCollector;
+SPLkotlinx/coroutines/flow/internal/SendingCollector;-><init>(Lkotlinx/coroutines/channels/SendChannel;)V
+SPLkotlinx/coroutines/flow/internal/SendingCollector;->emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+Lkotlinx/coroutines/internal/ConcurrentKt;
+SPLkotlinx/coroutines/internal/ConcurrentKt;-><clinit>()V
+SPLkotlinx/coroutines/internal/ConcurrentKt;->removeFutureOnCancel(Ljava/util/concurrent/Executor;)Z
+Lkotlinx/coroutines/internal/ConcurrentLinkedListKt;
+SPLkotlinx/coroutines/internal/ConcurrentLinkedListKt;-><clinit>()V
+SPLkotlinx/coroutines/internal/ConcurrentLinkedListKt;->access$getCLOSED$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/internal/ConcurrentLinkedListKt;->close(Lkotlinx/coroutines/internal/ConcurrentLinkedListNode;)Lkotlinx/coroutines/internal/ConcurrentLinkedListNode;
+Lkotlinx/coroutines/internal/ConcurrentLinkedListNode;
+SPLkotlinx/coroutines/internal/ConcurrentLinkedListNode;-><clinit>()V
+SPLkotlinx/coroutines/internal/ConcurrentLinkedListNode;-><init>(Lkotlinx/coroutines/internal/ConcurrentLinkedListNode;)V
+SPLkotlinx/coroutines/internal/ConcurrentLinkedListNode;->access$getNextOrClosed(Lkotlinx/coroutines/internal/ConcurrentLinkedListNode;)Ljava/lang/Object;
+SPLkotlinx/coroutines/internal/ConcurrentLinkedListNode;->cleanPrev()V
+SPLkotlinx/coroutines/internal/ConcurrentLinkedListNode;->getNext()Lkotlinx/coroutines/internal/ConcurrentLinkedListNode;
+SPLkotlinx/coroutines/internal/ConcurrentLinkedListNode;->getNextOrClosed()Ljava/lang/Object;
+SPLkotlinx/coroutines/internal/ConcurrentLinkedListNode;->get_next$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/internal/ConcurrentLinkedListNode;->get_prev$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/internal/ConcurrentLinkedListNode;->markAsClosed()Z
+Lkotlinx/coroutines/internal/Concurrent_commonKt;
+SPLkotlinx/coroutines/internal/Concurrent_commonKt;->getValue(Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/Object;
+SPLkotlinx/coroutines/internal/Concurrent_commonKt;->setValue(Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/Object;)V
+Lkotlinx/coroutines/internal/ContextScope;
+SPLkotlinx/coroutines/internal/ContextScope;-><init>(Lkotlin/coroutines/CoroutineContext;)V
+SPLkotlinx/coroutines/internal/ContextScope;->getCoroutineContext()Lkotlin/coroutines/CoroutineContext;
+Lkotlinx/coroutines/internal/DispatchedContinuation;
+SPLkotlinx/coroutines/internal/DispatchedContinuation;-><clinit>()V
+SPLkotlinx/coroutines/internal/DispatchedContinuation;-><init>(Lkotlinx/coroutines/CoroutineDispatcher;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/internal/DispatchedContinuation;->awaitReusability$kotlinx_coroutines_core()V
+SPLkotlinx/coroutines/internal/DispatchedContinuation;->claimReusableCancellableContinuation$kotlinx_coroutines_core()Lkotlinx/coroutines/CancellableContinuationImpl;
+SPLkotlinx/coroutines/internal/DispatchedContinuation;->dispatchYield$kotlinx_coroutines_core(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+SPLkotlinx/coroutines/internal/DispatchedContinuation;->getContext()Lkotlin/coroutines/CoroutineContext;
+SPLkotlinx/coroutines/internal/DispatchedContinuation;->getDelegate$kotlinx_coroutines_core()Lkotlin/coroutines/Continuation;
+SPLkotlinx/coroutines/internal/DispatchedContinuation;->getReusableCancellableContinuation()Lkotlinx/coroutines/CancellableContinuationImpl;
+SPLkotlinx/coroutines/internal/DispatchedContinuation;->get_reusableCancellableContinuation$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/internal/DispatchedContinuation;->isReusable$kotlinx_coroutines_core()Z
+SPLkotlinx/coroutines/internal/DispatchedContinuation;->postponeCancellation$kotlinx_coroutines_core(Ljava/lang/Throwable;)Z
+SPLkotlinx/coroutines/internal/DispatchedContinuation;->release$kotlinx_coroutines_core()V
+SPLkotlinx/coroutines/internal/DispatchedContinuation;->resumeWith(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/internal/DispatchedContinuation;->takeState$kotlinx_coroutines_core()Ljava/lang/Object;
+SPLkotlinx/coroutines/internal/DispatchedContinuation;->tryReleaseClaimedContinuation$kotlinx_coroutines_core(Lkotlinx/coroutines/CancellableContinuation;)Ljava/lang/Throwable;
+Lkotlinx/coroutines/internal/DispatchedContinuationKt;
+SPLkotlinx/coroutines/internal/DispatchedContinuationKt;-><clinit>()V
+SPLkotlinx/coroutines/internal/DispatchedContinuationKt;->access$getUNDEFINED$p()Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/internal/DispatchedContinuationKt;->resumeCancellableWithInternal(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V
+SPLkotlinx/coroutines/internal/DispatchedContinuationKt;->safeDispatch(Lkotlinx/coroutines/CoroutineDispatcher;Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+SPLkotlinx/coroutines/internal/DispatchedContinuationKt;->safeIsDispatchNeeded(Lkotlinx/coroutines/CoroutineDispatcher;Lkotlin/coroutines/CoroutineContext;)Z
+Lkotlinx/coroutines/internal/FastServiceLoader;
+SPLkotlinx/coroutines/internal/FastServiceLoader;-><clinit>()V
+SPLkotlinx/coroutines/internal/FastServiceLoader;-><init>()V
+SPLkotlinx/coroutines/internal/FastServiceLoader;->loadMainDispatcherFactory$kotlinx_coroutines_core()Ljava/util/List;
+Lkotlinx/coroutines/internal/FastServiceLoaderKt;
+SPLkotlinx/coroutines/internal/FastServiceLoaderKt;-><clinit>()V
+SPLkotlinx/coroutines/internal/FastServiceLoaderKt;->getANDROID_DETECTED()Z
+Lkotlinx/coroutines/internal/InlineList;
+SPLkotlinx/coroutines/internal/InlineList;->constructor-impl$default(Ljava/lang/Object;ILkotlin/jvm/internal/DefaultConstructorMarker;)Ljava/lang/Object;
+SPLkotlinx/coroutines/internal/InlineList;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
+SPLkotlinx/coroutines/internal/InlineList;->plus-FjFbRPM(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/internal/LimitedDispatcher;
+SPLkotlinx/coroutines/internal/LimitedDispatcher;-><clinit>()V
+SPLkotlinx/coroutines/internal/LimitedDispatcher;-><init>(Lkotlinx/coroutines/CoroutineDispatcher;ILjava/lang/String;)V
+SPLkotlinx/coroutines/internal/LimitedDispatcher;->access$obtainTaskOrDeallocateWorker(Lkotlinx/coroutines/internal/LimitedDispatcher;)Ljava/lang/Runnable;
+SPLkotlinx/coroutines/internal/LimitedDispatcher;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+SPLkotlinx/coroutines/internal/LimitedDispatcher;->getRunningWorkers$volatile$FU()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+SPLkotlinx/coroutines/internal/LimitedDispatcher;->obtainTaskOrDeallocateWorker()Ljava/lang/Runnable;
+SPLkotlinx/coroutines/internal/LimitedDispatcher;->tryAllocateWorker()Z
+Lkotlinx/coroutines/internal/LimitedDispatcher$Worker;
+SPLkotlinx/coroutines/internal/LimitedDispatcher$Worker;-><init>(Lkotlinx/coroutines/internal/LimitedDispatcher;Ljava/lang/Runnable;)V
+SPLkotlinx/coroutines/internal/LimitedDispatcher$Worker;->run()V
+Lkotlinx/coroutines/internal/LimitedDispatcherKt;
+SPLkotlinx/coroutines/internal/LimitedDispatcherKt;->checkParallelism(I)V
+Lkotlinx/coroutines/internal/ListClosed;
+SPLkotlinx/coroutines/internal/ListClosed;-><init>(I)V
+Lkotlinx/coroutines/internal/LockFreeLinkedListHead;
+SPLkotlinx/coroutines/internal/LockFreeLinkedListHead;-><init>()V
+SPLkotlinx/coroutines/internal/LockFreeLinkedListHead;->isRemoved()Z
+Lkotlinx/coroutines/internal/LockFreeLinkedListNode;
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;-><clinit>()V
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;-><init>()V
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;->addLast(Lkotlinx/coroutines/internal/LockFreeLinkedListNode;I)Z
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;->addNext(Lkotlinx/coroutines/internal/LockFreeLinkedListNode;Lkotlinx/coroutines/internal/LockFreeLinkedListNode;)Z
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;->addOneIfEmpty(Lkotlinx/coroutines/internal/LockFreeLinkedListNode;)Z
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;->close(I)V
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;->correctPrev()Lkotlinx/coroutines/internal/LockFreeLinkedListNode;
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;->findPrevNonRemoved(Lkotlinx/coroutines/internal/LockFreeLinkedListNode;)Lkotlinx/coroutines/internal/LockFreeLinkedListNode;
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;->finishAdd(Lkotlinx/coroutines/internal/LockFreeLinkedListNode;)V
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;->getNext()Ljava/lang/Object;
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;->getNextNode()Lkotlinx/coroutines/internal/LockFreeLinkedListNode;
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;->getPrevNode()Lkotlinx/coroutines/internal/LockFreeLinkedListNode;
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;->get_next$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;->get_prev$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;->get_removedRef$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;->isRemoved()Z
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;->remove()Z
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;->removeOrNext()Lkotlinx/coroutines/internal/LockFreeLinkedListNode;
+SPLkotlinx/coroutines/internal/LockFreeLinkedListNode;->removed()Lkotlinx/coroutines/internal/Removed;
+Lkotlinx/coroutines/internal/LockFreeTaskQueue;
+SPLkotlinx/coroutines/internal/LockFreeTaskQueue;-><clinit>()V
+SPLkotlinx/coroutines/internal/LockFreeTaskQueue;-><init>(Z)V
+SPLkotlinx/coroutines/internal/LockFreeTaskQueue;->addLast(Ljava/lang/Object;)Z
+SPLkotlinx/coroutines/internal/LockFreeTaskQueue;->getSize()I
+SPLkotlinx/coroutines/internal/LockFreeTaskQueue;->get_cur$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/internal/LockFreeTaskQueue;->removeFirstOrNull()Ljava/lang/Object;
+Lkotlinx/coroutines/internal/LockFreeTaskQueueCore;
+SPLkotlinx/coroutines/internal/LockFreeTaskQueueCore;-><clinit>()V
+SPLkotlinx/coroutines/internal/LockFreeTaskQueueCore;-><init>(IZ)V
+SPLkotlinx/coroutines/internal/LockFreeTaskQueueCore;->addLast(Ljava/lang/Object;)I
+SPLkotlinx/coroutines/internal/LockFreeTaskQueueCore;->getArray()Ljava/util/concurrent/atomic/AtomicReferenceArray;
+SPLkotlinx/coroutines/internal/LockFreeTaskQueueCore;->getSize()I
+SPLkotlinx/coroutines/internal/LockFreeTaskQueueCore;->get_state$volatile$FU()Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+SPLkotlinx/coroutines/internal/LockFreeTaskQueueCore;->removeFirstOrNull()Ljava/lang/Object;
+Lkotlinx/coroutines/internal/LockFreeTaskQueueCore$Companion;
+SPLkotlinx/coroutines/internal/LockFreeTaskQueueCore$Companion;-><init>()V
+SPLkotlinx/coroutines/internal/LockFreeTaskQueueCore$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlinx/coroutines/internal/LockFreeTaskQueueCore$Companion;->updateHead(JI)J
+SPLkotlinx/coroutines/internal/LockFreeTaskQueueCore$Companion;->updateTail(JI)J
+SPLkotlinx/coroutines/internal/LockFreeTaskQueueCore$Companion;->wo(JJ)J
+Lkotlinx/coroutines/internal/LockFreeTaskQueueCore$Placeholder;
+Lkotlinx/coroutines/internal/MainDispatcherFactory;
+Lkotlinx/coroutines/internal/MainDispatcherLoader;
+SPLkotlinx/coroutines/internal/MainDispatcherLoader;-><clinit>()V
+SPLkotlinx/coroutines/internal/MainDispatcherLoader;-><init>()V
+SPLkotlinx/coroutines/internal/MainDispatcherLoader;->loadMainDispatcher()Lkotlinx/coroutines/MainCoroutineDispatcher;
+Lkotlinx/coroutines/internal/MainDispatchersKt;
+SPLkotlinx/coroutines/internal/MainDispatchersKt;-><clinit>()V
+SPLkotlinx/coroutines/internal/MainDispatchersKt;->tryCreateDispatcher(Lkotlinx/coroutines/internal/MainDispatcherFactory;Ljava/util/List;)Lkotlinx/coroutines/MainCoroutineDispatcher;
+Lkotlinx/coroutines/internal/Removed;
+SPLkotlinx/coroutines/internal/Removed;-><init>(Lkotlinx/coroutines/internal/LockFreeLinkedListNode;)V
+Lkotlinx/coroutines/internal/ResizableAtomicArray;
+SPLkotlinx/coroutines/internal/ResizableAtomicArray;-><init>(I)V
+SPLkotlinx/coroutines/internal/ResizableAtomicArray;->get(I)Ljava/lang/Object;
+SPLkotlinx/coroutines/internal/ResizableAtomicArray;->setSynchronized(ILjava/lang/Object;)V
+Lkotlinx/coroutines/internal/ScopeCoroutine;
+SPLkotlinx/coroutines/internal/ScopeCoroutine;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/internal/ScopeCoroutine;->afterCompletion(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/internal/ScopeCoroutine;->afterResume(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/internal/ScopeCoroutine;->isScopedCoroutine()Z
+Lkotlinx/coroutines/internal/Segment;
+SPLkotlinx/coroutines/internal/Segment;-><clinit>()V
+SPLkotlinx/coroutines/internal/Segment;-><init>(JLkotlinx/coroutines/internal/Segment;I)V
+SPLkotlinx/coroutines/internal/Segment;->getCleanedAndPointers$volatile$FU()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+SPLkotlinx/coroutines/internal/Segment;->onSlotCleaned()V
+Lkotlinx/coroutines/internal/Symbol;
+SPLkotlinx/coroutines/internal/Symbol;-><init>(Ljava/lang/String;)V
+Lkotlinx/coroutines/internal/SystemPropsKt;
+SPLkotlinx/coroutines/internal/SystemPropsKt;->getAVAILABLE_PROCESSORS()I
+SPLkotlinx/coroutines/internal/SystemPropsKt;->systemProp$default(Ljava/lang/String;IIIILjava/lang/Object;)I
+SPLkotlinx/coroutines/internal/SystemPropsKt;->systemProp$default(Ljava/lang/String;JJJILjava/lang/Object;)J
+SPLkotlinx/coroutines/internal/SystemPropsKt;->systemProp(Ljava/lang/String;)Ljava/lang/String;
+SPLkotlinx/coroutines/internal/SystemPropsKt;->systemProp(Ljava/lang/String;III)I
+SPLkotlinx/coroutines/internal/SystemPropsKt;->systemProp(Ljava/lang/String;JJJ)J
+SPLkotlinx/coroutines/internal/SystemPropsKt;->systemProp(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+SPLkotlinx/coroutines/internal/SystemPropsKt;->systemProp(Ljava/lang/String;Z)Z
+Lkotlinx/coroutines/internal/SystemPropsKt__SystemPropsKt;
+SPLkotlinx/coroutines/internal/SystemPropsKt__SystemPropsKt;-><clinit>()V
+SPLkotlinx/coroutines/internal/SystemPropsKt__SystemPropsKt;->getAVAILABLE_PROCESSORS()I
+SPLkotlinx/coroutines/internal/SystemPropsKt__SystemPropsKt;->systemProp(Ljava/lang/String;)Ljava/lang/String;
+Lkotlinx/coroutines/internal/SystemPropsKt__SystemProps_commonKt;
+SPLkotlinx/coroutines/internal/SystemPropsKt__SystemProps_commonKt;->systemProp$default(Ljava/lang/String;IIIILjava/lang/Object;)I
+SPLkotlinx/coroutines/internal/SystemPropsKt__SystemProps_commonKt;->systemProp$default(Ljava/lang/String;JJJILjava/lang/Object;)J
+SPLkotlinx/coroutines/internal/SystemPropsKt__SystemProps_commonKt;->systemProp(Ljava/lang/String;III)I
+SPLkotlinx/coroutines/internal/SystemPropsKt__SystemProps_commonKt;->systemProp(Ljava/lang/String;JJJ)J
+SPLkotlinx/coroutines/internal/SystemPropsKt__SystemProps_commonKt;->systemProp(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+SPLkotlinx/coroutines/internal/SystemPropsKt__SystemProps_commonKt;->systemProp(Ljava/lang/String;Z)Z
+Lkotlinx/coroutines/internal/ThreadContextKt;
+SPLkotlinx/coroutines/internal/ThreadContextKt;-><clinit>()V
+SPLkotlinx/coroutines/internal/ThreadContextKt;->countAll$lambda$0(Ljava/lang/Object;Lkotlin/coroutines/CoroutineContext$Element;)Ljava/lang/Object;
+SPLkotlinx/coroutines/internal/ThreadContextKt;->restoreThreadContext(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
+SPLkotlinx/coroutines/internal/ThreadContextKt;->threadContextElements(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object;
+SPLkotlinx/coroutines/internal/ThreadContextKt;->updateThreadContext(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/internal/ThreadContextKt$$ExternalSyntheticLambda0;
+SPLkotlinx/coroutines/internal/ThreadContextKt$$ExternalSyntheticLambda0;-><init>()V
+SPLkotlinx/coroutines/internal/ThreadContextKt$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/coroutines/internal/ThreadContextKt$$ExternalSyntheticLambda1;
+SPLkotlinx/coroutines/internal/ThreadContextKt$$ExternalSyntheticLambda1;-><init>()V
+Lkotlinx/coroutines/internal/ThreadContextKt$$ExternalSyntheticLambda2;
+SPLkotlinx/coroutines/internal/ThreadContextKt$$ExternalSyntheticLambda2;-><init>()V
+Lkotlinx/coroutines/internal/ThreadLocalKt;
+SPLkotlinx/coroutines/internal/ThreadLocalKt;->commonThreadLocal(Lkotlinx/coroutines/internal/Symbol;)Ljava/lang/ThreadLocal;
+Lkotlinx/coroutines/internal/ThreadSafeHeap;
+SPLkotlinx/coroutines/internal/ThreadSafeHeap;-><clinit>()V
+SPLkotlinx/coroutines/internal/ThreadSafeHeap;-><init>()V
+SPLkotlinx/coroutines/internal/ThreadSafeHeap;->addImpl(Lkotlinx/coroutines/internal/ThreadSafeHeapNode;)V
+SPLkotlinx/coroutines/internal/ThreadSafeHeap;->firstImpl()Lkotlinx/coroutines/internal/ThreadSafeHeapNode;
+SPLkotlinx/coroutines/internal/ThreadSafeHeap;->getSize()I
+SPLkotlinx/coroutines/internal/ThreadSafeHeap;->get_size$volatile$FU()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+SPLkotlinx/coroutines/internal/ThreadSafeHeap;->isEmpty()Z
+SPLkotlinx/coroutines/internal/ThreadSafeHeap;->peek()Lkotlinx/coroutines/internal/ThreadSafeHeapNode;
+SPLkotlinx/coroutines/internal/ThreadSafeHeap;->realloc()[Lkotlinx/coroutines/internal/ThreadSafeHeapNode;
+SPLkotlinx/coroutines/internal/ThreadSafeHeap;->removeAtImpl(I)Lkotlinx/coroutines/internal/ThreadSafeHeapNode;
+SPLkotlinx/coroutines/internal/ThreadSafeHeap;->setSize(I)V
+SPLkotlinx/coroutines/internal/ThreadSafeHeap;->siftUpFrom(I)V
+Lkotlinx/coroutines/internal/ThreadSafeHeapNode;
+Lkotlinx/coroutines/intrinsics/CancellableKt;
+SPLkotlinx/coroutines/intrinsics/CancellableKt;->startCoroutineCancellable(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
+Lkotlinx/coroutines/intrinsics/UndispatchedKt;
+SPLkotlinx/coroutines/intrinsics/UndispatchedKt;->startCoroutineUndispatched(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)V
+SPLkotlinx/coroutines/intrinsics/UndispatchedKt;->startUndispatched(Lkotlinx/coroutines/internal/ScopeCoroutine;ZLjava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+SPLkotlinx/coroutines/intrinsics/UndispatchedKt;->startUndispatchedOrReturn(Lkotlinx/coroutines/internal/ScopeCoroutine;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
+Lkotlinx/coroutines/scheduling/CoroutineScheduler;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;-><clinit>()V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;-><init>(IIJLjava/lang/String;)V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->access$getControlState$volatile$FU()Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->addToGlobalQueue(Lkotlinx/coroutines/scheduling/Task;)Z
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->createNewWorker()I
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->createTask(Ljava/lang/Runnable;Z)Lkotlinx/coroutines/scheduling/Task;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->currentWorker()Lkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->dispatch$default(Lkotlinx/coroutines/scheduling/CoroutineScheduler;Ljava/lang/Runnable;ZZILjava/lang/Object;)V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->dispatch(Ljava/lang/Runnable;ZZ)V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->execute(Ljava/lang/Runnable;)V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->getControlState$volatile$FU()Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->getParkedWorkersStack$volatile$FU()Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->get_isTerminated$volatile$FU()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->isTerminated()Z
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->parkedWorkersStackNextIndex(Lkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;)I
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->parkedWorkersStackPop()Lkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->parkedWorkersStackPush(Lkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;)Z
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->runSafely(Lkotlinx/coroutines/scheduling/Task;)V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->signalBlockingWork(J)V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->signalCpuWork()V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->submitToLocalQueue(Lkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;Lkotlinx/coroutines/scheduling/Task;Z)Lkotlinx/coroutines/scheduling/Task;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->tryCreateWorker$default(Lkotlinx/coroutines/scheduling/CoroutineScheduler;JILjava/lang/Object;)Z
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->tryCreateWorker(J)Z
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler;->tryUnpark()Z
+Lkotlinx/coroutines/scheduling/CoroutineScheduler$Companion;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Companion;-><init>()V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;-><clinit>()V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;-><init>(Lkotlinx/coroutines/scheduling/CoroutineScheduler;)V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;-><init>(Lkotlinx/coroutines/scheduling/CoroutineScheduler;I)V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->access$getThis$0$p(Lkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;)Lkotlinx/coroutines/scheduling/CoroutineScheduler;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->executeTask(Lkotlinx/coroutines/scheduling/Task;)V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->findAnyTask(Z)Lkotlinx/coroutines/scheduling/Task;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->findTask(Z)Lkotlinx/coroutines/scheduling/Task;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->getIndexInArray()I
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->getNextParkedWorker()Ljava/lang/Object;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->getWorkerCtl$volatile$FU()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->inStack()Z
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->nextInt(I)I
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->park()V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->pollGlobalQueues()Lkotlinx/coroutines/scheduling/Task;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->run()V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->runWorker()V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->setIndexInArray(I)V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->setNextParkedWorker(Ljava/lang/Object;)V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->tryAcquireCpuPermit()Z
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->tryPark()V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->tryReleaseCpu(Lkotlinx/coroutines/scheduling/CoroutineScheduler$WorkerState;)Z
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$Worker;->trySteal(I)Lkotlinx/coroutines/scheduling/Task;
+Lkotlinx/coroutines/scheduling/CoroutineScheduler$WorkerState;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$WorkerState;->$values()[Lkotlinx/coroutines/scheduling/CoroutineScheduler$WorkerState;
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$WorkerState;-><clinit>()V
+SPLkotlinx/coroutines/scheduling/CoroutineScheduler$WorkerState;-><init>(Ljava/lang/String;I)V
+Lkotlinx/coroutines/scheduling/DefaultIoScheduler;
+SPLkotlinx/coroutines/scheduling/DefaultIoScheduler;-><clinit>()V
+SPLkotlinx/coroutines/scheduling/DefaultIoScheduler;-><init>()V
+SPLkotlinx/coroutines/scheduling/DefaultIoScheduler;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+SPLkotlinx/coroutines/scheduling/DefaultIoScheduler;->limitedParallelism(ILjava/lang/String;)Lkotlinx/coroutines/CoroutineDispatcher;
+Lkotlinx/coroutines/scheduling/DefaultScheduler;
+SPLkotlinx/coroutines/scheduling/DefaultScheduler;-><clinit>()V
+SPLkotlinx/coroutines/scheduling/DefaultScheduler;-><init>()V
+SPLkotlinx/coroutines/scheduling/DefaultScheduler;->limitedParallelism(ILjava/lang/String;)Lkotlinx/coroutines/CoroutineDispatcher;
+Lkotlinx/coroutines/scheduling/GlobalQueue;
+SPLkotlinx/coroutines/scheduling/GlobalQueue;-><init>()V
+Lkotlinx/coroutines/scheduling/NanoTimeSource;
+SPLkotlinx/coroutines/scheduling/NanoTimeSource;-><clinit>()V
+SPLkotlinx/coroutines/scheduling/NanoTimeSource;-><init>()V
+SPLkotlinx/coroutines/scheduling/NanoTimeSource;->nanoTime()J
+Lkotlinx/coroutines/scheduling/SchedulerCoroutineDispatcher;
+SPLkotlinx/coroutines/scheduling/SchedulerCoroutineDispatcher;-><init>(IIJLjava/lang/String;)V
+SPLkotlinx/coroutines/scheduling/SchedulerCoroutineDispatcher;->createScheduler()Lkotlinx/coroutines/scheduling/CoroutineScheduler;
+SPLkotlinx/coroutines/scheduling/SchedulerCoroutineDispatcher;->dispatchWithContext$kotlinx_coroutines_core(Ljava/lang/Runnable;ZZ)V
+SPLkotlinx/coroutines/scheduling/SchedulerCoroutineDispatcher;->getExecutor()Ljava/util/concurrent/Executor;
+Lkotlinx/coroutines/scheduling/SchedulerTimeSource;
+SPLkotlinx/coroutines/scheduling/SchedulerTimeSource;-><init>()V
+Lkotlinx/coroutines/scheduling/Task;
+SPLkotlinx/coroutines/scheduling/Task;-><init>()V
+SPLkotlinx/coroutines/scheduling/Task;-><init>(JZ)V
+Lkotlinx/coroutines/scheduling/TaskImpl;
+SPLkotlinx/coroutines/scheduling/TaskImpl;-><init>(Ljava/lang/Runnable;JZ)V
+SPLkotlinx/coroutines/scheduling/TaskImpl;->run()V
+Lkotlinx/coroutines/scheduling/TasksKt;
+SPLkotlinx/coroutines/scheduling/TasksKt;-><clinit>()V
+SPLkotlinx/coroutines/scheduling/TasksKt;->asTask(Ljava/lang/Runnable;JZ)Lkotlinx/coroutines/scheduling/Task;
+Lkotlinx/coroutines/scheduling/UnlimitedIoScheduler;
+SPLkotlinx/coroutines/scheduling/UnlimitedIoScheduler;-><clinit>()V
+SPLkotlinx/coroutines/scheduling/UnlimitedIoScheduler;-><init>()V
+SPLkotlinx/coroutines/scheduling/UnlimitedIoScheduler;->dispatch(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
+SPLkotlinx/coroutines/scheduling/UnlimitedIoScheduler;->limitedParallelism(ILjava/lang/String;)Lkotlinx/coroutines/CoroutineDispatcher;
+Lkotlinx/coroutines/scheduling/WorkQueue;
+SPLkotlinx/coroutines/scheduling/WorkQueue;-><clinit>()V
+SPLkotlinx/coroutines/scheduling/WorkQueue;-><init>()V
+SPLkotlinx/coroutines/scheduling/WorkQueue;->add(Lkotlinx/coroutines/scheduling/Task;Z)Lkotlinx/coroutines/scheduling/Task;
+SPLkotlinx/coroutines/scheduling/WorkQueue;->addLast(Lkotlinx/coroutines/scheduling/Task;)Lkotlinx/coroutines/scheduling/Task;
+SPLkotlinx/coroutines/scheduling/WorkQueue;->decrementIfBlocking(Lkotlinx/coroutines/scheduling/Task;)V
+SPLkotlinx/coroutines/scheduling/WorkQueue;->getBlockingTasksInBuffer$volatile$FU()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+SPLkotlinx/coroutines/scheduling/WorkQueue;->getBufferSize()I
+SPLkotlinx/coroutines/scheduling/WorkQueue;->getConsumerIndex$volatile$FU()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+SPLkotlinx/coroutines/scheduling/WorkQueue;->getLastScheduledTask$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/scheduling/WorkQueue;->getProducerIndex$volatile$FU()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+SPLkotlinx/coroutines/scheduling/WorkQueue;->poll()Lkotlinx/coroutines/scheduling/Task;
+SPLkotlinx/coroutines/scheduling/WorkQueue;->pollBuffer()Lkotlinx/coroutines/scheduling/Task;
+SPLkotlinx/coroutines/scheduling/WorkQueue;->trySteal(ILkotlin/jvm/internal/Ref$ObjectRef;)J
+SPLkotlinx/coroutines/scheduling/WorkQueue;->tryStealLastScheduled(ILkotlin/jvm/internal/Ref$ObjectRef;)J
+Lkotlinx/coroutines/selects/SelectInstance;
+Lkotlinx/coroutines/sync/Mutex;
+Lkotlinx/coroutines/sync/MutexImpl;
+SPLkotlinx/coroutines/sync/MutexImpl;-><clinit>()V
+SPLkotlinx/coroutines/sync/MutexImpl;-><init>(Z)V
+SPLkotlinx/coroutines/sync/MutexImpl;->getOwner$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+SPLkotlinx/coroutines/sync/MutexImpl;->isLocked()Z
+SPLkotlinx/coroutines/sync/MutexImpl;->lock$suspendImpl(Lkotlinx/coroutines/sync/MutexImpl;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/sync/MutexImpl;->lock(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+SPLkotlinx/coroutines/sync/MutexImpl;->tryLock(Ljava/lang/Object;)Z
+SPLkotlinx/coroutines/sync/MutexImpl;->tryLockImpl(Ljava/lang/Object;)I
+SPLkotlinx/coroutines/sync/MutexImpl;->unlock(Ljava/lang/Object;)V
+Lkotlinx/coroutines/sync/MutexImpl$$ExternalSyntheticLambda1;
+SPLkotlinx/coroutines/sync/MutexImpl$$ExternalSyntheticLambda1;-><init>(Lkotlinx/coroutines/sync/MutexImpl;)V
+Lkotlinx/coroutines/sync/MutexKt;
+SPLkotlinx/coroutines/sync/MutexKt;-><clinit>()V
+SPLkotlinx/coroutines/sync/MutexKt;->Mutex$default(ZILjava/lang/Object;)Lkotlinx/coroutines/sync/Mutex;
+SPLkotlinx/coroutines/sync/MutexKt;->Mutex(Z)Lkotlinx/coroutines/sync/Mutex;
+SPLkotlinx/coroutines/sync/MutexKt;->access$getNO_OWNER$p()Lkotlinx/coroutines/internal/Symbol;
+Lkotlinx/coroutines/sync/SemaphoreAndMutexImpl;
+SPLkotlinx/coroutines/sync/SemaphoreAndMutexImpl;-><clinit>()V
+SPLkotlinx/coroutines/sync/SemaphoreAndMutexImpl;-><init>(II)V
+SPLkotlinx/coroutines/sync/SemaphoreAndMutexImpl;->getAvailablePermits()I
+SPLkotlinx/coroutines/sync/SemaphoreAndMutexImpl;->get_availablePermits$volatile$FU()Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+SPLkotlinx/coroutines/sync/SemaphoreAndMutexImpl;->release()V
+SPLkotlinx/coroutines/sync/SemaphoreAndMutexImpl;->tryAcquire()Z
+Lkotlinx/coroutines/sync/SemaphoreAndMutexImpl$$ExternalSyntheticLambda0;
+SPLkotlinx/coroutines/sync/SemaphoreAndMutexImpl$$ExternalSyntheticLambda0;-><init>(Lkotlinx/coroutines/sync/SemaphoreAndMutexImpl;)V
+Lkotlinx/coroutines/sync/SemaphoreKt;
+SPLkotlinx/coroutines/sync/SemaphoreKt;-><clinit>()V
+SPLkotlinx/coroutines/sync/SemaphoreKt;->access$getSEGMENT_SIZE$p()I
+Lkotlinx/coroutines/sync/SemaphoreSegment;
+SPLkotlinx/coroutines/sync/SemaphoreSegment;-><init>(JLkotlinx/coroutines/sync/SemaphoreSegment;I)V
+Lkotlinx/serialization/DeserializationStrategy;
+Lkotlinx/serialization/InternalSerializationApi;
+Lkotlinx/serialization/KSerializer;
+Lkotlinx/serialization/MissingFieldException;
+Lkotlinx/serialization/Polymorphic;
+Lkotlinx/serialization/SerialFormat;
+Lkotlinx/serialization/Serializable;
+Lkotlinx/serialization/SerializationException;
+Lkotlinx/serialization/SerializationStrategy;
+Lkotlinx/serialization/SerializersCacheKt;
+SPLkotlinx/serialization/SerializersCacheKt;-><clinit>()V
+SPLkotlinx/serialization/SerializersCacheKt;->SERIALIZERS_CACHE_NULLABLE$lambda$0(Lkotlin/reflect/KClass;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/SerializersCacheKt;->findCachedSerializer(Lkotlin/reflect/KClass;Z)Lkotlinx/serialization/KSerializer;
+Lkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda0;
+SPLkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda0;-><init>()V
+Lkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda1;
+SPLkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda1;-><init>()V
+SPLkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda2;
+SPLkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda2;-><init>()V
+Lkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda3;
+SPLkotlinx/serialization/SerializersCacheKt$$ExternalSyntheticLambda3;-><init>()V
+Lkotlinx/serialization/SerializersKt;
+SPLkotlinx/serialization/SerializersKt;->serializer(Lkotlinx/serialization/modules/SerializersModule;Lkotlin/reflect/KType;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/SerializersKt;->serializerOrNull(Lkotlin/reflect/KClass;)Lkotlinx/serialization/KSerializer;
+Lkotlinx/serialization/SerializersKt__SerializersKt;
+SPLkotlinx/serialization/SerializersKt__SerializersKt;->serializer(Lkotlinx/serialization/modules/SerializersModule;Lkotlin/reflect/KType;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/SerializersKt__SerializersKt;->serializerByKTypeImpl$SerializersKt__SerializersKt(Lkotlinx/serialization/modules/SerializersModule;Lkotlin/reflect/KType;Z)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/SerializersKt__SerializersKt;->serializerOrNull(Lkotlin/reflect/KClass;)Lkotlinx/serialization/KSerializer;
+Lkotlinx/serialization/StringFormat;
+Lkotlinx/serialization/builtins/BuiltinSerializersKt;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->BooleanArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->ByteArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->CharArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->DoubleArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->FloatArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->IntArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->LongArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->NothingSerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->ShortArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->UByteArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->UIntArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->ULongArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->UShortArraySerializer()Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->getNullable(Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/UByte$Companion;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/UInt$Companion;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/ULong$Companion;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/UShort$Companion;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/Unit;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/BooleanCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/ByteCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/CharCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/DoubleCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/FloatCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/IntCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/LongCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/ShortCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/jvm/internal/StringCompanionObject;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/time/Duration$Companion;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/time/Instant$Companion;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/builtins/BuiltinSerializersKt;->serializer(Lkotlin/uuid/Uuid$Companion;)Lkotlinx/serialization/KSerializer;
+Lkotlinx/serialization/descriptors/PrimitiveKind;
+SPLkotlinx/serialization/descriptors/PrimitiveKind;-><init>()V
+SPLkotlinx/serialization/descriptors/PrimitiveKind;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/descriptors/PrimitiveKind$BOOLEAN;
+SPLkotlinx/serialization/descriptors/PrimitiveKind$BOOLEAN;-><clinit>()V
+SPLkotlinx/serialization/descriptors/PrimitiveKind$BOOLEAN;-><init>()V
+Lkotlinx/serialization/descriptors/PrimitiveKind$BYTE;
+SPLkotlinx/serialization/descriptors/PrimitiveKind$BYTE;-><clinit>()V
+SPLkotlinx/serialization/descriptors/PrimitiveKind$BYTE;-><init>()V
+Lkotlinx/serialization/descriptors/PrimitiveKind$CHAR;
+SPLkotlinx/serialization/descriptors/PrimitiveKind$CHAR;-><clinit>()V
+SPLkotlinx/serialization/descriptors/PrimitiveKind$CHAR;-><init>()V
+Lkotlinx/serialization/descriptors/PrimitiveKind$DOUBLE;
+SPLkotlinx/serialization/descriptors/PrimitiveKind$DOUBLE;-><clinit>()V
+SPLkotlinx/serialization/descriptors/PrimitiveKind$DOUBLE;-><init>()V
+Lkotlinx/serialization/descriptors/PrimitiveKind$FLOAT;
+SPLkotlinx/serialization/descriptors/PrimitiveKind$FLOAT;-><clinit>()V
+SPLkotlinx/serialization/descriptors/PrimitiveKind$FLOAT;-><init>()V
+Lkotlinx/serialization/descriptors/PrimitiveKind$INT;
+SPLkotlinx/serialization/descriptors/PrimitiveKind$INT;-><clinit>()V
+SPLkotlinx/serialization/descriptors/PrimitiveKind$INT;-><init>()V
+Lkotlinx/serialization/descriptors/PrimitiveKind$LONG;
+SPLkotlinx/serialization/descriptors/PrimitiveKind$LONG;-><clinit>()V
+SPLkotlinx/serialization/descriptors/PrimitiveKind$LONG;-><init>()V
+Lkotlinx/serialization/descriptors/PrimitiveKind$SHORT;
+SPLkotlinx/serialization/descriptors/PrimitiveKind$SHORT;-><clinit>()V
+SPLkotlinx/serialization/descriptors/PrimitiveKind$SHORT;-><init>()V
+Lkotlinx/serialization/descriptors/PrimitiveKind$STRING;
+SPLkotlinx/serialization/descriptors/PrimitiveKind$STRING;-><clinit>()V
+SPLkotlinx/serialization/descriptors/PrimitiveKind$STRING;-><init>()V
+Lkotlinx/serialization/descriptors/SerialDescriptor;
+SPLkotlinx/serialization/descriptors/SerialDescriptor;->isNullable()Z
+Lkotlinx/serialization/descriptors/SerialKind;
+SPLkotlinx/serialization/descriptors/SerialKind;-><init>()V
+SPLkotlinx/serialization/descriptors/SerialKind;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/descriptors/StructureKind;
+SPLkotlinx/serialization/descriptors/StructureKind;-><init>()V
+SPLkotlinx/serialization/descriptors/StructureKind;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/descriptors/StructureKind$OBJECT;
+SPLkotlinx/serialization/descriptors/StructureKind$OBJECT;-><clinit>()V
+SPLkotlinx/serialization/descriptors/StructureKind$OBJECT;-><init>()V
+Lkotlinx/serialization/encoding/AbstractDecoder;
+SPLkotlinx/serialization/encoding/AbstractDecoder;-><init>()V
+Lkotlinx/serialization/encoding/ChunkedDecoder;
+Lkotlinx/serialization/encoding/CompositeDecoder;
+SPLkotlinx/serialization/encoding/CompositeDecoder;-><clinit>()V
+Lkotlinx/serialization/encoding/CompositeDecoder$Companion;
+SPLkotlinx/serialization/encoding/CompositeDecoder$Companion;-><clinit>()V
+SPLkotlinx/serialization/encoding/CompositeDecoder$Companion;-><init>()V
+Lkotlinx/serialization/encoding/Decoder;
+Lkotlinx/serialization/internal/AbstractCollectionSerializer;
+SPLkotlinx/serialization/internal/AbstractCollectionSerializer;-><init>()V
+SPLkotlinx/serialization/internal/AbstractCollectionSerializer;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/internal/AbstractPolymorphicSerializer;
+Lkotlinx/serialization/internal/BooleanArraySerializer;
+SPLkotlinx/serialization/internal/BooleanArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/BooleanArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/BooleanSerializer;
+SPLkotlinx/serialization/internal/BooleanSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/BooleanSerializer;-><init>()V
+SPLkotlinx/serialization/internal/BooleanSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/ByteArraySerializer;
+SPLkotlinx/serialization/internal/ByteArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/ByteArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/ByteSerializer;
+SPLkotlinx/serialization/internal/ByteSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/ByteSerializer;-><init>()V
+SPLkotlinx/serialization/internal/ByteSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/CacheEntry;
+SPLkotlinx/serialization/internal/CacheEntry;-><init>(Lkotlinx/serialization/KSerializer;)V
+Lkotlinx/serialization/internal/CachedNames;
+Lkotlinx/serialization/internal/CachingKt;
+SPLkotlinx/serialization/internal/CachingKt;-><clinit>()V
+SPLkotlinx/serialization/internal/CachingKt;->createCache(Lkotlin/jvm/functions/Function1;)Lkotlinx/serialization/internal/SerializerCache;
+SPLkotlinx/serialization/internal/CachingKt;->createParametrizedCache(Lkotlin/jvm/functions/Function2;)Lkotlinx/serialization/internal/ParametrizedSerializerCache;
+Lkotlinx/serialization/internal/CharArraySerializer;
+SPLkotlinx/serialization/internal/CharArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/CharArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/CharSerializer;
+SPLkotlinx/serialization/internal/CharSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/CharSerializer;-><init>()V
+SPLkotlinx/serialization/internal/CharSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/ClassValueCache;
+SPLkotlinx/serialization/internal/ClassValueCache;-><init>(Lkotlin/jvm/functions/Function1;)V
+SPLkotlinx/serialization/internal/ClassValueCache;->get(Lkotlin/reflect/KClass;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/internal/ClassValueCache;->getCompute()Lkotlin/jvm/functions/Function1;
+Lkotlinx/serialization/internal/ClassValueCache$$ExternalSyntheticApiModelOutline0;
+SPLkotlinx/serialization/internal/ClassValueCache$$ExternalSyntheticApiModelOutline0;->m(Lkotlinx/serialization/internal/ClassValueReferences;Ljava/lang/Class;)Ljava/lang/Object;
+Lkotlinx/serialization/internal/ClassValueCache$get$$inlined$getOrSet$1;
+SPLkotlinx/serialization/internal/ClassValueCache$get$$inlined$getOrSet$1;-><init>(Lkotlinx/serialization/internal/ClassValueCache;Lkotlin/reflect/KClass;)V
+SPLkotlinx/serialization/internal/ClassValueCache$get$$inlined$getOrSet$1;->invoke()Ljava/lang/Object;
+Lkotlinx/serialization/internal/ClassValueParametrizedCache;
+SPLkotlinx/serialization/internal/ClassValueParametrizedCache;-><init>(Lkotlin/jvm/functions/Function2;)V
+Lkotlinx/serialization/internal/ClassValueReferences;
+SPLkotlinx/serialization/internal/ClassValueReferences;-><init>()V
+SPLkotlinx/serialization/internal/ClassValueReferences;->computeValue(Ljava/lang/Class;)Ljava/lang/Object;
+SPLkotlinx/serialization/internal/ClassValueReferences;->computeValue(Ljava/lang/Class;)Lkotlinx/serialization/internal/MutableSoftReference;
+Lkotlinx/serialization/internal/CollectionLikeSerializer;
+SPLkotlinx/serialization/internal/CollectionLikeSerializer;-><init>(Lkotlinx/serialization/KSerializer;)V
+SPLkotlinx/serialization/internal/CollectionLikeSerializer;-><init>(Lkotlinx/serialization/KSerializer;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/internal/DoubleArraySerializer;
+SPLkotlinx/serialization/internal/DoubleArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/DoubleArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/DoubleSerializer;
+SPLkotlinx/serialization/internal/DoubleSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/DoubleSerializer;-><init>()V
+SPLkotlinx/serialization/internal/DoubleSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/DurationSerializer;
+SPLkotlinx/serialization/internal/DurationSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/DurationSerializer;-><init>()V
+Lkotlinx/serialization/internal/FloatArraySerializer;
+SPLkotlinx/serialization/internal/FloatArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/FloatArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/FloatSerializer;
+SPLkotlinx/serialization/internal/FloatSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/FloatSerializer;-><init>()V
+SPLkotlinx/serialization/internal/FloatSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/GeneratedSerializer;
+Lkotlinx/serialization/internal/InlineClassDescriptor;
+SPLkotlinx/serialization/internal/InlineClassDescriptor;-><init>(Ljava/lang/String;Lkotlinx/serialization/internal/GeneratedSerializer;)V
+Lkotlinx/serialization/internal/InlineClassDescriptorKt;
+SPLkotlinx/serialization/internal/InlineClassDescriptorKt;->InlinePrimitiveDescriptor(Ljava/lang/String;Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/InlineClassDescriptorKt$InlinePrimitiveDescriptor$1;
+SPLkotlinx/serialization/internal/InlineClassDescriptorKt$InlinePrimitiveDescriptor$1;-><init>(Lkotlinx/serialization/KSerializer;)V
+Lkotlinx/serialization/internal/InstantSerializer;
+SPLkotlinx/serialization/internal/InstantSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/InstantSerializer;-><init>()V
+Lkotlinx/serialization/internal/IntArraySerializer;
+SPLkotlinx/serialization/internal/IntArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/IntArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/IntSerializer;
+SPLkotlinx/serialization/internal/IntSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/IntSerializer;-><init>()V
+SPLkotlinx/serialization/internal/IntSerializer;->deserialize(Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Integer;
+SPLkotlinx/serialization/internal/IntSerializer;->deserialize(Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
+SPLkotlinx/serialization/internal/IntSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/ListLikeDescriptor;
+SPLkotlinx/serialization/internal/ListLikeDescriptor;-><init>(Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+SPLkotlinx/serialization/internal/ListLikeDescriptor;-><init>(Lkotlinx/serialization/descriptors/SerialDescriptor;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/internal/LongArraySerializer;
+SPLkotlinx/serialization/internal/LongArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/LongArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/LongSerializer;
+SPLkotlinx/serialization/internal/LongSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/LongSerializer;-><init>()V
+SPLkotlinx/serialization/internal/LongSerializer;->deserialize(Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Long;
+SPLkotlinx/serialization/internal/LongSerializer;->deserialize(Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
+SPLkotlinx/serialization/internal/LongSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/MutableSoftReference;
+SPLkotlinx/serialization/internal/MutableSoftReference;-><init>()V
+SPLkotlinx/serialization/internal/MutableSoftReference;->getOrSetWithLock(Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+Lkotlinx/serialization/internal/NamedCompanion;
+Lkotlinx/serialization/internal/NothingSerialDescriptor;
+SPLkotlinx/serialization/internal/NothingSerialDescriptor;-><clinit>()V
+SPLkotlinx/serialization/internal/NothingSerialDescriptor;-><init>()V
+Lkotlinx/serialization/internal/NothingSerializer;
+SPLkotlinx/serialization/internal/NothingSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/NothingSerializer;-><init>()V
+Lkotlinx/serialization/internal/NullableSerializer;
+SPLkotlinx/serialization/internal/NullableSerializer;-><init>(Lkotlinx/serialization/KSerializer;)V
+SPLkotlinx/serialization/internal/NullableSerializer;->deserialize(Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
+SPLkotlinx/serialization/internal/NullableSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/ObjectSerializer;
+SPLkotlinx/serialization/internal/ObjectSerializer;-><init>(Ljava/lang/String;Ljava/lang/Object;)V
+Lkotlinx/serialization/internal/ObjectSerializer$$ExternalSyntheticLambda1;
+SPLkotlinx/serialization/internal/ObjectSerializer$$ExternalSyntheticLambda1;-><init>(Ljava/lang/String;Lkotlinx/serialization/internal/ObjectSerializer;)V
+Lkotlinx/serialization/internal/ParametrizedSerializerCache;
+Lkotlinx/serialization/internal/PlatformKt;
+SPLkotlinx/serialization/internal/PlatformKt;->companionOrNull(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Object;
+SPLkotlinx/serialization/internal/PlatformKt;->compiledSerializerImpl(Lkotlin/reflect/KClass;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/internal/PlatformKt;->constructSerializerForGivenTypeArgs(Ljava/lang/Class;[Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/internal/PlatformKt;->constructSerializerForGivenTypeArgs(Lkotlin/reflect/KClass;[Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/internal/PlatformKt;->findInNamedCompanion(Ljava/lang/Class;[Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/internal/PlatformKt;->findNamedCompanionByAnnotation(Ljava/lang/Class;)Ljava/lang/Object;
+SPLkotlinx/serialization/internal/PlatformKt;->findObjectSerializer(Ljava/lang/Class;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/internal/PlatformKt;->initBuiltins()Ljava/util/Map;
+SPLkotlinx/serialization/internal/PlatformKt;->invokeSerializerOnDefaultCompanion(Ljava/lang/Class;[Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer;
+SPLkotlinx/serialization/internal/PlatformKt;->isInterface(Lkotlin/reflect/KClass;)Z
+SPLkotlinx/serialization/internal/PlatformKt;->isPolymorphicSerializer(Ljava/lang/Class;)Z
+Lkotlinx/serialization/internal/Platform_commonKt;
+SPLkotlinx/serialization/internal/Platform_commonKt;-><clinit>()V
+SPLkotlinx/serialization/internal/Platform_commonKt;->cachedSerialNames(Lkotlinx/serialization/descriptors/SerialDescriptor;)Ljava/util/Set;
+SPLkotlinx/serialization/internal/Platform_commonKt;->kclass(Lkotlin/reflect/KType;)Lkotlin/reflect/KClass;
+Lkotlinx/serialization/internal/PluginGeneratedSerialDescriptor;
+SPLkotlinx/serialization/internal/PluginGeneratedSerialDescriptor;-><init>(Ljava/lang/String;Lkotlinx/serialization/internal/GeneratedSerializer;I)V
+SPLkotlinx/serialization/internal/PluginGeneratedSerialDescriptor;->getSerialName()Ljava/lang/String;
+Lkotlinx/serialization/internal/PluginGeneratedSerialDescriptor$$ExternalSyntheticLambda0;
+SPLkotlinx/serialization/internal/PluginGeneratedSerialDescriptor$$ExternalSyntheticLambda0;-><init>(Lkotlinx/serialization/internal/PluginGeneratedSerialDescriptor;)V
+Lkotlinx/serialization/internal/PluginGeneratedSerialDescriptor$$ExternalSyntheticLambda1;
+SPLkotlinx/serialization/internal/PluginGeneratedSerialDescriptor$$ExternalSyntheticLambda1;-><init>(Lkotlinx/serialization/internal/PluginGeneratedSerialDescriptor;)V
+Lkotlinx/serialization/internal/PluginGeneratedSerialDescriptor$$ExternalSyntheticLambda2;
+SPLkotlinx/serialization/internal/PluginGeneratedSerialDescriptor$$ExternalSyntheticLambda2;-><init>(Lkotlinx/serialization/internal/PluginGeneratedSerialDescriptor;)V
+Lkotlinx/serialization/internal/PrimitiveArrayDescriptor;
+SPLkotlinx/serialization/internal/PrimitiveArrayDescriptor;-><init>(Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+Lkotlinx/serialization/internal/PrimitiveArraySerializer;
+SPLkotlinx/serialization/internal/PrimitiveArraySerializer;-><init>(Lkotlinx/serialization/KSerializer;)V
+Lkotlinx/serialization/internal/PrimitiveSerialDescriptor;
+SPLkotlinx/serialization/internal/PrimitiveSerialDescriptor;-><init>(Ljava/lang/String;Lkotlinx/serialization/descriptors/PrimitiveKind;)V
+SPLkotlinx/serialization/internal/PrimitiveSerialDescriptor;->getElementsCount()I
+SPLkotlinx/serialization/internal/PrimitiveSerialDescriptor;->getSerialName()Ljava/lang/String;
+SPLkotlinx/serialization/internal/PrimitiveSerialDescriptor;->isNullable()Z
+Lkotlinx/serialization/internal/PrimitivesKt;
+SPLkotlinx/serialization/internal/PrimitivesKt;-><clinit>()V
+SPLkotlinx/serialization/internal/PrimitivesKt;->builtinSerializerOrNull(Lkotlin/reflect/KClass;)Lkotlinx/serialization/KSerializer;
+Lkotlinx/serialization/internal/SerialDescriptorForNullable;
+SPLkotlinx/serialization/internal/SerialDescriptorForNullable;-><init>(Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+Lkotlinx/serialization/internal/SerializerCache;
+Lkotlinx/serialization/internal/ShortArraySerializer;
+SPLkotlinx/serialization/internal/ShortArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/ShortArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/ShortSerializer;
+SPLkotlinx/serialization/internal/ShortSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/ShortSerializer;-><init>()V
+SPLkotlinx/serialization/internal/ShortSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/StringSerializer;
+SPLkotlinx/serialization/internal/StringSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/StringSerializer;-><init>()V
+Lkotlinx/serialization/internal/UByteArraySerializer;
+SPLkotlinx/serialization/internal/UByteArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/UByteArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/UByteSerializer;
+SPLkotlinx/serialization/internal/UByteSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/UByteSerializer;-><init>()V
+SPLkotlinx/serialization/internal/UByteSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/UIntArraySerializer;
+SPLkotlinx/serialization/internal/UIntArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/UIntArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/UIntSerializer;
+SPLkotlinx/serialization/internal/UIntSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/UIntSerializer;-><init>()V
+SPLkotlinx/serialization/internal/UIntSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/ULongArraySerializer;
+SPLkotlinx/serialization/internal/ULongArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/ULongArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/ULongSerializer;
+SPLkotlinx/serialization/internal/ULongSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/ULongSerializer;-><init>()V
+SPLkotlinx/serialization/internal/ULongSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/UShortArraySerializer;
+SPLkotlinx/serialization/internal/UShortArraySerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/UShortArraySerializer;-><init>()V
+Lkotlinx/serialization/internal/UShortSerializer;
+SPLkotlinx/serialization/internal/UShortSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/UShortSerializer;-><init>()V
+SPLkotlinx/serialization/internal/UShortSerializer;->getDescriptor()Lkotlinx/serialization/descriptors/SerialDescriptor;
+Lkotlinx/serialization/internal/UnitSerializer;
+SPLkotlinx/serialization/internal/UnitSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/UnitSerializer;-><init>()V
+Lkotlinx/serialization/internal/UuidSerializer;
+SPLkotlinx/serialization/internal/UuidSerializer;-><clinit>()V
+SPLkotlinx/serialization/internal/UuidSerializer;-><init>()V
+Lkotlinx/serialization/json/ClassDiscriminatorMode;
+SPLkotlinx/serialization/json/ClassDiscriminatorMode;->$values()[Lkotlinx/serialization/json/ClassDiscriminatorMode;
+SPLkotlinx/serialization/json/ClassDiscriminatorMode;-><clinit>()V
+SPLkotlinx/serialization/json/ClassDiscriminatorMode;-><init>(Ljava/lang/String;I)V
+Lkotlinx/serialization/json/Json;
+SPLkotlinx/serialization/json/Json;-><clinit>()V
+SPLkotlinx/serialization/json/Json;-><init>(Lkotlinx/serialization/json/JsonConfiguration;Lkotlinx/serialization/modules/SerializersModule;)V
+SPLkotlinx/serialization/json/Json;-><init>(Lkotlinx/serialization/json/JsonConfiguration;Lkotlinx/serialization/modules/SerializersModule;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlinx/serialization/json/Json;->decodeFromString(Lkotlinx/serialization/DeserializationStrategy;Ljava/lang/String;)Ljava/lang/Object;
+SPLkotlinx/serialization/json/Json;->getConfiguration()Lkotlinx/serialization/json/JsonConfiguration;
+SPLkotlinx/serialization/json/Json;->getSerializersModule()Lkotlinx/serialization/modules/SerializersModule;
+Lkotlinx/serialization/json/Json$Default;
+SPLkotlinx/serialization/json/Json$Default;-><init>()V
+SPLkotlinx/serialization/json/Json$Default;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/json/JsonArray;
+SPLkotlinx/serialization/json/JsonArray;-><clinit>()V
+SPLkotlinx/serialization/json/JsonArray;-><init>(Ljava/util/List;)V
+SPLkotlinx/serialization/json/JsonArray;->toString()Ljava/lang/String;
+Lkotlinx/serialization/json/JsonArray$Companion;
+SPLkotlinx/serialization/json/JsonArray$Companion;-><init>()V
+SPLkotlinx/serialization/json/JsonArray$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/json/JsonArrayBuilder;
+SPLkotlinx/serialization/json/JsonArrayBuilder;-><init>()V
+SPLkotlinx/serialization/json/JsonArrayBuilder;->build()Lkotlinx/serialization/json/JsonArray;
+Lkotlinx/serialization/json/JsonBuilder;
+SPLkotlinx/serialization/json/JsonBuilder;-><init>(Lkotlinx/serialization/json/Json;)V
+SPLkotlinx/serialization/json/JsonBuilder;->build$kotlinx_serialization_json()Lkotlinx/serialization/json/JsonConfiguration;
+SPLkotlinx/serialization/json/JsonBuilder;->getSerializersModule()Lkotlinx/serialization/modules/SerializersModule;
+SPLkotlinx/serialization/json/JsonBuilder;->setEncodeDefaults(Z)V
+SPLkotlinx/serialization/json/JsonBuilder;->setExplicitNulls(Z)V
+Lkotlinx/serialization/json/JsonConfiguration;
+SPLkotlinx/serialization/json/JsonConfiguration;-><init>(ZZZZZZLjava/lang/String;ZZLjava/lang/String;ZZLkotlinx/serialization/json/JsonNamingStrategy;ZZZLkotlinx/serialization/json/ClassDiscriminatorMode;Z)V
+SPLkotlinx/serialization/json/JsonConfiguration;-><init>(ZZZZZZLjava/lang/String;ZZLjava/lang/String;ZZLkotlinx/serialization/json/JsonNamingStrategy;ZZZLkotlinx/serialization/json/ClassDiscriminatorMode;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlinx/serialization/json/JsonConfiguration;->getAllowComments()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getAllowSpecialFloatingPointValues()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getAllowStructuredMapKeys()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getAllowTrailingComma()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getClassDiscriminator()Ljava/lang/String;
+SPLkotlinx/serialization/json/JsonConfiguration;->getClassDiscriminatorMode()Lkotlinx/serialization/json/ClassDiscriminatorMode;
+SPLkotlinx/serialization/json/JsonConfiguration;->getCoerceInputValues()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getDecodeEnumsCaseInsensitive()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getEncodeDefaults()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getExceptionsWithDebugInfo()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getExplicitNulls()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getIgnoreUnknownKeys()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getNamingStrategy()Lkotlinx/serialization/json/JsonNamingStrategy;
+SPLkotlinx/serialization/json/JsonConfiguration;->getPrettyPrint()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getPrettyPrintIndent()Ljava/lang/String;
+SPLkotlinx/serialization/json/JsonConfiguration;->getUseAlternativeNames()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->getUseArrayPolymorphism()Z
+SPLkotlinx/serialization/json/JsonConfiguration;->isLenient()Z
+Lkotlinx/serialization/json/JsonDecoder;
+Lkotlinx/serialization/json/JsonDecodingException;
+Lkotlinx/serialization/json/JsonElement;
+SPLkotlinx/serialization/json/JsonElement;-><clinit>()V
+SPLkotlinx/serialization/json/JsonElement;-><init>()V
+SPLkotlinx/serialization/json/JsonElement;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/json/JsonElement$Companion;
+SPLkotlinx/serialization/json/JsonElement$Companion;-><init>()V
+SPLkotlinx/serialization/json/JsonElement$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/json/JsonElementBuildersKt;
+SPLkotlinx/serialization/json/JsonElementBuildersKt;->put(Lkotlinx/serialization/json/JsonObjectBuilder;Ljava/lang/String;Ljava/lang/Boolean;)Lkotlinx/serialization/json/JsonElement;
+SPLkotlinx/serialization/json/JsonElementBuildersKt;->put(Lkotlinx/serialization/json/JsonObjectBuilder;Ljava/lang/String;Ljava/lang/String;)Lkotlinx/serialization/json/JsonElement;
+SPLkotlinx/serialization/json/JsonElementBuildersKt;->putJsonArray(Lkotlinx/serialization/json/JsonObjectBuilder;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lkotlinx/serialization/json/JsonElement;
+Lkotlinx/serialization/json/JsonElementKt;
+SPLkotlinx/serialization/json/JsonElementKt;-><clinit>()V
+SPLkotlinx/serialization/json/JsonElementKt;->JsonPrimitive(Ljava/lang/Boolean;)Lkotlinx/serialization/json/JsonPrimitive;
+SPLkotlinx/serialization/json/JsonElementKt;->JsonPrimitive(Ljava/lang/String;)Lkotlinx/serialization/json/JsonPrimitive;
+Lkotlinx/serialization/json/JsonException;
+Lkotlinx/serialization/json/JsonImpl;
+SPLkotlinx/serialization/json/JsonImpl;-><init>(Lkotlinx/serialization/json/JsonConfiguration;Lkotlinx/serialization/modules/SerializersModule;)V
+SPLkotlinx/serialization/json/JsonImpl;->validateConfiguration()V
+Lkotlinx/serialization/json/JsonKt;
+SPLkotlinx/serialization/json/JsonKt;->Json$default(Lkotlinx/serialization/json/Json;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/serialization/json/Json;
+SPLkotlinx/serialization/json/JsonKt;->Json(Lkotlinx/serialization/json/Json;Lkotlin/jvm/functions/Function1;)Lkotlinx/serialization/json/Json;
+Lkotlinx/serialization/json/JsonLiteral;
+SPLkotlinx/serialization/json/JsonLiteral;-><init>(Ljava/lang/Object;ZLkotlinx/serialization/descriptors/SerialDescriptor;)V
+SPLkotlinx/serialization/json/JsonLiteral;-><init>(Ljava/lang/Object;ZLkotlinx/serialization/descriptors/SerialDescriptor;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLkotlinx/serialization/json/JsonLiteral;->getContent()Ljava/lang/String;
+SPLkotlinx/serialization/json/JsonLiteral;->isString()Z
+SPLkotlinx/serialization/json/JsonLiteral;->toString()Ljava/lang/String;
+Lkotlinx/serialization/json/JsonNamingStrategy;
+Lkotlinx/serialization/json/JsonObject;
+SPLkotlinx/serialization/json/JsonObject;-><clinit>()V
+SPLkotlinx/serialization/json/JsonObject;-><init>(Ljava/util/Map;)V
+SPLkotlinx/serialization/json/JsonObject;->toString$lambda$0(Ljava/util/Map$Entry;)Ljava/lang/CharSequence;
+SPLkotlinx/serialization/json/JsonObject;->toString()Ljava/lang/String;
+Lkotlinx/serialization/json/JsonObject$$ExternalSyntheticLambda0;
+SPLkotlinx/serialization/json/JsonObject$$ExternalSyntheticLambda0;-><init>()V
+SPLkotlinx/serialization/json/JsonObject$$ExternalSyntheticLambda0;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lkotlinx/serialization/json/JsonObject$Companion;
+SPLkotlinx/serialization/json/JsonObject$Companion;-><init>()V
+SPLkotlinx/serialization/json/JsonObject$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/json/JsonObjectBuilder;
+SPLkotlinx/serialization/json/JsonObjectBuilder;-><init>()V
+SPLkotlinx/serialization/json/JsonObjectBuilder;->build()Lkotlinx/serialization/json/JsonObject;
+SPLkotlinx/serialization/json/JsonObjectBuilder;->put(Ljava/lang/String;Lkotlinx/serialization/json/JsonElement;)Lkotlinx/serialization/json/JsonElement;
+Lkotlinx/serialization/json/JsonPrimitive;
+SPLkotlinx/serialization/json/JsonPrimitive;-><clinit>()V
+SPLkotlinx/serialization/json/JsonPrimitive;-><init>()V
+SPLkotlinx/serialization/json/JsonPrimitive;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/json/JsonPrimitive$Companion;
+SPLkotlinx/serialization/json/JsonPrimitive$Companion;-><init>()V
+SPLkotlinx/serialization/json/JsonPrimitive$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/json/internal/AbstractJsonLexer;
+SPLkotlinx/serialization/json/internal/AbstractJsonLexer;-><init>(Lkotlinx/serialization/json/JsonConfiguration;)V
+SPLkotlinx/serialization/json/internal/AbstractJsonLexer;->consumeNumericLiteral()J
+SPLkotlinx/serialization/json/internal/AbstractJsonLexer;->expectEof()V
+SPLkotlinx/serialization/json/internal/AbstractJsonLexer;->tryConsumeNull$default(Lkotlinx/serialization/json/internal/AbstractJsonLexer;ZILjava/lang/Object;)Z
+SPLkotlinx/serialization/json/internal/AbstractJsonLexer;->tryConsumeNull(Z)Z
+Lkotlinx/serialization/json/internal/AbstractJsonLexerKt;
+SPLkotlinx/serialization/json/internal/AbstractJsonLexerKt;->charToTokenClass(C)B
+Lkotlinx/serialization/json/internal/CharMappings;
+SPLkotlinx/serialization/json/internal/CharMappings;-><clinit>()V
+SPLkotlinx/serialization/json/internal/CharMappings;-><init>()V
+SPLkotlinx/serialization/json/internal/CharMappings;->initC2ESC(CC)V
+SPLkotlinx/serialization/json/internal/CharMappings;->initC2ESC(IC)V
+SPLkotlinx/serialization/json/internal/CharMappings;->initC2TC(CB)V
+SPLkotlinx/serialization/json/internal/CharMappings;->initC2TC(IB)V
+SPLkotlinx/serialization/json/internal/CharMappings;->initCharToToken()V
+SPLkotlinx/serialization/json/internal/CharMappings;->initEscape()V
+Lkotlinx/serialization/json/internal/CreateMapForCacheKt;
+SPLkotlinx/serialization/json/internal/CreateMapForCacheKt;->createMapForCache(I)Ljava/util/Map;
+Lkotlinx/serialization/json/internal/DescriptorSchemaCache;
+SPLkotlinx/serialization/json/internal/DescriptorSchemaCache;-><init>()V
+Lkotlinx/serialization/json/internal/JsonElementMarker;
+Lkotlinx/serialization/json/internal/JsonPath;
+SPLkotlinx/serialization/json/internal/JsonPath;-><init>(Lkotlinx/serialization/json/JsonConfiguration;)V
+Lkotlinx/serialization/json/internal/StreamingJsonDecoder;
+SPLkotlinx/serialization/json/internal/StreamingJsonDecoder;-><init>(Lkotlinx/serialization/json/Json;Lkotlinx/serialization/json/internal/WriteMode;Lkotlinx/serialization/json/internal/AbstractJsonLexer;Lkotlinx/serialization/descriptors/SerialDescriptor;Lkotlinx/serialization/json/internal/StreamingJsonDecoder$DiscriminatorHolder;)V
+SPLkotlinx/serialization/json/internal/StreamingJsonDecoder;->decodeInt()I
+SPLkotlinx/serialization/json/internal/StreamingJsonDecoder;->decodeLong()J
+SPLkotlinx/serialization/json/internal/StreamingJsonDecoder;->decodeNotNullMark()Z
+SPLkotlinx/serialization/json/internal/StreamingJsonDecoder;->decodeSerializableValue(Lkotlinx/serialization/DeserializationStrategy;)Ljava/lang/Object;
+Lkotlinx/serialization/json/internal/StreamingJsonDecoder$DiscriminatorHolder;
+Lkotlinx/serialization/json/internal/StringJsonLexer;
+SPLkotlinx/serialization/json/internal/StringJsonLexer;-><init>(Ljava/lang/String;Lkotlinx/serialization/json/JsonConfiguration;)V
+SPLkotlinx/serialization/json/internal/StringJsonLexer;->consumeNextToken()B
+SPLkotlinx/serialization/json/internal/StringJsonLexer;->getSource()Ljava/lang/CharSequence;
+SPLkotlinx/serialization/json/internal/StringJsonLexer;->getSource()Ljava/lang/String;
+SPLkotlinx/serialization/json/internal/StringJsonLexer;->prefetchOrEof(I)I
+SPLkotlinx/serialization/json/internal/StringJsonLexer;->skipWhitespaces()I
+Lkotlinx/serialization/json/internal/StringJsonLexerKt;
+SPLkotlinx/serialization/json/internal/StringJsonLexerKt;->StringJsonLexer(Lkotlinx/serialization/json/Json;Ljava/lang/String;)Lkotlinx/serialization/json/internal/StringJsonLexer;
+Lkotlinx/serialization/json/internal/StringOpsKt;
+SPLkotlinx/serialization/json/internal/StringOpsKt;-><clinit>()V
+SPLkotlinx/serialization/json/internal/StringOpsKt;->printQuoted(Ljava/lang/StringBuilder;Ljava/lang/String;)V
+SPLkotlinx/serialization/json/internal/StringOpsKt;->toHexChar(I)C
+Lkotlinx/serialization/json/internal/WriteMode;
+SPLkotlinx/serialization/json/internal/WriteMode;->$values()[Lkotlinx/serialization/json/internal/WriteMode;
+SPLkotlinx/serialization/json/internal/WriteMode;-><clinit>()V
+SPLkotlinx/serialization/json/internal/WriteMode;-><init>(Ljava/lang/String;ICC)V
+Lkotlinx/serialization/modules/SerialModuleImpl;
+SPLkotlinx/serialization/modules/SerialModuleImpl;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Z)V
+Lkotlinx/serialization/modules/SerializersModule;
+SPLkotlinx/serialization/modules/SerializersModule;-><init>()V
+SPLkotlinx/serialization/modules/SerializersModule;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lkotlinx/serialization/modules/SerializersModuleBuildersKt;
+SPLkotlinx/serialization/modules/SerializersModuleBuildersKt;->EmptySerializersModule()Lkotlinx/serialization/modules/SerializersModule;
+Lkotlinx/serialization/modules/SerializersModuleKt;
+SPLkotlinx/serialization/modules/SerializersModuleKt;-><clinit>()V
+SPLkotlinx/serialization/modules/SerializersModuleKt;->getEmptySerializersModule()Lkotlinx/serialization/modules/SerializersModule;
+Lleakcanary/AndroidDebugHeapDumper;
+SPLleakcanary/AndroidDebugHeapDumper;-><clinit>()V
+SPLleakcanary/AndroidDebugHeapDumper;-><init>()V
+Lleakcanary/AndroidLeakFixes;
+SPLleakcanary/AndroidLeakFixes;-><clinit>()V
+SPLleakcanary/AndroidLeakFixes;-><init>(Ljava/lang/String;I)V
+SPLleakcanary/AndroidLeakFixes;-><init>(Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLleakcanary/AndroidLeakFixes;->access$getApplied$p(Lleakcanary/AndroidLeakFixes;)Z
+SPLleakcanary/AndroidLeakFixes;->access$setApplied$p(Lleakcanary/AndroidLeakFixes;Z)V
+SPLleakcanary/AndroidLeakFixes;->values()[Lleakcanary/AndroidLeakFixes;
+Lleakcanary/AndroidLeakFixes$ACCESSIBILITY_NODE_INFO;
+SPLleakcanary/AndroidLeakFixes$ACCESSIBILITY_NODE_INFO;-><init>(Ljava/lang/String;I)V
+SPLleakcanary/AndroidLeakFixes$ACCESSIBILITY_NODE_INFO;->apply(Landroid/app/Application;)V
+Lleakcanary/AndroidLeakFixes$ACTIVITY_MANAGER;
+SPLleakcanary/AndroidLeakFixes$ACTIVITY_MANAGER;-><init>(Ljava/lang/String;I)V
+SPLleakcanary/AndroidLeakFixes$ACTIVITY_MANAGER;->apply(Landroid/app/Application;)V
+Lleakcanary/AndroidLeakFixes$BUBBLE_POPUP;
+SPLleakcanary/AndroidLeakFixes$BUBBLE_POPUP;-><init>(Ljava/lang/String;I)V
+SPLleakcanary/AndroidLeakFixes$BUBBLE_POPUP;->apply(Landroid/app/Application;)V
+Lleakcanary/AndroidLeakFixes$CONNECTIVITY_MANAGER;
+SPLleakcanary/AndroidLeakFixes$CONNECTIVITY_MANAGER;-><init>(Ljava/lang/String;I)V
+SPLleakcanary/AndroidLeakFixes$CONNECTIVITY_MANAGER;->apply(Landroid/app/Application;)V
+Lleakcanary/AndroidLeakFixes$Companion;
+SPLleakcanary/AndroidLeakFixes$Companion;-><init>()V
+SPLleakcanary/AndroidLeakFixes$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLleakcanary/AndroidLeakFixes$Companion;->applyFixes$default(Lleakcanary/AndroidLeakFixes$Companion;Landroid/app/Application;Ljava/util/Set;ILjava/lang/Object;)V
+SPLleakcanary/AndroidLeakFixes$Companion;->applyFixes(Landroid/app/Application;Ljava/util/Set;)V
+Lleakcanary/AndroidLeakFixes$Companion$backgroundHandler$2;
+SPLleakcanary/AndroidLeakFixes$Companion$backgroundHandler$2;-><clinit>()V
+SPLleakcanary/AndroidLeakFixes$Companion$backgroundHandler$2;-><init>()V
+Lleakcanary/AndroidLeakFixes$FLUSH_HANDLER_THREADS;
+SPLleakcanary/AndroidLeakFixes$FLUSH_HANDLER_THREADS;-><init>(Ljava/lang/String;I)V
+SPLleakcanary/AndroidLeakFixes$FLUSH_HANDLER_THREADS;->apply(Landroid/app/Application;)V
+Lleakcanary/AndroidLeakFixes$IMM_CUR_ROOT_VIEW;
+SPLleakcanary/AndroidLeakFixes$IMM_CUR_ROOT_VIEW;-><init>(Ljava/lang/String;I)V
+SPLleakcanary/AndroidLeakFixes$IMM_CUR_ROOT_VIEW;->apply(Landroid/app/Application;)V
+Lleakcanary/AndroidLeakFixes$IMM_FOCUSED_VIEW;
+SPLleakcanary/AndroidLeakFixes$IMM_FOCUSED_VIEW;-><init>(Ljava/lang/String;I)V
+SPLleakcanary/AndroidLeakFixes$IMM_FOCUSED_VIEW;->apply(Landroid/app/Application;)V
+Lleakcanary/AndroidLeakFixes$LAST_HOVERED_VIEW;
+SPLleakcanary/AndroidLeakFixes$LAST_HOVERED_VIEW;-><init>(Ljava/lang/String;I)V
+SPLleakcanary/AndroidLeakFixes$LAST_HOVERED_VIEW;->apply(Landroid/app/Application;)V
+Lleakcanary/AndroidLeakFixes$MEDIA_SESSION_LEGACY_HELPER;
+SPLleakcanary/AndroidLeakFixes$MEDIA_SESSION_LEGACY_HELPER;-><init>(Ljava/lang/String;I)V
+SPLleakcanary/AndroidLeakFixes$MEDIA_SESSION_LEGACY_HELPER;->apply(Landroid/app/Application;)V
+Lleakcanary/AndroidLeakFixes$PERMISSION_CONTROLLER_MANAGER;
+SPLleakcanary/AndroidLeakFixes$PERMISSION_CONTROLLER_MANAGER;-><init>(Ljava/lang/String;I)V
+SPLleakcanary/AndroidLeakFixes$PERMISSION_CONTROLLER_MANAGER;->apply(Landroid/app/Application;)V
+Lleakcanary/AndroidLeakFixes$SAMSUNG_CLIPBOARD_MANAGER;
+SPLleakcanary/AndroidLeakFixes$SAMSUNG_CLIPBOARD_MANAGER;-><init>(Ljava/lang/String;I)V
+SPLleakcanary/AndroidLeakFixes$SAMSUNG_CLIPBOARD_MANAGER;->apply(Landroid/app/Application;)V
+Lleakcanary/AndroidLeakFixes$SPELL_CHECKER;
+SPLleakcanary/AndroidLeakFixes$SPELL_CHECKER;-><init>(Ljava/lang/String;I)V
+SPLleakcanary/AndroidLeakFixes$SPELL_CHECKER;->apply(Landroid/app/Application;)V
+Lleakcanary/AndroidLeakFixes$TEXT_LINE_POOL;
+SPLleakcanary/AndroidLeakFixes$TEXT_LINE_POOL;-><init>(Ljava/lang/String;I)V
+SPLleakcanary/AndroidLeakFixes$TEXT_LINE_POOL;->apply(Landroid/app/Application;)V
+Lleakcanary/AndroidLeakFixes$USER_MANAGER;
+SPLleakcanary/AndroidLeakFixes$USER_MANAGER;-><init>(Ljava/lang/String;I)V
+SPLleakcanary/AndroidLeakFixes$USER_MANAGER;->apply(Landroid/app/Application;)V
+Lleakcanary/AndroidLeakFixes$VIEW_LOCATION_HOLDER;
+SPLleakcanary/AndroidLeakFixes$VIEW_LOCATION_HOLDER;-><init>(Ljava/lang/String;I)V
+SPLleakcanary/AndroidLeakFixes$VIEW_LOCATION_HOLDER;->apply(Landroid/app/Application;)V
+Lleakcanary/AppWatcher;
+SPLleakcanary/AppWatcher;-><clinit>()V
+SPLleakcanary/AppWatcher;-><init>()V
+SPLleakcanary/AppWatcher;->isInstalled()Z
+Lleakcanary/AppWatcher$Config;
+SPLleakcanary/AppWatcher$Config;-><init>(ZZZZJZ)V
+SPLleakcanary/AppWatcher$Config;-><init>(ZZZZJZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lleakcanary/AppWatcher$objectWatcher$1;
+SPLleakcanary/AppWatcher$objectWatcher$1;-><clinit>()V
+SPLleakcanary/AppWatcher$objectWatcher$1;-><init>()V
+Lleakcanary/AppWatcher$objectWatcher$2;
+SPLleakcanary/AppWatcher$objectWatcher$2;-><clinit>()V
+SPLleakcanary/AppWatcher$objectWatcher$2;-><init>()V
+Lleakcanary/AppWatcher$objectWatcher$3;
+SPLleakcanary/AppWatcher$objectWatcher$3;-><clinit>()V
+SPLleakcanary/AppWatcher$objectWatcher$3;-><init>()V
+Lleakcanary/Clock;
+Lleakcanary/DefaultOnHeapAnalyzedListener;
+SPLleakcanary/DefaultOnHeapAnalyzedListener;-><clinit>()V
+SPLleakcanary/DefaultOnHeapAnalyzedListener;-><init>()V
+SPLleakcanary/DefaultOnHeapAnalyzedListener;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lleakcanary/DefaultOnHeapAnalyzedListener$Companion;
+SPLleakcanary/DefaultOnHeapAnalyzedListener$Companion;-><init>()V
+SPLleakcanary/DefaultOnHeapAnalyzedListener$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLleakcanary/DefaultOnHeapAnalyzedListener$Companion;->create()Lleakcanary/OnHeapAnalyzedListener;
+Lleakcanary/EventListener;
+Lleakcanary/HeapDumper;
+Lleakcanary/LazyForwardingEventListener;
+SPLleakcanary/LazyForwardingEventListener;-><init>(Lkotlin/jvm/functions/Function0;)V
+Lleakcanary/LeakCanary;
+SPLleakcanary/LeakCanary;-><clinit>()V
+SPLleakcanary/LeakCanary;-><init>()V
+SPLleakcanary/LeakCanary;->getConfig()Lleakcanary/LeakCanary$Config;
+SPLleakcanary/LeakCanary;->logConfigChange(Lleakcanary/LeakCanary$Config;Lleakcanary/LeakCanary$Config;)V
+SPLleakcanary/LeakCanary;->setConfig(Lleakcanary/LeakCanary$Config;)V
+Lleakcanary/LeakCanary$Config;
+SPLleakcanary/LeakCanary$Config;-><init>(ZZILjava/util/List;Ljava/util/List;Lleakcanary/OnHeapAnalyzedListener;Lshark/MetadataExtractor;ZIZLshark/LeakingObjectFinder;Lleakcanary/HeapDumper;Ljava/util/List;ZZ)V
+SPLleakcanary/LeakCanary$Config;-><init>(ZZILjava/util/List;Ljava/util/List;Lleakcanary/OnHeapAnalyzedListener;Lshark/MetadataExtractor;ZIZLshark/LeakingObjectFinder;Lleakcanary/HeapDumper;Ljava/util/List;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLleakcanary/LeakCanary$Config;->copy$default(Lleakcanary/LeakCanary$Config;ZZILjava/util/List;Ljava/util/List;Lleakcanary/OnHeapAnalyzedListener;Lshark/MetadataExtractor;ZIZLshark/LeakingObjectFinder;Lleakcanary/HeapDumper;Ljava/util/List;ZZILjava/lang/Object;)Lleakcanary/LeakCanary$Config;
+SPLleakcanary/LeakCanary$Config;->copy(ZZILjava/util/List;Ljava/util/List;Lleakcanary/OnHeapAnalyzedListener;Lshark/MetadataExtractor;ZIZLshark/LeakingObjectFinder;Lleakcanary/HeapDumper;Ljava/util/List;ZZ)Lleakcanary/LeakCanary$Config;
+Lleakcanary/LeakCanary$Config$1;
+SPLleakcanary/LeakCanary$Config$1;-><clinit>()V
+SPLleakcanary/LeakCanary$Config$1;-><init>()V
+Lleakcanary/LogcatEventListener;
+SPLleakcanary/LogcatEventListener;-><clinit>()V
+SPLleakcanary/LogcatEventListener;-><init>()V
+Lleakcanary/ObjectWatcher;
+SPLleakcanary/ObjectWatcher;-><init>(Lleakcanary/Clock;Ljava/util/concurrent/Executor;Lkotlin/jvm/functions/Function0;)V
+Lleakcanary/OnHeapAnalyzedListener;
+Lleakcanary/ReachabilityWatcher;
+Lleakcanary/RemoteWorkManagerHeapAnalyzer;
+SPLleakcanary/RemoteWorkManagerHeapAnalyzer;-><clinit>()V
+SPLleakcanary/RemoteWorkManagerHeapAnalyzer;-><init>()V
+SPLleakcanary/RemoteWorkManagerHeapAnalyzer;->getRemoteLeakCanaryServiceInClasspath$leakcanary_android_core_release()Z
+Lleakcanary/RemoteWorkManagerHeapAnalyzer$remoteLeakCanaryServiceInClasspath$2;
+SPLleakcanary/RemoteWorkManagerHeapAnalyzer$remoteLeakCanaryServiceInClasspath$2;-><clinit>()V
+SPLleakcanary/RemoteWorkManagerHeapAnalyzer$remoteLeakCanaryServiceInClasspath$2;-><init>()V
+SPLleakcanary/RemoteWorkManagerHeapAnalyzer$remoteLeakCanaryServiceInClasspath$2;->invoke()Ljava/lang/Object;
+SPLleakcanary/RemoteWorkManagerHeapAnalyzer$remoteLeakCanaryServiceInClasspath$2;->invoke()Z
+Lleakcanary/ToastEventListener;
+SPLleakcanary/ToastEventListener;-><clinit>()V
+SPLleakcanary/ToastEventListener;-><init>()V
+Lleakcanary/ViewLocationHolderLeakFix;
+SPLleakcanary/ViewLocationHolderLeakFix;-><clinit>()V
+SPLleakcanary/ViewLocationHolderLeakFix;-><init>()V
+SPLleakcanary/ViewLocationHolderLeakFix;->applyFix$plumber_android_core_release(Landroid/app/Application;)V
+Lleakcanary/WorkManagerHeapAnalyzer;
+SPLleakcanary/WorkManagerHeapAnalyzer;-><clinit>()V
+SPLleakcanary/WorkManagerHeapAnalyzer;-><init>()V
+SPLleakcanary/WorkManagerHeapAnalyzer;->getValidWorkManagerInClasspath$leakcanary_android_core_release()Z
+Lleakcanary/WorkManagerHeapAnalyzer$validWorkManagerInClasspath$2;
+SPLleakcanary/WorkManagerHeapAnalyzer$validWorkManagerInClasspath$2;-><clinit>()V
+SPLleakcanary/WorkManagerHeapAnalyzer$validWorkManagerInClasspath$2;-><init>()V
+SPLleakcanary/WorkManagerHeapAnalyzer$validWorkManagerInClasspath$2;->invoke()Ljava/lang/Object;
+SPLleakcanary/WorkManagerHeapAnalyzer$validWorkManagerInClasspath$2;->invoke()Z
+Lleakcanary/WorkManagerHeapAnalyzer$workManagerSupportsExpeditedRequests$2;
+SPLleakcanary/WorkManagerHeapAnalyzer$workManagerSupportsExpeditedRequests$2;-><clinit>()V
+SPLleakcanary/WorkManagerHeapAnalyzer$workManagerSupportsExpeditedRequests$2;-><init>()V
+Lleakcanary/internal/HandlersKt;
+SPLleakcanary/internal/HandlersKt;-><clinit>()V
+SPLleakcanary/internal/HandlersKt;->checkMainThread()V
+SPLleakcanary/internal/HandlersKt;->isMainThread()Z
+Lleakcanary/internal/HandlersKt$mainHandler$2;
+SPLleakcanary/internal/HandlersKt$mainHandler$2;-><clinit>()V
+SPLleakcanary/internal/HandlersKt$mainHandler$2;-><init>()V
+Lleakcanary/internal/HeapDumpControl;
+SPLleakcanary/internal/HeapDumpControl;-><clinit>()V
+SPLleakcanary/internal/HeapDumpControl;-><init>()V
+SPLleakcanary/internal/HeapDumpControl;->getBackgroundUpdateHandler()Landroid/os/Handler;
+SPLleakcanary/internal/HeapDumpControl;->iCanHasHeap()Lleakcanary/internal/HeapDumpControl$ICanHazHeap;
+SPLleakcanary/internal/HeapDumpControl;->updateICanHasHeapInBackground()V
+Lleakcanary/internal/HeapDumpControl$ICanHazHeap;
+SPLleakcanary/internal/HeapDumpControl$ICanHazHeap;-><init>()V
+SPLleakcanary/internal/HeapDumpControl$ICanHazHeap;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lleakcanary/internal/HeapDumpControl$ICanHazHeap$Nope;
+SPLleakcanary/internal/HeapDumpControl$ICanHazHeap$Nope;-><init>(Lkotlin/jvm/functions/Function0;)V
+Lleakcanary/internal/HeapDumpControl$ICanHazHeap$SilentNope;
+SPLleakcanary/internal/HeapDumpControl$ICanHazHeap$SilentNope;-><init>(Lkotlin/jvm/functions/Function0;)V
+Lleakcanary/internal/HeapDumpControl$backgroundUpdateHandler$2;
+SPLleakcanary/internal/HeapDumpControl$backgroundUpdateHandler$2;-><clinit>()V
+SPLleakcanary/internal/HeapDumpControl$backgroundUpdateHandler$2;-><init>()V
+SPLleakcanary/internal/HeapDumpControl$backgroundUpdateHandler$2;->invoke()Landroid/os/Handler;
+SPLleakcanary/internal/HeapDumpControl$backgroundUpdateHandler$2;->invoke()Ljava/lang/Object;
+Lleakcanary/internal/HeapDumpControl$hasLeakAssertionsClass$2;
+SPLleakcanary/internal/HeapDumpControl$hasLeakAssertionsClass$2;-><clinit>()V
+SPLleakcanary/internal/HeapDumpControl$hasLeakAssertionsClass$2;-><init>()V
+Lleakcanary/internal/HeapDumpControl$hasTestClass$2;
+SPLleakcanary/internal/HeapDumpControl$hasTestClass$2;-><clinit>()V
+SPLleakcanary/internal/HeapDumpControl$hasTestClass$2;-><init>()V
+Lleakcanary/internal/HeapDumpControl$iCanHasHeap$dumpHeap$1;
+SPLleakcanary/internal/HeapDumpControl$iCanHasHeap$dumpHeap$1;-><clinit>()V
+SPLleakcanary/internal/HeapDumpControl$iCanHasHeap$dumpHeap$1;-><init>()V
+Lleakcanary/internal/HeapDumpControl$testClassName$2;
+SPLleakcanary/internal/HeapDumpControl$testClassName$2;-><clinit>()V
+SPLleakcanary/internal/HeapDumpControl$testClassName$2;-><init>()V
+Lleakcanary/internal/HeapDumpControl$updateICanHasHeapInBackground$1;
+SPLleakcanary/internal/HeapDumpControl$updateICanHasHeapInBackground$1;-><clinit>()V
+SPLleakcanary/internal/HeapDumpControl$updateICanHasHeapInBackground$1;-><init>()V
+SPLleakcanary/internal/HeapDumpControl$updateICanHasHeapInBackground$1;->run()V
+Lleakcanary/internal/LeakCanaryFileProvider;
+SPLleakcanary/internal/LeakCanaryFileProvider;-><clinit>()V
+SPLleakcanary/internal/LeakCanaryFileProvider;-><init>()V
+SPLleakcanary/internal/LeakCanaryFileProvider;->access$getSCache$cp()Ljava/util/HashMap;
+SPLleakcanary/internal/LeakCanaryFileProvider;->attachInfo(Landroid/content/Context;Landroid/content/pm/ProviderInfo;)V
+SPLleakcanary/internal/LeakCanaryFileProvider;->onCreate()Z
+Lleakcanary/internal/LeakCanaryFileProvider$Companion;
+SPLleakcanary/internal/LeakCanaryFileProvider$Companion;-><init>()V
+SPLleakcanary/internal/LeakCanaryFileProvider$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLleakcanary/internal/LeakCanaryFileProvider$Companion;->access$getPathStrategy(Lleakcanary/internal/LeakCanaryFileProvider$Companion;Landroid/content/Context;Ljava/lang/String;)Lleakcanary/internal/LeakCanaryFileProvider$PathStrategy;
+SPLleakcanary/internal/LeakCanaryFileProvider$Companion;->buildPath(Ljava/io/File;[Ljava/lang/String;)Ljava/io/File;
+SPLleakcanary/internal/LeakCanaryFileProvider$Companion;->getPathStrategy(Landroid/content/Context;Ljava/lang/String;)Lleakcanary/internal/LeakCanaryFileProvider$PathStrategy;
+SPLleakcanary/internal/LeakCanaryFileProvider$Companion;->parsePathStrategy(Landroid/content/Context;Ljava/lang/String;)Lleakcanary/internal/LeakCanaryFileProvider$PathStrategy;
+Lleakcanary/internal/LeakCanaryFileProvider$PathStrategy;
+Lleakcanary/internal/LeakCanaryFileProvider$SimplePathStrategy;
+SPLleakcanary/internal/LeakCanaryFileProvider$SimplePathStrategy;-><init>(Ljava/lang/String;)V
+SPLleakcanary/internal/LeakCanaryFileProvider$SimplePathStrategy;->addRoot(Ljava/lang/String;Ljava/io/File;)V
+Lleakcanary/internal/PlumberInstaller;
+SPLleakcanary/internal/PlumberInstaller;-><init>()V
+SPLleakcanary/internal/PlumberInstaller;->onCreate()Z
+Lnet/ankiweb/rsdroid/Backend;
+SPLnet/ankiweb/rsdroid/Backend;-><clinit>()V
+SPLnet/ankiweb/rsdroid/Backend;-><init>(Ljava/lang/Iterable;)V
+SPLnet/ankiweb/rsdroid/Backend;->cancelCurrentProtoQuery(I)V
+SPLnet/ankiweb/rsdroid/Backend;->fullQueryProto(Ljava/lang/String;[Ljava/lang/Object;)Lanki/ankidroid/DbResponse;
+SPLnet/ankiweb/rsdroid/Backend;->getTr()Lnet/ankiweb/rsdroid/Translations;
+SPLnet/ankiweb/rsdroid/Backend;->openCollection(Ljava/lang/String;)V
+SPLnet/ankiweb/rsdroid/Backend;->runMethodRaw$lambda$0(II[BJ)[B
+SPLnet/ankiweb/rsdroid/Backend;->runMethodRaw(II[B)[B
+SPLnet/ankiweb/rsdroid/Backend;->tr_delegate$lambda$0(Lnet/ankiweb/rsdroid/Backend;)Lnet/ankiweb/rsdroid/Translations;
+SPLnet/ankiweb/rsdroid/Backend;->withBackend(Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+Lnet/ankiweb/rsdroid/Backend$$ExternalSyntheticLambda0;
+SPLnet/ankiweb/rsdroid/Backend$$ExternalSyntheticLambda0;-><init>(Lnet/ankiweb/rsdroid/Backend;)V
+SPLnet/ankiweb/rsdroid/Backend$$ExternalSyntheticLambda0;->invoke()Ljava/lang/Object;
+Lnet/ankiweb/rsdroid/Backend$$ExternalSyntheticLambda1;
+SPLnet/ankiweb/rsdroid/Backend$$ExternalSyntheticLambda1;-><init>(II[B)V
+SPLnet/ankiweb/rsdroid/Backend$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lnet/ankiweb/rsdroid/Backend$Companion;
+SPLnet/ankiweb/rsdroid/Backend$Companion;-><init>()V
+SPLnet/ankiweb/rsdroid/Backend$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lnet/ankiweb/rsdroid/BackendException;
+SPLnet/ankiweb/rsdroid/BackendException;-><clinit>()V
+SPLnet/ankiweb/rsdroid/BackendException;-><init>(Lanki/backend/BackendError;)V
+Lnet/ankiweb/rsdroid/BackendException$BackendDbException;
+Lnet/ankiweb/rsdroid/BackendException$BackendDbException$BackendDbCorruptException;
+Lnet/ankiweb/rsdroid/BackendException$BackendDbException$BackendDbFileTooNewException;
+Lnet/ankiweb/rsdroid/BackendException$BackendDbException$BackendDbFullException;
+Lnet/ankiweb/rsdroid/BackendException$BackendDbException$BackendDbLockedException;
+Lnet/ankiweb/rsdroid/BackendException$BackendSearchException;
+Lnet/ankiweb/rsdroid/BackendException$Companion;
+SPLnet/ankiweb/rsdroid/BackendException$Companion;-><init>()V
+SPLnet/ankiweb/rsdroid/BackendException$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLnet/ankiweb/rsdroid/BackendException$Companion;->fromError(Lanki/backend/BackendError;)Lnet/ankiweb/rsdroid/BackendException;
+Lnet/ankiweb/rsdroid/BackendException$Companion$WhenMappings;
+SPLnet/ankiweb/rsdroid/BackendException$Companion$WhenMappings;-><clinit>()V
+Lnet/ankiweb/rsdroid/BackendFactory;
+SPLnet/ankiweb/rsdroid/BackendFactory;-><clinit>()V
+SPLnet/ankiweb/rsdroid/BackendFactory;-><init>()V
+SPLnet/ankiweb/rsdroid/BackendFactory;->getBackend$default(Ljava/lang/Iterable;ILjava/lang/Object;)Lnet/ankiweb/rsdroid/Backend;
+SPLnet/ankiweb/rsdroid/BackendFactory;->getBackend(Ljava/lang/Iterable;)Lnet/ankiweb/rsdroid/Backend;
+SPLnet/ankiweb/rsdroid/BackendFactory;->setDefaultLanguages(Ljava/lang/Iterable;)V
+Lnet/ankiweb/rsdroid/BackendKt;
+SPLnet/ankiweb/rsdroid/BackendKt;->$r8$lambda$h6IVCdbvnaDg_XJznVj3rmenO90([Ljava/lang/Object;Lkotlinx/serialization/json/JsonArrayBuilder;)Lkotlin/Unit;
+SPLnet/ankiweb/rsdroid/BackendKt;-><clinit>()V
+SPLnet/ankiweb/rsdroid/BackendKt;->access$getLogger$p()Lorg/slf4j/Logger;
+SPLnet/ankiweb/rsdroid/BackendKt;->access$unpackResult([[B)[B
+SPLnet/ankiweb/rsdroid/BackendKt;->dbRequestJson$default(Ljava/lang/String;[Ljava/lang/Object;ZILjava/lang/Object;)Lcom/google/protobuf/ByteString;
+SPLnet/ankiweb/rsdroid/BackendKt;->dbRequestJson$lambda$0$0([Ljava/lang/Object;Lkotlinx/serialization/json/JsonArrayBuilder;)Lkotlin/Unit;
+SPLnet/ankiweb/rsdroid/BackendKt;->dbRequestJson(Ljava/lang/String;[Ljava/lang/Object;Z)Lcom/google/protobuf/ByteString;
+SPLnet/ankiweb/rsdroid/BackendKt;->unpackResult([[B)[B
+Lnet/ankiweb/rsdroid/BackendKt$$ExternalSyntheticLambda1;
+SPLnet/ankiweb/rsdroid/BackendKt$$ExternalSyntheticLambda1;-><init>([Ljava/lang/Object;)V
+SPLnet/ankiweb/rsdroid/BackendKt$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lnet/ankiweb/rsdroid/NativeMethods;
+SPLnet/ankiweb/rsdroid/NativeMethods;-><clinit>()V
+SPLnet/ankiweb/rsdroid/NativeMethods;-><init>()V
+Lnet/ankiweb/rsdroid/Translations;
+SPLnet/ankiweb/rsdroid/Translations;-><init>(Lnet/ankiweb/rsdroid/Backend;)V
+SPLnet/ankiweb/rsdroid/Translations;->actionsDecks()Ljava/lang/String;
+SPLnet/ankiweb/rsdroid/Translations;->actionsEmptyCards()Ljava/lang/String;
+SPLnet/ankiweb/rsdroid/Translations;->actionsExport()Ljava/lang/String;
+SPLnet/ankiweb/rsdroid/Translations;->actionsImport()Ljava/lang/String;
+SPLnet/ankiweb/rsdroid/Translations;->databaseCheckTitle()Ljava/lang/String;
+SPLnet/ankiweb/rsdroid/Translations;->decksCreateDeck()Ljava/lang/String;
+SPLnet/ankiweb/rsdroid/Translations;->mediaCheckCheckMediaAction()Ljava/lang/String;
+SPLnet/ankiweb/rsdroid/Translations;->statisticsTitle()Ljava/lang/String;
+SPLnet/ankiweb/rsdroid/Translations;->translate(IILjava/util/Map;)Ljava/lang/String;
+Lnet/ankiweb/rsdroid/database/AnkiDatabaseCursor;
+SPLnet/ankiweb/rsdroid/database/AnkiDatabaseCursor;-><init>()V
+SPLnet/ankiweb/rsdroid/database/AnkiDatabaseCursor;->moveToNext()Z
+Lnet/ankiweb/rsdroid/database/AnkiSupportSQLiteDatabase;
+SPLnet/ankiweb/rsdroid/database/AnkiSupportSQLiteDatabase;-><clinit>()V
+Lnet/ankiweb/rsdroid/database/AnkiSupportSQLiteDatabase$Companion;
+SPLnet/ankiweb/rsdroid/database/AnkiSupportSQLiteDatabase$Companion;-><init>()V
+SPLnet/ankiweb/rsdroid/database/AnkiSupportSQLiteDatabase$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLnet/ankiweb/rsdroid/database/AnkiSupportSQLiteDatabase$Companion;->withRustBackend(Lnet/ankiweb/rsdroid/Backend;)Landroidx/sqlite/db/SupportSQLiteDatabase;
+Lnet/ankiweb/rsdroid/database/RustSupportSQLiteDatabase;
+SPLnet/ankiweb/rsdroid/database/RustSupportSQLiteDatabase;-><clinit>()V
+SPLnet/ankiweb/rsdroid/database/RustSupportSQLiteDatabase;-><init>(Lnet/ankiweb/rsdroid/Backend;)V
+SPLnet/ankiweb/rsdroid/database/RustSupportSQLiteDatabase;->query(Ljava/lang/String;[Ljava/lang/Object;)Landroid/database/Cursor;
+Lnet/ankiweb/rsdroid/database/RustSupportSQLiteDatabase$Companion;
+SPLnet/ankiweb/rsdroid/database/RustSupportSQLiteDatabase$Companion;-><init>()V
+SPLnet/ankiweb/rsdroid/database/RustSupportSQLiteDatabase$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lnet/ankiweb/rsdroid/database/SQLHandler;
+Lnet/ankiweb/rsdroid/database/StreamingProtobufSQLiteCursor;
+SPLnet/ankiweb/rsdroid/database/StreamingProtobufSQLiteCursor;-><init>(Lnet/ankiweb/rsdroid/database/SQLHandler;Ljava/lang/String;[Ljava/lang/Object;)V
+SPLnet/ankiweb/rsdroid/database/StreamingProtobufSQLiteCursor;->close()V
+SPLnet/ankiweb/rsdroid/database/StreamingProtobufSQLiteCursor;->getCurrentSliceRowCount()I
+SPLnet/ankiweb/rsdroid/database/StreamingProtobufSQLiteCursor;->getFieldAtIndex(I)Lanki/ankidroid/SqlValue;
+SPLnet/ankiweb/rsdroid/database/StreamingProtobufSQLiteCursor;->getInt(I)I
+SPLnet/ankiweb/rsdroid/database/StreamingProtobufSQLiteCursor;->getLong(I)J
+SPLnet/ankiweb/rsdroid/database/StreamingProtobufSQLiteCursor;->getPosition()I
+SPLnet/ankiweb/rsdroid/database/StreamingProtobufSQLiteCursor;->getRowAtCurrentPosition()Lanki/ankidroid/Row;
+SPLnet/ankiweb/rsdroid/database/StreamingProtobufSQLiteCursor;->getSliceStartIndex()I
+SPLnet/ankiweb/rsdroid/database/StreamingProtobufSQLiteCursor;->moveToPosition(I)Z
+Lnet/ankiweb/rsdroid/database/StreamingProtobufSQLiteCursor$WhenMappings;
+SPLnet/ankiweb/rsdroid/database/StreamingProtobufSQLiteCursor$WhenMappings;-><clinit>()V
+Lnet/ankiweb/rsdroid/exceptions/BackendDeckIsFilteredException;
+Lnet/ankiweb/rsdroid/exceptions/BackendNetworkException;
+Lnet/ankiweb/rsdroid/exceptions/BackendNotFoundException;
+SPLnet/ankiweb/rsdroid/exceptions/BackendNotFoundException;-><init>(Lanki/backend/BackendError;)V
+Lokhttp3/Authenticator;
+SPLokhttp3/Authenticator;-><clinit>()V
+Lokhttp3/Authenticator$Companion;
+SPLokhttp3/Authenticator$Companion;-><clinit>()V
+SPLokhttp3/Authenticator$Companion;-><init>()V
+Lokhttp3/Authenticator$Companion$AuthenticatorNone;
+SPLokhttp3/Authenticator$Companion$AuthenticatorNone;-><init>()V
+Lokhttp3/Cache;
+Lokhttp3/Call$Factory;
+Lokhttp3/CertificatePinner;
+SPLokhttp3/CertificatePinner;-><clinit>()V
+SPLokhttp3/CertificatePinner;-><init>(Ljava/util/Set;Lokhttp3/internal/tls/CertificateChainCleaner;)V
+SPLokhttp3/CertificatePinner;-><init>(Ljava/util/Set;Lokhttp3/internal/tls/CertificateChainCleaner;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLokhttp3/CertificatePinner;->withCertificateChainCleaner$okhttp(Lokhttp3/internal/tls/CertificateChainCleaner;)Lokhttp3/CertificatePinner;
+Lokhttp3/CertificatePinner$Builder;
+SPLokhttp3/CertificatePinner$Builder;-><init>()V
+SPLokhttp3/CertificatePinner$Builder;->build()Lokhttp3/CertificatePinner;
+Lokhttp3/CertificatePinner$Companion;
+SPLokhttp3/CertificatePinner$Companion;-><init>()V
+SPLokhttp3/CertificatePinner$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lokhttp3/CipherSuite;
+SPLokhttp3/CipherSuite;-><clinit>()V
+SPLokhttp3/CipherSuite;-><init>(Ljava/lang/String;)V
+SPLokhttp3/CipherSuite;-><init>(Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLokhttp3/CipherSuite;->access$getINSTANCES$cp()Ljava/util/Map;
+SPLokhttp3/CipherSuite;->javaName()Ljava/lang/String;
+Lokhttp3/CipherSuite$Companion;
+SPLokhttp3/CipherSuite$Companion;-><init>()V
+SPLokhttp3/CipherSuite$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLokhttp3/CipherSuite$Companion;->access$init(Lokhttp3/CipherSuite$Companion;Ljava/lang/String;I)Lokhttp3/CipherSuite;
+SPLokhttp3/CipherSuite$Companion;->init(Ljava/lang/String;I)Lokhttp3/CipherSuite;
+Lokhttp3/CipherSuite$Companion$ORDER_BY_NAME$1;
+SPLokhttp3/CipherSuite$Companion$ORDER_BY_NAME$1;-><init>()V
+Lokhttp3/ConnectionPool;
+SPLokhttp3/ConnectionPool;-><init>()V
+SPLokhttp3/ConnectionPool;-><init>(IJLjava/util/concurrent/TimeUnit;)V
+SPLokhttp3/ConnectionPool;-><init>(IJLjava/util/concurrent/TimeUnit;Lokhttp3/internal/concurrent/TaskRunner;Lokhttp3/internal/connection/ConnectionListener;)V
+SPLokhttp3/ConnectionPool;-><init>(Lokhttp3/internal/connection/RealConnectionPool;)V
+Lokhttp3/ConnectionSpec;
+SPLokhttp3/ConnectionSpec;-><clinit>()V
+SPLokhttp3/ConnectionSpec;-><init>(ZZ[Ljava/lang/String;[Ljava/lang/String;)V
+SPLokhttp3/ConnectionSpec;->isTls()Z
+Lokhttp3/ConnectionSpec$Builder;
+SPLokhttp3/ConnectionSpec$Builder;-><init>(Z)V
+SPLokhttp3/ConnectionSpec$Builder;->build()Lokhttp3/ConnectionSpec;
+SPLokhttp3/ConnectionSpec$Builder;->cipherSuites([Ljava/lang/String;)Lokhttp3/ConnectionSpec$Builder;
+SPLokhttp3/ConnectionSpec$Builder;->cipherSuites([Lokhttp3/CipherSuite;)Lokhttp3/ConnectionSpec$Builder;
+SPLokhttp3/ConnectionSpec$Builder;->supportsTlsExtensions(Z)Lokhttp3/ConnectionSpec$Builder;
+SPLokhttp3/ConnectionSpec$Builder;->tlsVersions([Ljava/lang/String;)Lokhttp3/ConnectionSpec$Builder;
+SPLokhttp3/ConnectionSpec$Builder;->tlsVersions([Lokhttp3/TlsVersion;)Lokhttp3/ConnectionSpec$Builder;
+Lokhttp3/ConnectionSpec$Companion;
+SPLokhttp3/ConnectionSpec$Companion;-><init>()V
+SPLokhttp3/ConnectionSpec$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lokhttp3/CookieJar;
+SPLokhttp3/CookieJar;-><clinit>()V
+Lokhttp3/CookieJar$Companion;
+SPLokhttp3/CookieJar$Companion;-><clinit>()V
+SPLokhttp3/CookieJar$Companion;-><init>()V
+Lokhttp3/CookieJar$Companion$NoCookies;
+SPLokhttp3/CookieJar$Companion$NoCookies;-><init>()V
+Lokhttp3/Dispatcher;
+SPLokhttp3/Dispatcher;-><init>()V
+Lokhttp3/Dns;
+SPLokhttp3/Dns;-><clinit>()V
+Lokhttp3/Dns$Companion;
+SPLokhttp3/Dns$Companion;-><clinit>()V
+SPLokhttp3/Dns$Companion;-><init>()V
+Lokhttp3/Dns$Companion$SYSTEM$1;
+SPLokhttp3/Dns$Companion$SYSTEM$1;-><init>()V
+Lokhttp3/EventListener;
+SPLokhttp3/EventListener;-><clinit>()V
+SPLokhttp3/EventListener;-><init>()V
+Lokhttp3/EventListener$Companion;
+SPLokhttp3/EventListener$Companion;-><init>()V
+SPLokhttp3/EventListener$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lokhttp3/EventListener$Companion$NONE$1;
+SPLokhttp3/EventListener$Companion$NONE$1;-><init>()V
+Lokhttp3/EventListener$Factory;
+Lokhttp3/OkHttpClient;
+SPLokhttp3/OkHttpClient;-><clinit>()V
+SPLokhttp3/OkHttpClient;-><init>(Lokhttp3/OkHttpClient$Builder;)V
+SPLokhttp3/OkHttpClient;->access$getDEFAULT_CONNECTION_SPECS$cp()Ljava/util/List;
+SPLokhttp3/OkHttpClient;->access$getDEFAULT_PROTOCOLS$cp()Ljava/util/List;
+SPLokhttp3/OkHttpClient;->verifyClientState()V
+Lokhttp3/OkHttpClient$Builder;
+SPLokhttp3/OkHttpClient$Builder;-><init>()V
+SPLokhttp3/OkHttpClient$Builder;->build()Lokhttp3/OkHttpClient;
+SPLokhttp3/OkHttpClient$Builder;->connectTimeout(JLjava/util/concurrent/TimeUnit;)Lokhttp3/OkHttpClient$Builder;
+SPLokhttp3/OkHttpClient$Builder;->getAuthenticator$okhttp()Lokhttp3/Authenticator;
+SPLokhttp3/OkHttpClient$Builder;->getCache$okhttp()Lokhttp3/Cache;
+SPLokhttp3/OkHttpClient$Builder;->getCallTimeout$okhttp()I
+SPLokhttp3/OkHttpClient$Builder;->getCertificatePinner$okhttp()Lokhttp3/CertificatePinner;
+SPLokhttp3/OkHttpClient$Builder;->getConnectTimeout$okhttp()I
+SPLokhttp3/OkHttpClient$Builder;->getConnectionPool$okhttp()Lokhttp3/ConnectionPool;
+SPLokhttp3/OkHttpClient$Builder;->getConnectionSpecs$okhttp()Ljava/util/List;
+SPLokhttp3/OkHttpClient$Builder;->getCookieJar$okhttp()Lokhttp3/CookieJar;
+SPLokhttp3/OkHttpClient$Builder;->getDispatcher$okhttp()Lokhttp3/Dispatcher;
+SPLokhttp3/OkHttpClient$Builder;->getDns$okhttp()Lokhttp3/Dns;
+SPLokhttp3/OkHttpClient$Builder;->getEventListenerFactory$okhttp()Lokhttp3/EventListener$Factory;
+SPLokhttp3/OkHttpClient$Builder;->getFastFallback$okhttp()Z
+SPLokhttp3/OkHttpClient$Builder;->getFollowRedirects$okhttp()Z
+SPLokhttp3/OkHttpClient$Builder;->getFollowSslRedirects$okhttp()Z
+SPLokhttp3/OkHttpClient$Builder;->getHostnameVerifier$okhttp()Ljavax/net/ssl/HostnameVerifier;
+SPLokhttp3/OkHttpClient$Builder;->getInterceptors$okhttp()Ljava/util/List;
+SPLokhttp3/OkHttpClient$Builder;->getMinWebSocketMessageToCompress$okhttp()J
+SPLokhttp3/OkHttpClient$Builder;->getNetworkInterceptors$okhttp()Ljava/util/List;
+SPLokhttp3/OkHttpClient$Builder;->getPingInterval$okhttp()I
+SPLokhttp3/OkHttpClient$Builder;->getProtocols$okhttp()Ljava/util/List;
+SPLokhttp3/OkHttpClient$Builder;->getProxy$okhttp()Ljava/net/Proxy;
+SPLokhttp3/OkHttpClient$Builder;->getProxyAuthenticator$okhttp()Lokhttp3/Authenticator;
+SPLokhttp3/OkHttpClient$Builder;->getProxySelector$okhttp()Ljava/net/ProxySelector;
+SPLokhttp3/OkHttpClient$Builder;->getReadTimeout$okhttp()I
+SPLokhttp3/OkHttpClient$Builder;->getRetryOnConnectionFailure$okhttp()Z
+SPLokhttp3/OkHttpClient$Builder;->getRouteDatabase$okhttp()Lokhttp3/internal/connection/RouteDatabase;
+SPLokhttp3/OkHttpClient$Builder;->getSocketFactory$okhttp()Ljavax/net/SocketFactory;
+SPLokhttp3/OkHttpClient$Builder;->getSslSocketFactoryOrNull$okhttp()Ljavax/net/ssl/SSLSocketFactory;
+SPLokhttp3/OkHttpClient$Builder;->getTaskRunner$okhttp()Lokhttp3/internal/concurrent/TaskRunner;
+SPLokhttp3/OkHttpClient$Builder;->getWebSocketCloseTimeout$okhttp()I
+SPLokhttp3/OkHttpClient$Builder;->getWriteTimeout$okhttp()I
+SPLokhttp3/OkHttpClient$Builder;->readTimeout(JLjava/util/concurrent/TimeUnit;)Lokhttp3/OkHttpClient$Builder;
+SPLokhttp3/OkHttpClient$Builder;->setConnectionPool$okhttp(Lokhttp3/ConnectionPool;)V
+Lokhttp3/OkHttpClient$Companion;
+SPLokhttp3/OkHttpClient$Companion;-><init>()V
+SPLokhttp3/OkHttpClient$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLokhttp3/OkHttpClient$Companion;->getDEFAULT_CONNECTION_SPECS$okhttp()Ljava/util/List;
+SPLokhttp3/OkHttpClient$Companion;->getDEFAULT_PROTOCOLS$okhttp()Ljava/util/List;
+Lokhttp3/Protocol;
+SPLokhttp3/Protocol;->$values()[Lokhttp3/Protocol;
+SPLokhttp3/Protocol;-><clinit>()V
+SPLokhttp3/Protocol;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+Lokhttp3/Protocol$Companion;
+SPLokhttp3/Protocol$Companion;-><init>()V
+SPLokhttp3/Protocol$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lokhttp3/TlsVersion;
+SPLokhttp3/TlsVersion;->$values()[Lokhttp3/TlsVersion;
+SPLokhttp3/TlsVersion;-><clinit>()V
+SPLokhttp3/TlsVersion;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+SPLokhttp3/TlsVersion;->javaName()Ljava/lang/String;
+Lokhttp3/TlsVersion$Companion;
+SPLokhttp3/TlsVersion$Companion;-><init>()V
+SPLokhttp3/TlsVersion$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lokhttp3/WebSocket$Factory;
+Lokhttp3/android/AndroidDns$$ExternalSyntheticApiModelOutline0;
+SPLokhttp3/android/AndroidDns$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/ActivityManager;Ljava/lang/String;II)Ljava/util/List;
+SPLokhttp3/android/AndroidDns$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/ApplicationExitInfo;)I
+SPLokhttp3/android/AndroidDns$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/ApplicationExitInfo;)J
+SPLokhttp3/android/AndroidDns$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/job/JobScheduler;Ljava/lang/String;)Landroid/app/job/JobScheduler;
+SPLokhttp3/android/AndroidDns$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/pm/PackageInfo;)J
+SPLokhttp3/android/AndroidDns$$ExternalSyntheticApiModelOutline0;->m(Lcom/google/android/material/navigation/NavigationBarItemView;Z)V
+SPLokhttp3/android/AndroidDns$$ExternalSyntheticApiModelOutline0;->m(Ljava/lang/Object;)Landroid/app/ApplicationExitInfo;
+Lokhttp3/internal/_UtilJvmKt;
+SPLokhttp3/internal/_UtilJvmKt;-><clinit>()V
+SPLokhttp3/internal/_UtilJvmKt;->asFactory(Lokhttp3/EventListener;)Lokhttp3/EventListener$Factory;
+SPLokhttp3/internal/_UtilJvmKt;->checkDuration(Ljava/lang/String;JLjava/util/concurrent/TimeUnit;)I
+SPLokhttp3/internal/_UtilJvmKt;->immutableListOf([Ljava/lang/Object;)Ljava/util/List;
+SPLokhttp3/internal/_UtilJvmKt;->threadFactory(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory;
+SPLokhttp3/internal/_UtilJvmKt;->toImmutableList(Ljava/util/List;)Ljava/util/List;
+SPLokhttp3/internal/_UtilJvmKt;->toImmutableList([Ljava/lang/Object;)Ljava/util/List;
+Lokhttp3/internal/_UtilJvmKt$$ExternalSyntheticLambda0;
+SPLokhttp3/internal/_UtilJvmKt$$ExternalSyntheticLambda0;-><init>(Lokhttp3/EventListener;)V
+Lokhttp3/internal/_UtilJvmKt$$ExternalSyntheticLambda1;
+SPLokhttp3/internal/_UtilJvmKt$$ExternalSyntheticLambda1;-><init>(Ljava/lang/String;Z)V
+Lokhttp3/internal/authenticator/JavaNetAuthenticator;
+SPLokhttp3/internal/authenticator/JavaNetAuthenticator;-><init>(Lokhttp3/Dns;)V
+SPLokhttp3/internal/authenticator/JavaNetAuthenticator;-><init>(Lokhttp3/Dns;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lokhttp3/internal/concurrent/Lockable;
+Lokhttp3/internal/concurrent/Task;
+SPLokhttp3/internal/concurrent/Task;-><init>(Ljava/lang/String;Z)V
+SPLokhttp3/internal/concurrent/Task;-><init>(Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lokhttp3/internal/concurrent/TaskQueue;
+SPLokhttp3/internal/concurrent/TaskQueue;-><init>(Lokhttp3/internal/concurrent/TaskRunner;Ljava/lang/String;)V
+Lokhttp3/internal/concurrent/TaskRunner;
+SPLokhttp3/internal/concurrent/TaskRunner;-><clinit>()V
+SPLokhttp3/internal/concurrent/TaskRunner;-><init>(Lokhttp3/internal/concurrent/TaskRunner$Backend;Ljava/util/logging/Logger;)V
+SPLokhttp3/internal/concurrent/TaskRunner;-><init>(Lokhttp3/internal/concurrent/TaskRunner$Backend;Ljava/util/logging/Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLokhttp3/internal/concurrent/TaskRunner;->newQueue()Lokhttp3/internal/concurrent/TaskQueue;
+Lokhttp3/internal/concurrent/TaskRunner$Backend;
+Lokhttp3/internal/concurrent/TaskRunner$Companion;
+SPLokhttp3/internal/concurrent/TaskRunner$Companion;-><init>()V
+SPLokhttp3/internal/concurrent/TaskRunner$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lokhttp3/internal/concurrent/TaskRunner$RealBackend;
+SPLokhttp3/internal/concurrent/TaskRunner$RealBackend;-><init>(Ljava/util/concurrent/ThreadFactory;)V
+Lokhttp3/internal/concurrent/TaskRunner$runnable$1;
+SPLokhttp3/internal/concurrent/TaskRunner$runnable$1;-><init>(Lokhttp3/internal/concurrent/TaskRunner;)V
+Lokhttp3/internal/connection/ConnectionListener;
+SPLokhttp3/internal/connection/ConnectionListener;-><clinit>()V
+SPLokhttp3/internal/connection/ConnectionListener;-><init>()V
+SPLokhttp3/internal/connection/ConnectionListener;->access$getNONE$cp()Lokhttp3/internal/connection/ConnectionListener;
+Lokhttp3/internal/connection/ConnectionListener$Companion;
+SPLokhttp3/internal/connection/ConnectionListener$Companion;-><init>()V
+SPLokhttp3/internal/connection/ConnectionListener$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLokhttp3/internal/connection/ConnectionListener$Companion;->getNONE()Lokhttp3/internal/connection/ConnectionListener;
+Lokhttp3/internal/connection/ConnectionListener$Companion$NONE$1;
+SPLokhttp3/internal/connection/ConnectionListener$Companion$NONE$1;-><init>()V
+Lokhttp3/internal/connection/RealConnectionPool;
+SPLokhttp3/internal/connection/RealConnectionPool;-><clinit>()V
+SPLokhttp3/internal/connection/RealConnectionPool;-><init>(Lokhttp3/internal/concurrent/TaskRunner;IJLjava/util/concurrent/TimeUnit;Lokhttp3/internal/connection/ConnectionListener;)V
+Lokhttp3/internal/connection/RealConnectionPool$Companion;
+SPLokhttp3/internal/connection/RealConnectionPool$Companion;-><init>()V
+SPLokhttp3/internal/connection/RealConnectionPool$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lokhttp3/internal/connection/RealConnectionPool$cleanupTask$1;
+SPLokhttp3/internal/connection/RealConnectionPool$cleanupTask$1;-><init>(Lokhttp3/internal/connection/RealConnectionPool;Ljava/lang/String;)V
+Lokhttp3/internal/connection/RouteDatabase;
+SPLokhttp3/internal/connection/RouteDatabase;-><init>()V
+Lokhttp3/internal/http2/Http2;
+Lokhttp3/internal/platform/Android10Platform;
+SPLokhttp3/internal/platform/Android10Platform;-><clinit>()V
+SPLokhttp3/internal/platform/Android10Platform;-><init>()V
+SPLokhttp3/internal/platform/Android10Platform;->access$isSupported$cp()Z
+SPLokhttp3/internal/platform/Android10Platform;->buildCertificateChainCleaner(Ljavax/net/ssl/X509TrustManager;)Lokhttp3/internal/tls/CertificateChainCleaner;
+SPLokhttp3/internal/platform/Android10Platform;->newSSLContext()Ljavax/net/ssl/SSLContext;
+SPLokhttp3/internal/platform/Android10Platform;->setApplicationContext(Landroid/content/Context;)V
+Lokhttp3/internal/platform/Android10Platform$Companion;
+SPLokhttp3/internal/platform/Android10Platform$Companion;-><init>()V
+SPLokhttp3/internal/platform/Android10Platform$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLokhttp3/internal/platform/Android10Platform$Companion;->buildIfSupported()Lokhttp3/internal/platform/Platform;
+SPLokhttp3/internal/platform/Android10Platform$Companion;->isSupported()Z
+Lokhttp3/internal/platform/ContextAwarePlatform;
+Lokhttp3/internal/platform/Platform;
+SPLokhttp3/internal/platform/Platform;-><clinit>()V
+SPLokhttp3/internal/platform/Platform;-><init>()V
+SPLokhttp3/internal/platform/Platform;->access$getPlatform$cp()Lokhttp3/internal/platform/Platform;
+SPLokhttp3/internal/platform/Platform;->getSocketFactory()Ljavax/net/SocketFactory;
+SPLokhttp3/internal/platform/Platform;->newSSLContext()Ljavax/net/ssl/SSLContext;
+SPLokhttp3/internal/platform/Platform;->newSslSocketFactory(Ljavax/net/ssl/X509TrustManager;)Ljavax/net/ssl/SSLSocketFactory;
+SPLokhttp3/internal/platform/Platform;->platformTrustManager()Ljavax/net/ssl/X509TrustManager;
+Lokhttp3/internal/platform/Platform$Companion;
+SPLokhttp3/internal/platform/Platform$Companion;-><init>()V
+SPLokhttp3/internal/platform/Platform$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLokhttp3/internal/platform/Platform$Companion;->access$findPlatform(Lokhttp3/internal/platform/Platform$Companion;)Lokhttp3/internal/platform/Platform;
+SPLokhttp3/internal/platform/Platform$Companion;->findPlatform()Lokhttp3/internal/platform/Platform;
+SPLokhttp3/internal/platform/Platform$Companion;->get()Lokhttp3/internal/platform/Platform;
+SPLokhttp3/internal/platform/Platform$Companion;->isAndroid()Z
+Lokhttp3/internal/platform/PlatformInitializer;
+SPLokhttp3/internal/platform/PlatformInitializer;-><init>()V
+SPLokhttp3/internal/platform/PlatformInitializer;->create(Landroid/content/Context;)Ljava/lang/Object;
+SPLokhttp3/internal/platform/PlatformInitializer;->create(Landroid/content/Context;)Lokhttp3/internal/platform/Platform;
+SPLokhttp3/internal/platform/PlatformInitializer;->dependencies()Ljava/util/List;
+Lokhttp3/internal/platform/PlatformRegistry;
+SPLokhttp3/internal/platform/PlatformRegistry;-><clinit>()V
+SPLokhttp3/internal/platform/PlatformRegistry;-><init>()V
+SPLokhttp3/internal/platform/PlatformRegistry;->findPlatform()Lokhttp3/internal/platform/Platform;
+SPLokhttp3/internal/platform/PlatformRegistry;->isAndroid()Z
+SPLokhttp3/internal/platform/PlatformRegistry;->setApplicationContext(Landroid/content/Context;)V
+Lokhttp3/internal/platform/android/Android10SocketAdapter;
+SPLokhttp3/internal/platform/android/Android10SocketAdapter;-><clinit>()V
+SPLokhttp3/internal/platform/android/Android10SocketAdapter;-><init>()V
+SPLokhttp3/internal/platform/android/Android10SocketAdapter;->isSupported()Z
+Lokhttp3/internal/platform/android/Android10SocketAdapter$Companion;
+SPLokhttp3/internal/platform/android/Android10SocketAdapter$Companion;-><init>()V
+SPLokhttp3/internal/platform/android/Android10SocketAdapter$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLokhttp3/internal/platform/android/Android10SocketAdapter$Companion;->buildIfSupported()Lokhttp3/internal/platform/android/SocketAdapter;
+SPLokhttp3/internal/platform/android/Android10SocketAdapter$Companion;->isSupported()Z
+Lokhttp3/internal/platform/android/Android17SocketAdapter;
+SPLokhttp3/internal/platform/android/Android17SocketAdapter;-><clinit>()V
+Lokhttp3/internal/platform/android/Android17SocketAdapter$Companion;
+SPLokhttp3/internal/platform/android/Android17SocketAdapter$Companion;-><init>()V
+SPLokhttp3/internal/platform/android/Android17SocketAdapter$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLokhttp3/internal/platform/android/Android17SocketAdapter$Companion;->buildIfSupported()Lokhttp3/internal/platform/android/SocketAdapter;
+SPLokhttp3/internal/platform/android/Android17SocketAdapter$Companion;->isSupported()Z
+Lokhttp3/internal/platform/android/AndroidCertificateChainCleaner;
+SPLokhttp3/internal/platform/android/AndroidCertificateChainCleaner;-><clinit>()V
+SPLokhttp3/internal/platform/android/AndroidCertificateChainCleaner;-><init>(Ljavax/net/ssl/X509TrustManager;Landroid/net/http/X509TrustManagerExtensions;)V
+Lokhttp3/internal/platform/android/AndroidCertificateChainCleaner$Companion;
+SPLokhttp3/internal/platform/android/AndroidCertificateChainCleaner$Companion;-><init>()V
+SPLokhttp3/internal/platform/android/AndroidCertificateChainCleaner$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLokhttp3/internal/platform/android/AndroidCertificateChainCleaner$Companion;->buildIfSupported(Ljavax/net/ssl/X509TrustManager;)Lokhttp3/internal/platform/android/AndroidCertificateChainCleaner;
+Lokhttp3/internal/platform/android/AndroidLog;
+SPLokhttp3/internal/platform/android/AndroidLog;-><clinit>()V
+SPLokhttp3/internal/platform/android/AndroidLog;-><init>()V
+SPLokhttp3/internal/platform/android/AndroidLog;->enable()V
+SPLokhttp3/internal/platform/android/AndroidLog;->enableLogging(Ljava/lang/String;Ljava/lang/String;)V
+Lokhttp3/internal/platform/android/AndroidLogHandler;
+SPLokhttp3/internal/platform/android/AndroidLogHandler;-><clinit>()V
+SPLokhttp3/internal/platform/android/AndroidLogHandler;-><init>()V
+Lokhttp3/internal/platform/android/AndroidSocketAdapter;
+SPLokhttp3/internal/platform/android/AndroidSocketAdapter;-><clinit>()V
+SPLokhttp3/internal/platform/android/AndroidSocketAdapter;->access$getPlayProviderFactory$cp()Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;
+Lokhttp3/internal/platform/android/AndroidSocketAdapter$Companion;
+SPLokhttp3/internal/platform/android/AndroidSocketAdapter$Companion;-><init>()V
+SPLokhttp3/internal/platform/android/AndroidSocketAdapter$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLokhttp3/internal/platform/android/AndroidSocketAdapter$Companion;->factory(Ljava/lang/String;)Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;
+SPLokhttp3/internal/platform/android/AndroidSocketAdapter$Companion;->getPlayProviderFactory()Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;
+Lokhttp3/internal/platform/android/AndroidSocketAdapter$Companion$factory$1;
+SPLokhttp3/internal/platform/android/AndroidSocketAdapter$Companion$factory$1;-><init>(Ljava/lang/String;)V
+Lokhttp3/internal/platform/android/BouncyCastleSocketAdapter;
+SPLokhttp3/internal/platform/android/BouncyCastleSocketAdapter;-><clinit>()V
+SPLokhttp3/internal/platform/android/BouncyCastleSocketAdapter;->access$getFactory$cp()Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;
+Lokhttp3/internal/platform/android/BouncyCastleSocketAdapter$Companion;
+SPLokhttp3/internal/platform/android/BouncyCastleSocketAdapter$Companion;-><init>()V
+SPLokhttp3/internal/platform/android/BouncyCastleSocketAdapter$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLokhttp3/internal/platform/android/BouncyCastleSocketAdapter$Companion;->getFactory()Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;
+Lokhttp3/internal/platform/android/BouncyCastleSocketAdapter$Companion$factory$1;
+SPLokhttp3/internal/platform/android/BouncyCastleSocketAdapter$Companion$factory$1;-><init>()V
+Lokhttp3/internal/platform/android/ConscryptSocketAdapter;
+SPLokhttp3/internal/platform/android/ConscryptSocketAdapter;-><clinit>()V
+SPLokhttp3/internal/platform/android/ConscryptSocketAdapter;->access$getFactory$cp()Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;
+Lokhttp3/internal/platform/android/ConscryptSocketAdapter$Companion;
+SPLokhttp3/internal/platform/android/ConscryptSocketAdapter$Companion;-><init>()V
+SPLokhttp3/internal/platform/android/ConscryptSocketAdapter$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLokhttp3/internal/platform/android/ConscryptSocketAdapter$Companion;->getFactory()Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;
+Lokhttp3/internal/platform/android/ConscryptSocketAdapter$Companion$factory$1;
+SPLokhttp3/internal/platform/android/ConscryptSocketAdapter$Companion$factory$1;-><init>()V
+Lokhttp3/internal/platform/android/DeferredSocketAdapter;
+SPLokhttp3/internal/platform/android/DeferredSocketAdapter;-><init>(Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;)V
+SPLokhttp3/internal/platform/android/DeferredSocketAdapter;->isSupported()Z
+Lokhttp3/internal/platform/android/DeferredSocketAdapter$Factory;
+Lokhttp3/internal/platform/android/SocketAdapter;
+Lokhttp3/internal/tls/CertificateChainCleaner;
+SPLokhttp3/internal/tls/CertificateChainCleaner;-><clinit>()V
+SPLokhttp3/internal/tls/CertificateChainCleaner;-><init>()V
+Lokhttp3/internal/tls/CertificateChainCleaner$Companion;
+SPLokhttp3/internal/tls/CertificateChainCleaner$Companion;-><init>()V
+SPLokhttp3/internal/tls/CertificateChainCleaner$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLokhttp3/internal/tls/CertificateChainCleaner$Companion;->get(Ljavax/net/ssl/X509TrustManager;)Lokhttp3/internal/tls/CertificateChainCleaner;
+Lokhttp3/internal/tls/OkHostnameVerifier;
+SPLokhttp3/internal/tls/OkHostnameVerifier;-><clinit>()V
+SPLokhttp3/internal/tls/OkHostnameVerifier;-><init>()V
+Lorg/acra/ACRA;
+SPLorg/acra/ACRA;-><clinit>()V
+SPLorg/acra/ACRA;-><init>()V
+SPLorg/acra/ACRA;->currentProcessName()Ljava/lang/String;
+SPLorg/acra/ACRA;->getErrorReporter()Lorg/acra/ErrorReporter;
+SPLorg/acra/ACRA;->init$default(Landroid/app/Application;Lorg/acra/config/CoreConfigurationBuilder;ZILjava/lang/Object;)V
+SPLorg/acra/ACRA;->init(Landroid/app/Application;Lorg/acra/config/CoreConfiguration;Z)V
+SPLorg/acra/ACRA;->init(Landroid/app/Application;Lorg/acra/config/CoreConfigurationBuilder;Z)V
+SPLorg/acra/ACRA;->isACRASenderServiceProcess()Z
+SPLorg/acra/ACRA;->isInitialised()Z
+Lorg/acra/ErrorReporter;
+Lorg/acra/ReportField;
+SPLorg/acra/ReportField;->$values()[Lorg/acra/ReportField;
+SPLorg/acra/ReportField;-><clinit>()V
+SPLorg/acra/ReportField;-><init>(Ljava/lang/String;I)V
+Lorg/acra/attachment/AttachmentUriProvider;
+Lorg/acra/attachment/DefaultAttachmentProvider;
+Lorg/acra/builder/LastActivityManager;
+SPLorg/acra/builder/LastActivityManager;-><init>(Landroid/app/Application;)V
+SPLorg/acra/builder/LastActivityManager;->access$getActivityStack$p(Lorg/acra/builder/LastActivityManager;)Lorg/acra/collections/WeakStack;
+SPLorg/acra/builder/LastActivityManager;->access$getDestroyedCondition$p(Lorg/acra/builder/LastActivityManager;)Ljava/util/concurrent/locks/Condition;
+SPLorg/acra/builder/LastActivityManager;->access$getLock$p(Lorg/acra/builder/LastActivityManager;)Ljava/util/concurrent/locks/ReentrantLock;
+Lorg/acra/builder/LastActivityManager$1;
+SPLorg/acra/builder/LastActivityManager$1;-><init>(Lorg/acra/builder/LastActivityManager;)V
+SPLorg/acra/builder/LastActivityManager$1;->onActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
+SPLorg/acra/builder/LastActivityManager$1;->onActivityDestroyed(Landroid/app/Activity;)V
+SPLorg/acra/builder/LastActivityManager$1;->onActivityResumed(Landroid/app/Activity;)V
+SPLorg/acra/builder/LastActivityManager$1;->onActivityStarted(Landroid/app/Activity;)V
+Lorg/acra/builder/ReportExecutor;
+SPLorg/acra/builder/ReportExecutor;-><init>(Landroid/content/Context;Lorg/acra/config/CoreConfiguration;Lorg/acra/data/CrashReportDataFactory;Ljava/lang/Thread$UncaughtExceptionHandler;Lorg/acra/util/ProcessFinisher;Lorg/acra/scheduler/SchedulerStarter;Lorg/acra/builder/LastActivityManager;)V
+SPLorg/acra/builder/ReportExecutor;->setEnabled(Z)V
+Lorg/acra/collections/WeakStack;
+SPLorg/acra/collections/WeakStack;-><init>()V
+SPLorg/acra/collections/WeakStack;->add(Ljava/lang/Object;)Z
+SPLorg/acra/collections/WeakStack;->remove(Ljava/lang/Object;)Z
+Lorg/acra/collector/ApplicationStartupCollector;
+Lorg/acra/collector/BaseReportFieldCollector;
+SPLorg/acra/collector/BaseReportFieldCollector;-><init>([Lorg/acra/ReportField;)V
+Lorg/acra/collector/Collector;
+SPLorg/acra/collector/Collector;->getOrder()Lorg/acra/collector/Collector$Order;
+Lorg/acra/collector/Collector$Order;
+SPLorg/acra/collector/Collector$Order;->$values()[Lorg/acra/collector/Collector$Order;
+SPLorg/acra/collector/Collector$Order;-><clinit>()V
+SPLorg/acra/collector/Collector$Order;-><init>(Ljava/lang/String;I)V
+Lorg/acra/collector/CollectorException;
+Lorg/acra/collector/ConfigurationCollector;
+SPLorg/acra/collector/ConfigurationCollector;-><clinit>()V
+SPLorg/acra/collector/ConfigurationCollector;-><init>()V
+SPLorg/acra/collector/ConfigurationCollector;->collectApplicationStartUp(Landroid/content/Context;Lorg/acra/config/CoreConfiguration;)V
+Lorg/acra/collector/ConfigurationCollector$Companion;
+SPLorg/acra/collector/ConfigurationCollector$Companion;-><init>()V
+SPLorg/acra/collector/ConfigurationCollector$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lorg/acra/collector/CustomDataCollector;
+SPLorg/acra/collector/CustomDataCollector;-><init>()V
+Lorg/acra/collector/DeviceFeaturesCollector;
+SPLorg/acra/collector/DeviceFeaturesCollector;-><init>()V
+Lorg/acra/collector/DeviceIdCollector;
+SPLorg/acra/collector/DeviceIdCollector;-><init>()V
+Lorg/acra/collector/DisplayManagerCollector;
+SPLorg/acra/collector/DisplayManagerCollector;-><init>()V
+Lorg/acra/collector/DropBoxCollector;
+SPLorg/acra/collector/DropBoxCollector;-><clinit>()V
+SPLorg/acra/collector/DropBoxCollector;-><init>()V
+SPLorg/acra/collector/DropBoxCollector;->getOrder()Lorg/acra/collector/Collector$Order;
+Lorg/acra/collector/DropBoxCollector$Companion;
+SPLorg/acra/collector/DropBoxCollector$Companion;-><init>()V
+SPLorg/acra/collector/DropBoxCollector$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lorg/acra/collector/LogCatCollector;
+SPLorg/acra/collector/LogCatCollector;-><clinit>()V
+SPLorg/acra/collector/LogCatCollector;-><init>()V
+SPLorg/acra/collector/LogCatCollector;->getOrder()Lorg/acra/collector/Collector$Order;
+Lorg/acra/collector/LogCatCollector$Companion;
+SPLorg/acra/collector/LogCatCollector$Companion;-><init>()V
+SPLorg/acra/collector/LogCatCollector$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lorg/acra/collector/LogFileCollector;
+SPLorg/acra/collector/LogFileCollector;-><init>()V
+SPLorg/acra/collector/LogFileCollector;->getOrder()Lorg/acra/collector/Collector$Order;
+Lorg/acra/collector/MediaCodecListCollector;
+SPLorg/acra/collector/MediaCodecListCollector;-><clinit>()V
+SPLorg/acra/collector/MediaCodecListCollector;-><init>()V
+SPLorg/acra/collector/MediaCodecListCollector;->getOrder()Lorg/acra/collector/Collector$Order;
+Lorg/acra/collector/MediaCodecListCollector$Companion;
+SPLorg/acra/collector/MediaCodecListCollector$Companion;-><init>()V
+SPLorg/acra/collector/MediaCodecListCollector$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lorg/acra/collector/MemoryInfoCollector;
+SPLorg/acra/collector/MemoryInfoCollector;-><init>()V
+Lorg/acra/collector/PackageManagerCollector;
+SPLorg/acra/collector/PackageManagerCollector;-><init>()V
+Lorg/acra/collector/ReflectionCollector;
+SPLorg/acra/collector/ReflectionCollector;-><clinit>()V
+SPLorg/acra/collector/ReflectionCollector;-><init>()V
+Lorg/acra/collector/ReflectionCollector$Companion;
+SPLorg/acra/collector/ReflectionCollector$Companion;-><init>()V
+SPLorg/acra/collector/ReflectionCollector$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lorg/acra/collector/SettingsCollector;
+SPLorg/acra/collector/SettingsCollector;-><clinit>()V
+SPLorg/acra/collector/SettingsCollector;-><init>()V
+Lorg/acra/collector/SettingsCollector$Companion;
+SPLorg/acra/collector/SettingsCollector$Companion;-><init>()V
+SPLorg/acra/collector/SettingsCollector$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lorg/acra/collector/SharedPreferencesCollector;
+SPLorg/acra/collector/SharedPreferencesCollector;-><init>()V
+Lorg/acra/collector/SimpleValuesCollector;
+SPLorg/acra/collector/SimpleValuesCollector;-><clinit>()V
+SPLorg/acra/collector/SimpleValuesCollector;-><init>()V
+Lorg/acra/collector/SimpleValuesCollector$Companion;
+SPLorg/acra/collector/SimpleValuesCollector$Companion;-><init>()V
+SPLorg/acra/collector/SimpleValuesCollector$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lorg/acra/collector/StacktraceCollector;
+SPLorg/acra/collector/StacktraceCollector;-><init>()V
+SPLorg/acra/collector/StacktraceCollector;->getOrder()Lorg/acra/collector/Collector$Order;
+Lorg/acra/collector/ThreadCollector;
+SPLorg/acra/collector/ThreadCollector;-><init>()V
+SPLorg/acra/collector/ThreadCollector;->getOrder()Lorg/acra/collector/Collector$Order;
+Lorg/acra/collector/TimeCollector;
+SPLorg/acra/collector/TimeCollector;-><init>()V
+SPLorg/acra/collector/TimeCollector;->collectApplicationStartUp(Landroid/content/Context;Lorg/acra/config/CoreConfiguration;)V
+Lorg/acra/config/ACRAConfigurationException;
+Lorg/acra/config/ConfigUtils;
+SPLorg/acra/config/ConfigUtils;->findPluginConfiguration(Lorg/acra/config/CoreConfiguration;Ljava/lang/Class;)Lorg/acra/config/Configuration;
+SPLorg/acra/config/ConfigUtils;->getPluginConfiguration(Lorg/acra/config/CoreConfiguration;Ljava/lang/Class;)Lorg/acra/config/Configuration;
+Lorg/acra/config/Configuration;
+Lorg/acra/config/CoreConfiguration;
+SPLorg/acra/config/CoreConfiguration;-><init>(Ljava/lang/String;ZLjava/util/List;ILjava/util/List;Ljava/util/List;ZZLjava/util/List;ZZZLjava/util/List;Ljava/util/List;Ljava/lang/Class;Ljava/lang/String;ILorg/acra/file/Directory;Ljava/lang/Class;ZLjava/util/List;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Lorg/acra/data/StringFormat;ZLorg/acra/plugins/PluginLoader;Ljava/util/List;)V
+SPLorg/acra/config/CoreConfiguration;-><init>(Ljava/lang/String;ZLjava/util/List;ILjava/util/List;Ljava/util/List;ZZLjava/util/List;ZZZLjava/util/List;Ljava/util/List;Ljava/lang/Class;Ljava/lang/String;ILorg/acra/file/Directory;Ljava/lang/Class;ZLjava/util/List;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Lorg/acra/data/StringFormat;ZLorg/acra/plugins/PluginLoader;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLorg/acra/config/CoreConfiguration;->getDeleteUnapprovedReportsOnApplicationStart()Z
+SPLorg/acra/config/CoreConfiguration;->getPluginConfigurations()Ljava/util/List;
+SPLorg/acra/config/CoreConfiguration;->getPluginLoader()Lorg/acra/plugins/PluginLoader;
+SPLorg/acra/config/CoreConfiguration;->getReportContent()Ljava/util/List;
+SPLorg/acra/config/CoreConfiguration;->getSharedPreferencesName()Ljava/lang/String;
+Lorg/acra/config/CoreConfigurationBuilder;
+SPLorg/acra/config/CoreConfigurationBuilder;-><clinit>()V
+SPLorg/acra/config/CoreConfigurationBuilder;-><init>()V
+SPLorg/acra/config/CoreConfigurationBuilder;->access$get_defaultsBitField0$p(Lorg/acra/config/CoreConfigurationBuilder;)I
+SPLorg/acra/config/CoreConfigurationBuilder;->access$set_defaultsBitField0$p(Lorg/acra/config/CoreConfigurationBuilder;I)V
+SPLorg/acra/config/CoreConfigurationBuilder;->build()Lorg/acra/config/CoreConfiguration;
+SPLorg/acra/config/CoreConfigurationBuilder;->getAdditionalDropBoxTags()Ljava/util/List;
+SPLorg/acra/config/CoreConfigurationBuilder;->getAdditionalSharedPreferences()Ljava/util/List;
+SPLorg/acra/config/CoreConfigurationBuilder;->getAlsoReportToAndroidFramework()Ljava/lang/Boolean;
+SPLorg/acra/config/CoreConfigurationBuilder;->getApplicationLogFile()Ljava/lang/String;
+SPLorg/acra/config/CoreConfigurationBuilder;->getApplicationLogFileDir()Lorg/acra/file/Directory;
+SPLorg/acra/config/CoreConfigurationBuilder;->getApplicationLogFileLines()Ljava/lang/Integer;
+SPLorg/acra/config/CoreConfigurationBuilder;->getAttachmentUriProvider()Ljava/lang/Class;
+SPLorg/acra/config/CoreConfigurationBuilder;->getAttachmentUris()Ljava/util/List;
+SPLorg/acra/config/CoreConfigurationBuilder;->getBuildConfigClass()Ljava/lang/Class;
+SPLorg/acra/config/CoreConfigurationBuilder;->getDeleteUnapprovedReportsOnApplicationStart()Ljava/lang/Boolean;
+SPLorg/acra/config/CoreConfigurationBuilder;->getDropboxCollectionMinutes()Ljava/lang/Integer;
+SPLorg/acra/config/CoreConfigurationBuilder;->getExcludeMatchingSettingsKeys()Ljava/util/List;
+SPLorg/acra/config/CoreConfigurationBuilder;->getExcludeMatchingSharedPreferencesKeys()Ljava/util/List;
+SPLorg/acra/config/CoreConfigurationBuilder;->getIncludeDropBoxSystemTags()Ljava/lang/Boolean;
+SPLorg/acra/config/CoreConfigurationBuilder;->getLogcatArguments()Ljava/util/List;
+SPLorg/acra/config/CoreConfigurationBuilder;->getLogcatFilterByPid()Ljava/lang/Boolean;
+SPLorg/acra/config/CoreConfigurationBuilder;->getLogcatReadNonBlocking()Ljava/lang/Boolean;
+SPLorg/acra/config/CoreConfigurationBuilder;->getParallel()Ljava/lang/Boolean;
+SPLorg/acra/config/CoreConfigurationBuilder;->getPluginConfigurations()Ljava/util/List;
+SPLorg/acra/config/CoreConfigurationBuilder;->getPluginLoader()Lorg/acra/plugins/PluginLoader;
+SPLorg/acra/config/CoreConfigurationBuilder;->getReportContent()Ljava/util/List;
+SPLorg/acra/config/CoreConfigurationBuilder;->getReportFormat()Lorg/acra/data/StringFormat;
+SPLorg/acra/config/CoreConfigurationBuilder;->getReportSendFailureToast()Ljava/lang/String;
+SPLorg/acra/config/CoreConfigurationBuilder;->getReportSendSuccessToast()Ljava/lang/String;
+SPLorg/acra/config/CoreConfigurationBuilder;->getRetryPolicyClass()Ljava/lang/Class;
+SPLorg/acra/config/CoreConfigurationBuilder;->getSendReportsInDevMode()Ljava/lang/Boolean;
+SPLorg/acra/config/CoreConfigurationBuilder;->getSharedPreferencesName()Ljava/lang/String;
+SPLorg/acra/config/CoreConfigurationBuilder;->getStopServicesOnCrash()Ljava/lang/Boolean;
+SPLorg/acra/config/CoreConfigurationBuilder;->setBuildConfigClass(Ljava/lang/Class;)V
+SPLorg/acra/config/CoreConfigurationBuilder;->setExcludeMatchingSharedPreferencesKeys(Ljava/util/List;)V
+SPLorg/acra/config/CoreConfigurationBuilder;->setLogcatArguments(Ljava/util/List;)V
+SPLorg/acra/config/CoreConfigurationBuilder;->setPluginConfigurations(Ljava/util/List;)V
+SPLorg/acra/config/CoreConfigurationBuilder;->setReportContent(Ljava/util/List;)V
+SPLorg/acra/config/CoreConfigurationBuilder;->setSharedPreferencesName(Ljava/lang/String;)V
+SPLorg/acra/config/CoreConfigurationBuilder;->withBuildConfigClass(Ljava/lang/Class;)Lorg/acra/config/CoreConfigurationBuilder;
+SPLorg/acra/config/CoreConfigurationBuilder;->withExcludeMatchingSharedPreferencesKeys([Ljava/lang/String;)Lorg/acra/config/CoreConfigurationBuilder;
+SPLorg/acra/config/CoreConfigurationBuilder;->withLogcatArguments([Ljava/lang/String;)Lorg/acra/config/CoreConfigurationBuilder;
+SPLorg/acra/config/CoreConfigurationBuilder;->withPluginConfigurations([Lorg/acra/config/Configuration;)Lorg/acra/config/CoreConfigurationBuilder;
+SPLorg/acra/config/CoreConfigurationBuilder;->withReportContent([Lorg/acra/ReportField;)Lorg/acra/config/CoreConfigurationBuilder;
+SPLorg/acra/config/CoreConfigurationBuilder;->withSharedPreferencesName(Ljava/lang/String;)Lorg/acra/config/CoreConfigurationBuilder;
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$1;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$1;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$1;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$10;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$10;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$11;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$11;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$12;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$12;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$13;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$13;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$13;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$14;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$14;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$15;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$15;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$15;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$16;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$16;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$17;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$17;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$18;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$18;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$19;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$19;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$2;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$2;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$20;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$20;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$21;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$21;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$22;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$22;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$23;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$23;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$24;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$24;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$25;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$25;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$26;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$26;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$27;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$27;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$28;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$28;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$28;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$3;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$3;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$4;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$4;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$5;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$5;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$5;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$6;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$6;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$6;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$7;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$7;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$8;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$8;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$9;
+SPLorg/acra/config/CoreConfigurationBuilder$special$$inlined$observable$9;-><init>(Ljava/lang/Object;Lorg/acra/config/CoreConfigurationBuilder;)V
+Lorg/acra/config/DefaultRetryPolicy;
+Lorg/acra/config/DialogConfiguration;
+SPLorg/acra/config/DialogConfiguration;-><init>(ZLjava/lang/Class;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;)V
+SPLorg/acra/config/DialogConfiguration;-><init>(ZLjava/lang/Class;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lorg/acra/config/DialogConfigurationBuilder;
+SPLorg/acra/config/DialogConfigurationBuilder;-><clinit>()V
+SPLorg/acra/config/DialogConfigurationBuilder;-><init>()V
+SPLorg/acra/config/DialogConfigurationBuilder;->access$get_defaultsBitField0$p(Lorg/acra/config/DialogConfigurationBuilder;)I
+SPLorg/acra/config/DialogConfigurationBuilder;->access$set_defaultsBitField0$p(Lorg/acra/config/DialogConfigurationBuilder;I)V
+SPLorg/acra/config/DialogConfigurationBuilder;->build()Lorg/acra/config/DialogConfiguration;
+SPLorg/acra/config/DialogConfigurationBuilder;->getCommentPrompt()Ljava/lang/String;
+SPLorg/acra/config/DialogConfigurationBuilder;->getEmailPrompt()Ljava/lang/String;
+SPLorg/acra/config/DialogConfigurationBuilder;->getEnabled()Ljava/lang/Boolean;
+SPLorg/acra/config/DialogConfigurationBuilder;->getNegativeButtonText()Ljava/lang/String;
+SPLorg/acra/config/DialogConfigurationBuilder;->getPositiveButtonText()Ljava/lang/String;
+SPLorg/acra/config/DialogConfigurationBuilder;->getReportDialogClass()Ljava/lang/Class;
+SPLorg/acra/config/DialogConfigurationBuilder;->getResIcon()Ljava/lang/Integer;
+SPLorg/acra/config/DialogConfigurationBuilder;->getResTheme()Ljava/lang/Integer;
+SPLorg/acra/config/DialogConfigurationBuilder;->getText()Ljava/lang/String;
+SPLorg/acra/config/DialogConfigurationBuilder;->getTitle()Ljava/lang/String;
+SPLorg/acra/config/DialogConfigurationBuilder;->setCommentPrompt(Ljava/lang/String;)V
+SPLorg/acra/config/DialogConfigurationBuilder;->setEnabled(Ljava/lang/Boolean;)V
+SPLorg/acra/config/DialogConfigurationBuilder;->setPositiveButtonText(Ljava/lang/String;)V
+SPLorg/acra/config/DialogConfigurationBuilder;->setReportDialogClass(Ljava/lang/Class;)V
+SPLorg/acra/config/DialogConfigurationBuilder;->setResIcon(Ljava/lang/Integer;)V
+SPLorg/acra/config/DialogConfigurationBuilder;->setText(Ljava/lang/String;)V
+SPLorg/acra/config/DialogConfigurationBuilder;->setTitle(Ljava/lang/String;)V
+SPLorg/acra/config/DialogConfigurationBuilder;->withCommentPrompt(Ljava/lang/String;)Lorg/acra/config/DialogConfigurationBuilder;
+SPLorg/acra/config/DialogConfigurationBuilder;->withEnabled(Z)Lorg/acra/config/DialogConfigurationBuilder;
+SPLorg/acra/config/DialogConfigurationBuilder;->withPositiveButtonText(Ljava/lang/String;)Lorg/acra/config/DialogConfigurationBuilder;
+SPLorg/acra/config/DialogConfigurationBuilder;->withReportDialogClass(Ljava/lang/Class;)Lorg/acra/config/DialogConfigurationBuilder;
+SPLorg/acra/config/DialogConfigurationBuilder;->withResIcon(Ljava/lang/Integer;)Lorg/acra/config/DialogConfigurationBuilder;
+SPLorg/acra/config/DialogConfigurationBuilder;->withText(Ljava/lang/String;)Lorg/acra/config/DialogConfigurationBuilder;
+SPLorg/acra/config/DialogConfigurationBuilder;->withTitle(Ljava/lang/String;)Lorg/acra/config/DialogConfigurationBuilder;
+Lorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$1;
+SPLorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$1;-><init>(Ljava/lang/Object;Lorg/acra/config/DialogConfigurationBuilder;)V
+SPLorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$1;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$10;
+SPLorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$10;-><init>(Ljava/lang/Object;Lorg/acra/config/DialogConfigurationBuilder;)V
+Lorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$2;
+SPLorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$2;-><init>(Ljava/lang/Object;Lorg/acra/config/DialogConfigurationBuilder;)V
+SPLorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$2;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$3;
+SPLorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$3;-><init>(Ljava/lang/Object;Lorg/acra/config/DialogConfigurationBuilder;)V
+SPLorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$3;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$4;
+SPLorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$4;-><init>(Ljava/lang/Object;Lorg/acra/config/DialogConfigurationBuilder;)V
+Lorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$5;
+SPLorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$5;-><init>(Ljava/lang/Object;Lorg/acra/config/DialogConfigurationBuilder;)V
+SPLorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$5;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$6;
+SPLorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$6;-><init>(Ljava/lang/Object;Lorg/acra/config/DialogConfigurationBuilder;)V
+Lorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$7;
+SPLorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$7;-><init>(Ljava/lang/Object;Lorg/acra/config/DialogConfigurationBuilder;)V
+SPLorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$7;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$8;
+SPLorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$8;-><init>(Ljava/lang/Object;Lorg/acra/config/DialogConfigurationBuilder;)V
+SPLorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$8;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$9;
+SPLorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$9;-><init>(Ljava/lang/Object;Lorg/acra/config/DialogConfigurationBuilder;)V
+SPLorg/acra/config/DialogConfigurationBuilder$special$$inlined$observable$9;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/HttpSenderConfiguration;
+SPLorg/acra/config/HttpSenderConfiguration;-><init>(ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/acra/sender/HttpSender$Method;IIZLjava/lang/Class;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;ZZLjava/util/List;Ljava/util/Map;)V
+SPLorg/acra/config/HttpSenderConfiguration;-><init>(ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/acra/sender/HttpSender$Method;IIZLjava/lang/Class;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;ZZLjava/util/List;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lorg/acra/config/HttpSenderConfigurationBuilder;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;-><clinit>()V
+SPLorg/acra/config/HttpSenderConfigurationBuilder;-><init>()V
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->access$get_defaultsBitField0$p(Lorg/acra/config/HttpSenderConfigurationBuilder;)I
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->access$set_defaultsBitField0$p(Lorg/acra/config/HttpSenderConfigurationBuilder;I)V
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->build()Lorg/acra/config/HttpSenderConfiguration;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->getBasicAuthLogin()Ljava/lang/String;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->getBasicAuthPassword()Ljava/lang/String;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->getCertificatePath()Ljava/lang/String;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->getCertificateType()Ljava/lang/String;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->getChunked()Ljava/lang/Boolean;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->getCompress()Ljava/lang/Boolean;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->getConnectionTimeout()Ljava/lang/Integer;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->getDropReportsOnTimeout()Ljava/lang/Boolean;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->getEnabled()Ljava/lang/Boolean;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->getHttpHeaders()Ljava/util/Map;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->getHttpMethod()Lorg/acra/sender/HttpSender$Method;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->getKeyStoreFactoryClass()Ljava/lang/Class;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->getResCertificate()Ljava/lang/Integer;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->getSocketTimeout()Ljava/lang/Integer;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->getTlsProtocols()Ljava/util/List;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->setEnabled(Ljava/lang/Boolean;)V
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->setHttpMethod(Lorg/acra/sender/HttpSender$Method;)V
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->withEnabled(Z)Lorg/acra/config/HttpSenderConfigurationBuilder;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->withHttpMethod(Lorg/acra/sender/HttpSender$Method;)Lorg/acra/config/HttpSenderConfigurationBuilder;
+SPLorg/acra/config/HttpSenderConfigurationBuilder;->withUri(Ljava/lang/String;)Lorg/acra/config/HttpSenderConfigurationBuilder;
+Lorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$1;
+SPLorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$1;-><init>(Ljava/lang/Object;Lorg/acra/config/HttpSenderConfigurationBuilder;)V
+SPLorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$1;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$10;
+SPLorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$10;-><init>(Ljava/lang/Object;Lorg/acra/config/HttpSenderConfigurationBuilder;)V
+Lorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$11;
+SPLorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$11;-><init>(Ljava/lang/Object;Lorg/acra/config/HttpSenderConfigurationBuilder;)V
+Lorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$12;
+SPLorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$12;-><init>(Ljava/lang/Object;Lorg/acra/config/HttpSenderConfigurationBuilder;)V
+Lorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$13;
+SPLorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$13;-><init>(Ljava/lang/Object;Lorg/acra/config/HttpSenderConfigurationBuilder;)V
+Lorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$14;
+SPLorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$14;-><init>(Ljava/lang/Object;Lorg/acra/config/HttpSenderConfigurationBuilder;)V
+Lorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$15;
+SPLorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$15;-><init>(Ljava/lang/Object;Lorg/acra/config/HttpSenderConfigurationBuilder;)V
+Lorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$2;
+SPLorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$2;-><init>(Ljava/lang/Object;Lorg/acra/config/HttpSenderConfigurationBuilder;)V
+Lorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$3;
+SPLorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$3;-><init>(Ljava/lang/Object;Lorg/acra/config/HttpSenderConfigurationBuilder;)V
+Lorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$4;
+SPLorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$4;-><init>(Ljava/lang/Object;Lorg/acra/config/HttpSenderConfigurationBuilder;)V
+SPLorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$4;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$5;
+SPLorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$5;-><init>(Ljava/lang/Object;Lorg/acra/config/HttpSenderConfigurationBuilder;)V
+Lorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$6;
+SPLorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$6;-><init>(Ljava/lang/Object;Lorg/acra/config/HttpSenderConfigurationBuilder;)V
+Lorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$7;
+SPLorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$7;-><init>(Ljava/lang/Object;Lorg/acra/config/HttpSenderConfigurationBuilder;)V
+Lorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$8;
+SPLorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$8;-><init>(Ljava/lang/Object;Lorg/acra/config/HttpSenderConfigurationBuilder;)V
+Lorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$9;
+SPLorg/acra/config/HttpSenderConfigurationBuilder$special$$inlined$observable$9;-><init>(Ljava/lang/Object;Lorg/acra/config/HttpSenderConfigurationBuilder;)V
+Lorg/acra/config/LimiterConfiguration;
+SPLorg/acra/config/LimiterConfiguration;-><init>(ZLjava/util/concurrent/TimeUnit;JIIIILjava/lang/String;ZZ)V
+SPLorg/acra/config/LimiterConfiguration;-><init>(ZLjava/util/concurrent/TimeUnit;JIIIILjava/lang/String;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLorg/acra/config/LimiterConfiguration;->enabled()Z
+SPLorg/acra/config/LimiterConfiguration;->getDeleteReportsOnAppUpdate()Z
+Lorg/acra/config/LimiterConfigurationBuilder;
+SPLorg/acra/config/LimiterConfigurationBuilder;-><clinit>()V
+SPLorg/acra/config/LimiterConfigurationBuilder;-><init>()V
+SPLorg/acra/config/LimiterConfigurationBuilder;->access$get_defaultsBitField0$p(Lorg/acra/config/LimiterConfigurationBuilder;)I
+SPLorg/acra/config/LimiterConfigurationBuilder;->access$set_defaultsBitField0$p(Lorg/acra/config/LimiterConfigurationBuilder;I)V
+SPLorg/acra/config/LimiterConfigurationBuilder;->build()Lorg/acra/config/LimiterConfiguration;
+SPLorg/acra/config/LimiterConfigurationBuilder;->getDeleteReportsOnAppUpdate()Ljava/lang/Boolean;
+SPLorg/acra/config/LimiterConfigurationBuilder;->getEnabled()Ljava/lang/Boolean;
+SPLorg/acra/config/LimiterConfigurationBuilder;->getExceptionClassLimit()Ljava/lang/Integer;
+SPLorg/acra/config/LimiterConfigurationBuilder;->getFailedReportLimit()Ljava/lang/Integer;
+SPLorg/acra/config/LimiterConfigurationBuilder;->getIgnoredCrashToast()Ljava/lang/String;
+SPLorg/acra/config/LimiterConfigurationBuilder;->getOverallLimit()Ljava/lang/Integer;
+SPLorg/acra/config/LimiterConfigurationBuilder;->getPeriod()Ljava/lang/Long;
+SPLorg/acra/config/LimiterConfigurationBuilder;->getPeriodUnit()Ljava/util/concurrent/TimeUnit;
+SPLorg/acra/config/LimiterConfigurationBuilder;->getResetLimitsOnAppUpdate()Ljava/lang/Boolean;
+SPLorg/acra/config/LimiterConfigurationBuilder;->getStacktraceLimit()Ljava/lang/Integer;
+SPLorg/acra/config/LimiterConfigurationBuilder;->setDeleteReportsOnAppUpdate(Ljava/lang/Boolean;)V
+SPLorg/acra/config/LimiterConfigurationBuilder;->setEnabled(Ljava/lang/Boolean;)V
+SPLorg/acra/config/LimiterConfigurationBuilder;->setExceptionClassLimit(Ljava/lang/Integer;)V
+SPLorg/acra/config/LimiterConfigurationBuilder;->setResetLimitsOnAppUpdate(Ljava/lang/Boolean;)V
+SPLorg/acra/config/LimiterConfigurationBuilder;->setStacktraceLimit(Ljava/lang/Integer;)V
+SPLorg/acra/config/LimiterConfigurationBuilder;->withDeleteReportsOnAppUpdate(Z)Lorg/acra/config/LimiterConfigurationBuilder;
+SPLorg/acra/config/LimiterConfigurationBuilder;->withEnabled(Z)Lorg/acra/config/LimiterConfigurationBuilder;
+SPLorg/acra/config/LimiterConfigurationBuilder;->withExceptionClassLimit(I)Lorg/acra/config/LimiterConfigurationBuilder;
+SPLorg/acra/config/LimiterConfigurationBuilder;->withResetLimitsOnAppUpdate(Z)Lorg/acra/config/LimiterConfigurationBuilder;
+SPLorg/acra/config/LimiterConfigurationBuilder;->withStacktraceLimit(I)Lorg/acra/config/LimiterConfigurationBuilder;
+Lorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$1;
+SPLorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$1;-><init>(Ljava/lang/Object;Lorg/acra/config/LimiterConfigurationBuilder;)V
+SPLorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$1;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$10;
+SPLorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$10;-><init>(Ljava/lang/Object;Lorg/acra/config/LimiterConfigurationBuilder;)V
+SPLorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$10;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$2;
+SPLorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$2;-><init>(Ljava/lang/Object;Lorg/acra/config/LimiterConfigurationBuilder;)V
+Lorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$3;
+SPLorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$3;-><init>(Ljava/lang/Object;Lorg/acra/config/LimiterConfigurationBuilder;)V
+Lorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$4;
+SPLorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$4;-><init>(Ljava/lang/Object;Lorg/acra/config/LimiterConfigurationBuilder;)V
+Lorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$5;
+SPLorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$5;-><init>(Ljava/lang/Object;Lorg/acra/config/LimiterConfigurationBuilder;)V
+SPLorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$5;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$6;
+SPLorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$6;-><init>(Ljava/lang/Object;Lorg/acra/config/LimiterConfigurationBuilder;)V
+SPLorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$6;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$7;
+SPLorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$7;-><init>(Ljava/lang/Object;Lorg/acra/config/LimiterConfigurationBuilder;)V
+Lorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$8;
+SPLorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$8;-><init>(Ljava/lang/Object;Lorg/acra/config/LimiterConfigurationBuilder;)V
+Lorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$9;
+SPLorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$9;-><init>(Ljava/lang/Object;Lorg/acra/config/LimiterConfigurationBuilder;)V
+SPLorg/acra/config/LimiterConfigurationBuilder$special$$inlined$observable$9;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/LimitingReportAdministrator;
+SPLorg/acra/config/LimitingReportAdministrator;-><init>()V
+Lorg/acra/config/ReportingAdministrator;
+Lorg/acra/config/RetryPolicy;
+Lorg/acra/config/ToastConfiguration;
+SPLorg/acra/config/ToastConfiguration;-><init>(ZLjava/lang/String;I)V
+SPLorg/acra/config/ToastConfiguration;-><init>(ZLjava/lang/String;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lorg/acra/config/ToastConfigurationBuilder;
+SPLorg/acra/config/ToastConfigurationBuilder;-><clinit>()V
+SPLorg/acra/config/ToastConfigurationBuilder;-><init>()V
+SPLorg/acra/config/ToastConfigurationBuilder;->access$get_defaultsBitField0$p(Lorg/acra/config/ToastConfigurationBuilder;)I
+SPLorg/acra/config/ToastConfigurationBuilder;->access$set_defaultsBitField0$p(Lorg/acra/config/ToastConfigurationBuilder;I)V
+SPLorg/acra/config/ToastConfigurationBuilder;->build()Lorg/acra/config/ToastConfiguration;
+SPLorg/acra/config/ToastConfigurationBuilder;->getEnabled()Ljava/lang/Boolean;
+SPLorg/acra/config/ToastConfigurationBuilder;->getLength()Ljava/lang/Integer;
+SPLorg/acra/config/ToastConfigurationBuilder;->setEnabled(Ljava/lang/Boolean;)V
+SPLorg/acra/config/ToastConfigurationBuilder;->withEnabled(Z)Lorg/acra/config/ToastConfigurationBuilder;
+SPLorg/acra/config/ToastConfigurationBuilder;->withText(Ljava/lang/String;)Lorg/acra/config/ToastConfigurationBuilder;
+Lorg/acra/config/ToastConfigurationBuilder$special$$inlined$observable$1;
+SPLorg/acra/config/ToastConfigurationBuilder$special$$inlined$observable$1;-><init>(Ljava/lang/Object;Lorg/acra/config/ToastConfigurationBuilder;)V
+SPLorg/acra/config/ToastConfigurationBuilder$special$$inlined$observable$1;->afterChange(Lkotlin/reflect/KProperty;Ljava/lang/Object;Ljava/lang/Object;)V
+Lorg/acra/config/ToastConfigurationBuilder$special$$inlined$observable$2;
+SPLorg/acra/config/ToastConfigurationBuilder$special$$inlined$observable$2;-><init>(Ljava/lang/Object;Lorg/acra/config/ToastConfigurationBuilder;)V
+Lorg/acra/data/CrashReportDataFactory;
+SPLorg/acra/data/CrashReportDataFactory;-><init>(Landroid/content/Context;Lorg/acra/config/CoreConfiguration;)V
+SPLorg/acra/data/CrashReportDataFactory;->access$getSafeOrder(Lorg/acra/data/CrashReportDataFactory;Lorg/acra/collector/Collector;)Lorg/acra/collector/Collector$Order;
+SPLorg/acra/data/CrashReportDataFactory;->collectStartUp()V
+SPLorg/acra/data/CrashReportDataFactory;->getSafeOrder(Lorg/acra/collector/Collector;)Lorg/acra/collector/Collector$Order;
+Lorg/acra/data/CrashReportDataFactory$special$$inlined$sortedBy$1;
+SPLorg/acra/data/CrashReportDataFactory$special$$inlined$sortedBy$1;-><init>(Lorg/acra/data/CrashReportDataFactory;)V
+SPLorg/acra/data/CrashReportDataFactory$special$$inlined$sortedBy$1;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
+Lorg/acra/data/StringFormat;
+SPLorg/acra/data/StringFormat;->$values()[Lorg/acra/data/StringFormat;
+SPLorg/acra/data/StringFormat;-><clinit>()V
+SPLorg/acra/data/StringFormat;-><init>(Ljava/lang/String;ILjava/lang/String;)V
+SPLorg/acra/data/StringFormat;-><init>(Ljava/lang/String;ILjava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lorg/acra/data/StringFormat$JSON;
+SPLorg/acra/data/StringFormat$JSON;-><init>(Ljava/lang/String;I)V
+Lorg/acra/data/StringFormat$KEY_VALUE_LIST;
+SPLorg/acra/data/StringFormat$KEY_VALUE_LIST;-><init>(Ljava/lang/String;I)V
+Lorg/acra/dialog/CrashReportDialog;
+Lorg/acra/file/CrashReportFileNameParser;
+SPLorg/acra/file/CrashReportFileNameParser;-><init>()V
+Lorg/acra/file/Directory;
+SPLorg/acra/file/Directory;->$values()[Lorg/acra/file/Directory;
+SPLorg/acra/file/Directory;-><clinit>()V
+SPLorg/acra/file/Directory;-><init>(Ljava/lang/String;I)V
+SPLorg/acra/file/Directory;-><init>(Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lorg/acra/file/Directory$CACHE;
+SPLorg/acra/file/Directory$CACHE;-><init>(Ljava/lang/String;I)V
+Lorg/acra/file/Directory$EXTERNAL_CACHE;
+SPLorg/acra/file/Directory$EXTERNAL_CACHE;-><init>(Ljava/lang/String;I)V
+Lorg/acra/file/Directory$EXTERNAL_FILES;
+SPLorg/acra/file/Directory$EXTERNAL_FILES;-><init>(Ljava/lang/String;I)V
+Lorg/acra/file/Directory$EXTERNAL_STORAGE;
+SPLorg/acra/file/Directory$EXTERNAL_STORAGE;-><init>(Ljava/lang/String;I)V
+Lorg/acra/file/Directory$FILES;
+SPLorg/acra/file/Directory$FILES;-><init>(Ljava/lang/String;I)V
+Lorg/acra/file/Directory$FILES_LEGACY;
+SPLorg/acra/file/Directory$FILES_LEGACY;-><init>(Ljava/lang/String;I)V
+Lorg/acra/file/Directory$NO_BACKUP_FILES;
+SPLorg/acra/file/Directory$NO_BACKUP_FILES;-><init>(Ljava/lang/String;I)V
+Lorg/acra/file/Directory$ROOT;
+SPLorg/acra/file/Directory$ROOT;-><init>(Ljava/lang/String;I)V
+Lorg/acra/file/ReportLocator;
+SPLorg/acra/file/ReportLocator;-><clinit>()V
+SPLorg/acra/file/ReportLocator;-><init>(Landroid/content/Context;)V
+SPLorg/acra/file/ReportLocator;->getApprovedFolder()Ljava/io/File;
+SPLorg/acra/file/ReportLocator;->getApprovedReports()[Ljava/io/File;
+SPLorg/acra/file/ReportLocator;->getUnapprovedFolder()Ljava/io/File;
+SPLorg/acra/file/ReportLocator;->getUnapprovedReports()[Ljava/io/File;
+Lorg/acra/file/ReportLocator$Companion;
+SPLorg/acra/file/ReportLocator$Companion;-><init>()V
+SPLorg/acra/file/ReportLocator$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lorg/acra/file/ReportLocator$special$$inlined$sortedBy$1;
+SPLorg/acra/file/ReportLocator$special$$inlined$sortedBy$1;-><init>()V
+Lorg/acra/log/ACRALog;
+Lorg/acra/log/AndroidLogDelegate;
+SPLorg/acra/log/AndroidLogDelegate;-><init>()V
+SPLorg/acra/log/AndroidLogDelegate;->i(Ljava/lang/String;Ljava/lang/String;)I
+SPLorg/acra/log/AndroidLogDelegate;->w(Ljava/lang/String;Ljava/lang/String;)I
+Lorg/acra/plugins/HasConfigPlugin;
+SPLorg/acra/plugins/HasConfigPlugin;-><init>(Ljava/lang/Class;)V
+SPLorg/acra/plugins/HasConfigPlugin;->enabled(Lorg/acra/config/CoreConfiguration;)Z
+Lorg/acra/plugins/Plugin;
+SPLorg/acra/plugins/Plugin;->enabled(Lorg/acra/config/CoreConfiguration;)Z
+Lorg/acra/plugins/PluginLoader;
+Lorg/acra/plugins/ServicePluginLoader;
+SPLorg/acra/plugins/ServicePluginLoader;-><init>()V
+SPLorg/acra/plugins/ServicePluginLoader;->loadEnabled$lambda$1(Lorg/acra/config/CoreConfiguration;Lorg/acra/plugins/Plugin;)Z
+SPLorg/acra/plugins/ServicePluginLoader;->loadEnabled(Lorg/acra/config/CoreConfiguration;Ljava/lang/Class;)Ljava/util/List;
+SPLorg/acra/plugins/ServicePluginLoader;->loadInternal(Ljava/lang/Class;Lkotlin/jvm/functions/Function1;)Ljava/util/List;
+Lorg/acra/plugins/ServicePluginLoader$$ExternalSyntheticLambda1;
+SPLorg/acra/plugins/ServicePluginLoader$$ExternalSyntheticLambda1;-><init>(Lorg/acra/config/CoreConfiguration;)V
+SPLorg/acra/plugins/ServicePluginLoader$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+Lorg/acra/prefs/SharedPreferencesFactory;
+SPLorg/acra/prefs/SharedPreferencesFactory;-><clinit>()V
+SPLorg/acra/prefs/SharedPreferencesFactory;-><init>(Landroid/content/Context;Lorg/acra/config/CoreConfiguration;)V
+SPLorg/acra/prefs/SharedPreferencesFactory;->create()Landroid/content/SharedPreferences;
+Lorg/acra/prefs/SharedPreferencesFactory$Companion;
+SPLorg/acra/prefs/SharedPreferencesFactory$Companion;-><init>()V
+SPLorg/acra/prefs/SharedPreferencesFactory$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLorg/acra/prefs/SharedPreferencesFactory$Companion;->shouldEnableACRA(Landroid/content/SharedPreferences;)Z
+Lorg/acra/reporter/ErrorReporterImpl;
+SPLorg/acra/reporter/ErrorReporterImpl;-><init>(Landroid/app/Application;Lorg/acra/config/CoreConfiguration;ZZZ)V
+SPLorg/acra/reporter/ErrorReporterImpl;->putCustomData(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+SPLorg/acra/reporter/ErrorReporterImpl;->unregister()V
+Lorg/acra/scheduler/DefaultSenderScheduler;
+SPLorg/acra/scheduler/DefaultSenderScheduler;-><init>(Landroid/content/Context;Lorg/acra/config/CoreConfiguration;)V
+Lorg/acra/scheduler/SchedulerStarter;
+SPLorg/acra/scheduler/SchedulerStarter;-><init>(Landroid/content/Context;Lorg/acra/config/CoreConfiguration;)V
+Lorg/acra/scheduler/SenderScheduler;
+Lorg/acra/scheduler/SenderSchedulerFactory;
+Lorg/acra/security/KeyStoreFactory;
+Lorg/acra/security/NoKeyStoreFactory;
+Lorg/acra/security/TLS;
+SPLorg/acra/security/TLS;->$values()[Lorg/acra/security/TLS;
+SPLorg/acra/security/TLS;-><clinit>()V
+SPLorg/acra/security/TLS;-><init>(Ljava/lang/String;ILjava/lang/String;I)V
+Lorg/acra/sender/HttpSender$Method;
+SPLorg/acra/sender/HttpSender$Method;->$values()[Lorg/acra/sender/HttpSender$Method;
+SPLorg/acra/sender/HttpSender$Method;-><clinit>()V
+SPLorg/acra/sender/HttpSender$Method;-><init>(Ljava/lang/String;I)V
+SPLorg/acra/sender/HttpSender$Method;-><init>(Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lorg/acra/sender/HttpSender$Method$POST;
+SPLorg/acra/sender/HttpSender$Method$POST;-><init>(Ljava/lang/String;I)V
+Lorg/acra/sender/HttpSender$Method$PUT;
+SPLorg/acra/sender/HttpSender$Method$PUT;-><init>(Ljava/lang/String;I)V
+Lorg/acra/startup/LimiterStartupProcessor;
+SPLorg/acra/startup/LimiterStartupProcessor;-><init>()V
+SPLorg/acra/startup/LimiterStartupProcessor;->getAppVersion(Landroid/content/Context;)J
+SPLorg/acra/startup/LimiterStartupProcessor;->processReports(Landroid/content/Context;Lorg/acra/config/CoreConfiguration;Ljava/util/List;)V
+Lorg/acra/startup/StartupProcessor;
+Lorg/acra/startup/StartupProcessorExecutor;
+SPLorg/acra/startup/StartupProcessorExecutor;-><init>(Landroid/content/Context;Lorg/acra/config/CoreConfiguration;Lorg/acra/scheduler/SchedulerStarter;)V
+SPLorg/acra/startup/StartupProcessorExecutor;->processReports$lambda$6$lambda$5(Lorg/acra/startup/StartupProcessorExecutor;Ljava/util/Calendar;Z)V
+SPLorg/acra/startup/StartupProcessorExecutor;->processReports$lambda$6(Lorg/acra/startup/StartupProcessorExecutor;Ljava/util/Calendar;Z)V
+SPLorg/acra/startup/StartupProcessorExecutor;->processReports(Z)V
+Lorg/acra/startup/StartupProcessorExecutor$$ExternalSyntheticLambda0;
+SPLorg/acra/startup/StartupProcessorExecutor$$ExternalSyntheticLambda0;-><init>(Lorg/acra/startup/StartupProcessorExecutor;Ljava/util/Calendar;Z)V
+SPLorg/acra/startup/StartupProcessorExecutor$$ExternalSyntheticLambda0;->run()V
+Lorg/acra/startup/StartupProcessorExecutor$$ExternalSyntheticLambda1;
+SPLorg/acra/startup/StartupProcessorExecutor$$ExternalSyntheticLambda1;-><init>(Lorg/acra/startup/StartupProcessorExecutor;Ljava/util/Calendar;Z)V
+SPLorg/acra/startup/StartupProcessorExecutor$$ExternalSyntheticLambda1;->run()V
+Lorg/acra/startup/UnapprovedStartupProcessor;
+SPLorg/acra/startup/UnapprovedStartupProcessor;-><init>()V
+SPLorg/acra/startup/UnapprovedStartupProcessor;->processReports(Landroid/content/Context;Lorg/acra/config/CoreConfiguration;Ljava/util/List;)V
+Lorg/acra/util/Installation;
+SPLorg/acra/util/Installation;-><clinit>()V
+SPLorg/acra/util/Installation;-><init>()V
+SPLorg/acra/util/Installation;->id(Landroid/content/Context;)Ljava/lang/String;
+Lorg/acra/util/PackageManagerWrapper;
+SPLorg/acra/util/PackageManagerWrapper;-><init>(Landroid/content/Context;)V
+SPLorg/acra/util/PackageManagerWrapper;->getPackageInfo()Landroid/content/pm/PackageInfo;
+Lorg/acra/util/PackageManagerWrapperKt;
+SPLorg/acra/util/PackageManagerWrapperKt;->getVersionCodeLong(Landroid/content/pm/PackageInfo;)J
+Lorg/acra/util/ProcessFinisher;
+SPLorg/acra/util/ProcessFinisher;-><init>(Landroid/content/Context;Lorg/acra/config/CoreConfiguration;Lorg/acra/builder/LastActivityManager;)V
+Lorg/acra/util/StreamReader;
+SPLorg/acra/util/StreamReader;-><clinit>()V
+SPLorg/acra/util/StreamReader;-><init>(Ljava/io/File;)V
+SPLorg/acra/util/StreamReader;-><init>(Ljava/io/InputStream;IILkotlin/jvm/functions/Function1;)V
+SPLorg/acra/util/StreamReader;-><init>(Ljava/io/InputStream;IILkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLorg/acra/util/StreamReader;-><init>(Ljava/lang/String;)V
+SPLorg/acra/util/StreamReader;->read()Ljava/lang/String;
+SPLorg/acra/util/StreamReader;->readFully()Ljava/lang/String;
+Lorg/acra/util/StreamReader$Companion;
+SPLorg/acra/util/StreamReader$Companion;-><init>()V
+SPLorg/acra/util/StreamReader$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lorg/acra/util/StubCreator;
+SPLorg/acra/util/StubCreator;-><clinit>()V
+SPLorg/acra/util/StubCreator;-><init>()V
+SPLorg/acra/util/StubCreator;->createErrorReporterStub()Lorg/acra/ErrorReporter;
+SPLorg/acra/util/StubCreator;->createStub(Ljava/lang/Class;Ljava/lang/reflect/InvocationHandler;)Ljava/lang/Object;
+Lorg/acra/util/StubCreator$$ExternalSyntheticLambda0;
+SPLorg/acra/util/StubCreator$$ExternalSyntheticLambda0;-><init>()V
+Lorg/acra/util/SystemServices$ServiceNotReachedException;
+Lorg/slf4j/ILoggerFactory;
+Lorg/slf4j/IMarkerFactory;
+Lorg/slf4j/Logger;
+Lorg/slf4j/LoggerFactory;
+SPLorg/slf4j/LoggerFactory;-><clinit>()V
+SPLorg/slf4j/LoggerFactory;->bind()V
+SPLorg/slf4j/LoggerFactory;->earlyBindMDCAdapter()V
+SPLorg/slf4j/LoggerFactory;->findServiceProviders()Ljava/util/List;
+SPLorg/slf4j/LoggerFactory;->fixSubstituteLoggers()V
+SPLorg/slf4j/LoggerFactory;->getILoggerFactory()Lorg/slf4j/ILoggerFactory;
+SPLorg/slf4j/LoggerFactory;->getLogger(Ljava/lang/Class;)Lorg/slf4j/Logger;
+SPLorg/slf4j/LoggerFactory;->getLogger(Ljava/lang/String;)Lorg/slf4j/Logger;
+SPLorg/slf4j/LoggerFactory;->getProvider()Lorg/slf4j/spi/SLF4JServiceProvider;
+SPLorg/slf4j/LoggerFactory;->getServiceLoader(Ljava/lang/ClassLoader;)Ljava/util/ServiceLoader;
+SPLorg/slf4j/LoggerFactory;->isAmbiguousProviderList(Ljava/util/List;)Z
+SPLorg/slf4j/LoggerFactory;->loadExplicitlySpecified(Ljava/lang/ClassLoader;)Lorg/slf4j/spi/SLF4JServiceProvider;
+SPLorg/slf4j/LoggerFactory;->performInitialization()V
+SPLorg/slf4j/LoggerFactory;->postBindCleanUp()V
+SPLorg/slf4j/LoggerFactory;->replayEvents()V
+SPLorg/slf4j/LoggerFactory;->reportActualBinding(Ljava/util/List;)V
+SPLorg/slf4j/LoggerFactory;->reportMultipleBindingAmbiguity(Ljava/util/List;)V
+SPLorg/slf4j/LoggerFactory;->safelyInstantiate(Ljava/util/List;Ljava/util/Iterator;)V
+SPLorg/slf4j/LoggerFactory;->versionSanityCheck()V
+Lorg/slf4j/MDC;
+SPLorg/slf4j/MDC;->setMDCAdapter(Lorg/slf4j/spi/MDCAdapter;)V
+Lorg/slf4j/event/Level;
+SPLorg/slf4j/event/Level;->$values()[Lorg/slf4j/event/Level;
+SPLorg/slf4j/event/Level;-><clinit>()V
+SPLorg/slf4j/event/Level;-><init>(Ljava/lang/String;IILjava/lang/String;)V
+SPLorg/slf4j/event/Level;->values()[Lorg/slf4j/event/Level;
+Lorg/slf4j/helpers/AbstractLogger;
+SPLorg/slf4j/helpers/AbstractLogger;-><init>()V
+SPLorg/slf4j/helpers/AbstractLogger;->debug(Ljava/lang/String;Ljava/lang/Object;)V
+SPLorg/slf4j/helpers/AbstractLogger;->handle_0ArgsCall(Lorg/slf4j/event/Level;Lorg/slf4j/Marker;Ljava/lang/String;Ljava/lang/Throwable;)V
+SPLorg/slf4j/helpers/AbstractLogger;->handle_1ArgsCall(Lorg/slf4j/event/Level;Lorg/slf4j/Marker;Ljava/lang/String;Ljava/lang/Object;)V
+SPLorg/slf4j/helpers/AbstractLogger;->info(Lorg/slf4j/Marker;Ljava/lang/String;Ljava/lang/Throwable;)V
+Lorg/slf4j/helpers/BasicMDCAdapter;
+SPLorg/slf4j/helpers/BasicMDCAdapter;-><init>()V
+Lorg/slf4j/helpers/BasicMDCAdapter$1;
+SPLorg/slf4j/helpers/BasicMDCAdapter$1;-><init>(Lorg/slf4j/helpers/BasicMDCAdapter;)V
+Lorg/slf4j/helpers/BasicMarkerFactory;
+SPLorg/slf4j/helpers/BasicMarkerFactory;-><init>()V
+Lorg/slf4j/helpers/FormattingTuple;
+SPLorg/slf4j/helpers/FormattingTuple;-><clinit>()V
+SPLorg/slf4j/helpers/FormattingTuple;-><init>(Ljava/lang/String;)V
+SPLorg/slf4j/helpers/FormattingTuple;-><init>(Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/Throwable;)V
+SPLorg/slf4j/helpers/FormattingTuple;->getMessage()Ljava/lang/String;
+Lorg/slf4j/helpers/LegacyAbstractLogger;
+SPLorg/slf4j/helpers/LegacyAbstractLogger;-><init>()V
+SPLorg/slf4j/helpers/LegacyAbstractLogger;->isInfoEnabled(Lorg/slf4j/Marker;)Z
+Lorg/slf4j/helpers/MessageFormatter;
+SPLorg/slf4j/helpers/MessageFormatter;->arrayFormat(Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/Throwable;)Lorg/slf4j/helpers/FormattingTuple;
+SPLorg/slf4j/helpers/MessageFormatter;->basicArrayFormat(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+SPLorg/slf4j/helpers/MessageFormatter;->deeplyAppendParameter(Ljava/lang/StringBuilder;Ljava/lang/Object;Ljava/util/Map;)V
+SPLorg/slf4j/helpers/MessageFormatter;->isEscapedDelimeter(Ljava/lang/String;I)Z
+SPLorg/slf4j/helpers/MessageFormatter;->safeObjectAppend(Ljava/lang/StringBuilder;Ljava/lang/Object;)V
+Lorg/slf4j/helpers/NOPLoggerFactory;
+SPLorg/slf4j/helpers/NOPLoggerFactory;-><init>()V
+Lorg/slf4j/helpers/NOPMDCAdapter;
+SPLorg/slf4j/helpers/NOPMDCAdapter;-><init>()V
+Lorg/slf4j/helpers/NOP_FallbackServiceProvider;
+SPLorg/slf4j/helpers/NOP_FallbackServiceProvider;-><clinit>()V
+SPLorg/slf4j/helpers/NOP_FallbackServiceProvider;-><init>()V
+Lorg/slf4j/helpers/Reporter;
+SPLorg/slf4j/helpers/Reporter;-><clinit>()V
+SPLorg/slf4j/helpers/Reporter;->debug(Ljava/lang/String;)V
+SPLorg/slf4j/helpers/Reporter;->getTargetChoice()Lorg/slf4j/helpers/Reporter$TargetChoice;
+SPLorg/slf4j/helpers/Reporter;->initVerbosity()Lorg/slf4j/helpers/Reporter$Level;
+SPLorg/slf4j/helpers/Reporter;->isEnabledFor(Lorg/slf4j/helpers/Reporter$Level;)Z
+Lorg/slf4j/helpers/Reporter$Level;
+SPLorg/slf4j/helpers/Reporter$Level;->$values()[Lorg/slf4j/helpers/Reporter$Level;
+SPLorg/slf4j/helpers/Reporter$Level;-><clinit>()V
+SPLorg/slf4j/helpers/Reporter$Level;-><init>(Ljava/lang/String;II)V
+Lorg/slf4j/helpers/Reporter$TargetChoice;
+SPLorg/slf4j/helpers/Reporter$TargetChoice;->$values()[Lorg/slf4j/helpers/Reporter$TargetChoice;
+SPLorg/slf4j/helpers/Reporter$TargetChoice;-><clinit>()V
+SPLorg/slf4j/helpers/Reporter$TargetChoice;-><init>(Ljava/lang/String;I)V
+Lorg/slf4j/helpers/SubstituteLoggerFactory;
+SPLorg/slf4j/helpers/SubstituteLoggerFactory;-><init>()V
+SPLorg/slf4j/helpers/SubstituteLoggerFactory;->clear()V
+SPLorg/slf4j/helpers/SubstituteLoggerFactory;->getEventQueue()Ljava/util/concurrent/LinkedBlockingQueue;
+SPLorg/slf4j/helpers/SubstituteLoggerFactory;->getLoggers()Ljava/util/List;
+SPLorg/slf4j/helpers/SubstituteLoggerFactory;->postInitialization()V
+Lorg/slf4j/helpers/SubstituteServiceProvider;
+SPLorg/slf4j/helpers/SubstituteServiceProvider;-><init>()V
+SPLorg/slf4j/helpers/SubstituteServiceProvider;->getSubstituteLoggerFactory()Lorg/slf4j/helpers/SubstituteLoggerFactory;
+Lorg/slf4j/helpers/ThreadLocalMapOfStacks;
+SPLorg/slf4j/helpers/ThreadLocalMapOfStacks;-><init>()V
+Lorg/slf4j/helpers/Util;
+SPLorg/slf4j/helpers/Util;-><clinit>()V
+SPLorg/slf4j/helpers/Util;->safeGetBooleanSystemProperty(Ljava/lang/String;)Z
+SPLorg/slf4j/helpers/Util;->safeGetSystemProperty(Ljava/lang/String;)Ljava/lang/String;
+Lorg/slf4j/spi/LocationAwareLogger;
+Lorg/slf4j/spi/MDCAdapter;
+Lorg/slf4j/spi/SLF4JServiceProvider;
+Lshark/AndroidMetadataExtractor;
+SPLshark/AndroidMetadataExtractor;-><clinit>()V
+SPLshark/AndroidMetadataExtractor;-><init>()V
+Lshark/AndroidObjectInspectors;
+SPLshark/AndroidObjectInspectors;-><clinit>()V
+SPLshark/AndroidObjectInspectors;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidObjectInspectors;-><init>(Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLshark/AndroidObjectInspectors;->getLeakingObjectFilter$shark_android()Lkotlin/jvm/functions/Function1;
+SPLshark/AndroidObjectInspectors;->values()[Lshark/AndroidObjectInspectors;
+Lshark/AndroidObjectInspectors$ACTIVITY;
+SPLshark/AndroidObjectInspectors$ACTIVITY;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidObjectInspectors$ACTIVITY;->getLeakingObjectFilter$shark_android()Lkotlin/jvm/functions/Function1;
+Lshark/AndroidObjectInspectors$ACTIVITY$leakingObjectFilter$1;
+SPLshark/AndroidObjectInspectors$ACTIVITY$leakingObjectFilter$1;-><clinit>()V
+SPLshark/AndroidObjectInspectors$ACTIVITY$leakingObjectFilter$1;-><init>()V
+Lshark/AndroidObjectInspectors$ACTIVITY_THREAD;
+SPLshark/AndroidObjectInspectors$ACTIVITY_THREAD;-><init>(Ljava/lang/String;I)V
+Lshark/AndroidObjectInspectors$ANDROIDX_FRAGMENT;
+SPLshark/AndroidObjectInspectors$ANDROIDX_FRAGMENT;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidObjectInspectors$ANDROIDX_FRAGMENT;->getLeakingObjectFilter$shark_android()Lkotlin/jvm/functions/Function1;
+Lshark/AndroidObjectInspectors$ANDROIDX_FRAGMENT$leakingObjectFilter$1;
+SPLshark/AndroidObjectInspectors$ANDROIDX_FRAGMENT$leakingObjectFilter$1;-><clinit>()V
+SPLshark/AndroidObjectInspectors$ANDROIDX_FRAGMENT$leakingObjectFilter$1;-><init>()V
+Lshark/AndroidObjectInspectors$ANIMATOR;
+SPLshark/AndroidObjectInspectors$ANIMATOR;-><init>(Ljava/lang/String;I)V
+Lshark/AndroidObjectInspectors$APPLICATION;
+SPLshark/AndroidObjectInspectors$APPLICATION;-><init>(Ljava/lang/String;I)V
+Lshark/AndroidObjectInspectors$APPLICATION_PACKAGE_MANAGER;
+SPLshark/AndroidObjectInspectors$APPLICATION_PACKAGE_MANAGER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidObjectInspectors$APPLICATION_PACKAGE_MANAGER;->getLeakingObjectFilter$shark_android()Lkotlin/jvm/functions/Function1;
+Lshark/AndroidObjectInspectors$APPLICATION_PACKAGE_MANAGER$leakingObjectFilter$1;
+SPLshark/AndroidObjectInspectors$APPLICATION_PACKAGE_MANAGER$leakingObjectFilter$1;-><clinit>()V
+SPLshark/AndroidObjectInspectors$APPLICATION_PACKAGE_MANAGER$leakingObjectFilter$1;-><init>()V
+Lshark/AndroidObjectInspectors$COMPOSITION_IMPL;
+SPLshark/AndroidObjectInspectors$COMPOSITION_IMPL;-><init>(Ljava/lang/String;I)V
+Lshark/AndroidObjectInspectors$CONTEXT_FIELD;
+SPLshark/AndroidObjectInspectors$CONTEXT_FIELD;-><init>(Ljava/lang/String;I)V
+Lshark/AndroidObjectInspectors$CONTEXT_IMPL;
+SPLshark/AndroidObjectInspectors$CONTEXT_IMPL;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidObjectInspectors$CONTEXT_IMPL;->getLeakingObjectFilter$shark_android()Lkotlin/jvm/functions/Function1;
+Lshark/AndroidObjectInspectors$CONTEXT_IMPL$leakingObjectFilter$1;
+SPLshark/AndroidObjectInspectors$CONTEXT_IMPL$leakingObjectFilter$1;-><clinit>()V
+SPLshark/AndroidObjectInspectors$CONTEXT_IMPL$leakingObjectFilter$1;-><init>()V
+Lshark/AndroidObjectInspectors$CONTEXT_WRAPPER;
+SPLshark/AndroidObjectInspectors$CONTEXT_WRAPPER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidObjectInspectors$CONTEXT_WRAPPER;->getLeakingObjectFilter$shark_android()Lkotlin/jvm/functions/Function1;
+Lshark/AndroidObjectInspectors$CONTEXT_WRAPPER$leakingObjectFilter$1;
+SPLshark/AndroidObjectInspectors$CONTEXT_WRAPPER$leakingObjectFilter$1;-><clinit>()V
+SPLshark/AndroidObjectInspectors$CONTEXT_WRAPPER$leakingObjectFilter$1;-><init>()V
+Lshark/AndroidObjectInspectors$COORDINATOR;
+SPLshark/AndroidObjectInspectors$COORDINATOR;-><init>(Ljava/lang/String;I)V
+Lshark/AndroidObjectInspectors$Companion;
+SPLshark/AndroidObjectInspectors$Companion;-><init>()V
+SPLshark/AndroidObjectInspectors$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLshark/AndroidObjectInspectors$Companion;->createLeakingObjectFilters(Ljava/util/Set;)Ljava/util/List;
+SPLshark/AndroidObjectInspectors$Companion;->getAppDefaults()Ljava/util/List;
+Lshark/AndroidObjectInspectors$Companion$createLeakingObjectFilters$2$1;
+SPLshark/AndroidObjectInspectors$Companion$createLeakingObjectFilters$2$1;-><init>(Lkotlin/jvm/functions/Function1;)V
+Lshark/AndroidObjectInspectors$DIALOG;
+SPLshark/AndroidObjectInspectors$DIALOG;-><init>(Ljava/lang/String;I)V
+Lshark/AndroidObjectInspectors$EDITOR;
+SPLshark/AndroidObjectInspectors$EDITOR;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidObjectInspectors$EDITOR;->getLeakingObjectFilter$shark_android()Lkotlin/jvm/functions/Function1;
+Lshark/AndroidObjectInspectors$EDITOR$leakingObjectFilter$1;
+SPLshark/AndroidObjectInspectors$EDITOR$leakingObjectFilter$1;-><clinit>()V
+SPLshark/AndroidObjectInspectors$EDITOR$leakingObjectFilter$1;-><init>()V
+Lshark/AndroidObjectInspectors$FRAGMENT;
+SPLshark/AndroidObjectInspectors$FRAGMENT;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidObjectInspectors$FRAGMENT;->getLeakingObjectFilter$shark_android()Lkotlin/jvm/functions/Function1;
+Lshark/AndroidObjectInspectors$FRAGMENT$leakingObjectFilter$1;
+SPLshark/AndroidObjectInspectors$FRAGMENT$leakingObjectFilter$1;-><clinit>()V
+SPLshark/AndroidObjectInspectors$FRAGMENT$leakingObjectFilter$1;-><init>()V
+Lshark/AndroidObjectInspectors$INPUT_METHOD_MANAGER;
+SPLshark/AndroidObjectInspectors$INPUT_METHOD_MANAGER;-><init>(Ljava/lang/String;I)V
+Lshark/AndroidObjectInspectors$LIFECYCLE_REGISTRY;
+SPLshark/AndroidObjectInspectors$LIFECYCLE_REGISTRY;-><init>(Ljava/lang/String;I)V
+Lshark/AndroidObjectInspectors$LOADED_APK;
+SPLshark/AndroidObjectInspectors$LOADED_APK;-><init>(Ljava/lang/String;I)V
+Lshark/AndroidObjectInspectors$MAIN_THREAD;
+SPLshark/AndroidObjectInspectors$MAIN_THREAD;-><init>(Ljava/lang/String;I)V
+Lshark/AndroidObjectInspectors$MESSAGE;
+SPLshark/AndroidObjectInspectors$MESSAGE;-><init>(Ljava/lang/String;I)V
+Lshark/AndroidObjectInspectors$MESSAGE_QUEUE;
+SPLshark/AndroidObjectInspectors$MESSAGE_QUEUE;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidObjectInspectors$MESSAGE_QUEUE;->getLeakingObjectFilter$shark_android()Lkotlin/jvm/functions/Function1;
+Lshark/AndroidObjectInspectors$MESSAGE_QUEUE$leakingObjectFilter$1;
+SPLshark/AndroidObjectInspectors$MESSAGE_QUEUE$leakingObjectFilter$1;-><clinit>()V
+SPLshark/AndroidObjectInspectors$MESSAGE_QUEUE$leakingObjectFilter$1;-><init>()V
+Lshark/AndroidObjectInspectors$MORTAR_PRESENTER;
+SPLshark/AndroidObjectInspectors$MORTAR_PRESENTER;-><init>(Ljava/lang/String;I)V
+Lshark/AndroidObjectInspectors$MORTAR_SCOPE;
+SPLshark/AndroidObjectInspectors$MORTAR_SCOPE;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidObjectInspectors$MORTAR_SCOPE;->getLeakingObjectFilter$shark_android()Lkotlin/jvm/functions/Function1;
+Lshark/AndroidObjectInspectors$MORTAR_SCOPE$leakingObjectFilter$1;
+SPLshark/AndroidObjectInspectors$MORTAR_SCOPE$leakingObjectFilter$1;-><clinit>()V
+SPLshark/AndroidObjectInspectors$MORTAR_SCOPE$leakingObjectFilter$1;-><init>()V
+Lshark/AndroidObjectInspectors$OBJECT_ANIMATOR;
+SPLshark/AndroidObjectInspectors$OBJECT_ANIMATOR;-><init>(Ljava/lang/String;I)V
+Lshark/AndroidObjectInspectors$RECOMPOSER;
+SPLshark/AndroidObjectInspectors$RECOMPOSER;-><init>(Ljava/lang/String;I)V
+Lshark/AndroidObjectInspectors$SERVICE;
+SPLshark/AndroidObjectInspectors$SERVICE;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidObjectInspectors$SERVICE;->getLeakingObjectFilter$shark_android()Lkotlin/jvm/functions/Function1;
+Lshark/AndroidObjectInspectors$SERVICE$leakingObjectFilter$1;
+SPLshark/AndroidObjectInspectors$SERVICE$leakingObjectFilter$1;-><clinit>()V
+SPLshark/AndroidObjectInspectors$SERVICE$leakingObjectFilter$1;-><init>()V
+Lshark/AndroidObjectInspectors$STUB;
+SPLshark/AndroidObjectInspectors$STUB;-><init>(Ljava/lang/String;I)V
+Lshark/AndroidObjectInspectors$SUPPORT_FRAGMENT;
+SPLshark/AndroidObjectInspectors$SUPPORT_FRAGMENT;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidObjectInspectors$SUPPORT_FRAGMENT;->getLeakingObjectFilter$shark_android()Lkotlin/jvm/functions/Function1;
+Lshark/AndroidObjectInspectors$SUPPORT_FRAGMENT$leakingObjectFilter$1;
+SPLshark/AndroidObjectInspectors$SUPPORT_FRAGMENT$leakingObjectFilter$1;-><init>(Lshark/AndroidObjectInspectors$SUPPORT_FRAGMENT;)V
+Lshark/AndroidObjectInspectors$TOAST;
+SPLshark/AndroidObjectInspectors$TOAST;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidObjectInspectors$TOAST;->getLeakingObjectFilter$shark_android()Lkotlin/jvm/functions/Function1;
+Lshark/AndroidObjectInspectors$TOAST$leakingObjectFilter$1;
+SPLshark/AndroidObjectInspectors$TOAST$leakingObjectFilter$1;-><clinit>()V
+SPLshark/AndroidObjectInspectors$TOAST$leakingObjectFilter$1;-><init>()V
+Lshark/AndroidObjectInspectors$VIEW;
+SPLshark/AndroidObjectInspectors$VIEW;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidObjectInspectors$VIEW;->getLeakingObjectFilter$shark_android()Lkotlin/jvm/functions/Function1;
+Lshark/AndroidObjectInspectors$VIEW$leakingObjectFilter$1;
+SPLshark/AndroidObjectInspectors$VIEW$leakingObjectFilter$1;-><clinit>()V
+SPLshark/AndroidObjectInspectors$VIEW$leakingObjectFilter$1;-><init>()V
+Lshark/AndroidObjectInspectors$VIEW_ROOT_IMPL;
+SPLshark/AndroidObjectInspectors$VIEW_ROOT_IMPL;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidObjectInspectors$VIEW_ROOT_IMPL;->getLeakingObjectFilter$shark_android()Lkotlin/jvm/functions/Function1;
+Lshark/AndroidObjectInspectors$VIEW_ROOT_IMPL$leakingObjectFilter$1;
+SPLshark/AndroidObjectInspectors$VIEW_ROOT_IMPL$leakingObjectFilter$1;-><clinit>()V
+SPLshark/AndroidObjectInspectors$VIEW_ROOT_IMPL$leakingObjectFilter$1;-><init>()V
+Lshark/AndroidObjectInspectors$WINDOW;
+SPLshark/AndroidObjectInspectors$WINDOW;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidObjectInspectors$WINDOW;->getLeakingObjectFilter$shark_android()Lkotlin/jvm/functions/Function1;
+Lshark/AndroidObjectInspectors$WINDOW$leakingObjectFilter$1;
+SPLshark/AndroidObjectInspectors$WINDOW$leakingObjectFilter$1;-><clinit>()V
+SPLshark/AndroidObjectInspectors$WINDOW$leakingObjectFilter$1;-><init>()V
+Lshark/AndroidReferenceMatchers;
+SPLshark/AndroidReferenceMatchers;-><clinit>()V
+SPLshark/AndroidReferenceMatchers;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers;-><init>(Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLshark/AndroidReferenceMatchers;->access$getALWAYS$cp()Lkotlin/jvm/functions/Function1;
+SPLshark/AndroidReferenceMatchers;->values()[Lshark/AndroidReferenceMatchers;
+Lshark/AndroidReferenceMatchers$ACCESSIBILITY_ITERATORS;
+SPLshark/AndroidReferenceMatchers$ACCESSIBILITY_ITERATORS;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$ACCESSIBILITY_ITERATORS;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$ACCESSIBILITY_ITERATORS$add$1;
+SPLshark/AndroidReferenceMatchers$ACCESSIBILITY_ITERATORS$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$ACCESSIBILITY_ITERATORS$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$ACCESSIBILITY_NODE_ID_MANAGER;
+SPLshark/AndroidReferenceMatchers$ACCESSIBILITY_NODE_ID_MANAGER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$ACCESSIBILITY_NODE_ID_MANAGER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$ACCESSIBILITY_NODE_ID_MANAGER$add$1;
+SPLshark/AndroidReferenceMatchers$ACCESSIBILITY_NODE_ID_MANAGER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$ACCESSIBILITY_NODE_ID_MANAGER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$ACCESSIBILITY_NODE_INFO__MORIGINALTEXT;
+SPLshark/AndroidReferenceMatchers$ACCESSIBILITY_NODE_INFO__MORIGINALTEXT;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$ACCESSIBILITY_NODE_INFO__MORIGINALTEXT;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$ACCESSIBILITY_NODE_INFO__MORIGINALTEXT$add$1;
+SPLshark/AndroidReferenceMatchers$ACCESSIBILITY_NODE_INFO__MORIGINALTEXT$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$ACCESSIBILITY_NODE_INFO__MORIGINALTEXT$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$ACCOUNT_MANAGER__AMS_TASK__RESPONSE;
+SPLshark/AndroidReferenceMatchers$ACCOUNT_MANAGER__AMS_TASK__RESPONSE;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$ACCOUNT_MANAGER__AMS_TASK__RESPONSE;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$ACCOUNT_MANAGER__AMS_TASK__RESPONSE$add$1;
+SPLshark/AndroidReferenceMatchers$ACCOUNT_MANAGER__AMS_TASK__RESPONSE$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$ACCOUNT_MANAGER__AMS_TASK__RESPONSE$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$ACTIVITY_CHOOSE_MODEL;
+SPLshark/AndroidReferenceMatchers$ACTIVITY_CHOOSE_MODEL;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$ACTIVITY_CHOOSE_MODEL;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$ACTIVITY_CHOOSE_MODEL$add$1;
+SPLshark/AndroidReferenceMatchers$ACTIVITY_CHOOSE_MODEL$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$ACTIVITY_CHOOSE_MODEL$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$ACTIVITY_MANAGER_MCONTEXT;
+SPLshark/AndroidReferenceMatchers$ACTIVITY_MANAGER_MCONTEXT;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$ACTIVITY_MANAGER_MCONTEXT;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$ACTIVITY_MANAGER_MCONTEXT$add$1;
+SPLshark/AndroidReferenceMatchers$ACTIVITY_MANAGER_MCONTEXT$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$ACTIVITY_MANAGER_MCONTEXT$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$ACTIVITY_THREAD__M_NEW_ACTIVITIES;
+SPLshark/AndroidReferenceMatchers$ACTIVITY_THREAD__M_NEW_ACTIVITIES;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$ACTIVITY_THREAD__M_NEW_ACTIVITIES;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$ACTIVITY_THREAD__M_NEW_ACTIVITIES$add$1;
+SPLshark/AndroidReferenceMatchers$ACTIVITY_THREAD__M_NEW_ACTIVITIES$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$ACTIVITY_THREAD__M_NEW_ACTIVITIES$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$ACTIVITY_TRANSITION_STATE__M_EXITING_TO_VIEW;
+SPLshark/AndroidReferenceMatchers$ACTIVITY_TRANSITION_STATE__M_EXITING_TO_VIEW;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$ACTIVITY_TRANSITION_STATE__M_EXITING_TO_VIEW;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$ACTIVITY_TRANSITION_STATE__M_EXITING_TO_VIEW$add$1;
+SPLshark/AndroidReferenceMatchers$ACTIVITY_TRANSITION_STATE__M_EXITING_TO_VIEW$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$ACTIVITY_TRANSITION_STATE__M_EXITING_TO_VIEW$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$ANIMATION_HANDLER__ANIMATOR_REQUESTORS;
+SPLshark/AndroidReferenceMatchers$ANIMATION_HANDLER__ANIMATOR_REQUESTORS;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$ANIMATION_HANDLER__ANIMATOR_REQUESTORS;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$ANIMATION_HANDLER__ANIMATOR_REQUESTORS$add$1;
+SPLshark/AndroidReferenceMatchers$ANIMATION_HANDLER__ANIMATOR_REQUESTORS$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$ANIMATION_HANDLER__ANIMATOR_REQUESTORS$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$APPLICATION_PACKAGE_MANAGER__HAS_SYSTEM_FEATURE_QUERY;
+SPLshark/AndroidReferenceMatchers$APPLICATION_PACKAGE_MANAGER__HAS_SYSTEM_FEATURE_QUERY;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$APPLICATION_PACKAGE_MANAGER__HAS_SYSTEM_FEATURE_QUERY;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$APPLICATION_PACKAGE_MANAGER__HAS_SYSTEM_FEATURE_QUERY$add$1;
+SPLshark/AndroidReferenceMatchers$APPLICATION_PACKAGE_MANAGER__HAS_SYSTEM_FEATURE_QUERY$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$APPLICATION_PACKAGE_MANAGER__HAS_SYSTEM_FEATURE_QUERY$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$APP_OPS_MANAGER__CALLBACK_STUB;
+SPLshark/AndroidReferenceMatchers$APP_OPS_MANAGER__CALLBACK_STUB;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$APP_OPS_MANAGER__CALLBACK_STUB;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$APP_OPS_MANAGER__CALLBACK_STUB$add$1;
+SPLshark/AndroidReferenceMatchers$APP_OPS_MANAGER__CALLBACK_STUB$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$APP_OPS_MANAGER__CALLBACK_STUB$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$APP_WIDGET_HOST_CALLBACKS;
+SPLshark/AndroidReferenceMatchers$APP_WIDGET_HOST_CALLBACKS;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$APP_WIDGET_HOST_CALLBACKS;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$APP_WIDGET_HOST_CALLBACKS$add$1;
+SPLshark/AndroidReferenceMatchers$APP_WIDGET_HOST_CALLBACKS$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$APP_WIDGET_HOST_CALLBACKS$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$ASSIST_STRUCTURE;
+SPLshark/AndroidReferenceMatchers$ASSIST_STRUCTURE;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$ASSIST_STRUCTURE;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$ASSIST_STRUCTURE$add$1;
+SPLshark/AndroidReferenceMatchers$ASSIST_STRUCTURE$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$ASSIST_STRUCTURE$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$AUDIO_MANAGER;
+SPLshark/AndroidReferenceMatchers$AUDIO_MANAGER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$AUDIO_MANAGER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$AUDIO_MANAGER$add$1;
+SPLshark/AndroidReferenceMatchers$AUDIO_MANAGER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$AUDIO_MANAGER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$AUDIO_MANAGER__MCONTEXT_STATIC;
+SPLshark/AndroidReferenceMatchers$AUDIO_MANAGER__MCONTEXT_STATIC;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$AUDIO_MANAGER__MCONTEXT_STATIC;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$AUDIO_MANAGER__MCONTEXT_STATIC$add$1;
+SPLshark/AndroidReferenceMatchers$AUDIO_MANAGER__MCONTEXT_STATIC$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$AUDIO_MANAGER__MCONTEXT_STATIC$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$AW_CONTENTS_POSTED_CALLBACK;
+SPLshark/AndroidReferenceMatchers$AW_CONTENTS_POSTED_CALLBACK;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$AW_CONTENTS_POSTED_CALLBACK;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$AW_CONTENTS__A0;
+SPLshark/AndroidReferenceMatchers$AW_CONTENTS__A0;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$AW_CONTENTS__A0;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$AW_RESOURCE__SRESOURCES;
+SPLshark/AndroidReferenceMatchers$AW_RESOURCE__SRESOURCES;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$AW_RESOURCE__SRESOURCES;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$AW_RESOURCE__SRESOURCES$add$1;
+SPLshark/AndroidReferenceMatchers$AW_RESOURCE__SRESOURCES$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$AW_RESOURCE__SRESOURCES$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$BACKDROP_FRAME_RENDERER__MDECORVIEW;
+SPLshark/AndroidReferenceMatchers$BACKDROP_FRAME_RENDERER__MDECORVIEW;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$BACKDROP_FRAME_RENDERER__MDECORVIEW;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$BACKDROP_FRAME_RENDERER__MDECORVIEW$add$1;
+SPLshark/AndroidReferenceMatchers$BACKDROP_FRAME_RENDERER__MDECORVIEW$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$BACKDROP_FRAME_RENDERER__MDECORVIEW$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$BIOMETRIC_PROMPT;
+SPLshark/AndroidReferenceMatchers$BIOMETRIC_PROMPT;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$BIOMETRIC_PROMPT;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$BIOMETRIC_PROMPT$add$1;
+SPLshark/AndroidReferenceMatchers$BIOMETRIC_PROMPT$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$BIOMETRIC_PROMPT$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$BLOCKING_QUEUE;
+SPLshark/AndroidReferenceMatchers$BLOCKING_QUEUE;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$BLOCKING_QUEUE;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$BLOCKING_QUEUE$add$1;
+SPLshark/AndroidReferenceMatchers$BLOCKING_QUEUE$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$BLOCKING_QUEUE$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$BUBBLE_POPUP_HELPER__SHELPER;
+SPLshark/AndroidReferenceMatchers$BUBBLE_POPUP_HELPER__SHELPER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$BUBBLE_POPUP_HELPER__SHELPER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$BUBBLE_POPUP_HELPER__SHELPER$add$1;
+SPLshark/AndroidReferenceMatchers$BUBBLE_POPUP_HELPER__SHELPER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$BUBBLE_POPUP_HELPER__SHELPER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$CLIPBOARD_EX_MANAGER;
+SPLshark/AndroidReferenceMatchers$CLIPBOARD_EX_MANAGER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$CLIPBOARD_EX_MANAGER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$CLIPBOARD_EX_MANAGER$add$1;
+SPLshark/AndroidReferenceMatchers$CLIPBOARD_EX_MANAGER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$CLIPBOARD_EX_MANAGER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$CLIPBOARD_EX_MANAGER$add$2;
+SPLshark/AndroidReferenceMatchers$CLIPBOARD_EX_MANAGER$add$2;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$CLIPBOARD_EX_MANAGER$add$2;-><init>()V
+Lshark/AndroidReferenceMatchers$CLIPBOARD_EX_MANAGER$add$3;
+SPLshark/AndroidReferenceMatchers$CLIPBOARD_EX_MANAGER$add$3;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$CLIPBOARD_EX_MANAGER$add$3;-><init>()V
+Lshark/AndroidReferenceMatchers$CLIPBOARD_UI_MANAGER__SINSTANCE;
+SPLshark/AndroidReferenceMatchers$CLIPBOARD_UI_MANAGER__SINSTANCE;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$CLIPBOARD_UI_MANAGER__SINSTANCE;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$CLIPBOARD_UI_MANAGER__SINSTANCE$add$1;
+SPLshark/AndroidReferenceMatchers$CLIPBOARD_UI_MANAGER__SINSTANCE$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$CLIPBOARD_UI_MANAGER__SINSTANCE$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$COMPANION_DEVICE_SERVICE__STUB;
+SPLshark/AndroidReferenceMatchers$COMPANION_DEVICE_SERVICE__STUB;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$COMPANION_DEVICE_SERVICE__STUB;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$COMPANION_DEVICE_SERVICE__STUB$add$1;
+SPLshark/AndroidReferenceMatchers$COMPANION_DEVICE_SERVICE__STUB$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$COMPANION_DEVICE_SERVICE__STUB$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$CONNECTIVITY_MANAGER_CALLBACK_HANDLER;
+SPLshark/AndroidReferenceMatchers$CONNECTIVITY_MANAGER_CALLBACK_HANDLER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$CONNECTIVITY_MANAGER_CALLBACK_HANDLER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$CONNECTIVITY_MANAGER_CALLBACK_HANDLER$add$1;
+SPLshark/AndroidReferenceMatchers$CONNECTIVITY_MANAGER_CALLBACK_HANDLER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$CONNECTIVITY_MANAGER_CALLBACK_HANDLER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$CONNECTIVITY_MANAGER__SINSTANCE;
+SPLshark/AndroidReferenceMatchers$CONNECTIVITY_MANAGER__SINSTANCE;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$CONNECTIVITY_MANAGER__SINSTANCE;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$CONNECTIVITY_MANAGER__SINSTANCE$add$1;
+SPLshark/AndroidReferenceMatchers$CONNECTIVITY_MANAGER__SINSTANCE$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$CONNECTIVITY_MANAGER__SINSTANCE$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$CONTROLLED_INPUT_CONNECTION_WRAPPER;
+SPLshark/AndroidReferenceMatchers$CONTROLLED_INPUT_CONNECTION_WRAPPER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$CONTROLLED_INPUT_CONNECTION_WRAPPER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$Companion;
+SPLshark/AndroidReferenceMatchers$Companion;-><init>()V
+SPLshark/AndroidReferenceMatchers$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLshark/AndroidReferenceMatchers$Companion;->buildKnownReferences(Ljava/util/Set;)Ljava/util/List;
+SPLshark/AndroidReferenceMatchers$Companion;->getAppDefaults()Ljava/util/List;
+SPLshark/AndroidReferenceMatchers$Companion;->ignoredInstanceField(Ljava/lang/String;Ljava/lang/String;)Lshark/IgnoredReferenceMatcher;
+SPLshark/AndroidReferenceMatchers$Companion;->ignoredJavaLocal(Ljava/lang/String;)Lshark/IgnoredReferenceMatcher;
+SPLshark/AndroidReferenceMatchers$Companion;->instanceFieldLeak$default(Lshark/AndroidReferenceMatchers$Companion;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lshark/LibraryLeakReferenceMatcher;
+SPLshark/AndroidReferenceMatchers$Companion;->instanceFieldLeak(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lshark/LibraryLeakReferenceMatcher;
+SPLshark/AndroidReferenceMatchers$Companion;->libraryLeak(Lshark/ReferencePattern;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lshark/LibraryLeakReferenceMatcher;
+SPLshark/AndroidReferenceMatchers$Companion;->nativeGlobalVariableLeak$default(Lshark/AndroidReferenceMatchers$Companion;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lshark/LibraryLeakReferenceMatcher;
+SPLshark/AndroidReferenceMatchers$Companion;->nativeGlobalVariableLeak(Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lshark/LibraryLeakReferenceMatcher;
+SPLshark/AndroidReferenceMatchers$Companion;->staticFieldLeak$default(Lshark/AndroidReferenceMatchers$Companion;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lshark/LibraryLeakReferenceMatcher;
+SPLshark/AndroidReferenceMatchers$Companion;->staticFieldLeak(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lshark/LibraryLeakReferenceMatcher;
+Lshark/AndroidReferenceMatchers$Companion$ALWAYS$1;
+SPLshark/AndroidReferenceMatchers$Companion$ALWAYS$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$Companion$ALWAYS$1;-><init>()V
+Lshark/AndroidReferenceMatchers$Companion$libraryLeak$1;
+SPLshark/AndroidReferenceMatchers$Companion$libraryLeak$1;-><init>(Lkotlin/jvm/functions/Function1;)V
+Lshark/AndroidReferenceMatchers$DEVICE_POLICY_MANAGER__SETTINGS_OBSERVER;
+SPLshark/AndroidReferenceMatchers$DEVICE_POLICY_MANAGER__SETTINGS_OBSERVER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$DEVICE_POLICY_MANAGER__SETTINGS_OBSERVER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$DEVICE_POLICY_MANAGER__SETTINGS_OBSERVER$add$1;
+SPLshark/AndroidReferenceMatchers$DEVICE_POLICY_MANAGER__SETTINGS_OBSERVER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$DEVICE_POLICY_MANAGER__SETTINGS_OBSERVER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$DREAM_SERVICE;
+SPLshark/AndroidReferenceMatchers$DREAM_SERVICE;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$DREAM_SERVICE;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$DREAM_SERVICE$add$1;
+SPLshark/AndroidReferenceMatchers$DREAM_SERVICE$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$DREAM_SERVICE$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$EDITTEXT_BLINK_MESSAGEQUEUE;
+SPLshark/AndroidReferenceMatchers$EDITTEXT_BLINK_MESSAGEQUEUE;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$EDITTEXT_BLINK_MESSAGEQUEUE;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$EDITTEXT_BLINK_MESSAGEQUEUE$add$1;
+SPLshark/AndroidReferenceMatchers$EDITTEXT_BLINK_MESSAGEQUEUE$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$EDITTEXT_BLINK_MESSAGEQUEUE$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$EVENT_RECEIVER__MMESSAGE_QUEUE;
+SPLshark/AndroidReferenceMatchers$EVENT_RECEIVER__MMESSAGE_QUEUE;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$EVENT_RECEIVER__MMESSAGE_QUEUE;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$EXTENDED_STATUS_BAR_MANAGER;
+SPLshark/AndroidReferenceMatchers$EXTENDED_STATUS_BAR_MANAGER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$EXTENDED_STATUS_BAR_MANAGER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$EXTENDED_STATUS_BAR_MANAGER$add$1;
+SPLshark/AndroidReferenceMatchers$EXTENDED_STATUS_BAR_MANAGER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$EXTENDED_STATUS_BAR_MANAGER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$FINALIZER_WATCHDOG_DAEMON;
+SPLshark/AndroidReferenceMatchers$FINALIZER_WATCHDOG_DAEMON;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$FINALIZER_WATCHDOG_DAEMON;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$FLIPPER__APPLICATION_DESCRIPTOR;
+SPLshark/AndroidReferenceMatchers$FLIPPER__APPLICATION_DESCRIPTOR;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$FLIPPER__APPLICATION_DESCRIPTOR;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$GESTURE_BOOST_MANAGER;
+SPLshark/AndroidReferenceMatchers$GESTURE_BOOST_MANAGER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$GESTURE_BOOST_MANAGER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$GESTURE_BOOST_MANAGER$add$1;
+SPLshark/AndroidReferenceMatchers$GESTURE_BOOST_MANAGER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$GESTURE_BOOST_MANAGER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$HOST_ADPU_SERVICE_MSG_HANDLER;
+SPLshark/AndroidReferenceMatchers$HOST_ADPU_SERVICE_MSG_HANDLER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$HOST_ADPU_SERVICE_MSG_HANDLER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$HOST_ADPU_SERVICE_MSG_HANDLER$add$1;
+SPLshark/AndroidReferenceMatchers$HOST_ADPU_SERVICE_MSG_HANDLER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$HOST_ADPU_SERVICE_MSG_HANDLER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$IMM_CURRENT_INPUT_CONNECTION;
+SPLshark/AndroidReferenceMatchers$IMM_CURRENT_INPUT_CONNECTION;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$IMM_CURRENT_INPUT_CONNECTION;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$IMM_CURRENT_INPUT_CONNECTION$add$1;
+SPLshark/AndroidReferenceMatchers$IMM_CURRENT_INPUT_CONNECTION$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$IMM_CURRENT_INPUT_CONNECTION$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$IMM_LAST_FOCUS_VIEW;
+SPLshark/AndroidReferenceMatchers$IMM_LAST_FOCUS_VIEW;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$IMM_LAST_FOCUS_VIEW;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$IMM_LAST_FOCUS_VIEW$add$1;
+SPLshark/AndroidReferenceMatchers$IMM_LAST_FOCUS_VIEW$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$IMM_LAST_FOCUS_VIEW$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$INPUT_MANAGER__M_LATE_INIT_CONTEXT;
+SPLshark/AndroidReferenceMatchers$INPUT_MANAGER__M_LATE_INIT_CONTEXT;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$INPUT_MANAGER__M_LATE_INIT_CONTEXT;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$INPUT_MANAGER__M_LATE_INIT_CONTEXT$add$1;
+SPLshark/AndroidReferenceMatchers$INPUT_MANAGER__M_LATE_INIT_CONTEXT$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$INPUT_MANAGER__M_LATE_INIT_CONTEXT$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE;
+SPLshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$1;
+SPLshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$2;
+SPLshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$2;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$2;-><init>()V
+Lshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$3;
+SPLshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$3;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$3;-><init>()V
+Lshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$4;
+SPLshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$4;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$4;-><init>()V
+Lshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$5;
+SPLshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$5;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$5;-><init>()V
+Lshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$6;
+SPLshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$6;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$INPUT_METHOD_MANAGER_IS_TERRIBLE$add$6;-><init>()V
+Lshark/AndroidReferenceMatchers$INSTRUMENTATION_RECOMMEND_ACTIVITY;
+SPLshark/AndroidReferenceMatchers$INSTRUMENTATION_RECOMMEND_ACTIVITY;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$INSTRUMENTATION_RECOMMEND_ACTIVITY;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$INSTRUMENTATION_RECOMMEND_ACTIVITY$add$1;
+SPLshark/AndroidReferenceMatchers$INSTRUMENTATION_RECOMMEND_ACTIVITY$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$INSTRUMENTATION_RECOMMEND_ACTIVITY$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$IREQUEST_FINISH_CALLBACK;
+SPLshark/AndroidReferenceMatchers$IREQUEST_FINISH_CALLBACK;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$IREQUEST_FINISH_CALLBACK;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$IREQUEST_FINISH_CALLBACK$add$1;
+SPLshark/AndroidReferenceMatchers$IREQUEST_FINISH_CALLBACK$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$IREQUEST_FINISH_CALLBACK$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$JOB_SERVICE;
+SPLshark/AndroidReferenceMatchers$JOB_SERVICE;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$JOB_SERVICE;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$JOB_SERVICE$add$1;
+SPLshark/AndroidReferenceMatchers$JOB_SERVICE$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$JOB_SERVICE$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$LAYOUT_TRANSITION;
+SPLshark/AndroidReferenceMatchers$LAYOUT_TRANSITION;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$LAYOUT_TRANSITION;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$LAYOUT_TRANSITION$add$1;
+SPLshark/AndroidReferenceMatchers$LAYOUT_TRANSITION$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$LAYOUT_TRANSITION$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$LEAK_CANARY_HEAP_DUMPER;
+SPLshark/AndroidReferenceMatchers$LEAK_CANARY_HEAP_DUMPER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$LEAK_CANARY_HEAP_DUMPER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$LEAK_CANARY_INTERNAL;
+SPLshark/AndroidReferenceMatchers$LEAK_CANARY_INTERNAL;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$LEAK_CANARY_INTERNAL;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$LEAK_CANARY_THREAD;
+SPLshark/AndroidReferenceMatchers$LEAK_CANARY_THREAD;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$LEAK_CANARY_THREAD;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$LGCONTEXT__MCONTEXT;
+SPLshark/AndroidReferenceMatchers$LGCONTEXT__MCONTEXT;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$LGCONTEXT__MCONTEXT;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$LGCONTEXT__MCONTEXT$add$1;
+SPLshark/AndroidReferenceMatchers$LGCONTEXT__MCONTEXT$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$LGCONTEXT__MCONTEXT$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$MAGNIFIER;
+SPLshark/AndroidReferenceMatchers$MAGNIFIER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$MAGNIFIER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$MAGNIFIER$add$1;
+SPLshark/AndroidReferenceMatchers$MAGNIFIER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$MAGNIFIER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$MAIN;
+SPLshark/AndroidReferenceMatchers$MAIN;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$MAIN;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$MAPPER_CLIENT;
+SPLshark/AndroidReferenceMatchers$MAPPER_CLIENT;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$MAPPER_CLIENT;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$MAPPER_CLIENT$add$1;
+SPLshark/AndroidReferenceMatchers$MAPPER_CLIENT$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$MAPPER_CLIENT$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$MEDIA_PROJECTION_CALLBACK;
+SPLshark/AndroidReferenceMatchers$MEDIA_PROJECTION_CALLBACK;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$MEDIA_PROJECTION_CALLBACK;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$MEDIA_PROJECTION_CALLBACK$add$1;
+SPLshark/AndroidReferenceMatchers$MEDIA_PROJECTION_CALLBACK$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$MEDIA_PROJECTION_CALLBACK$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$MEDIA_SCANNER_CONNECTION;
+SPLshark/AndroidReferenceMatchers$MEDIA_SCANNER_CONNECTION;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$MEDIA_SCANNER_CONNECTION;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$MEDIA_SCANNER_CONNECTION$add$1;
+SPLshark/AndroidReferenceMatchers$MEDIA_SCANNER_CONNECTION$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$MEDIA_SCANNER_CONNECTION$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$MEDIA_SESSION_LEGACY_HELPER__SINSTANCE;
+SPLshark/AndroidReferenceMatchers$MEDIA_SESSION_LEGACY_HELPER__SINSTANCE;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$MEDIA_SESSION_LEGACY_HELPER__SINSTANCE;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$MEDIA_SESSION_LEGACY_HELPER__SINSTANCE$add$1;
+SPLshark/AndroidReferenceMatchers$MEDIA_SESSION_LEGACY_HELPER__SINSTANCE$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$MEDIA_SESSION_LEGACY_HELPER__SINSTANCE$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$MULTI_WINDOW_DECOR_SUPPORT__MWINDOW;
+SPLshark/AndroidReferenceMatchers$MULTI_WINDOW_DECOR_SUPPORT__MWINDOW;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$MULTI_WINDOW_DECOR_SUPPORT__MWINDOW;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$MULTI_WINDOW_DECOR_SUPPORT__MWINDOW$add$1;
+SPLshark/AndroidReferenceMatchers$MULTI_WINDOW_DECOR_SUPPORT__MWINDOW$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$MULTI_WINDOW_DECOR_SUPPORT__MWINDOW$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$OEM_SCENE_CALL_BLOCKER;
+SPLshark/AndroidReferenceMatchers$OEM_SCENE_CALL_BLOCKER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$OEM_SCENE_CALL_BLOCKER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$OEM_SCENE_CALL_BLOCKER$add$1;
+SPLshark/AndroidReferenceMatchers$OEM_SCENE_CALL_BLOCKER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$OEM_SCENE_CALL_BLOCKER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$PERF_MONITOR_LAST_CALLBACK;
+SPLshark/AndroidReferenceMatchers$PERF_MONITOR_LAST_CALLBACK;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$PERF_MONITOR_LAST_CALLBACK;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$PERF_MONITOR_LAST_CALLBACK$add$1;
+SPLshark/AndroidReferenceMatchers$PERF_MONITOR_LAST_CALLBACK$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$PERF_MONITOR_LAST_CALLBACK$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$PERMISSION_CONTROLLER_MANAGER;
+SPLshark/AndroidReferenceMatchers$PERMISSION_CONTROLLER_MANAGER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$PERMISSION_CONTROLLER_MANAGER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$PERMISSION_CONTROLLER_MANAGER$add$1;
+SPLshark/AndroidReferenceMatchers$PERMISSION_CONTROLLER_MANAGER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$PERMISSION_CONTROLLER_MANAGER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$PERSONA_MANAGER;
+SPLshark/AndroidReferenceMatchers$PERSONA_MANAGER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$PERSONA_MANAGER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$PERSONA_MANAGER$add$1;
+SPLshark/AndroidReferenceMatchers$PERSONA_MANAGER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$PERSONA_MANAGER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$PLAYER_BASE;
+SPLshark/AndroidReferenceMatchers$PLAYER_BASE;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$PLAYER_BASE;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$PLAYER_BASE$add$1;
+SPLshark/AndroidReferenceMatchers$PLAYER_BASE$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$PLAYER_BASE$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$RAZER_TEXT_KEY_LISTENER__MCONTEXT;
+SPLshark/AndroidReferenceMatchers$RAZER_TEXT_KEY_LISTENER__MCONTEXT;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$RAZER_TEXT_KEY_LISTENER__MCONTEXT;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$RAZER_TEXT_KEY_LISTENER__MCONTEXT$add$1;
+SPLshark/AndroidReferenceMatchers$RAZER_TEXT_KEY_LISTENER__MCONTEXT$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$RAZER_TEXT_KEY_LISTENER__MCONTEXT$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$REFERENCES;
+SPLshark/AndroidReferenceMatchers$REFERENCES;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$REFERENCES;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$RENDER_NODE_ANIMATOR;
+SPLshark/AndroidReferenceMatchers$RENDER_NODE_ANIMATOR;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$RENDER_NODE_ANIMATOR;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$RENDER_NODE_ANIMATOR$add$1;
+SPLshark/AndroidReferenceMatchers$RENDER_NODE_ANIMATOR$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$RENDER_NODE_ANIMATOR$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$RESOURCES__MCONTEXT;
+SPLshark/AndroidReferenceMatchers$RESOURCES__MCONTEXT;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$RESOURCES__MCONTEXT;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$RESOURCES__MCONTEXT$add$1;
+SPLshark/AndroidReferenceMatchers$RESOURCES__MCONTEXT$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$RESOURCES__MCONTEXT$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$SEM_APP_ICON_SOLUTION;
+SPLshark/AndroidReferenceMatchers$SEM_APP_ICON_SOLUTION;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$SEM_APP_ICON_SOLUTION;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$SEM_APP_ICON_SOLUTION$add$1;
+SPLshark/AndroidReferenceMatchers$SEM_APP_ICON_SOLUTION$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$SEM_APP_ICON_SOLUTION$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$SEM_CLIPBOARD_MANAGER__MCONTEXT;
+SPLshark/AndroidReferenceMatchers$SEM_CLIPBOARD_MANAGER__MCONTEXT;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$SEM_CLIPBOARD_MANAGER__MCONTEXT;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$SEM_CLIPBOARD_MANAGER__MCONTEXT$add$1;
+SPLshark/AndroidReferenceMatchers$SEM_CLIPBOARD_MANAGER__MCONTEXT$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$SEM_CLIPBOARD_MANAGER__MCONTEXT$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$SEM_CLIPBOARD_MANAGER__MCONTEXT$add$2;
+SPLshark/AndroidReferenceMatchers$SEM_CLIPBOARD_MANAGER__MCONTEXT$add$2;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$SEM_CLIPBOARD_MANAGER__MCONTEXT$add$2;-><init>()V
+Lshark/AndroidReferenceMatchers$SEM_EMERGENCY_MANAGER__MCONTEXT;
+SPLshark/AndroidReferenceMatchers$SEM_EMERGENCY_MANAGER__MCONTEXT;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$SEM_EMERGENCY_MANAGER__MCONTEXT;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$SEM_EMERGENCY_MANAGER__MCONTEXT$add$1;
+SPLshark/AndroidReferenceMatchers$SEM_EMERGENCY_MANAGER__MCONTEXT$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$SEM_EMERGENCY_MANAGER__MCONTEXT$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$SEM_PERSONA_MANAGER;
+SPLshark/AndroidReferenceMatchers$SEM_PERSONA_MANAGER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$SEM_PERSONA_MANAGER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$SEM_PERSONA_MANAGER$add$1;
+SPLshark/AndroidReferenceMatchers$SEM_PERSONA_MANAGER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$SEM_PERSONA_MANAGER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$SMART_COVER_MANAGER;
+SPLshark/AndroidReferenceMatchers$SMART_COVER_MANAGER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$SMART_COVER_MANAGER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$SMART_COVER_MANAGER$add$1;
+SPLshark/AndroidReferenceMatchers$SMART_COVER_MANAGER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$SMART_COVER_MANAGER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$SPAN_CONTROLLER;
+SPLshark/AndroidReferenceMatchers$SPAN_CONTROLLER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$SPAN_CONTROLLER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$SPAN_CONTROLLER$add$1;
+SPLshark/AndroidReferenceMatchers$SPAN_CONTROLLER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$SPAN_CONTROLLER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$SPAN_CONTROLLER$add$2;
+SPLshark/AndroidReferenceMatchers$SPAN_CONTROLLER$add$2;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$SPAN_CONTROLLER$add$2;-><init>()V
+Lshark/AndroidReferenceMatchers$SPEECH_RECOGNIZER;
+SPLshark/AndroidReferenceMatchers$SPEECH_RECOGNIZER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$SPEECH_RECOGNIZER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$SPEECH_RECOGNIZER$add$1;
+SPLshark/AndroidReferenceMatchers$SPEECH_RECOGNIZER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$SPEECH_RECOGNIZER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$SPELL_CHECKER;
+SPLshark/AndroidReferenceMatchers$SPELL_CHECKER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$SPELL_CHECKER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$SPELL_CHECKER$add$1;
+SPLshark/AndroidReferenceMatchers$SPELL_CHECKER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$SPELL_CHECKER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$SPELL_CHECKER_SESSION;
+SPLshark/AndroidReferenceMatchers$SPELL_CHECKER_SESSION;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$SPELL_CHECKER_SESSION;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$SPELL_CHECKER_SESSION$add$1;
+SPLshark/AndroidReferenceMatchers$SPELL_CHECKER_SESSION$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$SPELL_CHECKER_SESSION$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$SPEN_GESTURE_MANAGER;
+SPLshark/AndroidReferenceMatchers$SPEN_GESTURE_MANAGER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$SPEN_GESTURE_MANAGER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$SPEN_GESTURE_MANAGER$add$1;
+SPLshark/AndroidReferenceMatchers$SPEN_GESTURE_MANAGER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$SPEN_GESTURE_MANAGER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$STATIC_MTARGET_VIEW;
+SPLshark/AndroidReferenceMatchers$STATIC_MTARGET_VIEW;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$STATIC_MTARGET_VIEW;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$STATIC_MTARGET_VIEW$add$1;
+SPLshark/AndroidReferenceMatchers$STATIC_MTARGET_VIEW$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$STATIC_MTARGET_VIEW$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$SYSTEM_SENSOR_MANAGER__MAPPCONTEXTIMPL;
+SPLshark/AndroidReferenceMatchers$SYSTEM_SENSOR_MANAGER__MAPPCONTEXTIMPL;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$SYSTEM_SENSOR_MANAGER__MAPPCONTEXTIMPL;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$SYSTEM_SENSOR_MANAGER__MAPPCONTEXTIMPL$add$1;
+SPLshark/AndroidReferenceMatchers$SYSTEM_SENSOR_MANAGER__MAPPCONTEXTIMPL$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$SYSTEM_SENSOR_MANAGER__MAPPCONTEXTIMPL$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$TEXT_LINE__SCACHED;
+SPLshark/AndroidReferenceMatchers$TEXT_LINE__SCACHED;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$TEXT_LINE__SCACHED;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$TEXT_LINE__SCACHED$add$1;
+SPLshark/AndroidReferenceMatchers$TEXT_LINE__SCACHED$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$TEXT_LINE__SCACHED$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$TEXT_TO_SPEECH;
+SPLshark/AndroidReferenceMatchers$TEXT_TO_SPEECH;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$TEXT_TO_SPEECH;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$TEXT_TO_SPEECH$add$1;
+SPLshark/AndroidReferenceMatchers$TEXT_TO_SPEECH$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$TEXT_TO_SPEECH$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$TEXT_TO_SPEECH$add$2;
+SPLshark/AndroidReferenceMatchers$TEXT_TO_SPEECH$add$2;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$TEXT_TO_SPEECH$add$2;-><init>()V
+Lshark/AndroidReferenceMatchers$TEXT_VIEW__MLAST_HOVERED_VIEW;
+SPLshark/AndroidReferenceMatchers$TEXT_VIEW__MLAST_HOVERED_VIEW;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$TEXT_VIEW__MLAST_HOVERED_VIEW;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$TEXT_VIEW__MLAST_HOVERED_VIEW$add$1;
+SPLshark/AndroidReferenceMatchers$TEXT_VIEW__MLAST_HOVERED_VIEW$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$TEXT_VIEW__MLAST_HOVERED_VIEW$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$TOAST_TN;
+SPLshark/AndroidReferenceMatchers$TOAST_TN;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$TOAST_TN;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$UI_MODE_MANAGER;
+SPLshark/AndroidReferenceMatchers$UI_MODE_MANAGER;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$UI_MODE_MANAGER;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$UI_MODE_MANAGER$add$1;
+SPLshark/AndroidReferenceMatchers$UI_MODE_MANAGER$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$UI_MODE_MANAGER$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$USER_MANAGER__SINSTANCE;
+SPLshark/AndroidReferenceMatchers$USER_MANAGER__SINSTANCE;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$USER_MANAGER__SINSTANCE;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$USER_MANAGER__SINSTANCE$add$1;
+SPLshark/AndroidReferenceMatchers$USER_MANAGER__SINSTANCE$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$USER_MANAGER__SINSTANCE$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$VIEWLOCATIONHOLDER_ROOT;
+SPLshark/AndroidReferenceMatchers$VIEWLOCATIONHOLDER_ROOT;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$VIEWLOCATIONHOLDER_ROOT;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$VIEWLOCATIONHOLDER_ROOT$add$1;
+SPLshark/AndroidReferenceMatchers$VIEWLOCATIONHOLDER_ROOT$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$VIEWLOCATIONHOLDER_ROOT$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$VIEW_CONFIGURATION__MCONTEXT;
+SPLshark/AndroidReferenceMatchers$VIEW_CONFIGURATION__MCONTEXT;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$VIEW_CONFIGURATION__MCONTEXT;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$VIEW_CONFIGURATION__MCONTEXT$add$1;
+SPLshark/AndroidReferenceMatchers$VIEW_CONFIGURATION__MCONTEXT$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$VIEW_CONFIGURATION__MCONTEXT$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$VIEW_GROUP__M_CURRENT_DRAG_CHILD;
+SPLshark/AndroidReferenceMatchers$VIEW_GROUP__M_CURRENT_DRAG_CHILD;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$VIEW_GROUP__M_CURRENT_DRAG_CHILD;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$VIEW_GROUP__M_CURRENT_DRAG_CHILD$add$1;
+SPLshark/AndroidReferenceMatchers$VIEW_GROUP__M_CURRENT_DRAG_CHILD$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$VIEW_GROUP__M_CURRENT_DRAG_CHILD$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$VIEW_GROUP__M_PRE_SORTED_CHILDREN;
+SPLshark/AndroidReferenceMatchers$VIEW_GROUP__M_PRE_SORTED_CHILDREN;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$VIEW_GROUP__M_PRE_SORTED_CHILDREN;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$VIEW_GROUP__M_PRE_SORTED_CHILDREN$add$1;
+SPLshark/AndroidReferenceMatchers$VIEW_GROUP__M_PRE_SORTED_CHILDREN$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$VIEW_GROUP__M_PRE_SORTED_CHILDREN$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$VIEW_TOOLTIP_CALLBACK;
+SPLshark/AndroidReferenceMatchers$VIEW_TOOLTIP_CALLBACK;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$VIEW_TOOLTIP_CALLBACK;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$VIEW_TOOLTIP_CALLBACK$add$1;
+SPLshark/AndroidReferenceMatchers$VIEW_TOOLTIP_CALLBACK$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$VIEW_TOOLTIP_CALLBACK$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$WINDOW_ON_BACK_INVOKED_DISPATCHER__STUB;
+SPLshark/AndroidReferenceMatchers$WINDOW_ON_BACK_INVOKED_DISPATCHER__STUB;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$WINDOW_ON_BACK_INVOKED_DISPATCHER__STUB;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$WINDOW_ON_BACK_INVOKED_DISPATCHER__STUB$add$1;
+SPLshark/AndroidReferenceMatchers$WINDOW_ON_BACK_INVOKED_DISPATCHER__STUB$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$WINDOW_ON_BACK_INVOKED_DISPATCHER__STUB$add$1;-><init>()V
+Lshark/AndroidReferenceMatchers$XIAMI__RESOURCES_IMPL;
+SPLshark/AndroidReferenceMatchers$XIAMI__RESOURCES_IMPL;-><init>(Ljava/lang/String;I)V
+SPLshark/AndroidReferenceMatchers$XIAMI__RESOURCES_IMPL;->add$shark_android(Ljava/util/List;)V
+Lshark/AndroidReferenceMatchers$XIAMI__RESOURCES_IMPL$add$1;
+SPLshark/AndroidReferenceMatchers$XIAMI__RESOURCES_IMPL$add$1;-><clinit>()V
+SPLshark/AndroidReferenceMatchers$XIAMI__RESOURCES_IMPL$add$1;-><init>()V
+Lshark/FilteringLeakingObjectFinder$LeakingObjectFilter;
+Lshark/IgnoredReferenceMatcher;
+SPLshark/IgnoredReferenceMatcher;-><init>(Lshark/ReferencePattern;)V
+Lshark/KeyedWeakReferenceFinder;
+SPLshark/KeyedWeakReferenceFinder;-><clinit>()V
+SPLshark/KeyedWeakReferenceFinder;-><init>()V
+Lshark/LeakingObjectFinder;
+Lshark/LibraryLeakReferenceMatcher;
+SPLshark/LibraryLeakReferenceMatcher;-><init>(Lshark/ReferencePattern;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+Lshark/MetadataExtractor;
+Lshark/ObjectInspector;
+Lshark/ObjectInspectors;
+SPLshark/ObjectInspectors;-><clinit>()V
+SPLshark/ObjectInspectors;-><init>(Ljava/lang/String;I)V
+SPLshark/ObjectInspectors;-><init>(Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLshark/ObjectInspectors;->access$getJdkLeakingObjectFilters$cp()Ljava/util/List;
+SPLshark/ObjectInspectors;->getLeakingObjectFilter$shark()Lkotlin/jvm/functions/Function1;
+SPLshark/ObjectInspectors;->values()[Lshark/ObjectInspectors;
+Lshark/ObjectInspectors$ANONYMOUS_CLASS;
+SPLshark/ObjectInspectors$ANONYMOUS_CLASS;-><init>(Ljava/lang/String;I)V
+Lshark/ObjectInspectors$CLASS;
+SPLshark/ObjectInspectors$CLASS;-><init>(Ljava/lang/String;I)V
+Lshark/ObjectInspectors$CLASSLOADER;
+SPLshark/ObjectInspectors$CLASSLOADER;-><init>(Ljava/lang/String;I)V
+Lshark/ObjectInspectors$Companion;
+SPLshark/ObjectInspectors$Companion;-><init>()V
+SPLshark/ObjectInspectors$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLshark/ObjectInspectors$Companion;->createLeakingObjectFilters(Ljava/util/Set;)Ljava/util/List;
+SPLshark/ObjectInspectors$Companion;->getJdkDefaults()Ljava/util/List;
+SPLshark/ObjectInspectors$Companion;->getJdkLeakingObjectFilters()Ljava/util/List;
+Lshark/ObjectInspectors$Companion$createLeakingObjectFilters$2$1;
+SPLshark/ObjectInspectors$Companion$createLeakingObjectFilters$2$1;-><init>(Lkotlin/jvm/functions/Function1;)V
+Lshark/ObjectInspectors$KEYED_WEAK_REFERENCE;
+SPLshark/ObjectInspectors$KEYED_WEAK_REFERENCE;-><init>(Ljava/lang/String;I)V
+SPLshark/ObjectInspectors$KEYED_WEAK_REFERENCE;->getLeakingObjectFilter$shark()Lkotlin/jvm/functions/Function1;
+Lshark/ObjectInspectors$KEYED_WEAK_REFERENCE$leakingObjectFilter$1;
+SPLshark/ObjectInspectors$KEYED_WEAK_REFERENCE$leakingObjectFilter$1;-><clinit>()V
+SPLshark/ObjectInspectors$KEYED_WEAK_REFERENCE$leakingObjectFilter$1;-><init>()V
+Lshark/ObjectInspectors$THREAD;
+SPLshark/ObjectInspectors$THREAD;-><init>(Ljava/lang/String;I)V
+Lshark/ReferenceMatcher;
+SPLshark/ReferenceMatcher;-><init>()V
+SPLshark/ReferenceMatcher;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lshark/ReferencePattern;
+SPLshark/ReferencePattern;-><clinit>()V
+SPLshark/ReferencePattern;-><init>()V
+SPLshark/ReferencePattern;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lshark/ReferencePattern$Companion;
+SPLshark/ReferencePattern$Companion;-><init>()V
+SPLshark/ReferencePattern$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lshark/ReferencePattern$InstanceFieldPattern;
+SPLshark/ReferencePattern$InstanceFieldPattern;-><clinit>()V
+SPLshark/ReferencePattern$InstanceFieldPattern;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+Lshark/ReferencePattern$InstanceFieldPattern$Companion;
+SPLshark/ReferencePattern$InstanceFieldPattern$Companion;-><init>()V
+SPLshark/ReferencePattern$InstanceFieldPattern$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lshark/ReferencePattern$JavaLocalPattern;
+SPLshark/ReferencePattern$JavaLocalPattern;-><clinit>()V
+SPLshark/ReferencePattern$JavaLocalPattern;-><init>(Ljava/lang/String;)V
+Lshark/ReferencePattern$JavaLocalPattern$Companion;
+SPLshark/ReferencePattern$JavaLocalPattern$Companion;-><init>()V
+SPLshark/ReferencePattern$JavaLocalPattern$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lshark/ReferencePattern$NativeGlobalVariablePattern;
+SPLshark/ReferencePattern$NativeGlobalVariablePattern;-><clinit>()V
+SPLshark/ReferencePattern$NativeGlobalVariablePattern;-><init>(Ljava/lang/String;)V
+Lshark/ReferencePattern$NativeGlobalVariablePattern$Companion;
+SPLshark/ReferencePattern$NativeGlobalVariablePattern$Companion;-><init>()V
+SPLshark/ReferencePattern$NativeGlobalVariablePattern$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lshark/ReferencePattern$StaticFieldPattern;
+SPLshark/ReferencePattern$StaticFieldPattern;-><clinit>()V
+SPLshark/ReferencePattern$StaticFieldPattern;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+Lshark/ReferencePattern$StaticFieldPattern$Companion;
+SPLshark/ReferencePattern$StaticFieldPattern$Companion;-><init>()V
+SPLshark/ReferencePattern$StaticFieldPattern$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+Lshark/SharkLog;
+SPLshark/SharkLog;-><clinit>()V
+SPLshark/SharkLog;-><init>()V
+SPLshark/SharkLog;->getLogger()Lshark/SharkLog$Logger;
+Ltimber/log/Timber;
+SPLtimber/log/Timber;-><clinit>()V
+SPLtimber/log/Timber;->access$getTreeArray$cp()[Ltimber/log/Timber$Tree;
+SPLtimber/log/Timber;->access$getTrees$cp()Ljava/util/ArrayList;
+SPLtimber/log/Timber;->access$setTreeArray$cp([Ltimber/log/Timber$Tree;)V
+Ltimber/log/Timber$Forest;
+SPLtimber/log/Timber$Forest;-><init>()V
+SPLtimber/log/Timber$Forest;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+SPLtimber/log/Timber$Forest;->d(Ljava/lang/String;[Ljava/lang/Object;)V
+SPLtimber/log/Timber$Forest;->i(Ljava/lang/String;[Ljava/lang/Object;)V
+SPLtimber/log/Timber$Forest;->log(ILjava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)V
+SPLtimber/log/Timber$Forest;->plant(Ltimber/log/Timber$Tree;)V
+SPLtimber/log/Timber$Forest;->tag(Ljava/lang/String;)Ltimber/log/Timber$Tree;
+SPLtimber/log/Timber$Forest;->v(Ljava/lang/String;[Ljava/lang/Object;)V
+PLtimber/log/Timber$Forest;->w(Ljava/lang/String;[Ljava/lang/Object;)V
+Ltimber/log/Timber$Tree;
+SPLtimber/log/Timber$Tree;-><init>()V
+SPLtimber/log/Timber$Tree;->d(Ljava/lang/String;[Ljava/lang/Object;)V
+SPLtimber/log/Timber$Tree;->formatMessage(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+SPLtimber/log/Timber$Tree;->getExplicitTag$timber_release()Ljava/lang/ThreadLocal;
+SPLtimber/log/Timber$Tree;->getTag$timber_release()Ljava/lang/String;
+SPLtimber/log/Timber$Tree;->i(Ljava/lang/String;[Ljava/lang/Object;)V
+SPLtimber/log/Timber$Tree;->isLoggable(I)Z
+SPLtimber/log/Timber$Tree;->isLoggable(Ljava/lang/String;I)Z
+SPLtimber/log/Timber$Tree;->log(ILjava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)V
+SPLtimber/log/Timber$Tree;->prepareLog(ILjava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)V
+SPLtimber/log/Timber$Tree;->v(Ljava/lang/String;[Ljava/lang/Object;)V
+PLtimber/log/Timber$Tree;->w(Ljava/lang/String;[Ljava/lang/Object;)V
\ No newline at end of file
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt
index d3f2effea34e..5bc7688de104 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt
@@ -9,7 +9,6 @@
 package com.ichi2.anki
 
 import android.annotation.SuppressLint
-import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -131,7 +130,6 @@ import com.ichi2.anki.multimedia.getAvTag
 import com.ichi2.anki.observability.ChangeManager
 import com.ichi2.anki.observability.undoableOp
 import com.ichi2.anki.pages.AnkiServer
-import com.ichi2.anki.pages.CongratsPage
 import com.ichi2.anki.pages.PostRequestHandler
 import com.ichi2.anki.pages.PostRequestUri
 import com.ichi2.anki.reviewer.AutomaticAnswer
@@ -150,6 +148,7 @@ import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.snackbar.BaseSnackbarBuilderProvider
 import com.ichi2.anki.snackbar.SnackbarBuilder
 import com.ichi2.anki.snackbar.showSnackbar
+import com.ichi2.anki.study.StudyCompletionUi
 import com.ichi2.anki.ui.windows.reviewer.StudyScreenRepository
 import com.ichi2.anki.utils.OnlyOnce.Method.ANSWER_CARD
 import com.ichi2.anki.utils.OnlyOnce.preventSimultaneousExecutions
@@ -179,6 +178,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock
 import java.util.function.Consumer
 import java.util.function.Function
 import kotlin.math.abs
+import com.ichi2.anki.common.android.R as CommonR
 
 abstract class AbstractFlashcardViewer :
     NavigationDrawerActivity(),
@@ -526,7 +526,7 @@ abstract class AbstractFlashcardViewer :
             closeReviewer(RESULT_NO_MORE_CARDS)
             // When launched with a shortcut, we want to display a message when finishing
             if (intent.getBooleanExtra(EXTRA_STARTED_WITH_SHORTCUT, false)) {
-                CongratsPage.display(this)
+                StudyCompletionUi.displayFromShortcut(this)
             }
             return
         }
@@ -977,7 +977,7 @@ abstract class AbstractFlashcardViewer :
             }
         }
         if (animationEnabled()) {
-            flipCardLayout?.setBackgroundResource(getResFromAttr(this, R.attr.hardButtonRippleRef))
+            flipCardLayout?.setBackgroundResource(getResFromAttr(this, CommonR.attr.hardButtonRippleRef))
         }
         if (!buttonHeightSet && relativeButtonSize != 100) {
             val params = flipCardLayout!!.layoutParams
@@ -2627,7 +2627,8 @@ abstract class AbstractFlashcardViewer :
             }
             if (intent == null) {
                 val uri = url.toUri()
-                if (!appPermission.checkCanLaunchExternalApps()) {
+                intent = appPermission.createUrlIntent(uri)
+                if (intent == null) {
                     Timber.w("URL blocked: canLaunchExternalApps")
                     return true
                 }
@@ -2636,14 +2637,13 @@ abstract class AbstractFlashcardViewer :
                     return true
                 }
                 Timber.d("Opening external link \"%s\" with an Intent", url)
-                intent = Intent(Intent.ACTION_VIEW, uri)
             } else {
                 Timber.d("Opening resolved external link \"%s\" with an Intent: %s", url, intent)
             }
             try {
                 startActivity(intent)
-            } catch (_: ActivityNotFoundException) {
-                Timber.w("No app found to handle open external url from AbstractFlashcardViewer")
+            } catch (e: Exception) {
+                Timber.w(e, "Could not open url from AbstractFlashcardViewer")
                 showSnackbar(CommonString.activity_start_failed)
             }
             return true
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AndroidTtsPlayer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AndroidTtsPlayer.kt
index f300040ba594..d72fb7a5b42f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AndroidTtsPlayer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AndroidTtsPlayer.kt
@@ -24,6 +24,7 @@ import timber.log.Timber
 import kotlin.coroutines.resume
 
 class AndroidTtsPlayer(
+    /** Voices in engine-preference order, with the default engine first. */
     private val voices: List<TtsVoice>,
     /** Builds a [TextToSpeech] bound to an engine package. Overridable for testing */
     private val ttsFactory: suspend (engine: String) -> TextToSpeech? = { engine -> TtsVoices.createTts(engine) },
@@ -93,7 +94,7 @@ class AndroidTtsPlayer(
         TtsVoices.ttsEngine?.let { defaultEngine -> getOrCreateTts(defaultEngine) }
     }
 
-    // Prefer installed voices for language fallback without changing the shared matcher.
+    // Prefer installed voices for language fallback, preserving engine-preference order.
     // Keep uninstalled voices selectable: an explicit request can trigger their download.
     override fun getAvailableVoices(): List<TtsVoice> = voices.sortedBy { it.unavailable() }
 
@@ -198,7 +199,7 @@ class AndroidTtsPlayer(
 
         @CheckResult
         suspend fun createInstance(scope: CoroutineScope): AndroidTtsPlayer {
-            val voices = TtsVoices.allTtsVoices().toList()
+            val voices = TtsVoices.allTtsVoices()
             return AndroidTtsPlayer(voices).apply {
                 init(scope)
                 Timber.v("TTS creation: initialized player instance")
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt
index 65f4a46e8656..4a777452fad0 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt
@@ -83,10 +83,10 @@ import com.ichi2.anki.dialogs.DatabaseErrorDialog
 import com.ichi2.anki.dialogs.DatabaseErrorDialog.CustomExceptionData
 import com.ichi2.anki.dialogs.DatabaseErrorDialog.DatabaseErrorDialogType
 import com.ichi2.anki.dialogs.DialogHandler
-import com.ichi2.anki.dialogs.ExportReadyDialog.Companion.ARG_SHARE_AS_TEXT
-import com.ichi2.anki.dialogs.ExportReadyDialog.Companion.KEY_EXPORT_PATH
 import com.ichi2.anki.dialogs.ExportReadyDialog.Companion.REQUEST_EXPORT_SAVE
 import com.ichi2.anki.dialogs.ExportReadyDialog.Companion.REQUEST_EXPORT_SHARE
+import com.ichi2.anki.dialogs.ExportReadyDialog.Companion.RESULT_EXPORT_PATH
+import com.ichi2.anki.dialogs.ExportReadyDialog.Companion.RESULT_SHARE_AS_TEXT
 import com.ichi2.anki.dialogs.SimpleMessageDialog
 import com.ichi2.anki.dialogs.handleExportReadyRequest
 import com.ichi2.anki.dialogs.viewmodel.ExportReadyViewModel
@@ -166,17 +166,17 @@ open class AnkiActivity(
         super.onCreate(savedInstanceState)
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
             @Suppress("deprecation")
-            window.navigationBarColor = getColor(R.color.transparent)
+            window.navigationBarColor = getColor(CommonR.color.transparent)
         }
         supportFragmentManager.setFragmentResultListener(REQUEST_EXPORT_SAVE, this) { _, bundle ->
             saveExportFile(
-                bundle.getString(KEY_EXPORT_PATH) ?: error("Missing required exportPath!"),
+                bundle.getString(RESULT_EXPORT_PATH) ?: error("Missing required exportPath!"),
             )
         }
         supportFragmentManager.setFragmentResultListener(REQUEST_EXPORT_SHARE, this) { _, bundle ->
             shareFile(
-                path = bundle.requireString(KEY_EXPORT_PATH),
-                asText = bundle.getBoolean(ARG_SHARE_AS_TEXT, false),
+                path = bundle.requireString(RESULT_EXPORT_PATH),
+                asText = bundle.getBoolean(RESULT_SHARE_AS_TEXT, false),
             )
         }
 
@@ -187,7 +187,7 @@ open class AnkiActivity(
         }
 
         if (savedInstanceState != null) {
-            val restoredValue = savedInstanceState.getString(KEY_EXPORT_FILE_NAME) ?: return
+            val restoredValue = savedInstanceState.getString(STATE_EXPORT_FILE_PATH) ?: return
             fileExportPath = restoredValue
         }
     }
@@ -279,12 +279,12 @@ open class AnkiActivity(
 
     /**
      * Maps from intent name action to function to run when this action is received by [broadcastReceiver].
-     * By default it handles [SdCardReceiver.MEDIA_EJECT], and shows/dismisses dialogs when an SD
+     * By default it handles [SdCardReceiver.ACTION_MEDIA_EJECT], and shows/dismisses dialogs when an SD
      * card is ejected/remounted (collection is saved beforehand by [SdCardReceiver])
      */
     protected open val broadcastsActions =
         mapOf(
-            SdCardReceiver.MEDIA_EJECT to { onSdCardNotMounted() },
+            SdCardReceiver.ACTION_MEDIA_EJECT to { onSdCardNotMounted() },
         )
 
     /**
@@ -718,7 +718,7 @@ open class AnkiActivity(
 
     override fun onSaveInstanceState(outState: Bundle) {
         if (::fileExportPath.isInitialized) {
-            outState.putString(KEY_EXPORT_FILE_NAME, fileExportPath)
+            outState.putString(STATE_EXPORT_FILE_PATH, fileExportPath)
         }
         super.onSaveInstanceState(outState)
     }
@@ -864,7 +864,7 @@ open class AnkiActivity(
         const val EXTRA_FINISH_ANIMATION = "finishAnimation"
 
         private const val SIMPLE_NOTIFICATION_ID = 0
-        private const val KEY_EXPORT_FILE_NAME = "key_export_file_name"
+        private const val STATE_EXPORT_FILE_PATH = "key_export_file_name"
     }
 }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt
index e0936fb42fee..18a4373e5b02 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt
@@ -38,6 +38,7 @@ import com.ichi2.anki.common.crashreporting.CrashReportService.sendExceptionRepo
 import com.ichi2.anki.common.permissions.hasLegacyStorageAccessPermission
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.common.storage.CollectionHelper
+import com.ichi2.anki.common.storage.StorageDecision
 import com.ichi2.anki.common.utils.android.SdCard
 import com.ichi2.anki.common.utils.android.showThemedToast
 import com.ichi2.anki.common.utils.annotation.KotlinCleanup
@@ -59,6 +60,7 @@ import com.ichi2.anki.multiprofile.isPhoenixProcess
 import com.ichi2.anki.navigation.initializeNavigator
 import com.ichi2.anki.observability.ChangeManager
 import com.ichi2.anki.preferences.SharedPreferencesProvider
+import com.ichi2.anki.recorder.VoiceRecorder
 import com.ichi2.anki.reviewreminders.ReminderLogTree
 import com.ichi2.anki.servicelayer.DebugInfoService
 import com.ichi2.anki.servicelayer.ThrowableFilterService
@@ -66,16 +68,18 @@ import com.ichi2.anki.services.NotificationService
 import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.settings.PrefsRepository
 import com.ichi2.anki.startup.configureBackendTemporaryDirectory
-import com.ichi2.anki.startup.ensureCollectionPathSet
 import com.ichi2.anki.startup.getDefaultAnkiDroidDirectory
+import com.ichi2.anki.startup.maybeSetDefaultCollectionPath
 import com.ichi2.anki.ui.dialogs.ActivityAgnosticDialogs
 import com.ichi2.anki.widget.RECURRING_WIDGETS
 import com.ichi2.utils.ExceptionUtil
 import com.ichi2.utils.LanguageUtil
 import com.ichi2.utils.measureTime
 import com.ichi2.utils.setWebContentsDebuggingEnabled
+import com.ichi2.widget.AnkiDroidWidgetSmall
 import com.ichi2.widget.DayRolloverAlarm
 import com.ichi2.widget.WidgetNotificationScheduler
+import com.ichi2.widget.WidgetStatus
 import com.ichi2.widget.cardanalysis.CardAnalysisWidget
 import com.ichi2.widget.deckpicker.DeckPickerWidget
 import com.ichi2.widget.restoreRecurringAlarms
@@ -129,8 +133,8 @@ open class AnkiDroidApp :
         }
     }
 
+    @set:VisibleForTesting
     var profileManager: ProfileManager? = null
-        private set
 
     private val profileContext: Context?
         get() = profileManager?.activeProfileContext
@@ -188,6 +192,7 @@ open class AnkiDroidApp :
         initializeNavigator()
         initializeWidgetRepository()
         WidgetNotificationScheduler.register { scheduleNotification() }
+        WidgetStatus.register(Prefs) { context -> AnkiDroidWidgetSmall.UpdateService().doUpdate(context) }
         Animations.setPreferencesProvider { context -> PrefsRepository(context) }
         CollectionLockedException.messageProvider = {
             getString(CommonString.database_locked_summary_new, getString(CommonString.col_path))
@@ -279,6 +284,7 @@ open class AnkiDroidApp :
             runCatching {
                 measureTime("cacheCleanup") {
                     MultimediaArgsStorage.create(this@AnkiDroidApp).removeExpiredFiles()
+                    VoiceRecorder.removeExpiredRecordings(VoiceRecorder.recordingsDirectory(this@AnkiDroidApp))
                 }
             }.onFailure { Timber.w(it, "Unable to clean up expired cache files") }
         }
@@ -346,7 +352,13 @@ open class AnkiDroidApp :
             //  is not considered to be a fatal error, unless the directory itself is not writable.
             val ankiDroidDir =
                 try {
-                    ensureCollectionPathSet(this)
+                    maybeSetDefaultCollectionPath(this)
+                    if (CollectionHelper.storageDecision(this.sharedPrefs()) != StorageDecision.Decided) {
+                        // a fresh install without access to public storage: the user
+                        // decides via the permission screen (see maybeSetDefaultCollectionPath)
+                        Timber.i("skipping AnkiDroid directory init: storage is undecided")
+                        return@setup
+                    }
                     CollectionHelper.getCurrentAnkiDroidDirectory(this)
                 } catch (e: SystemStorageException) {
                     fatalInitializationError = FatalInitializationError.StorageError(e)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
index e25b9b46ff09..b562c562a452 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
@@ -35,6 +35,7 @@ import com.google.android.material.snackbar.Snackbar
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.browser.BrowserRowCollection
+import com.ichi2.anki.browser.BrowserSearchFeedbackMode
 import com.ichi2.anki.browser.CardBrowserFragment
 import com.ichi2.anki.browser.CardBrowserLaunchOptions
 import com.ichi2.anki.browser.CardBrowserViewModel
@@ -84,6 +85,7 @@ import com.ichi2.anki.ui.internationalization.sentenceCase
 import com.ichi2.anki.utils.ext.addPrepareMenuProvider
 import com.ichi2.anki.utils.ext.launchCollectionInLifecycleScope
 import com.ichi2.anki.utils.ext.onAllFragmentsLoaded
+import com.ichi2.anki.utils.showSearchError
 import com.ichi2.ui.CardBrowserSearchView
 import com.ichi2.utils.AndroidUiUtils.hideKeyboard
 import com.ichi2.utils.LanguageUtil
@@ -489,7 +491,7 @@ open class CardBrowser :
                     searchView?.post { searchView?.clearFocus() }
                 }
                 is SearchState.Error -> {
-                    showError(searchState.error, crashReportData = null)
+                    showSearchError(searchState.error)
                 }
             }
         }
@@ -617,18 +619,21 @@ open class CardBrowser :
         )
     }
 
-    private fun forceRefreshSearch(useSearchTextValue: Boolean = false) {
+    private fun forceRefreshSearch(
+        useSearchTextValue: Boolean = false,
+        feedbackMode: BrowserSearchFeedbackMode = BrowserSearchFeedbackMode.NONE,
+    ) {
         if (useSearchTextValue && searchView != null) {
-            viewModel.setQuery(searchView!!.query.toString())
+            viewModel.setQuery(searchView!!.query.toString(), feedbackMode = feedbackMode)
         } else {
-            viewModel.launchSearchForCards()
+            viewModel.launchSearchForCards(feedbackMode = feedbackMode)
         }
     }
 
-    private fun refreshBrowserUI() {
+    private fun refreshBrowserUI(feedbackMode: BrowserSearchFeedbackMode) {
         hideProgressBar()
         // reload whole view
-        forceRefreshSearch()
+        forceRefreshSearch(feedbackMode = feedbackMode)
         viewModel.endMultiSelectMode(SingleSelectCause.Other)
         invalidateOptionsMenu() // maybe the availability of undo changed
     }
@@ -670,7 +675,9 @@ open class CardBrowser :
             changes.card
         ) {
             // We refresh the Browser's own UI
-            refreshBrowserUI()
+            val feedbackMode =
+                if (handler is NoteEditorFragment) BrowserSearchFeedbackMode.COUNT_ONLY else BrowserSearchFeedbackMode.NONE
+            refreshBrowserUI(feedbackMode)
         }
     }
 
@@ -727,7 +734,7 @@ open class CardBrowser :
     companion object {
         // Keys for saving pane weights in SharedPreferences
         private const val PREF_CARD_BROWSER_PANE_WEIGHT = "cardBrowserPaneWeight"
-        private const val PREF_NOTE_EDITOR_PANE_WEIGHT = "noteEditorPaneWeight"
+        private const val PREF_NOTE_EDITOR_PANE_WEIGHT = "cardBrowserNoteEditorPaneWeight"
 
         // Values related to persistent state data
         fun clearLastDeckId() = SharedPreferencesLastDeckIdRepository.clearLastDeckId()
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateBrowserAppearanceEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateBrowserAppearanceEditor.kt
index 3f3e446b9b55..929ae1319c10 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateBrowserAppearanceEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateBrowserAppearanceEditor.kt
@@ -69,13 +69,17 @@ class CardTemplateBrowserAppearanceEditor : AnkiActivity(R.layout.activity_card_
             view.updatePadding(left = constraints.left, right = constraints.right, bottom = constraints.bottom)
             insets
         }
-        val bundle = savedInstanceState ?: intent.extras
-        if (bundle == null) {
-            showThemedToast(this, getString(CommonString.something_wrong), true)
-            finish()
-            return
+        when {
+            savedInstanceState != null ->
+                initializeUi(savedInstanceState.getString(STATE_QUESTION_FORMAT), savedInstanceState.getString(STATE_ANSWER_FORMAT))
+            intent.extras != null ->
+                initializeUi(intent.getStringExtra(EXTRA_QUESTION_FORMAT), intent.getStringExtra(EXTRA_ANSWER_FORMAT))
+            else -> {
+                showThemedToast(this, getString(CommonString.something_wrong), true)
+                finish()
+                return
+            }
         }
-        initializeUiFromBundle(bundle)
         // default result, only changed to RESULT_OK if actually saving changes
         setResult(RESULT_CANCELED)
         onBackPressedDispatcher.addCallback(discardChangesCallback)
@@ -137,14 +141,17 @@ class CardTemplateBrowserAppearanceEditor : AnkiActivity(R.layout.activity_card_
     }
 
     public override fun onSaveInstanceState(outState: Bundle) {
-        outState.putString(INTENT_QUESTION_FORMAT, questionFormat)
-        outState.putString(INTENT_ANSWER_FORMAT, answerFormat)
+        outState.putString(STATE_QUESTION_FORMAT, questionFormat)
+        outState.putString(STATE_ANSWER_FORMAT, answerFormat)
         super.onSaveInstanceState(outState)
     }
 
-    private fun initializeUiFromBundle(bundle: Bundle) {
-        binding.questionFormat.setText(bundle.getString(INTENT_QUESTION_FORMAT))
-        binding.answerFormat.setText(bundle.getString(INTENT_ANSWER_FORMAT))
+    private fun initializeUi(
+        questionFormat: String?,
+        answerFormat: String?,
+    ) {
+        binding.questionFormat.setText(questionFormat)
+        binding.answerFormat.setText(answerFormat)
 
         discardChangesCallback.isEnabled = hasChanges()
 
@@ -152,9 +159,9 @@ class CardTemplateBrowserAppearanceEditor : AnkiActivity(R.layout.activity_card_
         title = TR.sentenceCase.browserAppearance
     }
 
-    private fun answerHasChanged(intent: Intent): Boolean = intent.getStringExtra(INTENT_ANSWER_FORMAT) != answerFormat
+    private fun answerHasChanged(intent: Intent): Boolean = intent.getStringExtra(EXTRA_ANSWER_FORMAT) != answerFormat
 
-    private fun questionHasChanged(intent: Intent): Boolean = intent.getStringExtra(INTENT_QUESTION_FORMAT) != questionFormat
+    private fun questionHasChanged(intent: Intent): Boolean = intent.getStringExtra(EXTRA_QUESTION_FORMAT) != questionFormat
 
     private val questionFormat: String
         get() = getTextValue(binding.questionFormat)
@@ -174,8 +181,8 @@ class CardTemplateBrowserAppearanceEditor : AnkiActivity(R.layout.activity_card_
         Timber.i("Save and Exit")
         val data =
             Intent().apply {
-                putExtra(INTENT_QUESTION_FORMAT, questionFormat)
-                putExtra(INTENT_ANSWER_FORMAT, answerFormat)
+                putExtra(EXTRA_QUESTION_FORMAT, questionFormat)
+                putExtra(EXTRA_ANSWER_FORMAT, answerFormat)
             }
         setResult(RESULT_OK, data)
         finish()
@@ -208,8 +215,8 @@ class CardTemplateBrowserAppearanceEditor : AnkiActivity(R.layout.activity_card_
                     null
                 } else {
                     try {
-                        val question = intent.getStringExtra(INTENT_QUESTION_FORMAT)
-                        val answer = intent.getStringExtra(INTENT_ANSWER_FORMAT)
+                        val question = intent.getStringExtra(EXTRA_QUESTION_FORMAT)
+                        val answer = intent.getStringExtra(EXTRA_ANSWER_FORMAT)
                         Result(question, answer)
                     } catch (e: Exception) {
                         Timber.w(e, "Could not read result from intent")
@@ -220,8 +227,10 @@ class CardTemplateBrowserAppearanceEditor : AnkiActivity(R.layout.activity_card_
     }
 
     companion object {
-        const val INTENT_QUESTION_FORMAT = "bqfmt"
-        const val INTENT_ANSWER_FORMAT = "bafmt"
+        const val EXTRA_QUESTION_FORMAT = "bqfmt"
+        const val EXTRA_ANSWER_FORMAT = "bafmt"
+        private const val STATE_QUESTION_FORMAT = "bqfmt"
+        private const val STATE_ANSWER_FORMAT = "bafmt"
 
         /** Specified the card browser should use the default template formatter  */
         const val VALUE_USE_DEFAULT = ""
@@ -239,8 +248,8 @@ class CardTemplateBrowserAppearanceEditor : AnkiActivity(R.layout.activity_card_
             answerFormat: String,
         ): Intent =
             Intent(context, CardTemplateBrowserAppearanceEditor::class.java).apply {
-                putExtra(INTENT_QUESTION_FORMAT, questionFormat)
-                putExtra(INTENT_ANSWER_FORMAT, answerFormat)
+                putExtra(EXTRA_QUESTION_FORMAT, questionFormat)
+                putExtra(EXTRA_ANSWER_FORMAT, answerFormat)
             }
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateChanges.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateChanges.kt
deleted file mode 100644
index 92d86f8d8d5f..000000000000
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateChanges.kt
+++ /dev/null
@@ -1,286 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package com.ichi2.anki
-
-import com.ichi2.anki.CardTemplateNotetype.ChangeType
-import com.ichi2.anki.CardTemplateNotetype.TemplateChange
-import timber.log.Timber
-
-/** Tracks unsaved template operations and translates editor positions to database ordinals. */
-class CardTemplateChanges {
-    var templateChanges = ArrayList<TemplateChange>()
-
-    /**
-     * Template deletes shift card ordinals in the database. To operate without saving, we must keep track to apply in order.
-     * In addition, we don't want to persist a template add just to delete it later, so we combine those if they happen
-     */
-    fun addTemplateChange(
-        type: ChangeType,
-        ordinal: Int,
-    ) {
-        Timber.d("addTemplateChange() type %s for ordinal %s", type, ordinal)
-        val templateChanges = templateChanges
-        val change = TemplateChange(ordinal, type)
-
-        // If we are deleting something we added but have not saved, edit it out of the change list
-        if (type == ChangeType.DELETE) {
-            var ordinalAdjustment = 0
-            for (i in templateChanges.indices.reversed()) {
-                val oldChange = templateChanges[i]
-                when (oldChange.type) {
-                    ChangeType.DELETE ->
-                        if (oldChange.ordinal - ordinalAdjustment <= ordinal) {
-                            // Deleting an ordinal at or below us? Adjust our comparison basis...
-                            ordinalAdjustment++
-                            continue
-                        }
-                    ChangeType.ADD ->
-                        if (ordinal == oldChange.ordinal - ordinalAdjustment) {
-                            // Deleting something we added this session? Edit it out via compaction
-                            compactTemplateChanges(oldChange.ordinal)
-                            return
-                        }
-                }
-            }
-        }
-        Timber.d("addTemplateChange() added ord/type: %s/%s", change.ordinal, change.type)
-        templateChanges.add(change)
-        dumpChanges()
-    }
-
-    /**
-     * Return an int[] containing the collection-relative ordinals of all the currently pending deletes,
-     * including the ordinal passed in, as opposed to the changelist-relative ordinals
-     *
-     * @param ord int UI-relative ordinal to check database for delete safety along with existing deletes
-     * @return int[] of all ordinals currently in the database, pending delete
-     */
-    fun getDeleteDbOrds(ord: Int): IntArray {
-        dumpChanges()
-        Timber.d("getDeleteDbOrds()")
-
-        // array containing the original / db-relative ordinals for all pending deletes plus the proposed one
-        val deletedDbOrds = ArrayList<Int>(templateChanges.size)
-
-        // For each entry in the changes list - and the proposed delete - scan for deletes to get original ordinal
-        for (i in 0..templateChanges.size) {
-            var ordinalAdjustment = 0
-
-            // We need an initializer. Though proposed change is checked last, it's a reasonable default initializer.
-            var currentChange = TemplateChange(ord, ChangeType.DELETE)
-            if (i < templateChanges.size) {
-                // Until we exhaust the pending change list we will use them
-                currentChange = templateChanges[i]
-            }
-
-            // If the current pending change isn't a delete, it is unimportant here
-            if (currentChange.type !== ChangeType.DELETE) {
-                continue
-            }
-
-            // If it is a delete, scan previous deletes and shift as necessary for original ord
-            for (j in 0 until i) {
-                val previousChange = templateChanges[j]
-
-                // Is previous change a delete? Lower ordinal than current change?
-                if (previousChange.type === ChangeType.DELETE && previousChange.ordinal <= currentChange.ordinal) {
-                    // If so, that is the case where things shift. It means our ordinals moved and original ord is higher
-                    ordinalAdjustment++
-                }
-            }
-
-            // We know how many times ordinals smaller than the current were deleted so we have the total adjustment
-            // Save this pending delete at it's original / db-relative position
-            deletedDbOrds.add(currentChange.ordinal + ordinalAdjustment)
-        }
-        val deletedDbOrdInts = IntArray(deletedDbOrds.size)
-        for (i in deletedDbOrdInts.indices) {
-            deletedDbOrdInts[i] = deletedDbOrds[i]
-        }
-        return deletedDbOrdInts
-    }
-
-    fun dumpChanges() {
-        if (!BuildConfig.DEBUG) {
-            return
-        }
-        val adjustedChanges = adjustedTemplateChanges
-        for (i in templateChanges.indices) {
-            val change = templateChanges[i]
-            val adjustedChange = adjustedChanges[i]
-            Timber.d("dumpChanges() Change %s is ord/type %s/%s", i, change.ordinal, change.type)
-            Timber.d(
-                "dumpChanges() During save change %s will be ord/type %s/%s",
-                i,
-                adjustedChange.ordinal,
-                adjustedChange.type,
-            )
-        }
-    }
-
-    /**
-     * Adjust the ordinals in our accrued change list so that any pending adds have the correct
-     * ordinal after taking into account any pending deletes
-     *
-     * @return ArrayList<Object></Object>[2]> of [ordinal][ChangeType] entries
-     */
-    val adjustedTemplateChanges: ArrayList<TemplateChange>
-        get() {
-            val changes = templateChanges
-            val adjustedChanges = ArrayList<TemplateChange>(changes.size)
-
-            // In order to save the changes into the database, the ordinals in the changelist must correspond to the
-            // ordinals in the database (for deletes) or the correct index in the changes array (for adds)
-            // It is not possible to know what those will be until the user requests a save, so they are stored in the
-            // change list as-is until the save time comes, then the adjustment is made all at once
-            for (i in changes.indices) {
-                val change = changes[i]
-                val adjustedChange =
-                    when (change.type) {
-                        ChangeType.ADD -> {
-                            val adjustedOrdinal = getAdjustedAddOrdinalAtChangeIndex(this, i)
-                            Timber.d(
-                                "getAdjustedTemplateChanges() change %s ordinal adjusted from %s to %s",
-                                i,
-                                change.ordinal,
-                                adjustedOrdinal,
-                            )
-                            TemplateChange(adjustedOrdinal, ChangeType.ADD)
-                        }
-                        ChangeType.DELETE -> change
-                    }
-                adjustedChanges.add(adjustedChange)
-            }
-            return adjustedChanges
-        }
-
-    /**
-     * Scan the sequence of template add/deletes, looking for the given ordinal.
-     * When found, purge that ordinal and shift future changes down if they had ordinals higher than the one purged
-     */
-    private fun compactTemplateChanges(addedOrdinalToDelete: Int) {
-        Timber.d(
-            "compactTemplateChanges() merge/purge add/delete ordinal added as %s",
-            addedOrdinalToDelete,
-        )
-        var postChange = false
-        var ordinalAdjustment = 0
-        var i = 0
-        while (i < templateChanges.size) {
-            val change = templateChanges[i]
-            var ordinal = change.ordinal
-            val changeType = change.type
-            Timber.d("compactTemplateChanges() examining change entry %s / %s", ordinal, changeType)
-
-            // Only make adjustments after the ordinal we want to delete was added
-            if (!postChange) {
-                if (ordinal == addedOrdinalToDelete && changeType == ChangeType.ADD) {
-                    Timber.d("compactTemplateChanges() found our entry at index %s", i)
-                    // Remove this entry to start compaction, then fix up the loop counter since we altered size
-                    postChange = true
-                    templateChanges.removeAt(i)
-                    i--
-                }
-                i++
-                continue
-            }
-
-            // We compact all deletes with higher ordinals, so any delete is below us: shift our comparison basis
-            if (changeType == ChangeType.DELETE) {
-                ordinalAdjustment++
-                Timber.d(
-                    "compactTemplateChanges() delete affecting purged template, shifting basis, adj: %s",
-                    ordinalAdjustment,
-                )
-            }
-
-            // If following ordinals were higher, we move them as part of compaction
-            if (ordinal + ordinalAdjustment > addedOrdinalToDelete) {
-                Timber.d("compactTemplateChanges() shifting later/higher ordinal down")
-                change.ordinal = --ordinal
-            }
-            i++
-        }
-    }
-
-    companion object {
-        /**
-         * Check if the given ordinal from the current UI state (which includes all pending changes) is a pending add
-         *
-         * @param ord int representing an ordinal in the note type, that might be an unsaved addition
-         * @return boolean true if it is a pending addition from this editing session
-         */
-        fun isOrdinalPendingAdd(
-            noteType: CardTemplateChanges,
-            ord: Int,
-        ): Boolean {
-            for (i in noteType.templateChanges.indices) {
-                // commented out to make the code compile, why is this unused?
-                // val change = noteType.templateChanges[i]
-                val adjustedOrdinal = getAdjustedAddOrdinalAtChangeIndex(noteType, i)
-                if (adjustedOrdinal == ord) {
-                    Timber.d(
-                        "isOrdinalPendingAdd() found ord %s was pending add (would adjust to %s)",
-                        ord,
-                        adjustedOrdinal,
-                    )
-                    return true
-                }
-            }
-            Timber.d("isOrdinalPendingAdd() ord %s is not a pending add", ord)
-            return false
-        }
-
-        /**
-         * Check if the change at the given index in the changes array is an addition from this editing session
-         * (and thus is not in the database yet, and possibly needing ordinal adjustment from subsequent deletes)
-         * @param changesIndex the index of the template in the changes array
-         * @return either ordinal adjusted by any pending deletes if it is a pending add, or -1 if the ordinal is not an add
-         */
-        fun getAdjustedAddOrdinalAtChangeIndex(
-            noteType: CardTemplateChanges,
-            changesIndex: Int,
-        ): Int {
-            if (changesIndex >= noteType.templateChanges.size) {
-                return -1
-            }
-            var ordinalAdjustment = 0
-            val change = noteType.templateChanges[changesIndex]
-            val ordinalToInspect = change.ordinal
-            for (i in noteType.templateChanges.size - 1 downTo changesIndex) {
-                val oldChange = noteType.templateChanges[i]
-                val currentOrdinal = change.ordinal
-                when (oldChange.type) {
-                    ChangeType.DELETE -> {
-                        // Deleting an ordinal at or below us? Adjust our comparison basis...
-                        if (currentOrdinal - ordinalAdjustment <= ordinalToInspect) {
-                            ordinalAdjustment++
-                            continue
-                        }
-                        Timber.d(
-                            "getAdjustedAddOrdinalAtChangeIndex() contemplating delete at index %s, current ord adj %s",
-                            i,
-                            ordinalAdjustment,
-                        )
-                    }
-                    ChangeType.ADD ->
-                        if (changesIndex == i) {
-                            // something we added this session
-                            Timber.d(
-                                "getAdjustedAddOrdinalAtChangeIndex() pending add found at at index %s, old ord/adjusted ord %s/%s",
-                                i,
-                                currentOrdinal,
-                                currentOrdinal - ordinalAdjustment,
-                            )
-                            return currentOrdinal - ordinalAdjustment
-                        }
-                }
-            }
-            Timber.d(
-                "getAdjustedAddOrdinalAtChangeIndex() determined changesIndex %s was not a pending add",
-                changesIndex,
-            )
-            return -1
-        }
-    }
-}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
index eebc07c52163..ccc8fde442b5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateEditor.kt
@@ -60,12 +60,14 @@ import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.android.input.ShortcutGroup
 import com.ichi2.anki.android.input.shortcut
 import com.ichi2.anki.cardviewer.SingleCardSide
+import com.ichi2.anki.common.analytics.Analytics
 import com.ichi2.anki.common.android.animationDisabled
 import com.ichi2.anki.common.android.appContext
 import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.common.utils.android.getColorFromAttr
 import com.ichi2.anki.common.utils.android.showThemedToast
 import com.ichi2.anki.common.utils.annotation.KotlinCleanup
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.common.utils.ext.contentEquals
 import com.ichi2.anki.compat.CompatHelper.Companion.getSerializableCompat
 import com.ichi2.anki.databinding.ActivityCardTemplateEditorBinding
@@ -87,6 +89,8 @@ import com.ichi2.anki.libanki.NoteTypeId
 import com.ichi2.anki.libanki.NotetypeJson
 import com.ichi2.anki.libanki.Notetypes
 import com.ichi2.anki.libanki.Notetypes.Companion.NOT_FOUND_NOTE_TYPE
+import com.ichi2.anki.libanki.backend.BackendUtils
+import com.ichi2.anki.libanki.backend.model.toBackendNote
 import com.ichi2.anki.libanki.exception.ConfirmModSchemaException
 import com.ichi2.anki.libanki.getStockNotetype
 import com.ichi2.anki.libanki.getStockNotetypeKinds
@@ -111,20 +115,24 @@ import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.anki.utils.postDelayed
 import com.ichi2.utils.TruncatedString
 import com.ichi2.utils.copyToClipboard
-import com.ichi2.utils.dp
 import com.ichi2.utils.listItems
 import com.ichi2.utils.show
 import dev.androidbroadcast.vbpd.viewBinding
 import kotlinx.coroutines.launch
 import net.ankiweb.rsdroid.Translations
+import net.ankiweb.rsdroid.exceptions.BackendTemplateException
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import timber.log.Timber
+import java.util.concurrent.TimeoutException
 import java.util.regex.Pattern
 import kotlin.math.max
 import kotlin.math.min
+import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
+import kotlin.time.TimeSource
+import com.ichi2.anki.common.android.R as CommonR
 
 private typealias BackendCardTemplate = com.ichi2.anki.libanki.CardTemplate
 
@@ -204,30 +212,30 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
         // Load the args either from the intent or savedInstanceState bundle
         if (savedInstanceState == null) {
             // get note type id
-            noteTypeId = intent.getLongExtra(EDITOR_NOTE_TYPE_ID, NOT_FOUND_NOTE_TYPE)
+            noteTypeId = intent.getLongExtra(EXTRA_NOTE_TYPE_ID, NOT_FOUND_NOTE_TYPE)
             if (noteTypeId == NOT_FOUND_NOTE_TYPE) {
                 Timber.e("CardTemplateEditor :: no note type ID was provided")
                 finish()
                 return
             }
             // get id for currently edited note (optional)
-            noteId = intent.getLongExtra(EDITOR_NOTE_ID, -1L)
+            noteId = intent.getLongExtra(EXTRA_NOTE_ID, -1L)
             // get id for currently edited template (optional)
-            startingOrdId = intent.getIntExtra(EDITOR_START_ORD_ID, -1)
+            startingOrdId = intent.getIntExtra(EXTRA_START_ORD_ID, -1)
             tabToCursorPositions[0] = hashMapOf()
             tabToViewId[0] = R.id.front_edit
         } else {
-            noteTypeId = savedInstanceState.getLong(EDITOR_NOTE_TYPE_ID)
-            noteId = savedInstanceState.getLong(EDITOR_NOTE_ID)
-            startingOrdId = savedInstanceState.getInt(EDITOR_START_ORD_ID)
-            tabToCursorPositions = savedInstanceState.getSerializableCompat<HashMap<Int, HashMap<Int, Int>>>(TAB_TO_CURSOR_POSITION_KEY)!!
-            tabToViewId = savedInstanceState.getSerializableCompat<HashMap<Int, Int?>>(TAB_TO_VIEW_ID)!!
+            noteTypeId = savedInstanceState.getLong(STATE_NOTE_TYPE_ID)
+            noteId = savedInstanceState.getLong(STATE_NOTE_ID)
+            startingOrdId = savedInstanceState.getInt(STATE_STARTING_TEMPLATE_ORDINAL)
+            tabToCursorPositions = savedInstanceState.getSerializableCompat<HashMap<Int, HashMap<Int, Int>>>(STATE_TAB_TO_CURSOR_POSITION)!!
+            tabToViewId = savedInstanceState.getSerializableCompat<HashMap<Int, Int?>>(STATE_TAB_TO_VIEW_ID)!!
             tempNoteType = CardTemplateNotetype.fromBundle(savedInstanceState)
         }
 
         fragmented = binding.fragmentContainer?.isVisible == true
 
-        setNavigationBarColor(R.attr.alternativeBackgroundColor)
+        setNavigationBarColor(CommonR.attr.alternativeBackgroundColor)
 
         // Disable the home icon
         enableToolbar()
@@ -335,11 +343,11 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
     public override fun onSaveInstanceState(outState: Bundle) {
         with(outState) {
             tempNoteType?.let { putAll(it.toBundle()) }
-            putLong(EDITOR_NOTE_TYPE_ID, noteTypeId)
-            putLong(EDITOR_NOTE_ID, noteId)
-            putInt(EDITOR_START_ORD_ID, startingOrdId)
-            putSerializable(TAB_TO_VIEW_ID, tabToViewId)
-            putSerializable(TAB_TO_CURSOR_POSITION_KEY, tabToCursorPositions)
+            putLong(STATE_NOTE_TYPE_ID, noteTypeId)
+            putLong(STATE_NOTE_ID, noteId)
+            putInt(STATE_STARTING_TEMPLATE_ORDINAL, ord)
+            putSerializable(STATE_TAB_TO_VIEW_ID, tabToViewId)
+            putSerializable(STATE_TAB_TO_CURSOR_POSITION, tabToCursorPositions)
             super.onSaveInstanceState(this)
         }
     }
@@ -546,6 +554,39 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
         return supportFragmentManager.findFragmentByTag("f${adapter.getItemId(position)}") as? CardTemplateFragment
     }
 
+    private fun repositionTemplate(
+        from: CardOrdinal,
+        to: CardOrdinal,
+    ) {
+        if (from == to) return
+        val positions = (0 until tempNoteType!!.templateCount).toMutableList()
+        // Save the live cursor positions before the fragments are recreated at their new positions.
+        for (position in positions) {
+            templateFragment(position)?.takeIf { it.view != null }?.let { fragment ->
+                tabToCursorPositions[position]?.set(fragment.currentEditorViewId, fragment.binding.editText.selectionStart)
+            }
+        }
+        positions.add(to, positions.removeAt(from))
+        tabToCursorPositions = reorderTabState(tabToCursorPositions, positions)
+        tabToViewId = reorderTabState(tabToViewId, positions)
+        tempNoteType!!.repositionTemplate(from, to)
+
+        val pager = mainBinding.cardTemplateEditorPager
+        (pager.adapter as TemplatePagerAdapter).ordinalShift()
+        pager.adapter!!.notifyDataSetChanged()
+        pager.setCurrentItem(to, false)
+        loadTemplatePreviewerFragmentIfFragmented(to)
+        updateDiscardChangesCallback()
+    }
+
+    private fun <T> reorderTabState(
+        state: HashMap<Int, T>,
+        positions: List<Int>,
+    ): HashMap<Int, T> =
+        positions
+            .mapIndexedNotNull { newPosition, oldPosition -> state[oldPosition]?.let { newPosition to it } }
+            .toMap(HashMap())
+
     @get:VisibleForTesting
     val currentFragment: CardTemplateFragment?
         get() = templateFragment(ord)
@@ -611,7 +652,7 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
 
         // Index of this card template fragment in ViewPager
         private val cardIndex
-            get() = requireArguments().getInt(CARD_INDEX)
+            get() = requireArguments().getInt(ARG_CARD_INDEX)
 
         /** Whether this is the page shown by the pager. */
         private val isCurrentPage: Boolean
@@ -665,7 +706,7 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
                 binding.mainLayout.setBackgroundColor(
                     getColorFromAttr(
                         requireContext(),
-                        R.attr.alternativeBackgroundColor,
+                        CommonR.attr.alternativeBackgroundColor,
                     ),
                 )
 
@@ -732,7 +773,7 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
             }
             // set saved or default view
             binding.bottomNavigation.selectedItemId =
-                templateEditor.tabToViewId[cardIndex] ?: requireArguments().getInt(EDITOR_VIEW_ID_KEY)
+                templateEditor.tabToViewId[cardIndex] ?: requireArguments().getInt(ARG_EDITOR_VIEW_ID)
 
             // Set text change listeners
             val templateEditorWatcher: TextWatcher =
@@ -816,7 +857,7 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
 
             parentFragmentManager.setFragmentResultListener(insertFieldRequestKey, viewLifecycleOwner) { key, bundle ->
                 // this is guaranteed to be non null, as we put a non null value on the other side
-                insertField(bundle.getString(InsertFieldDialog.KEY_INSERTED_FIELD)!!)
+                insertField(bundle.getString(InsertFieldDialog.RESULT_INSERTED_FIELD)!!)
             }
             setupMenu()
         }
@@ -887,16 +928,7 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
 
                 // use the ord of the selected template, not the ord of the currently edited card
 
-                val ord =
-                    // deletions change ordinals, don't try to preview metadata if this occurs.
-                    if (tempModel.templateChanges.any {
-                            it.type == CardTemplateNotetype.ChangeType.DELETE
-                        }
-                    ) {
-                        null
-                    } else {
-                        templateEditor.ord
-                    }
+                val ord = tempModel.getOriginalOrdinal(templateEditor.ord)
 
                 val dialog =
                     InsertFieldDialog.newInstance(
@@ -953,14 +985,16 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
         }
 
         private fun showRepositionDialog() {
+            if (noteTypeCreatesDynamicNumberOfNotes() || tempModel.templateCount < 2) return
+            val currentPosition = templateEditor.ord
             RepositionCardTemplateDialog.showInstance(
                 requireContext(),
-                templateEditor.mainBinding.cardTemplateEditorPager.adapter!!
-                    .itemCount,
+                tempModel.templateCount,
             ) { newPosition ->
-                val currentPosition = templateEditor.ord
-                Timber.w("moving card template %d to %d", currentPosition, newPosition)
-                TODO("CardTemplateNotetype is a complex class and requires significant testing")
+                val newOrdinal = newPosition - 1
+                if (newOrdinal == currentPosition) return@showInstance
+                Timber.i("moving card template %d to %d", currentPosition, newOrdinal)
+                executeWithSyncCheck(Runnable { templateEditor.repositionTemplate(currentPosition, newOrdinal) })
             }
         }
 
@@ -1043,7 +1077,7 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
                 val numAffectedCards =
                     if (!CardTemplateNotetype.isOrdinalPendingAdd(tempModel, ordinal)) {
                         Timber.d("Ordinal is not a pending add, so we'll get the current card count for confirmation")
-                        withCol { notetypes.tmplUseCount(tempModel.notetype, ordinal) }
+                        withCol { notetypes.tmplUseCount(tempModel.notetype, tempModel.getOriginalOrdinal(ordinal)!!) }
                     } else {
                         0
                     }
@@ -1076,16 +1110,13 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
                 Timber.w("addCardTemplate attempted on cloze note type")
                 return
             }
-            // Show confirmation dialog
-            // isOrdinalPendingAdd method will check if there are any new card types added or not,
-            // if TempModel has new card type then numAffectedCards will be 0 by default.
-            val numAffectedCards =
-                if (!CardTemplateNotetype.isOrdinalPendingAdd(templateEditor.tempNoteType!!, templateEditor.ord)) {
-                    templateEditor.getColUnsafe.notetypes.tmplUseCount(templateEditor.tempNoteType!!.notetype, templateEditor.ord)
-                } else {
-                    0
-                }
-            confirmAddCards(templateEditor.tempNoteType!!.notetype, numAffectedCards)
+            val noteType = templateEditor.tempNoteType!!.notetype
+            val newTemplate = buildNewTemplate(noteType)
+            launchCatchingTask {
+                // Show confirmation dialog
+                val numAffectedCards = withProgress { withCol { countCardsCreatedBy(noteType, newTemplate) } }
+                confirmAddCards(noteType, newTemplate, numAffectedCards)
+            }
         }
 
         fun saveNoteType(): Boolean {
@@ -1127,6 +1158,7 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
         fun setupCommonMenu(menu: Menu) {
             menu.findItem(R.id.action_restore_to_default).title = TR.sentenceCase.restoreToDefault
             menu.findItem(R.id.action_card_browser_appearance).title = TR.sentenceCase.browserAppearance
+            menu.findItem(R.id.action_reposition).isVisible = !noteTypeCreatesDynamicNumberOfNotes() && tempModel.templateCount > 1
             if (noteTypeCreatesDynamicNumberOfNotes()) {
                 Timber.d("Editing cloze/occlusion note type, disabling add/delete card template and deck override functionality")
                 menu.findItem(R.id.action_add).isVisible = false
@@ -1313,7 +1345,7 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
         }
 
         fun getNote(col: Collection): Note? {
-            val nid = requireArguments().getLong(EDITOR_NOTE_ID)
+            val nid = requireArguments().getLong(EXTRA_NOTE_ID)
             return if (nid != -1L) col.getNote(nid) else null
         }
 
@@ -1382,7 +1414,7 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
          */
         private fun getCurrentCardTemplateIndex(): Int {
             // COULD_BE_BETTER: Lots of duplicate code could call this. Hold off on the refactor until #5151 goes in.
-            return requireArguments().getInt(CARD_INDEX)
+            return requireArguments().getInt(ARG_CARD_INDEX)
         }
 
         private suspend fun deletionWouldOrphanNote(
@@ -1484,6 +1516,7 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
          */
         private fun confirmAddCards(
             notetype: NotetypeJson,
+            newTemplate: BackendCardTemplate,
             numAffectedCards: Int,
         ) {
             val d = ConfirmationDialog()
@@ -1501,7 +1534,7 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
                 positiveButtonText = getString(CommonString.menu_add),
             )
 
-            val addCard = Runnable { addNewTemplate(notetype) }
+            val addCard = Runnable { addNewTemplate(notetype, newTemplate) }
             val confirm = Runnable { executeWithSyncCheck(addCard) }
             d.setConfirm(confirm)
             templateEditor.showDialogFragment(d)
@@ -1577,9 +1610,23 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
          * Add new template to a given note type
          * @param noteType note type to add new template to
          */
-        private fun addNewTemplate(noteType: NotetypeJson) {
-            // Build new template
-            val oldCardIndex = requireArguments().getInt(CARD_INDEX)
+        private fun addNewTemplate(
+            noteType: NotetypeJson,
+            newTemplate: BackendCardTemplate,
+        ) {
+            val templates = noteType.templates
+            templates.append(newTemplate)
+            templateEditor.tempNoteType!!.addNewTemplate()
+            templateEditor.mainBinding.cardTemplateEditorPager.adapter!!
+                .notifyDataSetChanged()
+            templateEditor.mainBinding.cardTemplateEditorPager.setCurrentItem(
+                templates.length() - 1,
+                templateEditor.animationDisabled(),
+            )
+        }
+
+        private fun buildNewTemplate(noteType: NotetypeJson): BackendCardTemplate {
+            val oldCardIndex = requireArguments().getInt(ARG_CARD_INDEX)
             val templates = noteType.templates
             val oldTemplate = templates[oldCardIndex]
             val newTemplate = Notetypes.newTemplate(newCardName(templates))
@@ -1591,16 +1638,9 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
                 flipQA(newTemplate)
             }
             val lastExistingOrd = templates.last().ord
-            Timber.d("addNewTemplate() lastExistingOrd was %s", lastExistingOrd)
+            Timber.d("buildNewTemplate() lastExistingOrd was %s", lastExistingOrd)
             newTemplate.setOrd(lastExistingOrd + 1)
-            templates.append(newTemplate)
-            templateEditor.tempNoteType!!.addNewTemplate(newTemplate)
-            templateEditor.mainBinding.cardTemplateEditorPager.adapter!!
-                .notifyDataSetChanged()
-            templateEditor.mainBinding.cardTemplateEditorPager.setCurrentItem(
-                templates.length() - 1,
-                templateEditor.animationDisabled(),
-            )
+            return newTemplate
         }
 
         /**
@@ -1668,9 +1708,9 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
             ): CardTemplateFragment {
                 val f = CardTemplateFragment()
                 val args = Bundle()
-                args.putInt(CARD_INDEX, cardIndex)
-                args.putLong(EDITOR_NOTE_ID, noteId)
-                args.putInt(EDITOR_VIEW_ID_KEY, viewId)
+                args.putInt(ARG_CARD_INDEX, cardIndex)
+                args.putLong(EXTRA_NOTE_ID, noteId)
+                args.putInt(ARG_EDITOR_VIEW_ID, viewId)
                 f.arguments = args
                 return f
             }
@@ -1684,13 +1724,16 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
     }
 
     companion object {
-        private const val TAB_TO_CURSOR_POSITION_KEY = "tabToCursorPosition"
-        private const val EDITOR_VIEW_ID_KEY = "editorViewId"
-        private const val TAB_TO_VIEW_ID = "tabToViewId"
-        const val EDITOR_NOTE_TYPE_ID = "noteTypeId"
-        private const val EDITOR_NOTE_ID = "noteId"
-        private const val EDITOR_START_ORD_ID = "ordId"
-        private const val CARD_INDEX = "card_ord"
+        private const val STATE_TAB_TO_CURSOR_POSITION = "tabToCursorPosition"
+        private const val ARG_EDITOR_VIEW_ID = "editorViewId"
+        private const val STATE_TAB_TO_VIEW_ID = "tabToViewId"
+        const val EXTRA_NOTE_TYPE_ID = "noteTypeId"
+        private const val EXTRA_NOTE_ID = "noteId"
+        private const val EXTRA_START_ORD_ID = "ordId"
+        private const val STATE_NOTE_TYPE_ID = "noteTypeId"
+        private const val STATE_NOTE_ID = "noteId"
+        private const val STATE_STARTING_TEMPLATE_ORDINAL = "ordId"
+        private const val ARG_CARD_INDEX = "card_ord"
 
         // Keys for saving pane weights in SharedPreferences
         private const val PREF_TEMPLATE_EDITOR_PANE_WEIGHT = "cardTemplateEditorPaneWeight"
@@ -1713,9 +1756,9 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
             ord: CardOrdinal? = null,
         ) = Intent(context, CardTemplateEditor::class.java)
             .apply {
-                putExtra(EDITOR_NOTE_TYPE_ID, noteTypeId)
-                noteId?.let { putExtra(EDITOR_NOTE_ID, it) }
-                ord?.let { putExtra(EDITOR_START_ORD_ID, it) }
+                putExtra(EXTRA_NOTE_TYPE_ID, noteTypeId)
+                noteId?.let { putExtra(EXTRA_NOTE_ID, it) }
+                ord?.let { putExtra(EXTRA_START_ORD_ID, it) }
 
                 Timber.d(
                     "Built intent for CardTemplateEditor; ntid: %s; nid: %s; ord: %s",
@@ -1726,3 +1769,30 @@ open class CardTemplateEditor : AnkiActivity(R.layout.activity_card_template_edi
             }
     }
 }
+
+@VisibleForTesting
+internal fun Collection.countCardsCreatedBy(
+    noteType: NotetypeJson,
+    template: BackendCardTemplate,
+    timeout: Duration = 1.seconds,
+): Int {
+    val deadline = TimeSource.Monotonic.markNow() + timeout
+    val unreferencedOrd = generateSequence(0) { it + 1 }.first { "c${it + 1}" !in template.qfmt }
+    val templateBytes = BackendUtils.toJsonBytes(template.deepClone().apply { setOrd(unreferencedOrd) })
+    val noteIds = notetypes.nids(noteType)
+    return try {
+        noteIds.count { nid ->
+            if (deadline.hasPassedNow()) {
+                Timber.w("counting the cards of a new card type timed out")
+                Analytics.sendAnalyticsException(TimeoutException("New card type count timed out with ${noteIds.size} notes"), false)
+                return noteIds.size
+            }
+            !backend
+                .renderUncommittedCardLegacy(getNote(nid).toBackendNote(), unreferencedOrd, templateBytes, false, true)
+                .isEmpty
+        }
+    } catch (e: BackendTemplateException) {
+        Timber.w(e, "new card type has a template error")
+        0
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateNotetype.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateNotetype.kt
index 650b701a4dda..0d6508f722e6 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateNotetype.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardTemplateNotetype.kt
@@ -8,12 +8,15 @@ import android.content.Intent
 import android.os.Bundle
 import android.os.Parcel
 import android.os.Parcelable
-import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.common.android.appContext
 import com.ichi2.anki.compat.CompatHelper.Companion.getSerializableCompat
+import com.ichi2.anki.libanki.CardOrdinal
 import com.ichi2.anki.libanki.CardTemplate
 import com.ichi2.anki.libanki.NoteTypeId
 import com.ichi2.anki.libanki.NotetypeJson
+import com.ichi2.anki.libanki.Notetypes
+import com.ichi2.anki.libanki.utils.insert
+import com.ichi2.anki.libanki.utils.remove
 import com.ichi2.anki.observability.undoableOp
 import com.ichi2.anki.utils.ext.readJson
 import com.ichi2.anki.utils.ext.writeJson
@@ -25,33 +28,21 @@ import java.io.IOException
 class CardTemplateNotetype(
     val notetype: NotetypeJson,
 ) {
-    enum class ChangeType {
-        ADD,
-        DELETE,
-    }
-
-    data class TemplateChange(
-        var ordinal: Int,
-        val type: ChangeType,
-    ) : java.io.Serializable
-
-    private val changes = CardTemplateChanges()
-
-    var templateChanges: ArrayList<TemplateChange>
-        get() = changes.templateChanges
-        private set(value) {
-            changes.templateChanges = value
-        }
+    /** Database identity at each editor position; null for an unsaved addition. */
+    private var originalTemplateOrds: ArrayList<CardOrdinal?> = notetype.templates.mapTo(ArrayList()) { it.ord }
+    private var deletedTemplateOrds = ArrayList<CardOrdinal>()
 
     fun toBundle(): Bundle =
         Bundle().apply {
-            putString(INTENT_MODEL_FILENAME, saveTempNoteType(appContext, notetype))
-            putSerializable("mTemplateChanges", templateChanges)
+            putString(STATE_EDITED_NOTE_TYPE_FILENAME, saveTempNoteType(appContext, notetype))
+            putSerializable(STATE_ORIGINAL_TEMPLATE_ORDS, originalTemplateOrds)
+            putSerializable(STATE_DELETED_TEMPLATE_ORDS, deletedTemplateOrds)
         }
 
     private fun loadTemplateChanges(bundle: Bundle) {
         try {
-            templateChanges = bundle.getSerializableCompat("mTemplateChanges")!!
+            originalTemplateOrds = bundle.getSerializableCompat(STATE_ORIGINAL_TEMPLATE_ORDS)!!
+            deletedTemplateOrds = bundle.getSerializableCompat(STATE_DELETED_TEMPLATE_ORDS)!!
         } catch (e: ClassCastException) {
             Timber.e(e, "Unexpected cast failure")
         }
@@ -81,80 +72,64 @@ class CardTemplateNotetype(
         notetype.templates[ordinal] = template
     }
 
-    fun addNewTemplate(newTemplate: CardTemplate) {
+    fun addNewTemplate() {
         Timber.d("addNewTemplate()")
-        addTemplateChange(ChangeType.ADD, newTemplate.ord)
+        originalTemplateOrds.add(null)
     }
 
     fun removeTemplate(ord: Int) {
         Timber.d("removeTemplate() on ordinal %s", ord)
-        addTemplateChange(ChangeType.DELETE, ord)
-    }
-
-    suspend fun saveToDatabase() {
-        Timber.d("saveToDatabase() called")
-        changes.dumpChanges()
-        clearTempNoteTypeFiles()
-        saveNoteType(notetype, adjustedTemplateChanges)
+        originalTemplateOrds.removeAt(ord)?.let { deletedTemplateOrds.add(it) }
     }
 
-    /**
-     * Handles everything for a note type change at once - template add / deletes as well as content updates
-     */
-    suspend fun saveNoteType(
-        notetype: NotetypeJson,
-        templateChanges: ArrayList<TemplateChange>,
+    /** Move a template while retaining its database identity for saving, previews and deletion checks. */
+    fun repositionTemplate(
+        from: CardOrdinal,
+        to: CardOrdinal,
     ) {
-        Timber.d("saveNoteType")
-        val oldNoteType = withCol { notetypes.get(notetype.id) }
+        require(from in 0 until templateCount && to in 0 until templateCount)
+        if (from == to) return
+        val template = getTemplate(from)
+        notetype.templates.remove(template)
+        notetype.templates.insert(to, template)
+        originalTemplateOrds.add(to, originalTemplateOrds.removeAt(from))
+        Notetypes._updateTemplOrds(notetype)
+    }
 
-        val newTemplates = notetype.templates
-        for (change in templateChanges) {
-            val oldTemplates = oldNoteType!!.templates
-            when (change.type) {
-                ChangeType.ADD -> {
-                    Timber.d("saveNoteType() adding template %s", change.ordinal)
-                    withCol { notetypes.addTemplate(oldNoteType, newTemplates[change.ordinal]) }
-                }
-                ChangeType.DELETE -> {
-                    Timber.d("saveNoteType() deleting template currently at ordinal %s", change.ordinal)
-                    withCol { notetypes.removeTemplate(oldNoteType, oldTemplates[change.ordinal]) }
-                }
-            }
+    suspend fun saveToDatabase() {
+        Timber.d("saveToDatabase() called")
+        val updated = notetype.deepClone()
+        for ((i, template) in updated.templates.withIndex()) {
+            template.setOrd(originalTemplateOrds[i])
         }
-
-        // required for Rust: the modified time can't go backwards, and we updated the note type by adding fields
-        // This could be done better
-        notetype.mod = oldNoteType!!.mod
         undoableOp {
-            notetypes.updateDict(notetype)
+            notetypes.updateDict(updated)
         }
+        clearTempNoteTypeFiles()
     }
 
-    fun addTemplateChange(
-        type: ChangeType,
-        ordinal: Int,
-    ) = changes.addTemplateChange(type, ordinal)
-
-    fun getDeleteDbOrds(ord: Int): IntArray = changes.getDeleteDbOrds(ord)
+    /** Database ordinals of pending deletions, including the proposed editor position. */
+    fun getDeleteDbOrds(ord: Int): IntArray = (deletedTemplateOrds + listOfNotNull(getOriginalOrdinal(ord))).toIntArray()
 
-    val adjustedTemplateChanges: ArrayList<TemplateChange>
-        get() = changes.adjustedTemplateChanges
+    /** Database ordinal for an editor position, or null for an unsaved addition. */
+    fun getOriginalOrdinal(ordinal: Int): CardOrdinal? = originalTemplateOrds[ordinal]
 
     companion object {
-        const val INTENT_MODEL_FILENAME = "editedNoteTypeFilename"
+        private const val STATE_EDITED_NOTE_TYPE_FILENAME = "editedNoteTypeFilename"
+        private const val STATE_ORIGINAL_TEMPLATE_ORDS = "originalTemplateOrds"
+        private const val STATE_DELETED_TEMPLATE_ORDS = "deletedTemplateOrds"
 
         /**
          * Load the TemporaryNoteType from the filename included in a Bundle
          *
-         * @param bundle a Bundle that should contain persisted JSON under INTENT_MODEL_FILENAME key
+         * @param bundle a Bundle that should contain persisted JSON under STATE_EDITED_NOTE_TYPE_FILENAME key
          * @return re-hydrated TemporaryNoteType or null if there was a problem, null means should reload from database
          */
         fun fromBundle(bundle: Bundle): CardTemplateNotetype? {
-            val editedNoteTypeFileName = bundle.getString(INTENT_MODEL_FILENAME)
+            val editedNoteTypeFileName = bundle.getString(STATE_EDITED_NOTE_TYPE_FILENAME)
             // Bundle.getString is @Nullable, so we have to check.
             if (editedNoteTypeFileName == null) {
-                Timber.d("fromBundle() - note type file name under key %s", INTENT_MODEL_FILENAME)
+                Timber.d("fromBundle() - note type file name under key %s", STATE_EDITED_NOTE_TYPE_FILENAME)
                 return null
             }
             Timber.d("onCreate() loading saved note type file %s", editedNoteTypeFileName)
@@ -225,12 +200,7 @@ class CardTemplateNotetype(
         fun isOrdinalPendingAdd(
             noteType: CardTemplateNotetype,
             ord: Int,
-        ): Boolean = CardTemplateChanges.isOrdinalPendingAdd(noteType.changes, ord)
-
-        fun getAdjustedAddOrdinalAtChangeIndex(
-            noteType: CardTemplateNotetype,
-            changesIndex: Int,
-        ): Int = CardTemplateChanges.getAdjustedAddOrdinalAtChangeIndex(noteType.changes, changesIndex)
+        ): Boolean = noteType.getOriginalOrdinal(ord) == null
     }
 }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CoroutineHelpers.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CoroutineHelpers.kt
index be57b28f4648..f8a7fc9fa211 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CoroutineHelpers.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CoroutineHelpers.kt
@@ -17,8 +17,10 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.coroutineScope
+import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewModelScope
 import anki.collection.Progress
 import com.ichi2.anki.CollectionManager.TR
@@ -30,15 +32,15 @@ import com.ichi2.anki.common.annotations.UseContextParameter
 import com.ichi2.anki.common.coroutines.applicationScope
 import com.ichi2.anki.common.crashreporting.CrashReportService
 import com.ichi2.anki.common.destinations.DeckOptionsDestination
+import com.ichi2.anki.common.destinations.DeferredNavigation
 import com.ichi2.anki.common.destinations.PreferencesDestination
+import com.ichi2.anki.common.destinations.toIntent
 import com.ichi2.anki.common.utils.android.isRobolectric
 import com.ichi2.anki.dialogs.DatabaseErrorDialog
 import com.ichi2.anki.dialogs.DatabaseErrorDialog.DatabaseErrorDialogType
 import com.ichi2.anki.exception.CollectionLockedException
 import com.ichi2.anki.exception.StorageAccessException
 import com.ichi2.anki.exception.StorageNotConfiguredException
-import com.ichi2.anki.pages.toIntent
-import com.ichi2.anki.preferences.toIntent
 import com.ichi2.anki.progress.blockTouches
 import com.ichi2.anki.progress.unblockTouches
 import com.ichi2.anki.snackbar.showSnackbar
@@ -241,24 +243,33 @@ fun Fragment.launchCatchingTask(
     errorMessage: String? = null,
     skipCrashReport: ((Exception) -> Boolean)? = null,
     block: suspend CoroutineScope.() -> Unit,
-): Job =
-    lifecycle.coroutineScope.launch {
-        // It's a bug to call this if the activity is invalid or finishing.
-        val validActivity =
-            kotlin
-                .runCatching {
-                    requireActivity(simpleName = true).also { activity ->
-                        check(!activity.isFinishing) {
-                            "Cannot launch task for ${this@launchCatchingTask.javaClass.simpleName}: activity is finishing"
-                        }
-                    }
-                }.getOrElse {
-                    Timber.w(it, "Fragment.launchCatchingTask")
-                    if (isRobolectric) throw it
-                    return@launch
-                }
+): Job {
+    val fragmentLifecycle = lifecycle
+    return fragmentLifecycle.coroutineScope.launch {
+        // Removal can precede scope registration; reading the fragment creates a new lifecycle.
+        if (fragmentLifecycle.currentState == Lifecycle.State.DESTROYED) {
+            Timber.w("Skipping launchCatchingTask for %s: fragment lifecycle is destroyed", this@launchCatchingTask.javaClass.simpleName)
+            return@launch
+        }
+        val validActivity = validActivityForTask() ?: return@launch
         validActivity.runCatching(errorMessage, skipCrashReport = skipCrashReport) { block() }
     }
+}
+
+private fun Fragment.validActivityForTask(): FragmentActivity? =
+    // It's a bug to call this if the activity is invalid or finishing.
+    kotlin
+        .runCatching {
+            requireActivity(simpleName = true).also { activity ->
+                check(!activity.isFinishing) {
+                    "Cannot launch task for ${this@validActivityForTask.javaClass.simpleName}: activity is finishing"
+                }
+            }
+        }.getOrElse {
+            Timber.w(it, "Fragment.launchCatchingTask")
+            if (isRobolectric) throw it
+            null
+        }
 
 /**
  * [Fragment.requireActivity], with a short stable name so crash reports can be grouped together.
@@ -275,6 +286,32 @@ fun Fragment.requireActivity(simpleName: Boolean): FragmentActivity =
         requireActivity()
     }
 
+/**
+ * Like [Fragment.launchCatchingTask], but tied to the current view's lifecycle.
+ * Skips [block] if the view is destroyed before the job starts.
+ *
+ * @return the launched job, or `null` if the fragment has no view.
+ */
+fun Fragment.launchCatchingViewTask(
+    errorMessage: String? = null,
+    skipCrashReport: ((Exception) -> Boolean)? = null,
+    block: suspend CoroutineScope.() -> Unit,
+): Job? {
+    val owner = viewLifecycleOwnerLiveData.value ?: return null
+    return owner.lifecycleScope.launch {
+        // A synchronous replacement can destroy the view before lifecycleScope registers cancellation.
+        if (owner.lifecycle.currentState == Lifecycle.State.DESTROYED) {
+            Timber.w(
+                "Skipping launchCatchingViewTask for %s: view lifecycle is destroyed",
+                this@launchCatchingViewTask.javaClass.simpleName,
+            )
+            return@launch
+        }
+        val validActivity = validActivityForTask() ?: return@launch
+        validActivity.runCatching(errorMessage, skipCrashReport = skipCrashReport) { block() }
+    }
+}
+
 /**
  * Displays an error dialog with title 'Error' and provided [message].
  * May report the error when the dialog is dismissed
@@ -283,10 +320,10 @@ fun Fragment.requireActivity(simpleName: Boolean): FragmentActivity =
  * @param crashReportData Crash report data which may be reported when the dialog is dismissed.
  */
 fun Context.showError(
-    message: String,
+    message: CharSequence,
     crashReportData: CrashReportData?,
 ) {
-    crashReportData.throwIfDialogUnusable(message)
+    crashReportData.throwIfDialogUnusable(message.toString())
 
     Timber.i("Error dialog displayed")
 
@@ -721,7 +758,7 @@ data class CrashReportData(
                 // if we're in the error dialog, we have no context of the deck which caused the exception
                 // assume it's the current deck
                 val openCurrentDeckOptions = DeckOptionsDestination.fromCurrentDeck()
-                context.startActivity(openCurrentDeckOptions.toIntent(context))
+                context.startActivity(with(DeferredNavigation) { openCurrentDeckOptions.toIntent() })
                 // dismiss the dialog - the user should have resolved the issue
                 return true
             }
@@ -736,7 +773,7 @@ data class CrashReportData(
 
             override suspend fun execute(context: Context): Boolean {
                 Timber.i("Opening 'Advanced settings'")
-                context.startActivity(PreferencesDestination.Advanced.toIntent(context))
+                context.startActivity(with(DeferredNavigation) { PreferencesDestination.Advanced.toIntent() })
                 return true
             }
         }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
index 7f8194ae4104..b0e12373479b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
@@ -24,7 +24,9 @@ import android.text.util.Linkify
 import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
+import android.view.MotionEvent
 import android.view.View
+import android.view.ViewConfiguration
 import android.view.ViewGroup.MarginLayoutParams
 import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
@@ -65,6 +67,7 @@ import androidx.fragment.app.commitNow
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import androidx.work.NetworkType
@@ -72,12 +75,14 @@ import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import anki.collection.OpChanges
 import anki.sync.SyncStatusResponse
+import com.google.android.material.behavior.HideViewOnScrollBehavior
 import com.google.android.material.progressindicator.LinearProgressIndicator
 import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
 import com.ichi2.anki.BottomNavController.NavigationItem
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CollectionManager.withCol
+import com.ichi2.anki.DeckPickerFloatingActionMenu.CloseAnimation
 import com.ichi2.anki.DeckPickerFloatingActionMenu.FloatingActionBarToggleListener
 import com.ichi2.anki.InitialActivity.StartupFailure
 import com.ichi2.anki.InitialActivity.StartupFailure.DBError
@@ -112,6 +117,7 @@ import com.ichi2.anki.common.storage.CollectionHelper
 import com.ichi2.anki.common.time.TimeManager
 import com.ichi2.anki.common.utils.android.showThemedToast
 import com.ichi2.anki.common.utils.annotation.KotlinCleanup
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.compat.CompatHelper.Companion.getSerializableCompat
 import com.ichi2.anki.contextmenu.DeckPickerMenuContentProvider
 import com.ichi2.anki.databinding.ActivityHomescreenBinding
@@ -165,8 +171,6 @@ import com.ichi2.anki.libanki.sched.DeckNode
 import com.ichi2.anki.mediacheck.MediaCheckFragment
 import com.ichi2.anki.observability.ChangeManager
 import com.ichi2.anki.pages.AnkiPackageImporterFragment
-import com.ichi2.anki.pages.CongratsPage
-import com.ichi2.anki.pages.CongratsPage.Companion.onDeckCompleted
 import com.ichi2.anki.progress.observeProgress
 import com.ichi2.anki.receiver.SdCardReceiver
 import com.ichi2.anki.reviewreminders.ReviewReminderScope
@@ -179,6 +183,9 @@ import com.ichi2.anki.shareddeck.SharedDecksActivity
 import com.ichi2.anki.snackbar.BaseSnackbarBuilderProvider
 import com.ichi2.anki.snackbar.SnackbarBuilder
 import com.ichi2.anki.snackbar.showSnackbar
+import com.ichi2.anki.study.StudyAvailability
+import com.ichi2.anki.study.StudyCompletionUi
+import com.ichi2.anki.study.currentDeckStudyState
 import com.ichi2.anki.sync.MeteredSyncPolicy
 import com.ichi2.anki.sync.launchCatchingRequiringOneWaySyncDiscardUndo
 import com.ichi2.anki.sync.syncStatus
@@ -213,7 +220,7 @@ import com.ichi2.utils.Permissions
 import com.ichi2.utils.VersionUtils
 import com.ichi2.utils.configureView
 import com.ichi2.utils.customView
-import com.ichi2.utils.dp
+import com.ichi2.utils.isRtl
 import com.ichi2.utils.message
 import com.ichi2.utils.positiveButton
 import com.ichi2.utils.show
@@ -221,6 +228,7 @@ import com.ichi2.utils.showDialogIfWebViewOutdated
 import com.ichi2.utils.title
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.awaitCancellation
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.launch
@@ -301,6 +309,7 @@ open class DeckPicker :
 
     private lateinit var decksLayoutManager: LinearLayoutManager
     private lateinit var deckListAdapter: DeckAdapter
+    private var backgroundImageErrorShown = false
     private lateinit var pullToSyncWrapper: SwipeRefreshLayout
 
     @VisibleForTesting
@@ -431,7 +440,7 @@ open class DeckPicker :
     private val closeFloatingActionBarBackPressCallback =
         object : OnBackPressedCallback(enabled = false) {
             override fun handleOnBackPressed() {
-                floatingActionMenu.closeFloatingActionMenu(applyRiseAndShrinkAnimation = true)
+                floatingActionMenu.closeFloatingActionMenu(style = CloseAnimation.SHORT)
             }
         }
 
@@ -522,7 +531,7 @@ open class DeckPicker :
             return
         }
         Timber.d("Not displaying app intro")
-        if (intent.hasExtra(INTENT_SYNC_FROM_LOGIN)) {
+        if (intent.hasExtra(EXTRA_SYNC_FROM_LOGIN)) {
             Timber.d("launched from introduction activity login: syncing")
             syncOnResume = true
         }
@@ -588,7 +597,16 @@ open class DeckPicker :
             )
         }
 
-        lifecycleScope.launch { applyDeckPickerBackground() }
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                applyDeckPickerBackground()
+                try {
+                    awaitCancellation()
+                } finally {
+                    deckPickerBinding.background.setImageDrawable(null)
+                }
+            }
+        }
 
         setupPullToSync()
         // Setup the FloatingActionButtons
@@ -638,6 +656,16 @@ open class DeckPicker :
         setFragmentResultListener(Check.DATABASE.requestKey) { _, _ ->
             performIntegrityCheck()
         }
+        setFragmentResultListener(SchedulerUpgradeDialog.REQUEST_SCHEDULER_UPGRADE) { _, result ->
+            if (result.getBoolean(SchedulerUpgradeDialog.RESULT_UPGRADE)) {
+                launchCatchingRequiringOneWaySyncDiscardUndo {
+                    this@DeckPicker.withProgress { withCol { sched.upgradeToV2() } }
+                    showThemedToast(this@DeckPicker, TR.schedulingUpdateDone(), false)
+                }
+            } else {
+                onBackPressedDispatcher.onBackPressed()
+            }
+        }
 
         registerStudyOptionsStudyHandler {
             Timber.d("Opening study screen from DeckPicker's study options panel")
@@ -724,14 +752,19 @@ open class DeckPicker :
                 val nav = insets.getInsets(navigationBars())
                 window.isNavigationBarContrastEnforced = nav.left > 0 || nav.right > 0
             }
+            val isRtl = deckPickerInclude.isRtl()
             deckPickerInclude.updatePadding(
-                left = bars.left,
-                right = if (fragmented) 0 else bars.right,
+                left = if (isRtl && fragmented) 0 else bars.left,
+                right = if (!isRtl && fragmented) 0 else bars.right,
             )
             deckPickerBinding.reviewSummaryTextView.updatePadding(bottom = withKeyboard.bottom)
 
-            val bottomNavView = findViewById<View?>(R.id.bottom_navigation)
-            val bottomNavOffset = if (bottomNavView?.isVisible == true) BOTTOM_NAV_HEIGHT_DP.dp.toPx(this) else 0
+            val bottomNavOffset =
+                if (binding.bottomNavigation?.let { it.isVisible && HideViewOnScrollBehavior.from(it).isScrolledIn } == true) {
+                    BOTTOM_NAV_HEIGHT_DP.dp.toPx(this)
+                } else {
+                    0
+                }
             // the keyboard covers the bottom navigation: clear whichever is taller
             floatingActionButtonBinding.root.updatePadding(
                 bottom = maxOf(bars.bottom + bottomNavOffset, withKeyboard.bottom),
@@ -758,10 +791,16 @@ open class DeckPicker :
             val studyoptionsView = binding.studyoptionsFragment ?: return
             ViewCompat.setOnApplyWindowInsetsListener(studyoptionsView) { _, insets ->
                 val bars = insets.getInsets(systemBars() or displayCutout())
-                // the toolbar clears the top and the deck list clears the left: the panel's
-                // fragments apply the remaining insets themselves, so their scrolled content
+                // the toolbar clears the top and the deck list clears the side touching the divider:
+                // the panel's fragments apply the remaining insets themselves, so their scrolled content
                 // renders underneath the navigation bar
-                insets.inset(bars.left, bars.top, 0, 0)
+                val isRtl = studyoptionsView.isRtl()
+                insets.inset(
+                    if (isRtl) 0 else bars.left,
+                    bars.top,
+                    if (isRtl) bars.right else 0,
+                    0,
+                )
             }
         }
     }
@@ -811,18 +850,9 @@ open class DeckPicker :
         }
 
         fun onPromptUserToUpdateScheduler(op: Unit) {
-            SchedulerUpgradeDialog(
-                activity = this,
-                onUpgrade = {
-                    launchCatchingRequiringOneWaySyncDiscardUndo {
-                        this@DeckPicker.withProgress { withCol { sched.upgradeToV2() } }
-                        showThemedToast(this@DeckPicker, TR.schedulingUpdateDone(), false)
-                    }
-                },
-                onCancel = {
-                    onBackPressedDispatcher.onBackPressed()
-                },
-            ).showDialog()
+            if (supportFragmentManager.findFragmentByTag(SchedulerUpgradeDialog.TAG) == null) {
+                SchedulerUpgradeDialog().showNow(supportFragmentManager, SchedulerUpgradeDialog.TAG)
+            }
         }
 
         fun onOptionsMenuUpdated(unused: OptionsMenuState) = invalidateOptionsMenu()
@@ -1160,9 +1190,9 @@ open class DeckPicker :
             is DiskFull -> displayNoStorageError()
             is DBError -> displayDatabaseFailure(CustomExceptionData.fromException(failure.exception))
             is StorageUndecided -> {
-                // unreachable: Undecided requires PREF_COLLECTION_PATH to be unset, which only
-                // happens if ensureCollectionPathSet failed at startup; getStartupFailureType
-                // then returns InitializationError (fatalError) before checking the decision
+                // Undecided requires PREF_COLLECTION_PATH to be unset: only expected if
+                // choosing a default collection path failed (SystemStorageException) after
+                // the permission checks passed
                 // TODO: #19552 - replace with the storage setup flow
                 Timber.w("storage setup flow (#19552) not implemented; showing load-failure options")
                 CrashReportService.sendExceptionReport(
@@ -1212,17 +1242,23 @@ open class DeckPicker :
     private suspend fun applyDeckPickerBackground() {
         val result = BackgroundImage.resolve(this)
         if (result is BackgroundImage.ResolveResult.Failure) {
-            showThemedToast(this, result.message(this), shortLength = false)
+            showBackgroundImageError(result.message(this))
         }
         val drawable = (result as? BackgroundImage.ResolveResult.Ready)?.drawable
         val applied =
             deckPickerBinding.background.setImageDrawableSafe(drawable) {
-                showThemedToast(this, getString(CommonString.background_image_too_large), shortLength = false)
+                showBackgroundImageError(getString(CommonString.background_image_too_large))
             }
         // activityHasBackground calls notifyDataSetChanged, ensure only 1 call
         deckListAdapter.activityHasBackground = applied && drawable != null
     }
 
+    private fun showBackgroundImageError(message: String) {
+        if (backgroundImageErrorShown) return
+        backgroundImageErrorShown = true
+        showThemedToast(this, message, shortLength = false)
+    }
+
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         if (viewModel.flowOfStartupResponse.value is StartupResponse.FatalError) {
             return false
@@ -1230,7 +1266,7 @@ open class DeckPicker :
 
         Timber.d("onCreateOptionsMenu()")
         if (isDrawerOpen) {
-            floatingActionMenu.closeFloatingActionMenu(applyRiseAndShrinkAnimation = false)
+            floatingActionMenu.closeFloatingActionMenu(style = CloseAnimation.LONG)
         }
         // Fragments own their menus: each fragment registers a MenuProvider against this
         // activity (see StudyOptionsFragment), and the menu host dispatches creation,
@@ -1430,13 +1466,13 @@ open class DeckPicker :
             }
             SyncIconState.PendingChanges -> {
                 BadgeDrawableBuilder(this)
-                    .withColorAttr(R.attr.badgeWarningColor)
+                    .withColorAttr(CommonR.attr.badgeWarningColor)
                     .replaceBadge(provider)
             }
             SyncIconState.OneWay, SyncIconState.NotLoggedIn -> {
                 BadgeDrawableBuilder(this)
                     .withText('!')
-                    .withColorAttr(R.attr.badgeErrorColor)
+                    .withColorAttr(CommonR.attr.badgeErrorColor)
                     .replaceBadge(provider)
             }
         }
@@ -1507,9 +1543,7 @@ open class DeckPicker :
                 return true
             }
             R.id.action_deck_delete -> {
-                launchCatchingTask {
-                    viewModel.deleteSelectedDeck().join()
-                }
+                deleteSelectedDeck()
                 return true
             }
             R.id.action_export_collection -> {
@@ -1549,7 +1583,10 @@ open class DeckPicker :
 
     private fun processReviewResults(resultCode: Int) {
         if (resultCode == AbstractFlashcardViewer.RESULT_NO_MORE_CARDS) {
-            CongratsPage.onReviewsCompleted(this, getColUnsafe.sched.totalCount() == 0)
+            launchCatchingTask {
+                val state = withCol { currentDeckStudyState() }
+                StudyCompletionUi.onReviewsCompleted(this@DeckPicker, state)
+            }
             fragment?.refreshInterface()
         }
     }
@@ -1572,7 +1609,7 @@ open class DeckPicker :
         // Due to the App Introduction, this may be called before permission has been granted.
         if (syncOnResume && hasCollectionStoragePermissions()) {
             syncOnResume = false
-            intent.removeExtra(INTENT_SYNC_FROM_LOGIN)
+            intent.removeExtra(EXTRA_SYNC_FROM_LOGIN)
             Timber.i("Performing Sync on Resume")
             Permissions.requestNotificationPermissionsForSyncing(this)
             sync()
@@ -1692,6 +1729,32 @@ open class DeckPicker :
         return false
     }
 
+    /** Where the current downward drag started: reset whenever the finger moves up */
+    private var touchAnchorY = 0f
+    private var lastTouchY = 0f
+
+    override fun dispatchTouchEvent(event: MotionEvent): Boolean {
+        // Content which fits once the bottom bar hides can no longer scroll, so scrolling alone
+        // could never bring the bar back: a downward drag always restores it.
+        if (bottomNavigationEnabled) {
+            when (event.actionMasked) {
+                MotionEvent.ACTION_DOWN -> {
+                    touchAnchorY = event.y
+                    lastTouchY = event.y
+                }
+                MotionEvent.ACTION_MOVE -> {
+                    if (event.y < lastTouchY) {
+                        touchAnchorY = event.y
+                    } else if (event.y - touchAnchorY > ViewConfiguration.get(this).scaledTouchSlop) {
+                        binding.bottomNavigation?.let { HideViewOnScrollBehavior.from(it).slideIn(it) }
+                    }
+                    lastTouchY = event.y
+                }
+            }
+        }
+        return super.dispatchTouchEvent(event)
+    }
+
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {
         if (!bottomNavigationEnabled || event.action != KeyEvent.ACTION_DOWN || !event.isAltPressed) {
             return super.dispatchKeyEvent(event)
@@ -1786,7 +1849,7 @@ open class DeckPicker :
                     if (event.isShiftPressed) {
                         // Shortcut: Shift + DEL - Delete deck without confirmation dialog
                         Timber.i("Shift+DEL: Deck deck without confirmation")
-                        viewModel.focusedDeck?.let { did -> deleteDeck(did) }
+                        deleteSelectedDeck()
                     } else {
                         // Shortcut: DEL
                         Timber.i("Delete Deck from keypress")
@@ -1801,7 +1864,7 @@ open class DeckPicker :
                 // that is, when it appears in the trailing study option fragment
                 if (fragmented) {
                     Timber.i("Rename Deck from keypress")
-                    viewModel.focusedDeck?.let { did -> renameDeckDialog(did) }
+                    viewModel.requestRenameSelectedDeck()
                     return true
                 }
             }
@@ -1898,7 +1961,7 @@ open class DeckPicker :
         } else if (skip < 2 && !InitialActivity.isLatestVersion(preferences)) {
             Timber.i("AnkiDroid is being updated and a collection already exists.")
             // The user might appreciate us now, see if they will help us get better?
-            if (!preferences.contains(AnkiDroidUsageAnalytics.ANALYTICS_OPTIN_KEY)) {
+            if (!preferences.contains(AnkiDroidUsageAnalytics.PREF_ANALYTICS_OPTIN)) {
                 displayAnalyticsOptInDialog()
             }
 
@@ -1909,14 +1972,14 @@ open class DeckPicker :
             val current = VersionUtils.pkgVersionCode
             Timber.i("Current AnkiDroid version: %s", current)
             val previous: Long =
-                if (preferences.contains(DeckPickerViewModel.UPGRADE_VERSION_KEY)) {
+                if (preferences.contains(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION)) {
                     // Upgrading currently installed app
                     viewModel.getPreviousVersion(preferences, current)
                 } else {
                     // Fresh install
                     current
                 }
-            preferences.edit { putLong(DeckPickerViewModel.UPGRADE_VERSION_KEY, current) }
+            preferences.edit { putLong(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION, current) }
 
             val upgradedPreferences = InitialActivity.upgradePreferences(this, previous)
             // Integrity check loads asynchronously and then restart deck picker when finished
@@ -2117,11 +2180,15 @@ open class DeckPicker :
     private fun tryShowStudyOptionsPanel(): Boolean {
         val containerId = binding.studyoptionsFragment?.id ?: return false
 
-        // Close other panels before looking for restored study options.
-        supportFragmentManager.popBackStackImmediate(
-            null,
-            FragmentManager.POP_BACK_STACK_INCLUSIVE,
-        )
+        // Only clear navigation when closing another side panel. Import dialogs can already
+        // be on the back stack when startup finishes, and must survive panel initialization.
+        val sidePanel = supportFragmentManager.findFragmentById(containerId)
+        if (sidePanel != null && sidePanel !is StudyOptionsFragment) {
+            supportFragmentManager.popBackStackImmediate(
+                null,
+                FragmentManager.POP_BACK_STACK_INCLUSIVE,
+            )
+        }
 
         val studyOptions = fragment
         if (studyOptions != null) {
@@ -2159,7 +2226,7 @@ open class DeckPicker :
     override val broadcastsActions =
         super.broadcastsActions +
             mapOf(
-                SdCardReceiver.MEDIA_MOUNT
+                SdCardReceiver.ACTION_MEDIA_MOUNT
                     to { ActivityCompat.recreate(this) },
             )
 
@@ -2229,25 +2296,26 @@ open class DeckPicker :
             updateDeckList()
         }
 
-        withCol { decks.select(did) }
+        val study =
+            withCol {
+                decks.select(did)
+                currentDeckStudyState()
+            }
         deckListAdapter.updateSelectedDeck(did)
         // Also forget the last deck used by the Browser
         CardBrowser.clearLastDeckId()
         viewModel.focusedDeck = did
 
-        // TODO: Reuse dueTree from ViewModel instead of recalculating for better performance.
-        val deck = withCol { sched.deckDueTree().find(did) }
-        if (deck?.hasCardsReadyToStudy() == true) {
+        if (study.availability == StudyAvailability.CardsAvailable) {
             openReviewerOrStudyOptions(selectionType)
             return
         }
 
-        val isEmpty = withCol { decks.cardCount(did, includeSubdecks = true) == 0 }
-        if (!deck?.filtered!! && isEmpty) {
+        if (study.isEmptyRegularDeck) {
             showEmptyDeckSnackbar()
             updateUi()
         } else {
-            onDeckCompleted()
+            StudyCompletionUi.openCongratsPage(this)
         }
     }
 
@@ -2364,6 +2432,11 @@ open class DeckPicker :
             viewModel.deleteDeck(did).join()
         }
 
+    private fun deleteSelectedDeck() =
+        launchCatchingTask {
+            viewModel.deleteSelectedDeck().join()
+        }
+
     @NeedsTest("14285: regression test to ensure UI is updated after this call")
     fun rebuildFiltered(did: DeckId) {
         launchCatchingTask {
@@ -2488,7 +2561,7 @@ open class DeckPicker :
          *
          * This is for the 'download existing collection from AnkiWeb' use case
          */
-        const val INTENT_SYNC_FROM_LOGIN = "syncFromLogin"
+        const val EXTRA_SYNC_FROM_LOGIN = "syncFromLogin"
 
         /**
          * Available options performed by other activities (request codes for onActivityResult())
@@ -2515,7 +2588,7 @@ open class DeckPicker :
             autoSync: Boolean = false,
         ) = Intent(context, DeckPicker::class.java).apply {
             if (autoSync) {
-                putExtra(INTENT_SYNC_FROM_LOGIN, true)
+                putExtra(EXTRA_SYNC_FROM_LOGIN, true)
             }
         }
     }
@@ -2523,7 +2596,7 @@ open class DeckPicker :
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         this.intent = intent
-        if (intent.hasExtra(INTENT_SYNC_FROM_LOGIN)) {
+        if (intent.hasExtra(EXTRA_SYNC_FROM_LOGIN)) {
             Timber.i("Sync requested from Login")
             this.syncOnResume = true
         }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPickerFloatingActionMenu.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPickerFloatingActionMenu.kt
index 00b80c70c1d1..f6288e2b0338 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPickerFloatingActionMenu.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPickerFloatingActionMenu.kt
@@ -4,6 +4,7 @@
 package com.ichi2.anki
 
 import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
 import android.content.Context
 import android.content.res.ColorStateList
 import android.view.KeyEvent
@@ -11,6 +12,8 @@ import android.view.MotionEvent
 import android.view.View
 import android.widget.LinearLayout
 import androidx.annotation.VisibleForTesting
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
 import com.google.android.material.color.MaterialColors
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.common.android.animationEnabled
@@ -30,14 +33,15 @@ class DeckPickerFloatingActionMenu(
 ) {
     // TODO: refactor this to decouple with Homescreen & DeckPicker
     private val binding: IncludeFloatingAddButtonBinding = homescreenBinding.deckPickerPane.floatingActionButton
+    private val extendedFabHorizontalPadding = binding.fabMain.paddingStart + binding.fabMain.paddingEnd
 
     /** Layout deck_picker.xml is attached here */
     private val linearLayout: LinearLayout = homescreenBinding.deckPickerPane.deckpickerView
     private val studyOptionsFrame: View? = homescreenBinding.studyoptionsFrame
 
     // Colors values obtained from attributes
-    private val fabNormalColor = MaterialColors.getColor(binding.fabMain, R.attr.fab_normal)
-    private val fabPressedColor = MaterialColors.getColor(binding.fabMain, R.attr.fab_pressed)
+    private val fabNormalColor = MaterialColors.getColor(binding.fabMain, CommonR.attr.fab_normal)
+    private val fabPressedColor = MaterialColors.getColor(binding.fabMain, CommonR.attr.fab_pressed)
 
     // Add Note Drawable Icon
     private val addNoteIcon: Int = R.drawable.ic_add_note
@@ -48,12 +52,15 @@ class DeckPickerFloatingActionMenu(
     var isFABOpen = false
         private set
 
+    private var pendingMenuReset = false
+
     @Suppress("unused")
     val isFragmented: Boolean
         get() = studyOptionsFrame != null
 
     @VisibleForTesting
     fun showFloatingActionMenu() {
+        if (pendingMenuReset) return
         toggleListener.onBeginToggle(isOpening = true)
         deckPicker.activeSnackBar?.dismiss()
         linearLayout.alpha = 0.5f
@@ -70,9 +77,12 @@ class DeckPickerFloatingActionMenu(
             binding.fabBGLayout.visibility = View.VISIBLE
             binding.fabMain.backgroundTintList = ColorStateList.valueOf(fabPressedColor)
             binding.fabMain.setIconResource(addNoteIcon)
-            binding.fabMain.extend()
+            extendMainButton()
 
             with(binding) {
+                // Dismissal listeners must not run when these opening animations finish.
+                addDeckButton.animate().setListener(null)
+                addFilteredDeckButton.animate().setListener(null)
                 addSharedButton.animate().translationY(0f).duration = 100
                 addDeckButton.animate().translationY(0f).duration = 70
                 addFilteredDeckButton.animate().translationY(0f).duration = 100
@@ -102,159 +112,83 @@ class DeckPickerFloatingActionMenu(
         }
     }
 
+    /** Extends Add without overshooting its final width, preserving the styled minimum width. */
+    private fun extendMainButton() =
+        with(binding.fabMain) {
+            val originalMinWidth = minWidth
+            val originalMinimumWidth = minimumWidth
+            // Material measures with collapsed padding, then adds the extra extended padding.
+            // Discount that padding from the minimum during measurement so it isn't counted twice.
+            val extraPadding = extendedFabHorizontalPadding - paddingStart - paddingEnd
+            // Both TextView's minWidth and View's minimumWidth constrain this measurement.
+            minWidth = (originalMinWidth - extraPadding).coerceAtLeast(0)
+            minimumWidth = (originalMinimumWidth - extraPadding).coerceAtLeast(0)
+            try {
+                extend()
+            } finally {
+                // Preserve the styled minimum width for the final wrap_content layout.
+                minWidth = originalMinWidth
+                minimumWidth = originalMinimumWidth
+            }
+        }
+
     /**
-     * This function takes a parameter which decides if we want to apply the rise and shrink animation
-     * for FAB or not.
-     *
-     * Case 1: When the FAB is already opened and we close it by pressing the back button then we need to show
-     * the rise and shrink animation and get back to the FAB with `+` icon.
-     *
-     * Case 2: When the user opens the side navigation drawer (without touching the FAB). In that case we don't
-     * want to show any type of rise and shrink animation for the FAB so we put the value `false` for the parameter.
+     * Dismisses the menu, or resets it off-screen after opening the editor.
+     * [style] selects the closing animation for Back/outside taps or menu actions.
+     * [animate] is false for the off-screen reset.
      */
-    fun closeFloatingActionMenu(applyRiseAndShrinkAnimation: Boolean) {
+    fun closeFloatingActionMenu(
+        style: CloseAnimation,
+        animate: Boolean = deckPicker.animationEnabled(),
+    ) {
         toggleListener.onBeginToggle(isOpening = false)
-        if (applyRiseAndShrinkAnimation) {
-            linearLayout.alpha = 1f
-            studyOptionsFrame?.let { it.alpha = 1f }
-            isFABOpen = false
-            binding.fabBGLayout.visibility = View.GONE
-            if (deckPicker.animationEnabled()) {
-                // Changes the background color of FAB to default
-                binding.fabMain.backgroundTintList = ColorStateList.valueOf(fabNormalColor)
-                // Close with animation
-                binding.fabMain.setIconResource(addWhiteIcon)
-                binding.fabMain.shrink()
-
-                with(binding) {
-                    addSharedButton.animate().alpha(0f).duration = 50
-                    addDeckButton.animate().alpha(0f).duration = 100
-                    addFilteredDeckButton.animate().alpha(0f).duration = 100
-                    addSharedButton.animate().translationY(400f).duration = 100
-                    addDeckButton
-                        .animate()
-                        .translationY(300f)
-                        .setDuration(50)
-                        .setListener(
-                            object : Animator.AnimatorListener {
-                                override fun onAnimationStart(animator: Animator) {}
-
-                                override fun onAnimationEnd(animator: Animator) {
-                                    if (!isFABOpen) {
-                                        addSharedButton.visibility = View.GONE
-                                        addDeckButton.visibility = View.GONE
-                                        addFilteredDeckButton.visibility = View.GONE
-                                    }
-                                }
-
-                                override fun onAnimationCancel(animator: Animator) {}
-
-                                override fun onAnimationRepeat(animator: Animator) {}
-                            },
-                        )
-                    addFilteredDeckButton
-                        .animate()
-                        .translationY(400f)
-                        .setDuration(100)
-                        .setListener(
-                            object : Animator.AnimatorListener {
-                                override fun onAnimationStart(animator: Animator) {}
-
-                                override fun onAnimationEnd(animator: Animator) {
-                                    if (!isFABOpen) {
-                                        addSharedButton.visibility = View.GONE
-                                        addDeckButton.visibility = View.GONE
-                                        addFilteredDeckButton.visibility = View.GONE
-                                    }
-                                }
-
-                                override fun onAnimationCancel(animator: Animator) {}
-
-                                override fun onAnimationRepeat(animator: Animator) {}
-                            },
-                        )
-                }
-            } else {
-                // Close without animation
-                binding.addSharedButton.visibility = View.GONE
-                binding.addDeckButton.visibility = View.GONE
-                binding.addFilteredDeckButton.visibility = View.GONE
-                binding.fabMain.isExtended = false
-
-                binding.fabMain.setIconResource(addWhiteIcon)
+        linearLayout.alpha = 1f
+        studyOptionsFrame?.let { it.alpha = 1f }
+        isFABOpen = false
+        with(binding) {
+            fabBGLayout.visibility = View.GONE
+            fabMain.backgroundTintList = ColorStateList.valueOf(fabNormalColor)
+            fabMain.setIconResource(addWhiteIcon)
+
+            if (!animate) {
+                addSharedButton.animate().cancel()
+                addDeckButton.animate().cancel()
+                addFilteredDeckButton.animate().cancel()
+                hideMenuButtons()
+                fabMain.isExtended = false
+                return
             }
-        } else {
-            linearLayout.alpha = 1f
-            studyOptionsFrame?.let { it.alpha = 1f }
-            isFABOpen = false
-            binding.fabBGLayout.visibility = View.GONE
-            if (deckPicker.animationEnabled()) {
-                // Changes the background color of FAB to default
-                binding.fabMain.backgroundTintList = ColorStateList.valueOf(fabNormalColor)
-                // Close with animation
-                binding.fabMain.setIconResource(addWhiteIcon)
-                binding.fabMain.shrink()
-
-                with(binding) {
-                    addSharedButton.animate().alpha(0f).duration = 70
-                    addDeckButton.animate().alpha(0f).duration = 50
-                    addFilteredDeckButton.animate().alpha(0f).duration = 50
-                    addSharedButton.animate().translationY(600f).duration = 100
-                    addDeckButton
-                        .animate()
-                        .translationY(400f)
-                        .setDuration(50)
-                        .setListener(
-                            object : Animator.AnimatorListener {
-                                override fun onAnimationStart(animator: Animator) {}
-
-                                override fun onAnimationEnd(animator: Animator) {
-                                    if (!isFABOpen) {
-                                        addSharedButton.visibility = View.GONE
-                                        addDeckButton.visibility = View.GONE
-                                        addFilteredDeckButton.visibility = View.GONE
-                                    }
-                                }
-
-                                override fun onAnimationCancel(animator: Animator) {}
-
-                                override fun onAnimationRepeat(animator: Animator) {}
-                            },
-                        )
-                    addFilteredDeckButton
-                        .animate()
-                        .translationY(600f)
-                        .setDuration(100)
-                        .setListener(
-                            object : Animator.AnimatorListener {
-                                override fun onAnimationStart(animator: Animator) {}
-
-                                override fun onAnimationEnd(animator: Animator) {
-                                    if (!isFABOpen) {
-                                        addSharedButton.visibility = View.GONE
-                                        addDeckButton.visibility = View.GONE
-                                        addFilteredDeckButton.visibility = View.GONE
-                                    }
-                                }
-
-                                override fun onAnimationCancel(animator: Animator) {}
-
-                                override fun onAnimationRepeat(animator: Animator) {}
-                            },
-                        )
+
+            fabMain.shrink()
+            val hideButtons =
+                object : AnimatorListenerAdapter() {
+                    override fun onAnimationEnd(animation: Animator) {
+                        if (!isFABOpen) {
+                            hideMenuButtons()
+                        }
+                    }
                 }
-            } else {
-                // Close without animation
-                binding.addSharedButton.visibility = View.GONE
-                binding.addDeckButton.visibility = View.GONE
-                binding.addFilteredDeckButton.visibility = View.GONE
-                binding.fabMain.isExtended = false
-
-                binding.fabMain.setIconResource(addWhiteIcon)
-            }
+            addSharedButton.animateClose(style.otherOffset, 100)
+            addDeckButton.animateClose(style.deckOffset, 50).setListener(hideButtons)
+            addFilteredDeckButton.animateClose(style.otherOffset, 100).setListener(hideButtons)
         }
     }
 
+    private fun hideMenuButtons() =
+        with(binding) {
+            addSharedButton.visibility = View.GONE
+            addDeckButton.visibility = View.GONE
+            addFilteredDeckButton.visibility = View.GONE
+        }
+
+    private fun View.animateClose(
+        offset: Float,
+        duration: Long,
+    ) = animate()
+        .alpha(0f)
+        .translationY(offset)
+        .setDuration(duration)
+
     fun showFloatingActionButton() {
         if (!binding.fabMain.isShown) {
             Timber.i("DeckPicker:: showFloatingActionButton()")
@@ -265,7 +199,7 @@ class DeckPickerFloatingActionMenu(
     fun hideFloatingActionButton() {
         if (binding.fabMain.isShown) {
             // close the menu if it's open so the other menu items are hidden as well
-            closeFloatingActionMenu(false)
+            closeFloatingActionMenu(style = CloseAnimation.LONG)
             Timber.i("DeckPicker:: hideFloatingActionButton()")
             binding.fabMain.visibility = View.GONE
         }
@@ -287,6 +221,14 @@ class DeckPickerFloatingActionMenu(
         }
 
     init {
+        deckPicker.lifecycle.addObserver(
+            object : DefaultLifecycleObserver {
+                override fun onStop(owner: LifecycleOwner) = resetMenuAfterAdding()
+
+                // In multi-window mode the deck screen may remain visible behind the editor.
+                override fun onResume(owner: LifecycleOwner) = resetMenuAfterAdding()
+            },
+        )
         binding.fabMain.isExtended = false
         binding.fabMain.setOnTouchListener(
             object : DoubleTapListener(context) {
@@ -322,7 +264,7 @@ class DeckPickerFloatingActionMenu(
                     KeyEvent.KEYCODE_ESCAPE -> {
                         if (isFABOpen) {
                             Timber.d("FAB main button: ESC key pressed - closing menu")
-                            closeFloatingActionMenu(applyRiseAndShrinkAnimation = true)
+                            closeFloatingActionMenu(style = CloseAnimation.SHORT)
                             return@setOnKeyListener true
                         }
                     }
@@ -331,11 +273,21 @@ class DeckPickerFloatingActionMenu(
             false
         }
 
-        binding.fabBGLayout.setOnClickListener { closeFloatingActionMenu(applyRiseAndShrinkAnimation = true) }
+        // Close the FAB menu when clicking outside the menu container
+        binding.fabBGLayout.setOnClickListener { closeFloatingActionMenu(style = CloseAnimation.SHORT) }
+
+        // Close the FAB menu when clicking the background inside the menu container
+        // (e.g., when tapping to the left of narrower buttons such as the "Add" button)
+        binding.fabLinearLayout.setOnClickListener {
+            if (isFABOpen) {
+                closeFloatingActionMenu(style = CloseAnimation.SHORT)
+            }
+        }
+
         val addDeckListener =
             View.OnClickListener {
                 if (isFABOpen) {
-                    closeFloatingActionMenu(applyRiseAndShrinkAnimation = false)
+                    closeFloatingActionMenu(style = CloseAnimation.LONG)
                     deckPicker.showCreateDeckDialog()
                 }
             }
@@ -346,7 +298,7 @@ class DeckPickerFloatingActionMenu(
         val addDeckKeyListener =
             createActivationKeyListener("Add Deck button: ENTER key pressed") {
                 if (isFABOpen) {
-                    closeFloatingActionMenu(applyRiseAndShrinkAnimation = false)
+                    closeFloatingActionMenu(style = CloseAnimation.LONG)
                     deckPicker.showCreateDeckDialog()
                 }
             }
@@ -354,7 +306,7 @@ class DeckPickerFloatingActionMenu(
         val addFilteredDeckListener =
             View.OnClickListener {
                 if (isFABOpen) {
-                    closeFloatingActionMenu(applyRiseAndShrinkAnimation = false)
+                    closeFloatingActionMenu(style = CloseAnimation.LONG)
                     deckPicker.showCreateFilteredDeckDialog()
                 }
             }
@@ -364,7 +316,7 @@ class DeckPickerFloatingActionMenu(
         val addFilteredDeckKeyListener =
             createActivationKeyListener("Add Filtered Deck button: ENTER key pressed") {
                 if (isFABOpen) {
-                    closeFloatingActionMenu(applyRiseAndShrinkAnimation = false)
+                    closeFloatingActionMenu(style = CloseAnimation.LONG)
                     deckPicker.showCreateFilteredDeckDialog()
                 }
             }
@@ -372,7 +324,7 @@ class DeckPickerFloatingActionMenu(
         val addSharedListener =
             View.OnClickListener {
                 if (isFABOpen) {
-                    closeFloatingActionMenu(applyRiseAndShrinkAnimation = false)
+                    closeFloatingActionMenu(style = CloseAnimation.LONG)
                     Timber.d("configureFloatingActionsMenu::addSharedButton::onClickListener - Adding Shared Deck")
                     deckPicker.openAnkiWebSharedDecks()
                 }
@@ -383,7 +335,7 @@ class DeckPickerFloatingActionMenu(
         val addSharedKeyListener =
             createActivationKeyListener("Add Shared Deck button: ENTER key pressed") {
                 if (isFABOpen) {
-                    closeFloatingActionMenu(applyRiseAndShrinkAnimation = false)
+                    closeFloatingActionMenu(style = CloseAnimation.LONG)
                     deckPicker.openAnkiWebSharedDecks()
                 }
             }
@@ -408,14 +360,23 @@ class DeckPickerFloatingActionMenu(
     }
 
     /**
-     * Closes the FAB menu and opens the [NoteEditorFragment]
+     * Opens the [NoteEditorFragment], preserving the menu during the outgoing transition.
      * @see DeckPicker.addNote
      */
     private fun addNote() {
-        closeFloatingActionMenu(applyRiseAndShrinkAnimation = false)
+        if (pendingMenuReset) return
+        pendingMenuReset = true
+        // Save a closed menu state without changing its appearance during the transition.
+        isFABOpen = false
         deckPicker.addNote()
     }
 
+    private fun resetMenuAfterAdding() {
+        if (!pendingMenuReset) return
+        pendingMenuReset = false
+        closeFloatingActionMenu(style = CloseAnimation.LONG, animate = false)
+    }
+
     /**
      * Sets the label of the 'Create deck' button from the backend translation.
      */
@@ -427,6 +388,18 @@ class DeckPickerFloatingActionMenu(
         }
     }
 
+    /** Animation styles for closing the FAB menu, with offsets in pixels. */
+    enum class CloseAnimation(
+        val deckOffset: Float,
+        val otherOffset: Float,
+    ) {
+        /** Back or an outside tap moves the menu buttons a shorter distance. */
+        SHORT(deckOffset = 300f, otherOffset = 400f),
+
+        /** Menu actions, the navigation drawer, or hiding the FAB move the buttons farther. */
+        LONG(deckOffset = 400f, otherOffset = 600f),
+    }
+
     fun interface FloatingActionBarToggleListener {
         /** Triggered when the drawer is starting to open/close */
         fun onBeginToggle(isOpening: Boolean)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DrawingFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DrawingFragment.kt
index 42ee61a1ed73..50e550ab5a42 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/DrawingFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/DrawingFragment.kt
@@ -94,7 +94,7 @@ class DrawingFragment : Fragment(R.layout.fragment_drawing) {
         val imagePath = saveWhiteboard(whiteboardView)
         val result =
             Intent().apply {
-                putExtra(IMAGE_PATH_KEY, imagePath)
+                putExtra(EXTRA_IMAGE_PATH, imagePath)
             }
         // TODO don't depend on an Activity
         requireActivity().setResult(Activity.RESULT_OK, result)
@@ -130,7 +130,7 @@ class DrawingFragment : Fragment(R.layout.fragment_drawing) {
     }
 
     companion object {
-        const val IMAGE_PATH_KEY = "path"
+        const val EXTRA_IMAGE_PATH = "path"
 
         fun getIntent(context: Context): Intent = SingleFragmentActivity.getIntent(context, DrawingFragment::class)
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/FieldEditText.kt b/AnkiDroid/src/main/java/com/ichi2/anki/FieldEditText.kt
index c658b29e4066..c97bdc20fd75 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/FieldEditText.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/FieldEditText.kt
@@ -31,6 +31,7 @@ import timber.log.Timber
 import java.util.Locale
 import kotlin.math.max
 import kotlin.math.min
+import com.ichi2.anki.common.android.R as CommonR
 
 class FieldEditText :
     FixedEditText,
@@ -79,7 +80,7 @@ class FieldEditText :
         val highlightColor =
             MaterialColors.getColor(
                 context,
-                R.attr.editTextHighlightColor,
+                CommonR.attr.editTextHighlightColor,
                 "#99CCFF".toColorInt(), // light blue color for fallback just-in-case
             )
         setHighlightColor(highlightColor)
@@ -112,7 +113,7 @@ class FieldEditText :
      * Modify the style of this view to represent a duplicate field.
      */
     fun setDupeStyle() {
-        setBackgroundColor(MaterialColors.getColor(context, R.attr.duplicateColor, 0))
+        setBackgroundColor(MaterialColors.getColor(context, CommonR.attr.duplicateColor, 0))
     }
 
     /**
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/HomeScreenNavigation.kt b/AnkiDroid/src/main/java/com/ichi2/anki/HomeScreenNavigation.kt
index 3cbc6bcd07b2..db86c1afe205 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/HomeScreenNavigation.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/HomeScreenNavigation.kt
@@ -16,7 +16,9 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import androidx.fragment.app.commit
 import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.behavior.HideViewOnScrollBehavior
 import com.google.android.material.bottomnavigation.BottomNavigationView
+import com.google.android.material.color.MaterialColors
 import com.ichi2.anki.BottomNavController.NavigationItem
 import com.ichi2.anki.browser.CardBrowserFragment
 import com.ichi2.anki.browser.CardBrowserViewModel
@@ -24,6 +26,7 @@ import com.ichi2.anki.browser.IdsFile
 import com.ichi2.anki.common.analytics.Analytics
 import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.pages.Statistics
+import com.google.android.material.R as MaterialR
 
 /**
  * Manages the bottom navigation bar for the home screen.
@@ -43,7 +46,68 @@ fun setupBottomNavigation() {
     val bottomNav = deckPicker.findViewById<BottomNavigationView>(R.id.bottom_navigation)
     val fragmentContainer = deckPicker.findViewById<View>(R.id.bottom_nav_fragment_container)
     val contentWrapper = deckPicker.findViewById<View>(R.id.deck_picker_content_wrapper)
+    val studiedSummary = deckPicker.deckPickerBinding.reviewSummaryTextView
+    // Once raised above the bar, the summary overlaps the deck list: a solid background stops deck names showing through.
+    studiedSummary.setBackgroundColor(MaterialColors.getColor(bottomNav, MaterialR.attr.colorSurface))
     bottomNav.isVisible = true
+    val scrollBehavior = HideViewOnScrollBehavior.from(bottomNav)
+
+    fun updateFragmentBottomMargin() {
+        val margin =
+            if (scrollBehavior.isScrolledIn) {
+                bottomNav.height
+            } else {
+                ViewCompat.getRootWindowInsets(bottomNav)?.getInsets(navigationBars())?.bottom ?: 0
+            }
+        if (fragmentContainer.marginBottom != margin) {
+            fragmentContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin = margin }
+        }
+    }
+
+    fun positionStudiedSummary(animate: Boolean) {
+        // The "Studied X cards today" summary is anchored to the bottom of the Decks layout, not to the bar.
+        // Raise it above the bar while the bar is shown. When the bar hides, return it to its resting
+        // position, where its bottom padding already keeps it above the system navigation bar.
+        val translation =
+            if (scrollBehavior.isScrolledIn && studiedSummary.height > 0) {
+                val navLocation = IntArray(2).also(bottomNav::getLocationInWindow)
+                val summaryLocation = IntArray(2).also(studiedSummary::getLocationInWindow)
+                // Subtract current translations so this is the resting position, even mid-animation.
+                val navTop = navLocation[1] - bottomNav.translationY
+                val summaryContentBottom =
+                    summaryLocation[1] - studiedSummary.translationY + studiedSummary.height - studiedSummary.paddingBottom
+                // Only ever raise it: an open keyboard already pads the text above the bar.
+                (navTop - summaryContentBottom - studiedSummary.marginBottom).coerceAtMost(0f)
+            } else if (scrollBehavior.isScrolledIn) {
+                -bottomNav.height.toFloat()
+            } else {
+                0f
+            }
+        // The deck list fades from the summary downwards. Moving the summary does not redraw that fade,
+        // so redraw it on every step, or it stays at the summary's old position.
+        val fadeWrapper = deckPicker.deckPickerBinding.decksFadeWrapper
+        studiedSummary.animate().cancel()
+        if (animate) {
+            studiedSummary
+                .animate()
+                .translationY(translation)
+                .setDuration(bottomNav.resources.getInteger(android.R.integer.config_shortAnimTime).toLong())
+                .setUpdateListener { fadeWrapper.invalidate() }
+                .start()
+        } else {
+            studiedSummary.translationY = translation
+            fadeWrapper.invalidate()
+        }
+    }
+
+    // Never hide the bar while explore-by-touch (e.g. TalkBack) is on, so it stays reachable.
+    scrollBehavior.disableOnTouchExploration(true)
+    scrollBehavior.addOnScrollStateChangedListener { _, _ ->
+        updateFragmentBottomMargin()
+        positionStudiedSummary(animate = true)
+        // Re-apply insets so the Decks FAB and list padding follow the bar's new position.
+        ViewCompat.requestApplyInsets(deckPicker.deckPickerBinding.root)
+    }
 
     NavigationItem.populateMenu(bottomNav, deckPicker)
 
@@ -67,14 +131,17 @@ fun setupBottomNavigation() {
         val navItem = NavigationItem.fromId(item.itemId) ?: return@setOnItemSelectedListener false
         if (item.itemId != bottomNav.selectedItemId) {
             Analytics.sendAnalyticsScreenView(navItem.analyticsScreenName)
+            scrollBehavior.slideIn(bottomNav)
         }
         handleNavigationItemSelected(navItem, contentWrapper, fragmentContainer, bottomNavBackCallback)
     }
 
-    bottomNav.addOnLayoutChangeListener { view, _, _, _, _, _, _, _, _ ->
-        if (fragmentContainer.marginBottom != view.height) {
-            fragmentContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin = view.height }
-        }
+    bottomNav.addOnLayoutChangeListener { _, _, top, _, bottom, _, oldTop, _, oldBottom ->
+        updateFragmentBottomMargin()
+        if (bottom - top != oldBottom - oldTop) positionStudiedSummary(animate = false)
+    }
+    studiedSummary.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+        if (scrollBehavior.isScrolledIn) positionStudiedSummary(animate = false)
     }
 }
 
@@ -172,6 +239,18 @@ private fun showBottomNavFragment(
     fragmentContainer.isVisible = true
 }
 
+/**
+ * Hides the bottom bar on downward scrolls and shows it on upward scrolls.
+ * For views which do not send nested-scroll events to the bar's [HideViewOnScrollBehavior].
+ */
+fun Fragment.updateBottomNavOnScroll(dy: Int) {
+    val deckPicker = activity as? DeckPicker ?: return
+    if (dy == 0 || !isVisible || !deckPicker.bottomNavigationEnabled) return
+    val bottomNav = deckPicker.binding.bottomNavigation ?: return
+    val behavior = HideViewOnScrollBehavior.from(bottomNav)
+    if (dy > 0) behavior.slideOut(bottomNav) else behavior.slideIn(bottomNav)
+}
+
 /** Hides any fragments currently hosted in the bottom-nav container. */
 context(deckPicker: DeckPicker)
 private fun FragmentTransaction.hideBottomNavFragments() {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Import.kt b/AnkiDroid/src/main/java/com/ichi2/anki/Import.kt
index 57db4db39996..679ccdcae3e8 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/Import.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/Import.kt
@@ -13,11 +13,13 @@ import com.ichi2.anki.common.destinations.addNextIntent
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.common.storage.CollectionHelper
 import com.ichi2.anki.dialogs.AsyncDialogFragment
+import com.ichi2.anki.dialogs.DialogHandler
 import com.ichi2.anki.dialogs.ImportDialog
 import com.ichi2.anki.dialogs.ImportFileSelectionFragment
 import com.ichi2.anki.dialogs.ImportFileSelectionFragment.ImportOptions
 import com.ichi2.anki.utils.ext.dismissAllDialogFragments
 import com.ichi2.anki.utils.ext.showDialogFragment
+import com.ichi2.utils.ImportResolution
 import com.ichi2.utils.ImportResult
 import com.ichi2.utils.ImportUtils
 import timber.log.Timber
@@ -55,7 +57,10 @@ fun AnkiActivity.onSelectedPackageToImport(data: Intent) {
 
 fun Activity.onSelectedCsvForImport(data: Intent) {
     val path = ImportUtils.getFileCachedCopy(this, data) ?: return
+    openCsvImporter(path)
+}
 
+fun Activity.openCsvImporter(path: String) {
     val stackBuilder = TaskStackBuilder.create(this)
     stackBuilder.addNextIntentWithParentStack(Intent(this, DeckPicker::class.java))
     stackBuilder.addNextIntent(CsvImporterDestination(path))
@@ -63,6 +68,22 @@ fun Activity.onSelectedCsvForImport(data: Intent) {
     stackBuilder.startActivities()
 }
 
+/**
+ * Open prepared text immediately, or store a package confirmation for the caller or onResume.
+ */
+fun Activity.openImport(result: ImportResult.Success) {
+    val message =
+        when (result.file) {
+            is ImportResolution.DeckPackage -> ImportUtils.CollectionImportAdd(result.path)
+            is ImportResolution.CollectionPackage -> ImportUtils.CollectionImportReplace(result.path)
+            is ImportResolution.Text -> {
+                openCsvImporter(result.path)
+                return
+            }
+        }
+    DialogHandler.storeMessage(message.toMessage())
+}
+
 fun AnkiActivity.showImportDialog(
     id: ImportDialog.Type,
     importPath: String,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Info.kt b/AnkiDroid/src/main/java/com/ichi2/anki/Info.kt
index d9d639fae1c6..4920fbd75ec6 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/Info.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/Info.kt
@@ -12,7 +12,6 @@ import android.view.View
 import android.webkit.WebChromeClient
 import android.webkit.WebResourceRequest
 import android.webkit.WebView
-import android.webkit.WebViewClient
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.SystemBarStyle
 import androidx.activity.enableEdgeToEdge
@@ -26,6 +25,8 @@ import com.ichi2.anki.common.utils.android.getColorFromAttr
 import com.ichi2.anki.databinding.ActivityInfoBinding
 import com.ichi2.anki.snackbar.BaseSnackbarBuilderProvider
 import com.ichi2.anki.snackbar.SnackbarBuilder
+import com.ichi2.anki.workarounds.OnWebViewRecreatedListener
+import com.ichi2.anki.workarounds.SafeWebViewClient
 import com.ichi2.utils.IntentUtil.canOpenIntent
 import com.ichi2.utils.IntentUtil.tryOpenIntent
 import com.ichi2.utils.VersionUtils.appName
@@ -44,8 +45,10 @@ private const val CHANGE_LOG_URL = "https://docs.ankidroid.org/changelog.html"
  */
 class Info :
     AnkiActivity(R.layout.activity_info),
-    BaseSnackbarBuilderProvider {
+    BaseSnackbarBuilderProvider,
+    OnWebViewRecreatedListener {
     private val binding by viewBinding(ActivityInfoBinding::bind)
+    private lateinit var onBackPressedCallback: OnBackPressedCallback
 
     override val baseSnackbarBuilder: SnackbarBuilder = {
         anchorView = binding.buttons
@@ -69,18 +72,6 @@ class Info :
             binding.donate.isVisible = false
         }
         title = "$appName v$pkgVersionName"
-        binding.webView.webChromeClient =
-            object : WebChromeClient() {
-                override fun onProgressChanged(
-                    view: WebView,
-                    progress: Int,
-                ) {
-                    // Hide the progress indicator when the page has finished loaded
-                    if (progress == 100) {
-                        binding.progressBar.visibility = View.GONE
-                    }
-                }
-            }
         binding.leftButton.run {
             if (canOpenMarketUri()) {
                 setText(CommonString.info_rate)
@@ -94,33 +85,58 @@ class Info :
                 visibility = View.GONE
             }
         }
-        val onBackPressedCallback =
+        onBackPressedCallback =
             object : OnBackPressedCallback(false) {
                 override fun handleOnBackPressed() {
                     if (binding.webView.canGoBack()) binding.webView.goBack()
                 }
             }
+        onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
+        binding.rightButton.run {
+            text = getString(CommonString.dialog_continue)
+            setOnClickListener { close() }
+        }
+        setupWebView()
+    }
+
+    override fun onWebViewRecreated(webView: WebView) {
+        setupWebView()
+    }
+
+    @SuppressLint("SetJavaScriptEnabled")
+    private fun setupWebView() {
         // Apply Theme colors
         val typedArray = theme.obtainStyledAttributes(intArrayOf(android.R.attr.colorBackground, android.R.attr.textColor))
         val backgroundColor = typedArray.getColor(0, -1)
         val textColor = typedArray.getColor(1, -1).toRGBHex()
+        typedArray.recycle()
 
         val anchorTextThemeColor = getColorFromAttr(this, android.R.attr.colorAccent)
         val anchorTextColor = anchorTextThemeColor.toRGBHex()
+        val background = backgroundColor.toRGBHex()
 
         binding.webView.setBackgroundColor(backgroundColor)
         binding.webView.settings.allowFileAccess = true
         binding.webView.settings.allowContentAccess = true
         setRenderWorkaround(this)
-        binding.rightButton.run {
-            text = getString(CommonString.dialog_continue)
-            setOnClickListener { close() }
-        }
-        val background = backgroundColor.toRGBHex()
-        binding.webView.loadUrl("/android_asset/changelog.html")
+
+        binding.webView.setWebChromeClient(
+            object : WebChromeClient() {
+                override fun onProgressChanged(
+                    view: WebView,
+                    progress: Int,
+                ) {
+                    // Hide the progress indicator when the page has finished loaded
+                    if (progress == 100) {
+                        binding.progressBar.visibility = View.GONE
+                    }
+                }
+            },
+        )
+
         binding.webView.settings.javaScriptEnabled = true
-        binding.webView.webViewClient =
-            object : WebViewClient() {
+        binding.webView.setWebViewClient(
+            object : SafeWebViewClient() {
                 override fun onPageFinished(
                     view: WebView,
                     url: String,
@@ -129,7 +145,7 @@ class Info :
                  *  or else it will break in any one mode.
                  */
                     @Suppress("ktlint:standard:max-line-length")
-                    binding.webView.loadUrl(
+                    view.loadUrl(
                         """javascript:document.body.style.setProperty("color", "$textColor");
                             x=document.getElementsByTagName("a");
                             for(i=0; i<x.length; i++){
@@ -144,7 +160,7 @@ class Info :
                     )
                     if (!BuildConfig.SHOW_DONATE_LINKS) {
                         // remove donation links, keeping the text
-                        binding.webView.evaluateJavascript(
+                        view.evaluateJavascript(
                             """document.querySelectorAll('a[href*="opencollective.com"]')
                                 .forEach((a) => a.replaceWith(...a.childNodes));""",
                             null,
@@ -172,10 +188,16 @@ class Info :
                     isReload: Boolean,
                 ) {
                     super.doUpdateVisitedHistory(view, url, isReload)
-                    onBackPressedCallback.isEnabled = view != null && view.canGoBack()
+                    onBackPressedCallback.isEnabled = binding.webView.canGoBack()
                 }
-            }
-        onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
+            },
+        )
+        binding.webView.loadUrl("/android_asset/changelog.html")
+    }
+
+    override fun onDestroy() {
+        binding.webView.safeDestroy()
+        super.onDestroy()
     }
 
     /**
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/InitialActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/InitialActivity.kt
index 2fa9b5732c65..47032a3a5b60 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/InitialActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/InitialActivity.kt
@@ -30,8 +30,8 @@ import com.ichi2.anki.exception.SystemStorageException
 import com.ichi2.anki.servicelayer.PreferenceUpgradeService
 import com.ichi2.anki.servicelayer.PreferenceUpgradeService.setPreferencesUpToDate
 import com.ichi2.anki.startup.StoragePolicy
-import com.ichi2.anki.startup.ensureCollectionPathSet
 import com.ichi2.anki.startup.folderToPersist
+import com.ichi2.anki.startup.maybeSetDefaultCollectionPath
 import com.ichi2.anki.ui.windows.permissions.InternetPermissionFragment
 import com.ichi2.anki.ui.windows.permissions.LegacyNotificationsPermissionFragment
 import com.ichi2.anki.ui.windows.permissions.NotificationsPermissionFragment
@@ -55,11 +55,11 @@ object InitialActivity {
      * [StorageDecision] undecided. Startup calls this once permissions are granted, so a
      * deferred decision is recorded before the collection is opened.
      *
-     * @see ensureCollectionPathSet
+     * @see maybeSetDefaultCollectionPath
      */
     fun decideStorageIfUndecided(context: Context) {
         try {
-            ensureCollectionPathSet(context)
+            maybeSetDefaultCollectionPath(context)
         } catch (e: SystemStorageException) {
             // startup continues: getStartupFailureType reports the undecided state
             Timber.w(e, "unable to choose a default collection path")
@@ -268,7 +268,7 @@ enum class StoragePermissionSet(
         get() =
             when (this) {
                 LEGACY_ACCESS -> StoragePolicy.Fixed(AnkiDroidFolder.PUBLIC)
-                EXTERNAL_MANAGER -> StoragePolicy.Fixed(AnkiDroidFolder.PUBLIC)
+                EXTERNAL_MANAGER -> StoragePolicy.UserChoosesOnPermissionScreen
                 APP_PRIVATE -> StoragePolicy.Fixed(AnkiDroidFolder.APP_PRIVATE)
             }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt b/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt
index ca424c2f39af..c4cca328a2f6 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt
@@ -29,13 +29,14 @@ import com.ichi2.anki.common.utils.ext.getParcelableExtraCompat
 import com.ichi2.anki.dialogs.DialogHandler.Companion.storeMessage
 import com.ichi2.anki.dialogs.DialogHandlerMessage
 import com.ichi2.anki.dialogs.requireDeckPickerOrShowError
-import com.ichi2.anki.exception.SystemStorageException
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.shareddeck.SharedDecksDownloadFragment
+import com.ichi2.anki.sync.MeteredSyncPolicy
 import com.ichi2.anki.ui.windows.reviewer.ReviewerFragment
 import com.ichi2.anki.utils.MimeTypeUtils
 import com.ichi2.anki.worker.SyncWorker
+import com.ichi2.anki.worker.UniqueWorkNames
 import com.ichi2.utils.FileUtil
 import com.ichi2.utils.ImportResult
 import com.ichi2.utils.ImportUtils.handleFileImport
@@ -46,6 +47,9 @@ import com.ichi2.utils.NetworkUtils
 import com.ichi2.utils.TruncatedString
 import com.ichi2.utils.copyToClipboard
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.io.File
@@ -60,6 +64,9 @@ import kotlin.math.min
  * @author Tim
  */
 class IntentHandler : AbstractIntentHandler() {
+    // A delayed work query must not reopen DeckPicker after this activity is dismissed.
+    private val syncIntentScope = MainScope()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         // Note: This is our entry point from the launcher with intent: android.intent.action.MAIN
         if (showedActivityFailedScreen(savedInstanceState)) {
@@ -76,7 +83,8 @@ class IntentHandler : AbstractIntentHandler() {
         val runIfStoragePermissions = { runnable: () -> Unit -> performActionIfStorageAccessible(reloadIntent, action) { runnable() } }
         val launchType = getLaunchType(intent)
         // TODO block the UI with some kind of ProgressDialog instead of cancelling the sync work
-        if (requiresCollectionAccess(launchType)) {
+        // A sync intent must not interrupt an existing sync; handleSyncIntent ignores duplicates.
+        if (launchType != LaunchType.SYNC && requiresCollectionAccess(launchType)) {
             if (WorkManager.isInitialized()) {
                 SyncWorker.cancel(this)
             } else {
@@ -118,6 +126,11 @@ class IntentHandler : AbstractIntentHandler() {
         }
     }
 
+    override fun onDestroy() {
+        syncIntentScope.cancel()
+        super.onDestroy()
+    }
+
     private fun copyDebugInfoToClipboard(intent: Intent) {
         Timber.i("Copying debug info to clipboard")
         val clipboardData =
@@ -210,11 +223,23 @@ class IntentHandler : AbstractIntentHandler() {
         action: String?,
     ) {
         Timber.i("Handling Sync Intent")
-        sendDoSyncMsg()
-        reloadIntent.action = action
-        reloadIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-        startActivity(reloadIntent)
-        finish()
+        syncIntentScope.launch {
+            val existingSync = WorkManager.getInstance(this@IntentHandler).getWorkInfosForUniqueWorkFlow(UniqueWorkNames.SYNC).first()
+            // finish() may be called before onDestroy() cancels the query.
+            if (isFinishing) return@launch
+            val foregroundSync = CollectionManager.collectionLease?.operation?.isSync == true
+            if (foregroundSync || existingSync.any { !it.state.isFinished }) {
+                // Opening DeckPicker would also access the collection while the existing sync is using it.
+                Timber.w("Ignoring sync intent: collection sync is already pending or running")
+                finish()
+                return@launch
+            }
+            sendDoSyncMsg()
+            reloadIntent.action = action
+            reloadIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+            startActivity(reloadIntent)
+            finish()
+        }
     }
 
     private fun handleFileImport(
@@ -358,8 +383,9 @@ class IntentHandler : AbstractIntentHandler() {
     }
 
     companion object {
+        private const val ACTION_DO_SYNC = "com.ichi2.anki.DO_SYNC"
         const val EXTRA_DECK_ID = "EXTRA_DECK_ID"
-        private const val CLIPBOARD_INTENT = "com.ichi2.anki.COPY_DEBUG_INFO"
+        private const val ACTION_COPY_DEBUG_INFO = "com.ichi2.anki.COPY_DEBUG_INFO"
         private const val EXTRA_CLIPBOARD_DATA = "clip_data"
 
         private val textMimeTypes = MimeTypeUtils.CSV_TSV_MIME_TYPES
@@ -370,25 +396,6 @@ class IntentHandler : AbstractIntentHandler() {
             return !isInvalidViewIntent(intent)
         }
 
-        /** Checks whether storage permissions are granted on the device. If the device is not using legacy storage,
-         *  it verifies if the app has been granted the necessary storage access permission.
-         *  @return `true`: if granted, otherwise `false` and shows a missing permission toast
-         *
-         * @throws SystemStorageException if `getExternalFilesDir` returns null
-         */
-        fun grantedStoragePermissions(
-            context: Context,
-            showToast: Boolean,
-        ): Boolean {
-            val granted = grantedStoragePermissions(context)
-
-            if (!granted && showToast) {
-                showThemedToast(context, context.getString(CommonString.intent_handler_failed_no_storage_permission), false)
-            }
-
-            return granted
-        }
-
         /** Whether this is the `anki://x-callback-url/browser` deep link that opens the [CardBrowser]. */
         private fun Intent.isBrowserDeepLink(): Boolean {
             val data = data ?: return false
@@ -414,11 +421,11 @@ class IntentHandler : AbstractIntentHandler() {
                     textMimeTypes.contains(mimeType) -> LaunchType.TEXT_IMPORT
                     else -> LaunchType.FILE_IMPORT
                 }
-            } else if ("com.ichi2.anki.DO_SYNC" == action) {
+            } else if (ACTION_DO_SYNC == action) {
                 LaunchType.SYNC
             } else if (intent.hasExtra(EXTRA_DECK_ID)) {
                 LaunchType.REVIEW
-            } else if (action == CLIPBOARD_INTENT) {
+            } else if (action == ACTION_COPY_DEBUG_INFO) {
                 LaunchType.COPY_DEBUG_INFO
             } else {
                 LaunchType.DEFAULT_START_APP_IF_NEW
@@ -457,17 +464,18 @@ class IntentHandler : AbstractIntentHandler() {
                 val deckPicker = activity.requireDeckPickerOrShowError() ?: return
                 val res = deckPicker.resources
                 val hkey = Prefs.hkey
-                val millisecondsSinceLastSync = millisecondsSinceLastSync()
-                val limited = millisecondsSinceLastSync < INTENT_SYNC_MIN_INTERVAL
+                val millisecondsSinceLastSyncAttempt = millisecondsSinceLastSyncAttempt()
+                val limited = millisecondsSinceLastSyncAttempt < INTENT_SYNC_MIN_INTERVAL
                 if (!limited && !hkey.isNullOrEmpty() && NetworkUtils.isOnline) {
-                    deckPicker.sync()
+                    startBackgroundSync(deckPicker)
                 } else {
                     val err = res.getString(CommonString.sync_error)
                     if (limited) {
                         val remainingTimeInSeconds =
-                            max((INTENT_SYNC_MIN_INTERVAL - millisecondsSinceLastSync) / 1000, 1)
+                            max((INTENT_SYNC_MIN_INTERVAL - millisecondsSinceLastSyncAttempt) / 1000, 1)
                         // getQuantityString needs an int
                         val remaining = min(Int.MAX_VALUE.toLong(), remainingTimeInSeconds).toInt()
+                        Timber.i("Ignoring sync intent: rate limited for another %d seconds", remaining)
                         val message =
                             res.getQuantityString(
                                 CommonPlurals.sync_automatic_sync_needs_more_time,
@@ -476,6 +484,7 @@ class IntentHandler : AbstractIntentHandler() {
                             )
                         deckPicker.showSimpleNotification(err, message, NotificationChannel.SYNC)
                     } else {
+                        Timber.i("Ignoring sync intent: %s", if (hkey.isNullOrEmpty()) "not logged in" else "offline")
                         deckPicker.showSimpleNotification(
                             err,
                             res.getString(CommonString.youre_offline),
@@ -486,6 +495,23 @@ class IntentHandler : AbstractIntentHandler() {
                 deckPicker.finish()
             }
 
+            private fun startBackgroundSync(deckPicker: DeckPicker) {
+                if (MeteredSyncPolicy.shouldBlock()) {
+                    Timber.i("Ignoring sync intent: metered sync is disabled")
+                    return
+                }
+                val auth = syncAuth()
+                if (auth == null) {
+                    Timber.i("Ignoring sync intent: no sync credentials")
+                    return
+                }
+
+                // Keep collection and media sync running after DeckPicker finishes.
+                val syncMedia = shouldFetchMedia()
+                Timber.i("Enqueuing background sync from intent (syncMedia=%s)", syncMedia)
+                SyncWorker.start(deckPicker, auth, syncMedia = syncMedia)
+            }
+
             override fun toMessage(): Message = emptyMessage(this.what)
 
             companion object {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/IntroductionActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/IntroductionActivity.kt
index c7e8bd5cc6ae..4428a320d9ef 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/IntroductionActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/IntroductionActivity.kt
@@ -20,7 +20,7 @@ import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.introduction.CollectionPermissionScreenLauncher
 import com.ichi2.anki.introduction.SetupCollectionFragment
 import com.ichi2.anki.introduction.SetupCollectionFragment.CollectionSetupOption
-import com.ichi2.anki.introduction.SetupCollectionFragment.Companion.FRAGMENT_KEY
+import com.ichi2.anki.introduction.SetupCollectionFragment.Companion.REQUEST_COLLECTION_SETUP
 import com.ichi2.anki.introduction.SetupCollectionFragment.Companion.RESULT_KEY
 import com.ichi2.anki.introduction.hasCollectionStoragePermissions
 import com.ichi2.anki.utils.ext.setFragmentResultListener
@@ -63,7 +63,7 @@ class IntroductionActivity :
         super.onCreate(savedInstanceState)
         enableEdgeToEdge(statusBarStyle = SystemBarStyle.dark(Color.TRANSPARENT))
 
-        setFragmentResultListener(FRAGMENT_KEY) { _, bundle ->
+        setFragmentResultListener(REQUEST_COLLECTION_SETUP) { _, bundle ->
             val option =
                 BundleCompat.getParcelable(bundle, RESULT_KEY, CollectionSetupOption::class.java) ?: error("Missing introduction option!")
             when (option) {
@@ -82,11 +82,11 @@ class IntroductionActivity :
 
     private fun startDeckPicker(result: Int = RESULT_START_NEW) {
         Timber.i("Opening deck picker, login: %b", result == RESULT_SYNC_PROFILE)
-        this.sharedPrefs().edit { putBoolean(INTRODUCTION_SLIDES_SHOWN, true) }
+        this.sharedPrefs().edit { putBoolean(PREF_INTRODUCTION_SLIDES_SHOWN, true) }
         val deckPicker = Intent(this, DeckPicker::class.java)
         deckPicker.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
         if (result == RESULT_SYNC_PROFILE) {
-            deckPicker.putExtra(DeckPicker.INTENT_SYNC_FROM_LOGIN, true)
+            deckPicker.putExtra(DeckPicker.EXTRA_SYNC_FROM_LOGIN, true)
         }
 
         startActivity(deckPicker)
@@ -101,8 +101,8 @@ class IntroductionActivity :
          * Key for the preference recording that the slide "Study less/ Remember more" offering to
          * get started or sync from ankiweb, was displayed. If so don't display it again.
          */
-        const val INTRODUCTION_SLIDES_SHOWN = "IntroductionSlidesShown"
+        const val PREF_INTRODUCTION_SLIDES_SHOWN = "IntroductionSlidesShown"
     }
 }
 
-internal fun Context.hasShownAppIntro(): Boolean = sharedPrefs().getBoolean(IntroductionActivity.INTRODUCTION_SLIDES_SHOWN, false)
+internal fun Context.hasShownAppIntro(): Boolean = sharedPrefs().getBoolean(IntroductionActivity.PREF_INTRODUCTION_SLIDES_SHOWN, false)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt b/AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt
index 39889d4771f3..07d23332199a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt
@@ -197,7 +197,8 @@ object MediaRegistration {
         }
 
         // register media for webView
-        if (!registerMediaForWebView(tempFilePath)) {
+        val importedFile = registerMediaForWebView(tempFilePath)
+        if (importedFile == null) {
             clipCopy.delete()
             return null
         }
@@ -205,8 +206,7 @@ object MediaRegistration {
 
         val field = if (isImage) ImageField() else MediaClipField()
 
-        field.hasTemporaryMedia = true
-        field.mediaFile = tempFilePath
+        field.mediaFile = importedFile
         return field.formattedValue
     }
 
@@ -231,25 +231,22 @@ object MediaRegistration {
     }
 
     /**
+     * @return the imported file, including any filename changes made by the backend, or null on failure
+     *
      * @throws OutOfMemoryError if the file could not be copied to a contiguous block of memory (or is >= 2GB)
      */
     @CheckResult
-    fun registerMediaForWebView(mediaPath: File?): Boolean {
-        if (mediaPath == null) {
-            // Nothing to register - continue with execution.
-            return true
-        }
+    private fun registerMediaForWebView(mediaPath: File): File? {
         Timber.i("Adding media to collection: %s", mediaPath)
-        val f = mediaPath
         return try {
-            CollectionManager.getColUnsafe().media.addFile(f)
-            true
+            val media = CollectionManager.getColUnsafe().media
+            File(media.dir, media.addFile(mediaPath))
         } catch (e: IOException) {
             Timber.w(e, "Failed to add file")
-            false
+            null
         } catch (e: EmptyMediaException) {
             Timber.w(e, "Failed to add file")
-            false
+            null
         }
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NavigationDrawerActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NavigationDrawerActivity.kt
index b4c4adbed9b4..e0016b6e8389 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/NavigationDrawerActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/NavigationDrawerActivity.kt
@@ -38,7 +38,6 @@ import androidx.viewbinding.ViewBinding
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.navigation.NavigationView
 import com.ichi2.anki.CollectionManager.TR
-import com.ichi2.anki.IntentHandler.Companion.grantedStoragePermissions
 import com.ichi2.anki.NoteEditorFragment.Companion.NoteEditorCaller
 import com.ichi2.anki.common.android.animationEnabled
 import com.ichi2.anki.common.destinations.BrowserDestination
@@ -48,6 +47,7 @@ import com.ichi2.anki.common.destinations.StatisticsDestination
 import com.ichi2.anki.common.destinations.navigate
 import com.ichi2.anki.common.destinations.toIntent
 import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.anki.common.storage.grantedStoragePermissions
 import com.ichi2.anki.common.utils.android.HandlerUtils
 import com.ichi2.anki.dialogs.help.HelpDialog
 import com.ichi2.anki.utils.ext.showDialogFragment
@@ -99,7 +99,7 @@ abstract class NavigationDrawerActivity(
             ) as ClosableDrawerLayout
 
         val coordinatorLayout = binding.root
-        if (preferences.getBoolean(FULL_SCREEN_NAVIGATION_DRAWER, false)) {
+        if (preferences.getBoolean(PREF_FULL_SCREEN_NAVIGATION_DRAWER, false)) {
             // If full screen navigation drawer is needed, then add FullDraggableContainer as a child view of closableDrawerLayout.
             // Then add coordinatorLayout as a child view of fullDraggableContainer.
             val fullDraggableContainer = FullDraggableContainerFix(this)
@@ -129,7 +129,7 @@ abstract class NavigationDrawerActivity(
             LayoutInflater
                 .from(this)
                 .inflate(layoutResID, closableDrawerLayout, false) as CoordinatorLayout
-        if (preferences.getBoolean(FULL_SCREEN_NAVIGATION_DRAWER, false)) {
+        if (preferences.getBoolean(PREF_FULL_SCREEN_NAVIGATION_DRAWER, false)) {
             // If full screen navigation drawer is needed, then add FullDraggableContainer as a child view of closableDrawerLayout.
             // Then add coordinatorLayout as a child view of fullDraggableContainer.
             val fullDraggableContainer = FullDraggableContainerFix(this)
@@ -157,7 +157,7 @@ abstract class NavigationDrawerActivity(
         // Create inherited navigation drawer layout here so that it can be used by parent class
         drawerLayout = mainView.findViewById(R.id.drawer_layout)
         // Force transparent status bar with primary dark color underlaid so that the drawer displays under status bar
-        window.statusBarColor = getColor(R.color.transparent)
+        window.statusBarColor = getColor(CommonR.color.transparent)
         drawerLayout.setStatusBarBackgroundColor(
             MaterialColors.getColor(
                 this,
@@ -306,7 +306,9 @@ abstract class NavigationDrawerActivity(
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
         // Pass any configuration change to the drawer toggles
-        drawerToggle.onConfigurationChanged(newConfig)
+        if (::drawerToggle.isInitialized) {
+            drawerToggle.onConfigurationChanged(newConfig)
+        }
     }
 
     /**
@@ -497,7 +499,7 @@ abstract class NavigationDrawerActivity(
     companion object {
         // Intent request codes
         const val REQUEST_PREFERENCES_UPDATE = 100
-        const val FULL_SCREEN_NAVIGATION_DRAWER = "gestureFullScreenNavigationDrawer"
+        const val PREF_FULL_SCREEN_NAVIGATION_DRAWER = "gestureFullScreenNavigationDrawer"
 
         const val EXTRA_STARTED_WITH_SHORTCUT = "com.ichi2.anki.StartedWithShortcut"
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorActivity.kt
index 1bf05a082800..1b16456a4923 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorActivity.kt
@@ -40,6 +40,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import timber.log.Timber
 import kotlin.time.Duration.Companion.milliseconds
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * To find the actual note Editor, @see [NoteEditorFragment]
@@ -105,7 +106,7 @@ class NoteEditorActivity :
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             window.isNavigationBarContrastEnforced = false
         } else {
-            setNavigationBarColor(R.attr.toolbarBackgroundColor)
+            setNavigationBarColor(CommonR.attr.toolbarBackgroundColor)
         }
         ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _, insets ->
             val bars = insets.getInsets(systemBars() or displayCutout() or ime())
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorFragment.kt
index baee819a2a3a..29475bef92a7 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorFragment.kt
@@ -98,8 +98,9 @@ import com.ichi2.anki.common.utils.android.showThemedToast
 import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.common.utils.ext.AddingDefaultsMode
 import com.ichi2.anki.common.utils.ext.addingDefaultsMode
-import com.ichi2.anki.common.utils.ext.currentDeckId
 import com.ichi2.anki.common.utils.ext.getParcelableExtraCompat
+import com.ichi2.anki.common.utils.ext.ifZero
+import com.ichi2.anki.common.utils.ext.indexOfOrNull
 import com.ichi2.anki.common.utils.ext.pasteImagesAsPng
 import com.ichi2.anki.compat.CompatHelper.Companion.getSerializableCompat
 import com.ichi2.anki.compat.setTooltipTextCompat
@@ -145,6 +146,8 @@ import com.ichi2.anki.noteeditor.NoteEditorMultimediaController
 import com.ichi2.anki.noteeditor.Toolbar
 import com.ichi2.anki.noteeditor.Toolbar.TextFormatListener
 import com.ichi2.anki.noteeditor.Toolbar.TextWrapper
+import com.ichi2.anki.noteeditor.ToolbarLayoutDialogHost
+import com.ichi2.anki.noteeditor.data.ToolbarPreferences
 import com.ichi2.anki.observability.undoableOp
 import com.ichi2.anki.pages.ImageOcclusion
 import com.ichi2.anki.pages.viewmodel.ImageOcclusionArgs
@@ -153,6 +156,7 @@ import com.ichi2.anki.previewer.TemplatePreviewerPage
 import com.ichi2.anki.servicelayer.LanguageHintService.languageHint
 import com.ichi2.anki.servicelayer.NoteService
 import com.ichi2.anki.servicelayer.NoteService.convertToHtmlNewline
+import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.snackbar.BaseSnackbarBuilderProvider
 import com.ichi2.anki.snackbar.SnackbarBuilder
 import com.ichi2.anki.snackbar.showSnackbar
@@ -162,13 +166,14 @@ import com.ichi2.anki.utils.HanUnificationDetector
 import com.ichi2.anki.utils.RunOnlyOnce
 import com.ichi2.anki.utils.bottomCornerSideClearance
 import com.ichi2.anki.utils.doOnApplyWindowInsets
+import com.ichi2.anki.utils.ext.getLongOrNull
 import com.ichi2.anki.utils.ext.requireLong
 import com.ichi2.anki.utils.ext.sharedPrefs
 import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.anki.utils.insetsOf
 import com.ichi2.anki.utils.openUrl
 import com.ichi2.imagecropper.ImageCropper
-import com.ichi2.imagecropper.ImageCropper.Companion.CROP_IMAGE_RESULT
+import com.ichi2.imagecropper.ImageCropper.Companion.EXTRA_CROP_IMAGE_RESULT
 import com.ichi2.imagecropper.ImageCropperLauncher
 import com.ichi2.utils.AndroidUiUtils.showSoftInput
 import com.ichi2.utils.ClipboardUtil
@@ -199,8 +204,7 @@ import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
 import com.ichi2.anki.common.android.R as CommonR
-
-const val CALLER_KEY = "caller"
+import com.ichi2.anki.noteeditor.R as NoteEditorR
 
 /**
  * Allows the user to edit a note, for instance if there is a typo. A card is a presentation of a note, and has two
@@ -299,6 +303,8 @@ class NoteEditorFragment :
     private var sourceText: Array<String?>? = null
     private val fieldState = FieldState.fromEditor(this)
     private lateinit var toolbar: Toolbar
+    private val toolbarPreferences by lazy { ToolbarPreferences(sharedPrefs()) }
+    private val toolbarLayoutDialog = ToolbarLayoutDialogHost()
 
     // save field index as key and text as value when toggle sticky clicked in Field Edit Text
     @VisibleForTesting
@@ -323,7 +329,7 @@ class NoteEditorFragment :
      * If true, this fragment is on the trailing side of the card browser.
      */
     private val inCardBrowserActivity
-        get() = requireArguments().getBoolean(IN_CARD_BROWSER_ACTIVITY)
+        get() = requireArguments().getBoolean(EXTRA_IN_CARD_BROWSER_ACTIVITY)
 
     private val requestAddLauncher =
         registerForActivityResult(
@@ -351,9 +357,7 @@ class NoteEditorFragment :
         }
 
     @VisibleForTesting
-    internal val multimediaController: NoteEditorMultimediaController by lazy {
-        NoteEditorMultimediaController(this, multimediaFragmentLauncher)
-    }
+    internal val multimediaController: NoteEditorMultimediaController = NoteEditorMultimediaController(this, multimediaFragmentLauncher)
 
     private val requestTemplateEditLauncher =
         registerForActivityResult(
@@ -539,17 +543,18 @@ class NoteEditorFragment :
         fieldState.setInstanceState(savedInstanceState)
         val intent = requireActivity().intent
         if (savedInstanceState != null) {
-            caller = fromValue(savedInstanceState.getInt(CALLER_KEY))
+            caller = fromValue(savedInstanceState.getInt(STATE_CALLER))
             addNote = savedInstanceState.getBoolean("addNote")
+            isFieldEdited = savedInstanceState.getBoolean("isFieldEdited")
             deckId = savedInstanceState.getLong("did")
             selectedNoteTypeId =
                 if (savedInstanceState.containsKey("noteTypeId")) savedInstanceState.getLong("noteTypeId") else null
             selectedTags = savedInstanceState.getStringArrayList("tags")
-            reloadRequired = savedInstanceState.getBoolean(EXTRA_RELOAD_REQUIRED)
+            reloadRequired = savedInstanceState.getBoolean(STATE_RELOAD_REQUIRED)
             multimediaController.onRestoreInstanceState(savedInstanceState)
             toggleStickyText =
                 savedInstanceState.getSerializableCompat<HashMap<Int, String?>>("toggleSticky")!!
-            changed = savedInstanceState.getBoolean(EXTRA_NOTE_CHANGED)
+            changed = savedInstanceState.getBoolean(STATE_NOTE_CHANGED)
         } else {
             caller = fromValue(requireArguments().getInt(EXTRA_CALLER, NoteEditorCaller.NO_CALLER.value))
             if (caller == NoteEditorCaller.NO_CALLER) {
@@ -578,16 +583,20 @@ class NoteEditorFragment :
             setBackgroundColor(
                 MaterialColors.getColor(
                     requireContext(),
-                    R.attr.toolbarBackgroundColor,
+                    CommonR.attr.toolbarBackgroundColor,
                     0,
                 ),
             )
-            setIconColor(MaterialColors.getColor(requireContext(), R.attr.toolbarIconColor, 0))
+            setIconColor(MaterialColors.getColor(requireContext(), CommonR.attr.toolbarIconColor, 0))
         }
+        toolbarLayoutDialog.bind(binding.toolbarLayoutDialog, toolbarPreferences, savedInstanceState, ::updateToolbar)
         setupEdgeToEdge()
         registerDeckSelectedHandler(REQUEST_DECK_SELECTION_NOTE_EDITOR, ::onDeckSelected)
         try {
-            setupEditor(getColUnsafe)
+            setupEditor(getColUnsafe, savedInstanceState)
+            if (addNote) {
+                savedInstanceState?.getStringArrayList("addNoteFieldBaseline")?.let { addNoteFieldBaseline = it }
+            }
         } catch (ex: RuntimeException) {
             Timber.w(ex, "setupEditor")
             requireAnkiActivity().onCollectionLoadError()
@@ -611,17 +620,23 @@ class NoteEditorFragment :
     override fun onSaveInstanceState(outState: Bundle) {
         addInstanceStateToBundle(outState)
         super.onSaveInstanceState(outState)
+        toolbarLayoutDialog.onSaveInstanceState(outState)
     }
 
     private fun addInstanceStateToBundle(savedInstanceState: Bundle) {
         Timber.i("Saving instance")
-        savedInstanceState.putInt(CALLER_KEY, caller.value)
+        savedInstanceState.putInt(STATE_CALLER, caller.value)
         savedInstanceState.putBoolean("addNote", addNote)
+        if (addNote) {
+            savedInstanceState.putBoolean("isFieldEdited", isFieldEdited)
+            savedInstanceState.putStringArrayList("addNoteFieldBaseline", ArrayList(addNoteFieldBaseline))
+        }
         savedInstanceState.putLong("did", deckId)
         selectedNoteTypeId?.let { savedInstanceState.putLong("noteTypeId", it) }
-        savedInstanceState.putBoolean(EXTRA_NOTE_CHANGED, changed)
-        savedInstanceState.putBoolean(EXTRA_RELOAD_REQUIRED, reloadRequired)
+        savedInstanceState.putBoolean(STATE_NOTE_CHANGED, changed)
+        savedInstanceState.putBoolean(STATE_RELOAD_REQUIRED, reloadRequired)
         savedInstanceState.putIntegerArrayList("customViewIds", customViewIds)
+        fieldState.saveInstanceState(savedInstanceState)
         multimediaController.onSaveInstanceState(savedInstanceState)
         savedInstanceState.putSerializable("toggleSticky", toggleStickyText)
         if (selectedTags == null) {
@@ -631,7 +646,10 @@ class NoteEditorFragment :
     }
 
     // Finish initializing the fragment after the collection has been correctly loaded
-    private fun setupEditor(col: Collection) {
+    private fun setupEditor(
+        col: Collection,
+        savedInstanceState: Bundle?,
+    ) {
         val intent = requireActivity().intent
         Timber.d("NoteEditor() onCollectionLoaded: caller: %s", caller)
         requireAnkiActivity().registerReceiver()
@@ -761,7 +779,6 @@ class NoteEditorFragment :
             deckTextView.setText(CommonString.CardEditorCardDeck)
         }
 
-        deckId = requireArguments().getLong(EXTRA_DID, deckId)
         if (addNote) {
             // Initialize both selections from the same defaults
             // https://github.com/ankitects/anki/blob/754ce3a25f608010c0249e074e5d7fe95bda035f/qt/aqt/addcards_legacy.py#L91-L108
@@ -769,6 +786,14 @@ class NoteEditorFragment :
             if (selectedNoteTypeId?.let { col.notetypes.get(it) } == null) {
                 selectedNoteTypeId = defaults.notetypeId
             }
+            // A restored selection takes precedence over the original launch destination.
+            deckId = deckId.ifZero { requireArguments().getLong(EXTRA_DID) }
+            if (deckId == 0L && caller == NoteEditorCaller.NOTEEDITOR_INTENT_ADD &&
+                col.config.addingDefaultsMode == AddingDefaultsMode.USE_CURRENT_DECK
+            ) {
+                // Sharing has its own destination; adding notes must not change the study deck.
+                deckId = Prefs.lastSharedDeckId
+            }
             val deck = col.decks.getLegacy(deckId)
             if (deck == null || deck.isFiltered) {
                 deckId = defaults.deckId
@@ -791,8 +816,11 @@ class NoteEditorFragment :
             }
         }
         val getTextFromSearchView = requireArguments().getString(EXTRA_TEXT_FROM_SEARCH_VIEW)
-        setDid(editorNote)
-        setNote(editorNote, FieldChangeType.onActivityCreation(shouldReplaceNewlines()))
+        setNote(
+            editorNote,
+            FieldChangeType.onActivityCreation(shouldReplaceNewlines()),
+            noteTypeId = savedInstanceState?.getLongOrNull("noteTypeId") ?: requireArguments().getLongOrNull(EXTRA_NOTE_TYPE_ID),
+        )
         if (addNote) {
             noteTypeSpinner!!.onItemSelectedListener = SetNoteTypeListener()
             requireAnkiActivity().setToolbarText(titleRes = CommonString.menu_add)
@@ -928,7 +956,7 @@ class NoteEditorFragment :
 
                     result.data?.let {
                         val cropResultData =
-                            it.getParcelableExtraCompat<ImageCropper.CropResultData>(CROP_IMAGE_RESULT)
+                            it.getParcelableExtraCompat<ImageCropper.CropResultData>(EXTRA_CROP_IMAGE_RESULT)
                         Timber.d("Cropped image data: $cropResultData")
                         if (cropResultData?.uriPath == null) return@registerForActivityResult
                         setupImageOcclusionEditor(cropResultData.uriPath)
@@ -1114,8 +1142,8 @@ class NoteEditorFragment :
         } else if (ACTION_CREATE_FLASHCARD == intent.action) {
             // mSourceLanguage = extras.getString(SOURCE_LANGUAGE);
             // mTargetLanguage = extras.getString(TARGET_LANGUAGE);
-            sourceText!![0] = extras.getString(SOURCE_TEXT)
-            sourceText!![1] = extras.getString(TARGET_TEXT)
+            sourceText!![0] = extras.getString(EXTRA_SOURCE_TEXT)
+            sourceText!![1] = extras.getString(EXTRA_TARGET_TEXT)
         } else {
             var first: String?
             var second: String?
@@ -1187,8 +1215,7 @@ class NoteEditorFragment :
             }
 
             if (!isFieldEdited) return false
-            val currentStrings = editFields!!.map { it.text?.toString() ?: "" }
-            return currentStrings != addNoteFieldBaseline
+            return fieldState.currentFieldValues != addNoteFieldBaseline
         }
 
         // changed note type?
@@ -1243,49 +1270,52 @@ class NoteEditorFragment :
     // SAVE NOTE METHODS
     // ----------------------------------------------------------------------------
 
-    @KotlinCleanup("return early and simplify if possible")
     private fun onNoteAdded(count: Int) {
-        var closeEditorAfterSave = false
-        var closeIntent: Intent? = null
         changed = true
         sourceText = null
+        if (caller == NoteEditorCaller.NOTEEDITOR || caller == NoteEditorCaller.NOTEEDITOR_INTENT_ADD || aedictIntent) {
+            // Do not queue field or preview updates for an activity which is about to finish.
+            val closeIntent = Intent()
+            if (caller == NoteEditorCaller.NOTEEDITOR_INTENT_ADD) {
+                closeIntent.putExtra(EXTRA_ID, requireArguments().getString(EXTRA_ID))
+            }
+            if (caller == NoteEditorCaller.NOTEEDITOR_INTENT_ADD || aedictIntent) {
+                showThemedToast(requireContext(), CommonString.note_message, shortLength = true)
+            }
+            closeNoteEditor(closeIntent)
+            return
+        }
+
+        fieldState.clearHiddenFields()
         refreshNoteData(FieldChangeType.onNoteAdded(shouldReplaceNewlines()))
         // backend text ends with dot
         val successMessage = TR.importingCardsAdded(count).replace(".", "")
         showSnackbar(successMessage, Snackbar.LENGTH_SHORT)
 
-        if (caller == NoteEditorCaller.NOTEEDITOR || aedictIntent) {
-            closeEditorAfterSave = true
-        } else if (caller == NoteEditorCaller.NOTEEDITOR_INTENT_ADD) {
-            closeEditorAfterSave = true
-            closeIntent = Intent().apply { putExtra(EXTRA_ID, requireArguments().getString(EXTRA_ID)) }
-        } else if (!editFields!!.isEmpty()) {
+        if (!editFields!!.isEmpty()) {
             editFields!!.first().focusWithKeyboard()
         }
 
-        if (closeEditorAfterSave) {
-            if (caller == NoteEditorCaller.NOTEEDITOR_INTENT_ADD || aedictIntent) {
-                showThemedToast(requireContext(), CommonString.note_message, shortLength = true)
-            }
-            closeNoteEditor(closeIntent ?: Intent())
-        } else {
-            // Reset check for changes to fields
-            isFieldEdited = false
-            isTagsEdited = false
-        }
+        // Reset check for changes to fields
+        isFieldEdited = false
+        isTagsEdited = false
+        delegate?.onNoteSaved()
     }
 
     private suspend fun saveNoteWithProgress() {
+        val destinationDeckId = deckId
         // adding current note to collection
         val changes =
             requireActivity().withProgress(resources.getString(CommonString.saving_facts)) {
                 undoableOp {
-                    addNote(editorNote!!, deckId)
+                    addNote(editorNote!!, destinationDeckId)
                 }
             }
+        if (caller == NoteEditorCaller.NOTEEDITOR_INTENT_ADD) {
+            Prefs.lastSharedDeckId = destinationDeckId
+        }
         // update UI based on the result, noOfAddedCards
         onNoteAdded(changes.count)
-        delegate?.onNoteSaved()
     }
 
     @VisibleForTesting
@@ -1333,7 +1363,7 @@ class NoteEditorFragment :
                 reloadRequired = true
 
                 val cardIdsToMove = getAffectedCards()
-                undoableOp { setDeck(cardIdsToMove, deckId) }
+                undoableOp(this@NoteEditorFragment) { setDeck(cardIdsToMove, deckId) }
 
                 // refresh the card object to reflect the database changes from above
                 currentEditedCard!!.load(getColUnsafe)
@@ -1371,7 +1401,7 @@ class NoteEditorFragment :
             // accept & update the note in the activity
             if (caller == NoteEditorCaller.PREVIEWER_EDIT || caller == NoteEditorCaller.EDIT) {
                 requireActivity().withProgress {
-                    undoableOp {
+                    undoableOp(this@NoteEditorFragment) {
                         updateNote(currentEditedCard!!.note(this@undoableOp))
                     }
                 }
@@ -1380,7 +1410,6 @@ class NoteEditorFragment :
             closeNoteEditorAfterSave()
             return
         }
-        delegate?.onNoteSaved()
     }
 
     /**
@@ -1501,16 +1530,8 @@ class NoteEditorFragment :
                 }
             }
         }
-        menu.findItem(R.id.action_show_toolbar).isChecked =
-            !shouldHideToolbar()
         menu.findItem(R.id.action_capitalize).isChecked =
             sharedPrefs().getBoolean(PREF_NOTE_EDITOR_CAPITALIZE, true)
-        menu.findItem(R.id.action_scroll_toolbar).apply {
-            isChecked =
-                sharedPrefs().getBoolean(PREF_NOTE_EDITOR_SCROLL_TOOLBAR, true)
-            isEnabled =
-                !shouldHideToolbar()
-        }
     }
 
     /**
@@ -1585,15 +1606,9 @@ class NoteEditorFragment :
                 showDialogFragment(fontSizeDialog)
                 return true
             }
-            R.id.action_show_toolbar -> {
-                item.isChecked = !item.isChecked
-                this.sharedPrefs().edit {
-                    putBoolean(PREF_NOTE_EDITOR_SHOW_TOOLBAR, item.isChecked)
-                }
-                updateToolbar()
-
-                // Update the overflow action menu in order to switch the enable/disable status of the "Scroll toolbar" item on the spot
-                requireActivity().invalidateOptionsMenu()
+            R.id.action_toolbar_layout -> {
+                toolbarLayoutDialog.show()
+                return true
             }
             R.id.action_capitalize -> {
                 Timber.i("NoteEditor:: Capitalize button pressed. New State: %b", !item.isChecked)
@@ -1601,13 +1616,6 @@ class NoteEditorFragment :
                 toggleCapitalize(item.isChecked)
                 return true
             }
-            R.id.action_scroll_toolbar -> {
-                item.isChecked = !item.isChecked
-                this.sharedPrefs().edit {
-                    putBoolean(PREF_NOTE_EDITOR_SCROLL_TOOLBAR, item.isChecked)
-                }
-                updateToolbar()
-            }
         }
         return false
     }
@@ -1649,7 +1657,14 @@ class NoteEditorFragment :
     }
 
     fun copyNote() {
-        requestAddLauncher.navigate(NoteEditorDestination.CopyNote(deckId, fieldsText, selectedTags.orEmpty()))
+        requestAddLauncher.navigate(
+            NoteEditorDestination.CopyNote(
+                deckId = deckId,
+                fieldsText = fieldsText,
+                noteTypeId = currentlySelectedNotetype?.id ?: editorNote!!.noteTypeId,
+                tags = selectedTags.orEmpty(),
+            ),
+        )
     }
 
     // ----------------------------------------------------------------------------
@@ -2199,34 +2214,7 @@ class NoteEditorFragment :
         return fieldText.toString()
     }
 
-    private fun setDid(note: Note?) {
-        fun calculateDeckId(): DeckId {
-            if (deckId != 0L) return deckId
-            if (note != null && !addNote && currentEditedCard != null) {
-                return currentEditedCard!!.currentDeckId()
-            }
-
-            if (getColUnsafe.config.addingDefaultsMode == AddingDefaultsMode.DECIDE_BY_NOTE_TYPE) {
-                return getColUnsafe.notetypes.current().let {
-                    Timber.d("Adding to deck of note type, noteType: %s", it.name)
-                    return@let it.did
-                }
-            }
-
-            val currentDeckId = getColUnsafe.config.currentDeckId
-            return if (getColUnsafe.decks.isFiltered(currentDeckId)) {
-                /*
-                 * If the deck in mCurrentDid is a filtered (dynamic) deck, then we can't create cards in it,
-                 * and we set mCurrentDid to the Default deck. Otherwise, we keep the number that had been
-                 * selected previously in the activity.
-                 */
-                1
-            } else {
-                currentDeckId
-            }
-        }
-
-        deckId = calculateDeckId()
+    private fun updateDeckName() {
         launchCatchingTask {
             val selectedDeckName = withCol { decks.name(deckId) }
             view?.findViewById<TextView>(R.id.note_deck_name)?.text = selectedDeckName
@@ -2242,14 +2230,17 @@ class NoteEditorFragment :
     private fun setNote(
         note: Note?,
         changeType: FieldChangeType,
+        noteTypeId: NoteTypeId? = null,
     ) {
+        // An explicit type takes precedence over the deck's remembered type.
+        noteTypeId?.let { selectedNoteTypeId = it }
         editorNote = note ?: Note.fromNotetypeId(getColUnsafe, checkNotNull(selectedNoteTypeId))
         if (selectedTags == null) {
             selectedTags = editorNote!!.tags
         }
         // nb: setOnItemSelectedListener and populateEditFields need to occur after this
         setNoteTypePosition()
-        setDid(note)
+        updateDeckName()
         updateTags()
         updateCards(editorNote!!.notetype)
         updateToolbar()
@@ -2269,19 +2260,17 @@ class NoteEditorFragment :
         } else {
             populateEditFields(changeType)
             if (changeType.type == Type.CHANGE_FIELD_COUNT) {
-                // A note type switch may carry the user's just-typed text into the new fields,
-                // so don't re-capture the baseline from current content. Instead, remap the
-                // existing baseline the same way the field content itself was remapped: keep
-                // baseline values for fields that still exist (put through the same <br>-to-newline
-                // conversion `populateEditFields` just applied to the actual field content, so a
-                // sticky field containing literal `<br>` text doesn't look edited), and treat any
-                // field the new note type added as baseline-empty, since it didn't exist for the
-                // user to edit before.
+                // Keep the baseline for hidden fields as well as visible ones. Only visible
+                // values pass through setContent(), so only normalize those baseline values.
                 if (addNote) {
                     addNoteFieldBaseline =
-                        List(editFields!!.size) { i ->
+                        List(maxOf(editFields!!.size, addNoteFieldBaseline.size)) { i ->
                             val old = addNoteFieldBaseline.getOrElse(i) { "" }
-                            FieldEditText.convertBrToNewline(old, changeType.replaceNewlines)
+                            if (i < editFields!!.size) {
+                                FieldEditText.convertBrToNewline(old, changeType.replaceNewlines)
+                            } else {
+                                old
+                            }
                         }
                 }
             } else {
@@ -2300,7 +2289,7 @@ class NoteEditorFragment :
     ) {
         val drawable =
             ResourcesCompat.getDrawable(resources, drawableRes, null)!!.apply {
-                setTint(MaterialColors.getColor(requireContext(), R.attr.toolbarIconColor, 0))
+                setTint(MaterialColors.getColor(requireContext(), CommonR.attr.toolbarIconColor, 0))
             }
         val button =
             toolbar.insertItem(0, drawable) { insertCloze(type) }.apply {
@@ -2352,7 +2341,7 @@ class NoteEditorFragment :
     }
 
     private fun updateToolbar() {
-        toolbar.isVisible = !shouldHideToolbar()
+        toolbar.isVisible = toolbarPreferences.isVisible
         applyBottomInset()
         if (!toolbar.isVisible) return
         toolbar.clearCustomItems()
@@ -2398,8 +2387,8 @@ class NoteEditorFragment :
 
         // Let the user add more buttons (always at the end).
         // Sets the add custom tag icon color.
-        val drawable = ResourcesCompat.getDrawable(resources, R.drawable.ic_add_toolbar_icon, null)
-        drawable!!.setTint(MaterialColors.getColor(requireContext(), R.attr.toolbarIconColor, 0))
+        val drawable = ResourcesCompat.getDrawable(resources, NoteEditorR.drawable.ic_add_toolbar_icon, null)
+        drawable!!.setTint(MaterialColors.getColor(requireContext(), CommonR.attr.toolbarIconColor, 0))
         val addButton = toolbar.insertItem(0, drawable) { displayAddToolbarDialog() }
         addButton.contentDescription = resources.getString(CommonString.add_toolbar_item)
         addButton.setTooltipTextCompat(resources.getString(CommonString.add_toolbar_item))
@@ -2445,8 +2434,8 @@ class NoteEditorFragment :
             CustomToolbarButton(
                 index = currentButtonIndex,
                 buttonText = buttonText.ifEmpty { currentButton.buttonText },
-                prefix = prefix.ifEmpty { currentButton.prefix },
-                suffix = suffix.ifEmpty { currentButton.suffix },
+                prefix = prefix,
+                suffix = suffix,
             )
 
         saveToolbarButtons(toolbarButtons)
@@ -2571,11 +2560,18 @@ class NoteEditorFragment :
             )
         }
         editToolbarDialog.show()
+
+        fun updateSaveButton() {
+            editToolbarDialog.positiveButton.isEnabled = !et.text.isNullOrBlank() || !et2.text.isNullOrBlank()
+        }
+
+        et.doAfterTextChanged { updateSaveButton() }
+        et2.doAfterTextChanged { updateSaveButton() }
+        updateSaveButton()
     }
 
     private fun setNoteTypePosition() {
-        // Set current note type and deck positions in spinners
-        val position = allNoteTypeIds!!.indexOf(editorNote!!.notetype.id)
+        val position = allNoteTypeIds!!.indexOfOrNull(editorNote!!.noteTypeId)!!
         // set selection without firing selectionChanged event
         noteTypeSpinner!!.setSelection(position, false)
     }
@@ -2838,24 +2834,28 @@ class NoteEditorFragment :
         // the action is cancelled?
         //    public static final String SOURCE_LANGUAGE = "SOURCE_LANGUAGE";
         //    public static final String TARGET_LANGUAGE = "TARGET_LANGUAGE";
-        const val SOURCE_TEXT = "SOURCE_TEXT"
-        const val TARGET_TEXT = "TARGET_TEXT"
+        const val EXTRA_SOURCE_TEXT = "SOURCE_TEXT"
+        const val EXTRA_TARGET_TEXT = "TARGET_TEXT"
         const val EXTRA_CALLER = "CALLER"
         const val EXTRA_CARD_ID = "CARD_ID"
         const val EXTRA_CONTENTS = "CONTENTS"
         const val EXTRA_TAGS = "TAGS"
         const val EXTRA_ID = "ID"
         const val EXTRA_DID = "DECK_ID"
+        const val EXTRA_NOTE_TYPE_ID = "NOTE_TYPE_ID"
         const val EXTRA_TEXT_FROM_SEARCH_VIEW = "SEARCH"
         const val EXTRA_EDIT_FROM_CARD_ID = "editCid"
         const val ACTION_CREATE_FLASHCARD = "org.openintents.action.CREATE_FLASHCARD"
         const val ACTION_CREATE_FLASHCARD_SEND = "android.intent.action.SEND"
         const val EXTRA_NOTE_CHANGED = "noteChanged"
         const val EXTRA_RELOAD_REQUIRED = "reloadRequired"
+        private const val STATE_NOTE_CHANGED = "noteChanged"
+        private const val STATE_RELOAD_REQUIRED = "reloadRequired"
         const val EXTRA_IMG_OCCLUSION = "image_uri"
-        const val IN_CARD_BROWSER_ACTIVITY = "inCardBrowserActivity"
+        const val EXTRA_IN_CARD_BROWSER_ACTIVITY = "inCardBrowserActivity"
         const val EXTRA_CARD_IDS = "EXTRA_CARD_IDS"
         const val REQUEST_DECK_SELECTION_NOTE_EDITOR = "request_deck_selection_note_editor"
+        private const val STATE_CALLER = "caller"
 
         // calling activity
         enum class NoteEditorCaller(
@@ -2883,8 +2883,6 @@ class NoteEditorFragment :
         const val RESULT_UPDATED_IO_NOTE = 11
 
         // preferences keys
-        const val PREF_NOTE_EDITOR_SCROLL_TOOLBAR = "noteEditorScrollToolbar"
-        private const val PREF_NOTE_EDITOR_SHOW_TOOLBAR = "noteEditorShowToolbar"
         private const val PREF_NOTE_EDITOR_NEWLINE_REPLACE = "noteEditorNewlineReplace"
         private const val PREF_NOTE_EDITOR_CAPITALIZE = "note_editor_capitalize"
         private const val PREF_NOTE_EDITOR_FONT_SIZE = "note_editor_font_size"
@@ -2913,10 +2911,5 @@ class NoteEditorFragment :
             if (ImportUtils.isInvalidViewIntent(intent)) return false
             return intent.resolveMimeType()?.startsWith("image/") == true
         }
-
-        private fun shouldHideToolbar(): Boolean =
-            !appContext
-                .sharedPrefs()
-                .getBoolean(PREF_NOTE_EDITOR_SHOW_TOOLBAR, true)
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteTypeFieldEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteTypeFieldEditor.kt
index 4ae9410e5dd8..5bbd69735cf7 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/NoteTypeFieldEditor.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/NoteTypeFieldEditor.kt
@@ -32,12 +32,13 @@ import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.common.utils.android.showThemedToast
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.ActivityNoteTypeFieldEditorBinding
 import com.ichi2.anki.databinding.ItemNotetypeFieldBinding
 import com.ichi2.anki.dialogs.ConfirmationDialog
 import com.ichi2.anki.dialogs.LocaleSelectionDialog
-import com.ichi2.anki.dialogs.LocaleSelectionDialog.Companion.KEY_SELECTED_LOCALE
 import com.ichi2.anki.dialogs.LocaleSelectionDialog.Companion.REQUEST_HINT_LOCALE_SELECTION
+import com.ichi2.anki.dialogs.LocaleSelectionDialog.Companion.RESULT_SELECTED_LOCALE
 import com.ichi2.anki.dialogs.NoteTypeFieldEditorContextMenu.Companion.newInstance
 import com.ichi2.anki.dialogs.NoteTypeFieldEditorContextMenu.NoteTypeFieldEditorContextMenuAction
 import com.ichi2.anki.libanki.Collection
@@ -54,7 +55,6 @@ import com.ichi2.anki.utils.ext.setFragmentResultListener
 import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.ui.FixedEditText
 import com.ichi2.utils.customView
-import com.ichi2.utils.dp
 import com.ichi2.utils.getInputField
 import com.ichi2.utils.input
 import com.ichi2.utils.moveCursorToEnd
@@ -67,6 +67,7 @@ import org.json.JSONArray
 import org.json.JSONException
 import timber.log.Timber
 import java.util.Locale
+import com.ichi2.anki.common.android.R as CommonR
 
 @NeedsTest("perform one action, then another")
 class NoteTypeFieldEditor : AnkiActivity(R.layout.activity_note_type_field_editor) {
@@ -123,7 +124,7 @@ class NoteTypeFieldEditor : AnkiActivity(R.layout.activity_note_type_field_edito
             val selectedLocale =
                 BundleCompat.getSerializable(
                     bundle,
-                    KEY_SELECTED_LOCALE,
+                    RESULT_SELECTED_LOCALE,
                     Locale::class.java,
                 )
             if (selectedLocale != null) {
@@ -408,7 +409,7 @@ class NoteTypeFieldEditor : AnkiActivity(R.layout.activity_note_type_field_edito
                     }
                     negativeButton(CommonString.dialog_cancel)
                     setMessage(TR.fieldsNewPosition1(numberOfTemplates))
-                    setView(R.layout.dialog_generic_text_input)
+                    setView(CommonR.layout.dialog_generic_text_input)
                 }.input(
                     prefill = (currentPos + 1).toString(),
                     inputType = InputType.TYPE_CLASS_NUMBER,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ReadText.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ReadText.kt
index e77befd592cf..b9622b7aee04 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ReadText.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ReadText.kt
@@ -15,6 +15,7 @@ import androidx.appcompat.app.AlertDialog
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.cardviewer.SingleCardSide
 import com.ichi2.anki.common.utils.android.showThemedToast
+import com.ichi2.anki.dialogs.TtsPlaybackErrorDialog
 import com.ichi2.anki.i18n.getIso3LanguageOrNull
 import com.ichi2.anki.libanki.Card
 import com.ichi2.anki.libanki.Collection
@@ -326,7 +327,9 @@ object ReadText {
                             }
                         }
                 } else {
-                    showThemedToast(context, context.getString(CommonString.no_tts_available_message), false)
+                    if (ankiActivityContext == null || !TtsPlaybackErrorDialog.showMissingEngineDialogIfNeeded(ankiActivityContext)) {
+                        showThemedToast(context, context.getString(CommonString.no_tts_available_message), false)
+                    }
                     Timber.w("TTS not successfully initialized")
                 }
             }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
index b09eb89aa188..b808a548ba78 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
@@ -87,6 +87,7 @@ import com.ichi2.anki.common.time.TimeManager
 import com.ichi2.anki.common.utils.android.HandlerUtils.executeFunctionWithDelay
 import com.ichi2.anki.common.utils.android.HandlerUtils.getDefaultLooper
 import com.ichi2.anki.common.utils.android.showThemedToast
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.common.utils.ext.showRemainingDueCounts
 import com.ichi2.anki.libanki.Card
 import com.ichi2.anki.libanki.CardId
@@ -144,7 +145,6 @@ import com.ichi2.themes.Themes.currentTheme
 import com.ichi2.utils.Permissions.canRecordAudio
 import com.ichi2.utils.ViewGroupUtils.setRenderWorkaround
 import com.ichi2.utils.cancelable
-import com.ichi2.utils.dp
 import com.ichi2.utils.iconAlpha
 import com.ichi2.utils.increaseHorizontalPaddingOfOverflowMenuIcons
 import com.ichi2.utils.message
@@ -157,6 +157,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import timber.log.Timber
 import kotlin.coroutines.resume
+import com.ichi2.anki.common.android.R as CommonR
 
 @Suppress("LeakingThis")
 @NeedsTest("#14709: Timebox shouldn't appear instantly when the Reviewer is opened")
@@ -266,7 +267,7 @@ open class Reviewer :
         }
         startLoadingCollection()
         registerOnForgetHandler { listOf(currentCardId!!) }
-        previousCardId = savedInstanceState?.getLongOrNull(KEY_PREVIOUS_CARD_ID)
+        previousCardId = savedInstanceState?.getLongOrNull(STATE_PREVIOUS_CARD_ID)
     }
 
     override fun onPause() {
@@ -287,7 +288,7 @@ open class Reviewer :
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        previousCardId?.let { outState.putLong(KEY_PREVIOUS_CARD_ID, it) }
+        previousCardId?.let { outState.putLong(STATE_PREVIOUS_CARD_ID, it) }
     }
 
     protected val flagToDisplay: Flag
@@ -511,7 +512,7 @@ open class Reviewer :
             }
             clearInsets(
                 topBar,
-                basePadding = resources.getDimensionPixelSize(R.dimen.side_margin),
+                basePadding = resources.getDimensionPixelSize(CommonR.dimen.side_margin),
                 top = if (fullscreenMode == FullScreenMode.BUTTONS_ONLY) topBarTop else null,
             )
         }
@@ -558,7 +559,7 @@ open class Reviewer :
         }
 
         val answerArea = findViewById<ViewGroup>(R.id.answer_options_layout)
-        answerArea.setBackgroundColor(MaterialColors.getColor(this, R.attr.showAnswerColor, 0))
+        answerArea.setBackgroundColor(MaterialColors.getColor(this, CommonR.attr.showAnswerColor, 0))
         // The bottom inset is painted showAnswerColor by the background, extending the
         // answer area's color underneath the navigation bar - or, in immersive review,
         // down to the screen edge
@@ -2143,7 +2144,7 @@ open class Reviewer :
          */
         const val EXTRA_DECK_ID = "deckId"
 
-        private const val KEY_PREVIOUS_CARD_ID = "key_previous_card_id"
+        private const val STATE_PREVIOUS_CARD_ID = "key_previous_card_id"
 
         private const val REQUEST_AUDIO_PERMISSION = 0
         private const val ANIMATION_DURATION = 200
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsFragment.kt
index 73023aa76ccc..98f9c5a0dbf3 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsFragment.kt
@@ -20,6 +20,7 @@ import android.widget.ScrollView
 import android.widget.TextView
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.StringRes
 import androidx.annotation.VisibleForTesting
 import androidx.constraintlayout.widget.Group
 import androidx.core.text.HtmlCompat
@@ -48,10 +49,11 @@ import com.ichi2.anki.filtered.FilteredDeckOptionsFragment
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.libanki.Decks
 import com.ichi2.anki.observability.ChangeManager
+import com.ichi2.anki.progress.observeProgress
 import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.ui.internationalization.sentenceCase
 import com.ichi2.anki.utils.doOnApplyWindowInsets
-import com.ichi2.anki.utils.ext.launchCollectionInLifecycleScope
+import com.ichi2.anki.utils.ext.launchCollectionInViewLifecycleScope
 import com.ichi2.anki.utils.ext.setFragmentResultListener
 import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.ui.CollectionMediaImageGetter
@@ -114,7 +116,7 @@ class StudyOptionsFragment :
         displayedDeckId = savedInstanceState?.getLong(STATE_DISPLAYED_DECK_ID)?.takeIf { it != 0L }
         // Subscribe once per fragment: returning from another panel can recreate its view.
         ChangeManager.subscribe(this)
-        viewModel.flowOfState.launchCollectionInLifecycleScope(::rebuildUi)
+        observeProgress(viewModel) { progress -> getString(progress.messageRes) }
     }
 
     override fun onCreateView(
@@ -140,6 +142,7 @@ class StudyOptionsFragment :
             requireAnkiActivity().setToolbarText(title = "")
         }
         setupContentInsets(view)
+        viewModel.flowOfState.launchCollectionInViewLifecycleScope(::rebuildUi)
         refreshInterface()
     }
 
@@ -289,20 +292,12 @@ class StudyOptionsFragment :
             }
             R.id.action_rebuild -> {
                 Timber.i("StudyOptionsFragment:: rebuild cram deck button pressed")
-                launchCatchingTask {
-                    withProgress(CommonString.rebuild_filtered_deck) {
-                        viewModel.rebuildCram()
-                    }
-                }
+                launchCatchingTask { viewModel.rebuildCram() }
                 return true
             }
             R.id.action_empty -> {
                 Timber.i("StudyOptionsFragment:: empty cram deck button pressed")
-                launchCatchingTask {
-                    withProgress(CommonString.empty_filtered_deck) {
-                        viewModel.emptyCram()
-                    }
-                }
+                launchCatchingTask { viewModel.emptyCram() }
                 return true
             }
             else -> return false
@@ -326,7 +321,7 @@ class StudyOptionsFragment :
             menu.findItem(R.id.action_custom_study)?.isVisible = true
             menu.findItem(R.id.action_deck_or_study_options)?.title = TR.sentenceCase.deckOptions
         }
-        if (state is StudyOptionsState.Congrats) {
+        if (state is StudyOptionsState.Congrats || state is StudyOptionsState.Empty) {
             menu.findItem(R.id.action_custom_study)?.isVisible = false
         }
         menu.findItem(R.id.action_schedule_reminders)?.isVisible = Prefs.newReviewRemindersEnabled
@@ -356,7 +351,7 @@ class StudyOptionsFragment :
 
     fun refreshInterface() {
         Timber.d("Refreshing StudyOptionsFragment")
-        launchCatchingTask { viewModel.refreshData() }
+        launchCatchingViewTask { viewModel.refreshData() }
     }
 
     private fun rebuildUi(state: StudyOptionsState) {
@@ -449,7 +444,7 @@ class StudyOptionsFragment :
         buryInfoLabel.isVisible = data.hasBuriedCards
 
         fun TextView.updateBuryText(count: Int) {
-            this.isVisible = count > 0
+            this.isVisible = deckInfoLayout.isVisible && count > 0
             this.text =
                 when {
                     count > 0 ->
@@ -458,7 +453,6 @@ class StudyOptionsFragment :
                             count,
                             count,
                         )
-                    // #18094 - potential race condition: view may be visible with a count of 0
                     else -> ""
                 }
         }
@@ -572,3 +566,11 @@ class StudyOptionsFragment :
         }
     }
 }
+
+@get:StringRes
+private val StudyOptionsProgress.messageRes: Int
+    get() =
+        when (this) {
+            StudyOptionsProgress.REBUILDING_FILTERED_DECK -> CommonString.rebuild_filtered_deck
+            StudyOptionsProgress.EMPTYING_FILTERED_DECK -> CommonString.empty_filtered_deck
+        }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsViewModel.kt
index 528abc126751..5b175cab7653 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsViewModel.kt
@@ -10,6 +10,11 @@ import com.ichi2.anki.CollectionManager.withOpenColOrNull
 import com.ichi2.anki.libanki.Collection
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.observability.undoableOp
+import com.ichi2.anki.progress.HasProgress
+import com.ichi2.anki.progress.ProgressManager
+import com.ichi2.anki.study.DeckKind
+import com.ichi2.anki.study.StudyAvailability
+import com.ichi2.anki.study.currentDeckStudyState
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -17,7 +22,11 @@ import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.io.File
 
-class StudyOptionsViewModel : ViewModel() {
+class StudyOptionsViewModel :
+    ViewModel(),
+    HasProgress<StudyOptionsProgress> {
+    override val progressManager = ProgressManager<StudyOptionsProgress>()
+
     val flowOfState: StateFlow<StudyOptionsState>
         field = MutableStateFlow<StudyOptionsState>(StudyOptionsState.Loading)
     val state: StudyOptionsState get() = flowOfState.value
@@ -49,14 +58,18 @@ class StudyOptionsViewModel : ViewModel() {
 
     suspend fun rebuildCram() {
         Timber.d("doInBackground - RebuildCram")
-        undoableOp { sched.rebuildFilteredDeck(decks.selected()) }
-        withCol { updateStateFromCollection() }
+        progressManager.withProgress(message = StudyOptionsProgress.REBUILDING_FILTERED_DECK) {
+            undoableOp { sched.rebuildFilteredDeck(decks.selected()) }
+            withCol { updateStateFromCollection() }
+        }
     }
 
     suspend fun emptyCram() {
         Timber.d("doInBackgroundEmptyCram")
-        undoableOp { sched.emptyFilteredDeck(decks.selected()) }
-        withCol { updateStateFromCollection() }
+        progressManager.withProgress(message = StudyOptionsProgress.EMPTYING_FILTERED_DECK) {
+            undoableOp { sched.emptyFilteredDeck(decks.selected()) }
+            withCol { updateStateFromCollection() }
+        }
     }
 
     fun unbury(): Job =
@@ -69,19 +82,18 @@ class StudyOptionsViewModel : ViewModel() {
      */
     private fun Collection.updateStateFromCollection() {
         val deck = decks.current()
-        val deckId = deck.id
-        val counts = sched.counts()
+        val study = currentDeckStudyState()
+        val deckId = study.deckId
         var buriedNew = 0
         var buriedLearning = 0
         var buriedReview = 0
         val tree = sched.deckDueTree(deckId)
         if (tree != null) {
-            buriedNew = tree.newCount - counts.new
-            buriedLearning = tree.learnCount - counts.lrn
-            buriedReview = tree.reviewCount - counts.rev
+            buriedNew = tree.newCount - study.newCardsAvailable
+            buriedLearning = tree.learnCount - study.learningCardsAvailable
+            buriedReview = tree.reviewCount - study.reviewCardsAvailable
         }
-        val isDynamic = deck.isFiltered
-        val fullName = deck.getString("name")
+        val isDynamic = study.kind == DeckKind.Filtered
         val description =
             if (isDynamic) {
                 null
@@ -95,40 +107,39 @@ class StudyOptionsViewModel : ViewModel() {
             }
         val data =
             DeckStudyData(
-                newCardsToday = counts.new,
-                lrnCardsToday = counts.lrn,
-                revCardsToday = counts.rev,
+                newCardsToday = study.newCardsAvailable,
+                lrnCardsToday = study.learningCardsAvailable,
+                revCardsToday = study.reviewCardsAvailable,
                 buriedNew = buriedNew,
                 buriedLearning = buriedLearning,
                 buriedReview = buriedReview,
                 totalNewCards = sched.totalNewForCurrentDeck(),
-                numberOfCardsInDeck = decks.cardCount(deckId, includeSubdecks = true),
+                numberOfCardsInDeck = study.cardCount,
             )
 
         flowOfIsFilteredDeck.value = isDynamic
         flowOfHaveBuried.value = sched.haveBuried()
-        flowOfSelectedDeckId.value = decks.selected()
+        flowOfSelectedDeckId.value = study.deckId
         // Only resolve the media directory when a description will render it: an in-memory
         // collection has no media folder and `media.dir` would throw.
         flowOfMediaDir.value = if (!description.isNullOrEmpty()) media.dir else null
 
-        val totalDue = data.newCardsToday + data.lrnCardsToday + data.revCardsToday
         flowOfState.value =
             when {
-                data.numberOfCardsInDeck == 0 && !isDynamic ->
+                study.isEmptyRegularDeck ->
                     StudyOptionsState.Empty(
-                        deckName = fullName,
+                        deckName = deck.name,
                         data = data,
                     )
-                totalDue == 0 ->
+                study.availability == StudyAvailability.NoCardsAvailable ->
                     StudyOptionsState.Congrats(
-                        deckName = fullName,
+                        deckName = deck.name,
                         isDynamic = isDynamic,
                         data = data,
                     )
                 else ->
                     StudyOptionsState.StudyOptions(
-                        deckName = fullName,
+                        deckName = deck.name,
                         deckDescription = description,
                         isDynamic = isDynamic,
                         data = data,
@@ -137,6 +148,11 @@ class StudyOptionsViewModel : ViewModel() {
     }
 }
 
+enum class StudyOptionsProgress {
+    REBUILDING_FILTERED_DECK,
+    EMPTYING_FILTERED_DECK,
+}
+
 class DeckStudyData(
     val newCardsToday: Int,
     val lrnCardsToday: Int,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Sync.kt b/AnkiDroid/src/main/java/com/ichi2/anki/Sync.kt
index bce8c357ca36..d6333a2f2e87 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/Sync.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/Sync.kt
@@ -19,6 +19,7 @@ import com.ichi2.anki.observability.ChangeManager.notifySubscribersAllValuesChan
 import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.settings.enums.ShouldFetchMedia
 import com.ichi2.anki.snackbar.showSnackbar
+import com.ichi2.anki.sync.MediaSync
 import com.ichi2.anki.sync.MeteredSyncPermission
 import com.ichi2.anki.sync.MeteredSyncPolicy
 import com.ichi2.anki.sync.SyncAuth
@@ -43,7 +44,7 @@ import timber.log.Timber
 import kotlin.time.Duration.Companion.milliseconds
 
 object SyncPreferences {
-    const val CURRENT_SYNC_URI = "currentSyncUri"
+    const val PREF_CURRENT_SYNC_URI = "currentSyncUri"
     const val CUSTOM_SYNC_URI = "syncBaseUrl"
     const val CUSTOM_SYNC_ENABLED = CUSTOM_SYNC_URI + VersatileTextWithASwitchPreference.SWITCH_SUFFIX
 }
@@ -88,7 +89,8 @@ fun getEndpoint(): String? {
  */
 fun isLoggedIn(): Boolean = !Prefs.hkey.isNullOrEmpty()
 
-fun millisecondsSinceLastSync() = TimeManager.time.intTimeMS() - Prefs.lastSyncTime
+/** Elapsed milliseconds since the last manual or automatic sync attempt. */
+fun millisecondsSinceLastSyncAttempt() = TimeManager.time.intTimeMS() - Prefs.lastSyncTime
 
 fun DeckPicker.handleNewSync(
     conflict: ConflictResolution?,
@@ -137,8 +139,6 @@ fun DeckPicker.handleNewSync(
             notifySubscribersAllValuesChanged(deckPicker)
             refreshState()
         } finally {
-            // Always update last sync time to prevent infinite retry loops
-            // when sync fails (e.g., collection too large). See issue #19776
             setLastSyncTimeToNow()
         }
     }
@@ -284,7 +284,12 @@ private suspend fun handleDownload(
                     Timber.i("Sync: Backup skipped before full download: collection unchanged")
                 }
                 close(downgrade = false, forFullSync = true)
-                fullUploadOrDownload(auth, upload = false, serverUsn = mediaUsn)
+                // Media starts through SyncMediaWorker so WorkManager can enforce network constraints.
+                fullUploadOrDownload(
+                    auth,
+                    upload = false,
+                    mediaSync = MediaSync.Skip,
+                )
             } finally {
                 reopen(afterFullSync = true)
             }
@@ -318,7 +323,12 @@ private suspend fun handleUpload(
         ) {
             close(downgrade = false, forFullSync = true)
             try {
-                fullUploadOrDownload(auth, upload = true, serverUsn = mediaUsn)
+                // Media starts through SyncMediaWorker so WorkManager can enforce network constraints.
+                fullUploadOrDownload(
+                    auth,
+                    upload = true,
+                    mediaSync = MediaSync.Skip,
+                )
             } finally {
                 reopen(afterFullSync = true)
             }
@@ -420,6 +430,7 @@ fun DeckPicker.showSyncLogMessage(
     }
 }
 
+/** Starts the retry delay after every sync attempt, regardless of outcome. */
 fun setLastSyncTimeToNow() {
     Prefs.lastSyncTime = TimeManager.time.intTimeMS()
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/TtsVoices.kt b/AnkiDroid/src/main/java/com/ichi2/anki/TtsVoices.kt
index 977fbc5851de..a46a95096c6b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/TtsVoices.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/TtsVoices.kt
@@ -20,6 +20,9 @@
 
 package com.ichi2.anki
 
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
 import android.speech.tts.TextToSpeech
 import android.speech.tts.Voice
 import com.ichi2.anki.common.android.appContext
@@ -55,8 +58,8 @@ object TtsVoices {
     /** Published before scanning other engines, so legacy TTS need not wait for them. */
     private val engineLocaleData = AtomicReference(CompletableDeferred<EngineLocales>())
 
-    /** An immutable list of voices available for TTS */
-    private lateinit var availableVoices: Set<AndroidTtsVoice>
+    /** Voices in engine-preference order: the default engine first, then the other engines. */
+    private lateinit var availableVoices: List<AndroidTtsVoice>
 
     /** A job which populates both the default-engine languages and all available voices. */
     private var buildLocalesJob: Job? = null
@@ -72,6 +75,16 @@ object TtsVoices {
     var ttsEngine: String? = null
         private set
 
+    /** Returns whether the system has any installed TTS services. */
+    fun hasInstalledEngine(context: Context): Boolean {
+        val engines =
+            context.packageManager.queryIntentServices(
+                Intent(TextToSpeech.Engine.INTENT_ACTION_TTS_SERVICE),
+                PackageManager.MATCH_DEFAULT_ONLY,
+            )
+        return engines.isNotEmpty()
+    }
+
     suspend fun refresh() {
         launchBuildLocalesJob()
         buildLocalesJob?.join()
@@ -105,9 +118,10 @@ object TtsVoices {
     }
 
     /**
-     * Returns the list of available voices for use in TTS
+     * Returns distinct voices from the default engine first, then other engines in discovery order.
+     * Voice order within each engine is preserved. Playback uses this order for language fallback.
      */
-    suspend fun allTtsVoices(): Set<AndroidTtsVoice> {
+    suspend fun allTtsVoices(): List<AndroidTtsVoice> {
         if (this::availableVoices.isInitialized) {
             return this.availableVoices
         }
@@ -150,7 +164,7 @@ object TtsVoices {
     internal suspend fun loadVoices(
         defaultLocales: CompletableDeferred<EngineLocales>,
         createTts: suspend (String?) -> TextToSpeech?,
-    ): Set<AndroidTtsVoice> {
+    ): List<AndroidTtsVoice> {
         // A default-engine instance is needed first to enumerate the installed engines
         val probeTts =
             try {
@@ -163,16 +177,16 @@ object TtsVoices {
         if (probeTts == null) {
             Timber.e("Unable to build list of TTS Voices")
             defaultLocales.complete(EngineLocales(null, emptyList()))
-            return emptySet()
+            return emptyList()
         }
 
         val enginePackages =
             try {
                 val engine = probeTts.defaultEngine
                 defaultLocales.complete(EngineLocales(engine, readLocales(probeTts)))
-                // `engines` lists every installed engine; include the default defensively
+                // Put the default first, preserving discovery order for the remaining engines.
                 try {
-                    (probeTts.engines.map { it.name } + listOfNotNull(engine)).distinct()
+                    (listOfNotNull(engine) + probeTts.engines.map { it.name }).distinct()
                 } catch (e: Exception) {
                     Timber.w(e, "unable to list TTS engines")
                     listOfNotNull(engine)
@@ -209,15 +223,16 @@ object TtsVoices {
      *
      * Each engine is initialised independently so a single misbehaving engine cannot prevent the
      * others from being listed.
+     * Voices are distinct by engine and voice name, keeping the first occurrence.
      *
      * @param createTts builds a [TextToSpeech] bound to the provided engine package, or `null` on failure
-     * @return the union of all voices across [enginePackages]
+     * @return all voices in [enginePackages] order, preserving each engine's voice order
      */
     internal suspend fun loadVoicesFromEngines(
         enginePackages: List<String>,
         createTts: suspend (engine: String) -> TextToSpeech?,
-    ): Set<AndroidTtsVoice> {
-        val voices = mutableSetOf<AndroidTtsVoice>()
+    ): List<AndroidTtsVoice> {
+        val voices = mutableListOf<AndroidTtsVoice>()
         for (engine in enginePackages) {
             val tts = createTts(engine)
             if (tts == null) {
@@ -234,7 +249,7 @@ object TtsVoices {
                 tts.shutdown()
             }
         }
-        return voices
+        return voices.distinctBy { it.engine to it.voice.name }
     }
 
     /**
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/account/AccountActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/account/AccountActivity.kt
index a24fdf35cf23..152727598acf 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/account/AccountActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/account/AccountActivity.kt
@@ -17,7 +17,7 @@ import com.ichi2.anki.isLoggedIn
 class AccountActivity : SingleFragmentActivity() {
     companion object {
         /** Sees if we want to go back to the DeckPicker after login*/
-        const val START_FROM_DECKPICKER = "START_FOR_RESULT"
+        const val ARG_START_FOR_RESULT = "START_FOR_RESULT"
 
         /**
          * Returns an [Intent] to launch either [LoggedInFragment] or [LoginFragment]
@@ -39,7 +39,7 @@ class AccountActivity : SingleFragmentActivity() {
                 fragmentClass = if (isLoggedIn()) LoggedInFragment::class else LoginFragment::class,
                 arguments =
                     Bundle().apply {
-                        putBoolean(START_FROM_DECKPICKER, forResult)
+                        putBoolean(ARG_START_FOR_RESULT, forResult)
                     },
             ).setClass(context, AccountActivity::class.java)
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/account/LoginFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/account/LoginFragment.kt
index 3965a07e2e32..ee2b33648365 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/account/LoginFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/account/LoginFragment.kt
@@ -33,7 +33,7 @@ import com.ichi2.anki.CommonString
 import com.ichi2.anki.CrashReportData.Companion.toCrashReportData
 import com.ichi2.anki.DeckPicker
 import com.ichi2.anki.R
-import com.ichi2.anki.account.AccountActivity.Companion.START_FROM_DECKPICKER
+import com.ichi2.anki.account.AccountActivity.Companion.ARG_START_FOR_RESULT
 import com.ichi2.anki.dialogs.help.HelpDialog
 import com.ichi2.anki.exception.CollectionLockedException
 import com.ichi2.anki.getEndpoint
@@ -235,7 +235,7 @@ class LoginFragment : Fragment(R.layout.fragment_my_account) {
                     is LoginState.Success -> {
                         Timber.i("Login Successful")
                         val activity = requireActivity()
-                        val isForResult = arguments?.getBoolean(START_FROM_DECKPICKER) ?: false
+                        val isForResult = arguments?.getBoolean(ARG_START_FOR_RESULT) ?: false
 
                         // If the user explicitly came from a sync prompt (onboarding/pressing sync)
                         // then their intent was to sync after login success
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/analytics/AnkiDroidUsageAnalytics.kt b/AnkiDroid/src/main/java/com/ichi2/anki/analytics/AnkiDroidUsageAnalytics.kt
index 7a82e0098c55..852c35aefbcb 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/analytics/AnkiDroidUsageAnalytics.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/analytics/AnkiDroidUsageAnalytics.kt
@@ -35,8 +35,8 @@ import java.util.UUID
  */
 @NeedsTest("Add coverage for opt-in handling, client id persistence and event/exception sending")
 internal object AnkiDroidUsageAnalytics : UsageAnalytics {
-    const val ANALYTICS_OPTIN_KEY = UsageAnalytics.ANALYTICS_OPTIN_KEY
-    private const val ANALYTICS_CLIENT_ID = "googleAnalyticsClientId"
+    const val PREF_ANALYTICS_OPTIN = UsageAnalytics.PREF_ANALYTICS_OPTIN
+    private const val PREF_ANALYTICS_CLIENT_ID = "googleAnalyticsClientId"
 
     /**
      * Hard cap on the length of an exception description sent to GA.
@@ -73,7 +73,7 @@ internal object AnkiDroidUsageAnalytics : UsageAnalytics {
 
     private val sharedPrefsListener =
         SharedPreferences.OnSharedPreferenceChangeListener { prefs, key ->
-            if (key == ANALYTICS_OPTIN_KEY) {
+            if (key == PREF_ANALYTICS_OPTIN) {
                 val newOptIn = prefs.getBoolean(key, false)
                 // [isEnabled] updates `optIn` before it writes, so an unchanged value
                 // means it's already handling this toggle: don't rebuild twice
@@ -147,7 +147,7 @@ internal object AnkiDroidUsageAnalytics : UsageAnalytics {
 
     private fun handlePreferences(context: Context) {
         val userPrefs = context.sharedPrefs()
-        optIn = userPrefs.getBoolean(ANALYTICS_OPTIN_KEY, false)
+        optIn = userPrefs.getBoolean(PREF_ANALYTICS_OPTIN, false)
         userPrefs.registerOnSharedPreferenceChangeListener(sharedPrefsListener)
     }
 
@@ -226,8 +226,8 @@ internal object AnkiDroidUsageAnalytics : UsageAnalytics {
     private fun getOrCreateClientId(context: Context): String {
         Timber.d("AnkiDroidUsageAnalytics:: getting client Id")
         val prefs = context.getSharedPreferences(ANALYTICS_PREFS, Context.MODE_PRIVATE)
-        return prefs.getString(ANALYTICS_CLIENT_ID, null) ?: UUID.randomUUID().toString().also {
-            prefs.edit { putString(ANALYTICS_CLIENT_ID, it) }
+        return prefs.getString(PREF_ANALYTICS_CLIENT_ID, null) ?: UUID.randomUUID().toString().also {
+            prefs.edit { putString(PREF_ANALYTICS_CLIENT_ID, it) }
         }
     }
 
@@ -258,7 +258,7 @@ internal object AnkiDroidUsageAnalytics : UsageAnalytics {
         set(value) {
             optIn = value
             appContext.sharedPrefs().edit {
-                putBoolean(ANALYTICS_OPTIN_KEY, value)
+                putBoolean(PREF_ANALYTICS_OPTIN, value)
             }
             // Rebuild the underlying client so its own `enabled` flag picks
             // up the new opt-in state without waiting for the next launch.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/analytics/SharedPreferencesAnrReportState.kt b/AnkiDroid/src/main/java/com/ichi2/anki/analytics/SharedPreferencesAnrReportState.kt
index 8cfca2049c91..be7026c3ac54 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/analytics/SharedPreferencesAnrReportState.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/analytics/SharedPreferencesAnrReportState.kt
@@ -11,10 +11,10 @@ internal class SharedPreferencesAnrReportState(
     private val preferences get() = context.getSharedPreferences("historical_anrs", Context.MODE_PRIVATE)
 
     val lastProcessedTimestamp: Long
-        get() = preferences.getLong(TIMESTAMP_KEY, 0L)
+        get() = preferences.getLong(PREF_TIMESTAMP, 0L)
 
     @SuppressLint("UseKtx") // The commit result decides whether it is safe to report this exit.
-    fun markProcessed(timestamp: Long): Boolean = preferences.edit().putLong(TIMESTAMP_KEY, timestamp).commit()
+    fun markProcessed(timestamp: Long): Boolean = preferences.edit().putLong(PREF_TIMESTAMP, timestamp).commit()
 }
 
-private const val TIMESTAMP_KEY = "checked_through"
+private const val PREF_TIMESTAMP = "checked_through"
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnSelectionFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnSelectionFragment.kt
index 6ac488863e6a..f82082622b59 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnSelectionFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnSelectionFragment.kt
@@ -30,7 +30,7 @@ import com.ichi2.anki.browser.ColumnUsage.AVAILABLE
 import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.databinding.DialogBrowserColumnsSelectionBinding
 import com.ichi2.anki.dialogs.DiscardChangesDialog
-import com.ichi2.anki.launchCatchingTask
+import com.ichi2.anki.launchCatchingViewTask
 import com.ichi2.anki.model.CardsOrNotes
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.anki.utils.ext.requireParcelable
@@ -104,7 +104,7 @@ class BrowserColumnSelectionFragment : DialogFragment(R.layout.dialog_browser_co
         applyInsets()
 
         if (savedInstanceState == null) {
-            launchCatchingTask {
+            launchCatchingViewTask {
                 val (active, available) =
                     withProgress {
                         viewModel.previewColumnHeadings(cardsOrNotes)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt
index 08b1f03a2e84..b94eb289b4fb 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt
@@ -28,16 +28,17 @@ import com.ichi2.anki.R
 import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.common.utils.android.darkenColor
 import com.ichi2.anki.common.utils.android.lightenColorAbsolute
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.common.utils.ext.replaceWith
 import com.ichi2.anki.common.utils.ext.setBitFlag
 import com.ichi2.anki.databinding.ItemCardBrowserBinding
 import com.ichi2.anki.databinding.ViewBrowserColumnCellBinding
 import com.ichi2.themes.Themes
-import com.ichi2.utils.dp
 import com.ichi2.utils.removeChildren
 import net.ankiweb.rsdroid.BackendException
 import timber.log.Timber
 import kotlin.math.abs
+import com.ichi2.anki.common.android.R as CommonR
 
 typealias RowIsSelected = Boolean
 
@@ -259,7 +260,7 @@ class BrowserMultiColumnAdapter(
             val rowColor =
                 // This only highlights in fragmented mode
                 if (viewModel.paneRow == id) {
-                    ThemeUtils.getThemeAttrColor(context, R.attr.focusedRowBackgroundColor)
+                    ThemeUtils.getThemeAttrColor(context, CommonR.attr.focusedRowBackgroundColor)
                 } else {
                     backendColorToColor(row.color)
                 }
@@ -289,9 +290,9 @@ class BrowserMultiColumnAdapter(
             Color.COLOR_FLAG_TURQUOISE -> context.getColor(Flag.TURQUOISE.browserColorRes!!)
             Color.COLOR_FLAG_PURPLE -> context.getColor(Flag.PURPLE.browserColorRes!!)
 
-            Color.COLOR_SUSPENDED -> ThemeUtils.getThemeAttrColor(context, R.attr.suspendedColor)
-            Color.COLOR_MARKED -> ThemeUtils.getThemeAttrColor(context, R.attr.markedColor)
-            Color.COLOR_BURIED -> ThemeUtils.getThemeAttrColor(context, R.attr.buriedColor)
+            Color.COLOR_SUSPENDED -> ThemeUtils.getThemeAttrColor(context, CommonR.attr.suspendedColor)
+            Color.COLOR_MARKED -> ThemeUtils.getThemeAttrColor(context, CommonR.attr.markedColor)
+            Color.COLOR_BURIED -> ThemeUtils.getThemeAttrColor(context, CommonR.attr.buriedColor)
 
             Color.COLOR_DEFAULT, Color.UNRECOGNIZED ->
                 ThemeUtils.getThemeAttrColor(context, android.R.attr.colorBackground)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserSearchFeedback.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserSearchFeedback.kt
new file mode 100644
index 000000000000..d573dc06deaf
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserSearchFeedback.kt
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.browser
+
+/** The feedback requested for a completed browser search. */
+enum class BrowserSearchFeedbackMode {
+    /** Suppress search feedback, including for operations which provide their own message. */
+    NONE,
+
+    /** Report search results, offering "Search all decks" when applicable. */
+    SEARCH_RESULTS,
+
+    /** Show the result count when it is hidden in the header. */
+    COUNT_ONLY,
+}
+
+/** The feedback to display after a browser search completes. */
+internal enum class BrowserSearchFeedback(
+    val offersSearchAllDecks: Boolean = false,
+) {
+    NONE,
+    COUNT,
+    COUNT_WITH_SEARCH_ALL_DECKS(offersSearchAllDecks = true),
+    NO_CARDS_IN_SELECTED_DECK(offersSearchAllDecks = true),
+}
+
+internal fun browserSearchFeedback(
+    feedbackMode: BrowserSearchFeedbackMode,
+    rowCount: Int,
+    allDecksSelected: Boolean,
+    isHeaderCountVisible: Boolean,
+): BrowserSearchFeedback =
+    // The search facts come from the completed search; header visibility is checked when displaying it.
+    when (feedbackMode) {
+        // Ordinary opening, deck changes and sorting stay quiet (Issue 21242).
+        // Operations with their own feedback use this mode.
+        BrowserSearchFeedbackMode.NONE -> BrowserSearchFeedback.NONE
+        // User actions without their own message report the hidden count, without an action (Issue 22384).
+        BrowserSearchFeedbackMode.COUNT_ONLY ->
+            if (isHeaderCountVisible) BrowserSearchFeedback.NONE else BrowserSearchFeedback.COUNT
+        BrowserSearchFeedbackMode.SEARCH_RESULTS ->
+            when {
+                // A search within a deck also offers "Search all decks", even with a visible header (Issue 5159).
+                !allDecksSelected && rowCount == 0 -> BrowserSearchFeedback.NO_CARDS_IN_SELECTED_DECK
+                !allDecksSelected -> BrowserSearchFeedback.COUNT_WITH_SEARCH_ALL_DECKS
+                // Submitted searches show the count when the header hides it (Issue 3592).
+                isHeaderCountVisible -> BrowserSearchFeedback.NONE
+                else -> BrowserSearchFeedback.COUNT
+            }
+    }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserFragment.kt
index dc837e4f137e..dc7e34e8ee99 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserFragment.kt
@@ -79,7 +79,6 @@ import com.ichi2.anki.browser.CardBrowserViewModel.ChangeMultiSelectMode.MultiSe
 import com.ichi2.anki.browser.CardBrowserViewModel.ChangeMultiSelectMode.SingleSelectCause
 import com.ichi2.anki.browser.CardBrowserViewModel.ChangeNoteTypeResponse
 import com.ichi2.anki.browser.CardBrowserViewModel.RowSelection
-import com.ichi2.anki.browser.CardBrowserViewModel.SearchResultMessage
 import com.ichi2.anki.browser.CardBrowserViewModel.SearchState
 import com.ichi2.anki.browser.CardBrowserViewModel.SearchState.Initializing
 import com.ichi2.anki.browser.CardBrowserViewModel.SearchState.Searching
@@ -99,17 +98,18 @@ import com.ichi2.anki.browser.search.SearchString
 import com.ichi2.anki.browser.search.SortOrderBottomSheetFragment
 import com.ichi2.anki.browser.search.StandardSearchFragment
 import com.ichi2.anki.browser.search.formatChipDescription
+import com.ichi2.anki.browser.search.getIcon
 import com.ichi2.anki.browser.search.iconRes
-import com.ichi2.anki.browser.search.savedFilters
 import com.ichi2.anki.common.ALL_DECKS_ID
 import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.common.destinations.NoteEditorDestination
 import com.ichi2.anki.common.destinations.navigate
 import com.ichi2.anki.common.utils.ext.ifNotZero
+import com.ichi2.anki.common.utils.ext.savedFilters
 import com.ichi2.anki.dialogs.BrowserOptionsDialog
 import com.ichi2.anki.dialogs.ChangeNoteTypeDialog
 import com.ichi2.anki.dialogs.DeckSelectionDialog
-import com.ichi2.anki.dialogs.DeckSelectionDialog.Companion.ARG_SELECTED_DECK
+import com.ichi2.anki.dialogs.DeckSelectionDialog.Companion.RESULT_SELECTED_DECK
 import com.ichi2.anki.dialogs.GradeNowDialog
 import com.ichi2.anki.dialogs.SaveBrowserSearchDialogFragment
 import com.ichi2.anki.dialogs.SavedBrowserSearchesDialogFragment
@@ -142,6 +142,7 @@ import com.ichi2.anki.ui.RecyclerFastScroller
 import com.ichi2.anki.ui.attachFastScroller
 import com.ichi2.anki.ui.internationalization.sentenceCase
 import com.ichi2.anki.undoAndShowSnackbar
+import com.ichi2.anki.updateBottomNavOnScroll
 import com.ichi2.anki.utils.bottomCornerClearance
 import com.ichi2.anki.utils.ext.addPrepareMenuProvider
 import com.ichi2.anki.utils.ext.getParcelableCompat
@@ -210,7 +211,7 @@ class CardBrowserFragment :
             if (result.resultCode == Activity.RESULT_OK) {
                 // The old forceRefreshSearch called setQuery(searchView.text) before searching,
                 // but the ViewModel already holds the submitted query, so we just re-run the search directly.
-                activityViewModel.launchSearchForCards()
+                activityViewModel.launchSearchForCards(feedbackMode = BrowserSearchFeedbackMode.COUNT_ONLY)
             }
         }
 
@@ -326,7 +327,7 @@ class CardBrowserFragment :
 
         // onSearchForDecks starts deck selection using childFragmentManager
         childFragmentManager.setFragmentResultListener(DeckSelectionDialog.REQUEST_SELECT_DECK, this) { _, bundle ->
-            val selectedDeck = bundle.getParcelableCompat<SelectableDeck>(ARG_SELECTED_DECK)
+            val selectedDeck = bundle.getParcelableCompat<SelectableDeck>(RESULT_SELECTED_DECK)
             activityViewModel.setSelectedDeck(requireNotNull(selectedDeck) { "Expected non-null deck" })
         }
 
@@ -339,6 +340,19 @@ class CardBrowserFragment :
             view.findViewById<RecyclerView>(R.id.card_browser_list).apply {
                 attachFastScroller(R.id.browser_scroller)
                 clipToPadding = false
+                // Upward scrolls in the embedded browser do not reliably reach the bottom bar's
+                // scroll behavior, so drive the bar directly from the list.
+                addOnScrollListener(
+                    object : RecyclerView.OnScrollListener() {
+                        override fun onScrolled(
+                            recyclerView: RecyclerView,
+                            dx: Int,
+                            dy: Int,
+                        ) {
+                            updateBottomNavOnScroll(dy)
+                        }
+                    },
+                )
             }
         applyContentInsets(view)
         DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL).apply {
@@ -598,7 +612,7 @@ class CardBrowserFragment :
                                         }
 
                                         override fun onQueryTextSubmit(query: String): Boolean {
-                                            vm.setQuery(query, fromUserSearch = true)
+                                            vm.setQuery(query, feedbackMode = BrowserSearchFeedbackMode.SEARCH_RESULTS)
                                             legacySearchView!!.clearFocus()
                                             return true
                                         }
@@ -1004,47 +1018,36 @@ class CardBrowserFragment :
             }
         }
 
-        fun onSearchCompleted(state: SearchState.Completed) {
-            // #3592: show the number of cards found the number of cards is not visible in the menu
-            val isMenuSubtitleVisible = legacySearchView != null && legacySearchView!!.isIconified
-
-            fun showSnackbar(
-                message: String,
-                searchAllDecks: Boolean,
-            ) {
-                // Don't show a snackbar if the results are visible in the header.
-                // But do show the snackbar if an action is available
-                if (isMenuSubtitleVisible && !searchAllDecks) return
-
-                showSnackbar(message, Snackbar.LENGTH_SHORT) {
-                    if (!searchAllDecks) return@showSnackbar
+        fun onSearchFeedback(state: SearchState.Completed) {
+            if (!activityViewModel.consumeSearchFeedback(state)) return
+            val subtitle = legacySubtitle ?: requireActivity().findViewById<TextView>(R.id.subtitle)
+            val feedback =
+                browserSearchFeedback(
+                    feedbackMode = state.feedbackMode,
+                    rowCount = state.rowCount,
+                    allDecksSelected = state.allDecksSelected,
+                    isHeaderCountVisible = subtitle?.isShown == true && legacySearchView?.isIconified != false,
+                )
+            val message =
+                when (feedback) {
+                    BrowserSearchFeedback.NONE -> return
+                    BrowserSearchFeedback.COUNT, BrowserSearchFeedback.COUNT_WITH_SEARCH_ALL_DECKS -> state.formatCardCount(resources)
+                    BrowserSearchFeedback.NO_CARDS_IN_SELECTED_DECK ->
+                        getString(CommonString.card_browser_no_cards_in_deck, selectedDeckNameForUi)
+                }
+            showSnackbar(message, Snackbar.LENGTH_SHORT) {
+                if (feedback.offersSearchAllDecks) {
                     setAction(CommonString.card_browser_search_all_decks) {
-                        activityViewModel.setSelectedDeck(SelectableDeck.AllDecks)
+                        activityViewModel.setSelectedDeck(SelectableDeck.AllDecks, feedbackMode = BrowserSearchFeedbackMode.SEARCH_RESULTS)
                     }
                 }
             }
-
-            when (val result = state.resultMessage) {
-                // no message for browser open / deck change / order change: only user searches
-                null -> return
-                is SearchResultMessage.CardCount ->
-                    showSnackbar(
-                        message = state.formatCardCount(resources),
-                        searchAllDecks = result.includeSearchAllDecksAction,
-                    )
-                SearchResultMessage.NoCardsInSelectedDeck ->
-                    showSnackbar(
-                        getString(CommonString.card_browser_no_cards_in_deck, selectedDeckNameForUi),
-                        searchAllDecks = true,
-                    )
-            }
         }
 
         fun searchStateChanged(searchState: SearchState) {
             cardsAdapter.refreshRows()
             progressIndicator.isVisible = searchState == Initializing || searchState == Searching
             if (searchState is SearchState.Completed) {
-                onSearchCompleted(searchState)
                 invalidateMenu()
             }
         }
@@ -1150,11 +1153,14 @@ class CardBrowserFragment :
 
         @NeedsTest("displayed filter")
         fun onSearchSubmitted(value: SearchRequest) {
+            // Queued search updates can arrive after finish(), before the lifecycle stops.
+            if (activity?.isFinishing == true) return
+
             // WARN: This changes the text when the SearchView is open
             launchCatchingTask { searchBar?.setText(value.toUserSpannable()) }
 
             Timber.i("relaying submitted search to activity")
-            activityViewModel.launchSearchForCards(value, forceRefresh = false, fromUserSearch = true)
+            activityViewModel.launchSearchForCards(value, forceRefresh = false, feedbackMode = BrowserSearchFeedbackMode.SEARCH_RESULTS)
         }
 
         fun onUserMessage(message: UserMessage) =
@@ -1198,15 +1204,7 @@ class CardBrowserFragment :
             tagsChip?.hasCheckedBackground = filters.tags.any()
 
             cardStateChip?.text = formatChipDescription(filters.cardStates.map { it.label }, emptyValue = "Card state")
-            cardStateChip?.chipIcon =
-                ContextCompat.getDrawable(requireContext(), filters.cardStates.firstOrNull().iconRes)?.also {
-                    if (filters.cardStates.isEmpty()) {
-                        DrawableCompat.setTint(
-                            it.mutate(),
-                            MaterialColors.getColor(requireContext(), androidx.appcompat.R.attr.colorPrimary, 0),
-                        )
-                    }
-                }
+            cardStateChip?.chipIcon = filters.cardStates.firstOrNull().getIcon(requireContext())
             cardStateChip?.hasCheckedBackground = filters.cardStates.any()
 
             // Flags: Use the icon/checked state to explain what the filter is.
@@ -1278,6 +1276,7 @@ class CardBrowserFragment :
         activityViewModel.flowOfCardsUpdated.launchCollectionInLifecycleScope(::cardsUpdatedChanged)
         activityViewModel.flowOfMultiSelectModeChanged.launchCollectionInLifecycleScope(::onMultiSelectModeChanged)
         activityViewModel.flowOfSearchState.launchCollectionInLifecycleScope(::searchStateChanged)
+        activityViewModel.flowOfSearchFeedback.filterNotNull().launchCollectionInLifecycleScope(::onSearchFeedback)
         activityViewModel.flowOfLastCompletedSearch.filterNotNull().launchCollectionInLifecycleScope(::onLastCompletedSearchChanged)
         activityViewModel.flowOfColumnHeadings.launchCollectionInLifecycleScope(::onColumnNamesChanged)
         activityViewModel.flowOfCardStateChanged.launchCollectionInLifecycleScope(::onCardsMarkedEvent)
@@ -1300,10 +1299,10 @@ class CardBrowserFragment :
     private fun setupFragmentResultListeners() {
         ankiActivity.setFragmentResultListener(REQUEST_REPOSITION_NEW_CARDS) { _, bundle ->
             repositionCardsNoValidation(
-                position = bundle.getInt(RepositionCardFragment.ARG_POSITION),
-                step = bundle.getInt(RepositionCardFragment.ARG_STEP),
-                shuffle = bundle.getBoolean(RepositionCardFragment.ARG_RANDOM),
-                shift = bundle.getBoolean(RepositionCardFragment.ARG_SHIFT),
+                position = bundle.getInt(RepositionCardFragment.RESULT_POSITION),
+                step = bundle.getInt(RepositionCardFragment.RESULT_STEP),
+                shuffle = bundle.getBoolean(RepositionCardFragment.RESULT_RANDOM),
+                shift = bundle.getBoolean(RepositionCardFragment.RESULT_SHIFT),
             )
         }
     }
@@ -1918,7 +1917,11 @@ class CardBrowserFragment :
                             tags = selectedTags,
                         ),
                 )
-            activityViewModel.launchSearchForCards(updatedSearch, forceRefresh = false)
+            activityViewModel.launchSearchForCards(
+                updatedSearch,
+                forceRefresh = false,
+                feedbackMode = BrowserSearchFeedbackMode.SEARCH_RESULTS,
+            )
         } else {
             activityViewModel.filterByTags(selectedTags, cardState)
         }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
index 98a3e0706b0f..ad107ed857e3 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserViewModel.kt
@@ -55,7 +55,6 @@ import com.ichi2.anki.model.CardsOrNotes.CARDS
 import com.ichi2.anki.model.CardsOrNotes.NOTES
 import com.ichi2.anki.model.SelectableDeck
 import com.ichi2.anki.model.SortType
-import com.ichi2.anki.observability.ChangeManager
 import com.ichi2.anki.observability.undoableOp
 import com.ichi2.anki.preferences.SharedPreferencesProvider
 import com.ichi2.anki.progress.HasProgress
@@ -163,6 +162,13 @@ class CardBrowserViewModel(
                 initialValue = null,
             )
 
+    // Keep feedback while the browser is stopped (e.g. saving in the note editor).
+    // The UI consumes it once; a newer search discards feedback for the old results.
+    val flowOfSearchFeedback: StateFlow<SearchState.Completed?>
+        field = MutableStateFlow<SearchState.Completed?>(null)
+
+    fun consumeSearchFeedback(search: SearchState.Completed): Boolean = flowOfSearchFeedback.compareAndSet(search, null)
+
     /**
      * Commands to drive the note editor either in a fragment or a standalone activity
      * @see NoteEditorCommand
@@ -186,17 +192,6 @@ class CardBrowserViewModel(
         companion object
     }
 
-    /** Result of a completed search, used to drive a snackbar in the UI */
-    sealed interface SearchResultMessage {
-        /** "X cards/notes shown | Search all decks" */
-        data class CardCount(
-            val includeSearchAllDecksAction: Boolean,
-        ) : SearchResultMessage
-
-        /** "No cards in deck X" message; always paired with a "search all decks" action. */
-        data object NoCardsInSelectedDeck : SearchResultMessage
-    }
-
     /** text in the search box (potentially unsubmitted) */
     // this does not currently bind to the value in the UI and is only used for posting
     val flowOfFilterQuery = MutableSharedFlow<String>()
@@ -418,7 +413,10 @@ class CardBrowserViewModel(
     val lastDeckId: DeckId?
         get() = lastDeckIdRepository.lastDeckId
 
-    fun setSelectedDeck(deck: SelectableDeck) {
+    fun setSelectedDeck(
+        deck: SelectableDeck,
+        feedbackMode: BrowserSearchFeedbackMode = BrowserSearchFeedbackMode.NONE,
+    ) {
         Timber.i("setting deck: %s", deck)
 
         lastDeckIdRepository.lastDeckId =
@@ -434,7 +432,7 @@ class CardBrowserViewModel(
             }
 
         val updatedFilter = searchRequestFlow.value.copyFilters { it.copy(decks = deckFilter) }
-        launchSearchForCards(updatedFilter, forceRefresh = false)
+        launchSearchForCards(updatedFilter, forceRefresh = false, feedbackMode = feedbackMode)
     }
 
     val searchRequestFlow = MutableStateFlow(SearchRequest(query = ""))
@@ -589,10 +587,22 @@ class CardBrowserViewModel(
             null -> {}
         }
 
+        val initialFeedbackMode =
+            when (options) {
+                is CardBrowserLaunchOptions.DeepLink,
+                is CardBrowserLaunchOptions.SystemContextMenu,
+                is CardBrowserLaunchOptions.SearchQueryJs,
+                -> BrowserSearchFeedbackMode.SEARCH_RESULTS
+                is CardBrowserLaunchOptions.ScrollToCard, null -> BrowserSearchFeedbackMode.NONE
+            }
+        var firstSearch = true
         performSearchFlow
             .onEach {
                 Timber.d("performSearchFlow -> launching search")
-                launchSearchForCards()
+                // After initialization, this flow only runs when cards/notes mode changes.
+                val feedbackMode = if (firstSearch) initialFeedbackMode else BrowserSearchFeedbackMode.COUNT_ONLY
+                firstSearch = false
+                launchSearchForCards(feedbackMode = feedbackMode)
             }.launchIn(viewModelScope)
 
         flowOfCardsOrNotes
@@ -611,7 +621,7 @@ class CardBrowserViewModel(
 
             val initialDeckId = if (selectAllDecks) SelectableDeck.AllDecks else getInitialDeck()
             // PERF: slightly inefficient if the source was lastDeckId
-            setSelectedDeck(initialDeckId)
+            setSelectedDeck(initialDeckId, feedbackMode = initialFeedbackMode)
             refreshBackendColumns()
 
             refreshSortState()
@@ -1093,7 +1103,7 @@ class CardBrowserViewModel(
      * If no cards are suspended, suspend all
      * If there is a mix, suspend all
      *
-     * Changes are handled by [ChangeManager]
+     * Refreshes the results with count feedback after the edit.
      */
     fun toggleSuspendCards() =
         viewModelScope.launch {
@@ -1104,14 +1114,14 @@ class CardBrowserViewModel(
                 Timber.d("toggling selected cards suspend status")
                 val cardIds = queryAllSelectedCardIds()
 
-                undoableOp<OpChanges> {
+                undoableOp<OpChanges>(this@CardBrowserViewModel) {
                     val wantUnsuspend = cardIds.all { getCard(it).queue == QueueType.Suspended }
                     if (wantUnsuspend) {
                         sched.unsuspendCards(cardIds)
                     } else {
                         sched.suspendCards(cardIds).changes
                     }
-                }
+                }.also(::refreshAfterEdit)
                 Timber.d("finished 'toggleSuspendCards'")
             }
         }
@@ -1268,13 +1278,13 @@ class CardBrowserViewModel(
             searchRequestFlow.value.copy(
                 query = filterQuery,
             )
-        launchSearchForCards()
+        launchSearchForCards(feedbackMode = BrowserSearchFeedbackMode.SEARCH_RESULTS)
     }
 
     fun setQuery(
         query: String,
         forceRefresh: Boolean = true,
-        fromUserSearch: Boolean = false,
+        feedbackMode: BrowserSearchFeedbackMode = BrowserSearchFeedbackMode.NONE,
     ) = viewModelScope.launch {
         val newValue = searchRequestFlow.value.copy(query = query)
         if (!forceRefresh && withCol { searchRequestFlow.value.toSearchString() == newValue.toSearchString() }) {
@@ -1283,7 +1293,7 @@ class CardBrowserViewModel(
         }
 
         searchRequestFlow.value = newValue
-        launchSearchForCards(fromUserSearch = fromUserSearch)
+        launchSearchForCards(feedbackMode = feedbackMode)
     }
 
     /**
@@ -1329,7 +1339,7 @@ class CardBrowserViewModel(
         indeterminateTags: List<String>,
     ) = progressManager.withProgress {
         val selectedNoteIds = queryAllSelectedNoteIds().distinct()
-        undoableOp {
+        undoableOp(this@CardBrowserViewModel) {
             val selectedNotes =
                 selectedNoteIds
                     .map { noteId -> getNote(noteId) }
@@ -1339,7 +1349,7 @@ class CardBrowserViewModel(
                         note.setTagsFromStr(this@undoableOp, tags.join(updatedTags))
                     }
             updateNotes(selectedNotes)
-        }
+        }.also(::refreshAfterEdit)
     }
 
     suspend fun filterByTags(
@@ -1445,13 +1455,12 @@ class CardBrowserViewModel(
 
     /**
      * @param forceRefresh if `true`, perform a search even if the search query is unchanged
-     * @param fromUserSearch whether the user explicitly searched for something; controls whether a
-     * result message (snackbar) is surfaced. See [SearchState.Completed.resultMessage]
+     * @param feedbackMode the feedback requested for this search, resolved by [browserSearchFeedback]
      */
     fun launchSearchForCards(
         searchRequest: SearchRequest,
         forceRefresh: Boolean,
-        fromUserSearch: Boolean = false,
+        feedbackMode: BrowserSearchFeedbackMode = BrowserSearchFeedbackMode.NONE,
     ) = viewModelScope.launch {
         Timber.d("launching search [new syntax]: '%s'", searchRequest)
 
@@ -1463,7 +1472,7 @@ class CardBrowserViewModel(
         }
 
         searchRequestFlow.value = searchRequest
-        launchSearchForCards(fromUserSearch = fromUserSearch)
+        launchSearchForCards(feedbackMode = feedbackMode)
     }
 
     /**
@@ -1471,14 +1480,16 @@ class CardBrowserViewModel(
      *
      * @see com.ichi2.anki.searchForRows
      */
-    @NeedsTest("Invalid searches are handled. For instance: 'and'")
-    fun launchSearchForCards(fromUserSearch: Boolean = false) {
+    fun launchSearchForCards(feedbackMode: BrowserSearchFeedbackMode = BrowserSearchFeedbackMode.NONE) {
         if (!initCompleted) return
 
         viewModelScope.launch {
+            searchJob?.cancel()
+            flowOfSearchFeedback.value = null
             // update the UI while we're searching
             clearCardsList()
 
+            // Another request may have started a search while clearCardsList() was suspended.
             searchJob?.cancel()
             searchJob =
                 launchCatchingIO(
@@ -1498,7 +1509,12 @@ class CardBrowserViewModel(
                     }
                     ensurePaneRowValid()
                     if (isFragmented) flowOfNoteEditorCommand.emit(NoteEditorCommand.fromCurrentSearchState())
-                    flowOfSearchState.emit(SearchState.Completed.fromCurrentState(fromUserSearch))
+                    val completed = SearchState.Completed.fromCurrentState(feedbackMode)
+                    withContext(Dispatchers.Main) {
+                        ensureActive()
+                        flowOfSearchState.emit(completed)
+                        flowOfSearchFeedback.value = completed.takeUnless { feedbackMode == BrowserSearchFeedbackMode.NONE }
+                    }
                     selectUnvalidatedRowIds(pendingSelectionRestore)
                     pendingSelectionRestore = emptyList()
                 }
@@ -1521,6 +1537,14 @@ class CardBrowserViewModel(
 
     private fun refreshSearch() = launchSearchForCards()
 
+    /** Refreshes edits which use the result count as their feedback. */
+    private fun refreshAfterEdit(changes: OpChanges) {
+        if (changes.browserSidebar || changes.browserTable || changes.noteText || changes.card) {
+            endMultiSelectMode(SingleSelectCause.Other)
+            launchSearchForCards(feedbackMode = BrowserSearchFeedbackMode.COUNT_ONLY)
+        }
+    }
+
     private suspend fun clearCardsList() {
         cards.reset()
         flowOfCardsUpdated.emit(Unit)
@@ -1611,20 +1635,16 @@ class CardBrowserViewModel(
     /**
      * Builds a [SearchState.Completed] event reflecting the current ViewModel state.
      *
-     * @param fromUserSearch whether this search was triggered by the user searching for something.
+     * @param feedbackMode the feedback requested for this search.
      */
-    private fun SearchState.Completed.Companion.fromCurrentState(fromUserSearch: Boolean = false): SearchState.Completed =
+    private fun SearchState.Completed.Companion.fromCurrentState(
+        feedbackMode: BrowserSearchFeedbackMode = BrowserSearchFeedbackMode.NONE,
+    ): SearchState.Completed =
         SearchState.Completed(
             rowCount = rowCount,
             cardsOrNotes = cardsOrNotes,
-            resultMessage =
-                when {
-                    !fromUserSearch -> null
-                    // TODO: better message if rowCount == 0 AND hasSelectedAllDecks
-                    hasSelectedAllDecks() -> SearchResultMessage.CardCount(includeSearchAllDecksAction = false)
-                    rowCount == 0 -> SearchResultMessage.NoCardsInSelectedDeck
-                    else -> SearchResultMessage.CardCount(includeSearchAllDecksAction = true)
-                },
+            feedbackMode = feedbackMode,
+            allDecksSelected = hasSelectedAllDecks(),
         )
 
     /** Builds the post-search trailing-pane command from current ViewModel state (tablet only). */
@@ -1749,13 +1769,10 @@ class CardBrowserViewModel(
         data class Completed(
             val rowCount: Int,
             val cardsOrNotes: CardsOrNotes,
-            /**
-             * The message (snackbar) to surface for this search, or `null` if none should be shown.
-             *
-             * Only populated for explicit user searches; `null` for browser open, deck change and
-             * order/direction changes.
-             */
-            val resultMessage: SearchResultMessage?,
+            /** The feedback requested by the caller for this search. */
+            val feedbackMode: BrowserSearchFeedbackMode,
+            /** The deck scope used by this search, before any subsequent UI changes. */
+            val allDecksSelected: Boolean,
         ) : SearchState {
             companion object
         }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/ColumnSelectionDialogFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/ColumnSelectionDialogFragment.kt
index b029960412e2..1a66995b189a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/ColumnSelectionDialogFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/ColumnSelectionDialogFragment.kt
@@ -16,9 +16,9 @@ import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.ItemColumnSelectionBinding
 import com.ichi2.anki.utils.ext.requireParcelable
-import com.ichi2.utils.dp
 import com.ichi2.utils.setPaddingRelative
 import kotlinx.coroutines.launch
 import timber.log.Timber
@@ -26,14 +26,14 @@ import timber.log.Timber
 class ColumnSelectionDialogFragment : DialogFragment() {
     private val viewModel: CardBrowserViewModel by activityViewModels()
     private val columnToReplace: ColumnHeading by lazy {
-        requireArguments().requireParcelable(SELECTED_COLUMN)
+        requireArguments().requireParcelable(ARG_SELECTED_COLUMN)
     }
 
     private var availableColumns: List<ColumnWithSample> = emptyList()
 
     override fun onSaveInstanceState(outState: Bundle) {
         with(outState) {
-            outState.putParcelableArrayList(AVAILABLE_COLUMNS, availableColumns.toCollection(ArrayList()))
+            outState.putParcelableArrayList(STATE_AVAILABLE_COLUMNS, availableColumns.toCollection(ArrayList()))
             super.onSaveInstanceState(this)
         }
     }
@@ -87,7 +87,13 @@ class ColumnSelectionDialogFragment : DialogFragment() {
                 if (savedInstanceState == null) {
                     viewModel.previewColumnHeadings(viewModel.cardsOrNotes).second
                 } else {
-                    BundleCompat.getParcelableArrayList(savedInstanceState, AVAILABLE_COLUMNS, ColumnWithSample::class.java)!!.toList()
+                    BundleCompat
+                        .getParcelableArrayList(
+                            savedInstanceState,
+                            STATE_AVAILABLE_COLUMNS,
+                            ColumnWithSample::class.java,
+                        )!!
+                        .toList()
                 }
             adapter.clear()
             adapter.addAll(availableColumns)
@@ -121,12 +127,12 @@ class ColumnSelectionDialogFragment : DialogFragment() {
     companion object {
         const val TAG = "ColumnSelectionDialog"
 
-        private const val SELECTED_COLUMN = "selected_column"
-        private const val AVAILABLE_COLUMNS = "availableColumns"
+        private const val ARG_SELECTED_COLUMN = "selected_column"
+        private const val STATE_AVAILABLE_COLUMNS = "availableColumns"
 
         fun newInstance(selectedColumn: ColumnHeading): ColumnSelectionDialogFragment =
             ColumnSelectionDialogFragment().apply {
-                arguments = Bundle().apply { putParcelable(SELECTED_COLUMN, selectedColumn) }
+                arguments = Bundle().apply { putParcelable(ARG_SELECTED_COLUMN, selectedColumn) }
             }
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt
index 4cf9d5c73744..85bbd31be294 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt
@@ -20,13 +20,13 @@ import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
 import com.ichi2.anki.analytics.AnalyticsDialogFragment
-import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_FIELD
-import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_MATCH_CASE
-import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_ONLY_SELECTED_NOTES
-import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_REGEX
-import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_REPLACEMENT
-import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_SEARCH
 import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.REQUEST_FIND_AND_REPLACE
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.RESULT_FIELD
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.RESULT_MATCH_CASE
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.RESULT_ONLY_SELECTED_NOTES
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.RESULT_REGEX
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.RESULT_REPLACEMENT
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.RESULT_SEARCH
 import com.ichi2.anki.databinding.FragmentFindReplaceBinding
 import com.ichi2.anki.libanki.NoteId
 import com.ichi2.anki.notetype.ManageNotetypes
@@ -147,13 +147,13 @@ class FindAndReplaceDialogFragment : AnalyticsDialogFragment() {
         setFragmentResult(
             REQUEST_FIND_AND_REPLACE,
             Bundle().apply {
-                putString(ARG_SEARCH, search.toString())
-                putString(ARG_REPLACEMENT, replacement.toString())
-                putString(ARG_FIELD, selectedField)
-                putBoolean(ARG_ONLY_SELECTED_NOTES, onlyInSelectedNotes)
+                putString(RESULT_SEARCH, search.toString())
+                putString(RESULT_REPLACEMENT, replacement.toString())
+                putString(RESULT_FIELD, selectedField)
+                putBoolean(RESULT_ONLY_SELECTED_NOTES, onlyInSelectedNotes)
                 // "Ignore case" checkbox text => when it's checked we pass false to the backend
-                putBoolean(ARG_MATCH_CASE, !ignoreCase)
-                putBoolean(ARG_REGEX, inputAsRegex)
+                putBoolean(RESULT_MATCH_CASE, !ignoreCase)
+                putBoolean(RESULT_REGEX, inputAsRegex)
             },
         )
     }
@@ -167,21 +167,21 @@ class FindAndReplaceDialogFragment : AnalyticsDialogFragment() {
         const val TAG = "FindAndReplaceDialogFragment"
         const val REQUEST_FIND_AND_REPLACE = "request_find_and_replace"
         const val ARG_IDS = "arg_ids"
-        const val ARG_SEARCH = "arg_search"
-        const val ARG_REPLACEMENT = "arg_replacement"
-        const val ARG_FIELD = "arg_field"
-        const val ARG_ONLY_SELECTED_NOTES = "arg_only_selected_notes"
-        const val ARG_MATCH_CASE = "arg_match_case"
-        const val ARG_REGEX = "arg_regex"
+        const val RESULT_SEARCH = "arg_search"
+        const val RESULT_REPLACEMENT = "arg_replacement"
+        const val RESULT_FIELD = "arg_field"
+        const val RESULT_ONLY_SELECTED_NOTES = "arg_only_selected_notes"
+        const val RESULT_MATCH_CASE = "arg_match_case"
+        const val RESULT_REGEX = "arg_regex"
 
         /**
-         * Receiving this value in the result [Bundle] for the [ARG_FIELD] entry means that
+         * Receiving this value in the result [Bundle] for the [RESULT_FIELD] entry means that
          * the user selected "All fields" as the field target for the find and replace action.
          */
         const val ALL_FIELDS_AS_FIELD = "find_and_replace_dialog_fragment_all_fields_as_field"
 
         /**
-         * Receiving this value in the result [Bundle] for the [ARG_FIELD] entry means that
+         * Receiving this value in the result [Bundle] for the [RESULT_FIELD] entry means that
          * the user selected "Tags" as the field target for the find and replace action.
          */
         const val TAGS_AS_FIELD = "find_and_replace_dialog_fragment_tags_as_field"
@@ -205,12 +205,12 @@ fun CardBrowser.registerFindReplaceHandler(action: (FindReplaceResult) -> Unit)
     setFragmentResultListener(REQUEST_FIND_AND_REPLACE) { _, bundle ->
         action(
             FindReplaceResult(
-                search = bundle.getString(ARG_SEARCH) ?: error("Missing required argument: search"),
-                replacement = bundle.getString(ARG_REPLACEMENT) ?: error("Missing required argument: replacement"),
-                field = bundle.getString(ARG_FIELD) ?: error("Missing required argument: field"),
-                onlyOnSelectedNotes = bundle.getBoolean(ARG_ONLY_SELECTED_NOTES, true),
-                matchCase = bundle.getBoolean(ARG_MATCH_CASE, false),
-                regex = bundle.getBoolean(ARG_REGEX, false),
+                search = bundle.getString(RESULT_SEARCH) ?: error("Missing required argument: search"),
+                replacement = bundle.getString(RESULT_REPLACEMENT) ?: error("Missing required argument: replacement"),
+                field = bundle.getString(RESULT_FIELD) ?: error("Missing required argument: field"),
+                onlyOnSelectedNotes = bundle.getBoolean(RESULT_ONLY_SELECTED_NOTES, true),
+                matchCase = bundle.getBoolean(RESULT_MATCH_CASE, false),
+                regex = bundle.getBoolean(RESULT_REGEX, false),
             ),
         )
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/LastDeckIdRepository.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/LastDeckIdRepository.kt
index 2d32163112ee..76b0cb917a3f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/LastDeckIdRepository.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/LastDeckIdRepository.kt
@@ -25,14 +25,14 @@ class SharedPreferencesLastDeckIdRepository : LastDeckIdRepository {
         get() =
             appContext
                 .getSharedPreferences(PERSISTENT_STATE_FILE, 0)
-                .getLong(LAST_DECK_ID_KEY, Decks.NOT_FOUND_DECK_ID)
+                .getLong(PREF_LAST_DECK_ID, Decks.NOT_FOUND_DECK_ID)
                 .takeUnless { it == Decks.NOT_FOUND_DECK_ID }
         set(value) =
             if (value == null) {
                 clearLastDeckId()
             } else {
                 appContext.getSharedPreferences(PERSISTENT_STATE_FILE, 0).edit {
-                    putLong(LAST_DECK_ID_KEY, value)
+                    putLong(PREF_LAST_DECK_ID, value)
                 }
             }
 
@@ -40,11 +40,11 @@ class SharedPreferencesLastDeckIdRepository : LastDeckIdRepository {
         fun clearLastDeckId() {
             val context: Context = appContext
             context.getSharedPreferences(PERSISTENT_STATE_FILE, 0).edit {
-                remove(LAST_DECK_ID_KEY)
+                remove(PREF_LAST_DECK_ID)
             }
         }
 
         private const val PERSISTENT_STATE_FILE = "DeckPickerState"
-        private const val LAST_DECK_ID_KEY = "lastDeckId"
+        private const val PREF_LAST_DECK_ID = "lastDeckId"
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/RepositionCardFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/RepositionCardFragment.kt
index a4b5bb17cda8..7b59431ab7ec 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/RepositionCardFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/RepositionCardFragment.kt
@@ -75,10 +75,10 @@ class RepositionCardFragment : DialogFragment() {
                     setFragmentResult(
                         REQUEST_REPOSITION_NEW_CARDS,
                         Bundle().apply {
-                            putInt(ARG_POSITION, position)
-                            putInt(ARG_STEP, step)
-                            putBoolean(ARG_RANDOM, binding.randomizeOrderCheck.isChecked)
-                            putBoolean(ARG_SHIFT, binding.shiftPositionCheck.isChecked)
+                            putInt(RESULT_POSITION, position)
+                            putInt(RESULT_STEP, step)
+                            putBoolean(RESULT_RANDOM, binding.randomizeOrderCheck.isChecked)
+                            putBoolean(RESULT_SHIFT, binding.shiftPositionCheck.isChecked)
                         },
                     )
                 }
@@ -124,10 +124,13 @@ class RepositionCardFragment : DialogFragment() {
         const val REQUEST_REPOSITION_NEW_CARDS = "request_repositions_new_cards"
         private const val ARG_QUEUE_TOP = "arg_queue_top"
         private const val ARG_QUEUE_BOTTOM = "arg_queue_bottom"
-        const val ARG_POSITION = "arg_position"
-        const val ARG_STEP = "arg_step"
-        const val ARG_RANDOM = "arg_random"
-        const val ARG_SHIFT = "arg_shift"
+        const val RESULT_POSITION = "arg_position"
+        const val RESULT_STEP = "arg_step"
+        const val RESULT_RANDOM = "arg_random"
+        const val RESULT_SHIFT = "arg_shift"
+
+        private const val ARG_RANDOM = "arg_random"
+        private const val ARG_SHIFT = "arg_shift"
 
         fun newInstance(
             queueTop: Int,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/AdvancedSearchFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/AdvancedSearchFragment.kt
index 4f60339ff88c..4cb7854d272d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/AdvancedSearchFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/AdvancedSearchFragment.kt
@@ -20,7 +20,7 @@ import com.ichi2.anki.browser.search.AdvancedSearchFieldsTab.FieldSearch
 import com.ichi2.anki.browser.search.AdvancedSearchFragment.OptionData
 import com.ichi2.anki.browser.search.AdvancedSearchFragment.OptionType
 import com.ichi2.anki.browser.search.AdvancedSearchFragment.OptionType.InsertExample
-import com.ichi2.anki.databinding.DialogGenericRecyclerViewBinding
+import com.ichi2.anki.common.android.databinding.DialogGenericRecyclerViewBinding
 import com.ichi2.anki.databinding.FragmentAdvancedSearchBinding
 import com.ichi2.anki.databinding.ItemAdvancedSearchBinding
 import com.ichi2.anki.dialogs.FieldSelectionDialog
@@ -32,6 +32,7 @@ import com.ichi2.anki.utils.openUrl
 import dev.androidbroadcast.vbpd.viewBinding
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Helps a user build an advanced search string, explaining options listed in the
@@ -262,7 +263,7 @@ class AdvancedSearchFragment : Fragment(R.layout.fragment_advanced_search) {
      *
      * @see OptionData
      */
-    class SelectAdvancedSearchFragment : Fragment(R.layout.dialog_generic_recycler_view) {
+    class SelectAdvancedSearchFragment : Fragment(CommonR.layout.dialog_generic_recycler_view) {
         val binding by viewBinding(DialogGenericRecyclerViewBinding::bind)
 
         val data: List<OptionData>
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/CardStateBottomSheetFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/CardStateBottomSheetFragment.kt
index 680551fecfae..18b301f9734f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/CardStateBottomSheetFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/CardStateBottomSheetFragment.kt
@@ -2,20 +2,25 @@
 
 package com.ichi2.anki.browser.search
 
+import android.content.Context
+import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.DrawableCompat
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.google.android.material.color.MaterialColors
 import com.ichi2.anki.R
 import com.ichi2.anki.databinding.FragmentBottomSheetListBinding
 import com.ichi2.anki.databinding.ItemBrowserFilterBottomSheetBinding
 import com.ichi2.anki.utils.ext.behavior
 import dev.androidbroadcast.vbpd.viewBinding
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * A [BottomSheetDialogFragment] allowing selection of 0-many [CardState]s
@@ -92,7 +97,7 @@ class CardStateBottomSheetFragment : BottomSheetDialogFragment(R.layout.fragment
             val state = this.states[position]
             holder.binding.text.text = state.label
             holder.binding.checkbox.contentDescription = state.label
-            holder.binding.icon.setImageResource(state.iconRes)
+            holder.binding.icon.setImageDrawable(state.getIcon(holder.itemView.context))
             holder.binding.root.setOnClickListener { onItemClickedListener(state) }
             holder.binding.checkbox.apply {
                 this.isChecked = checkedItems.contains(state)
@@ -121,14 +126,19 @@ class CardStateBottomSheetFragment : BottomSheetDialogFragment(R.layout.fragment
     }
 }
 
-@get:DrawableRes
-val CardState?.iconRes
-    get() =
+/** Returns the card-state icon tinted with the current theme's state color. */
+fun CardState?.getIcon(context: Context): Drawable? {
+    val iconRes = if (this == null) R.drawable.ic_card_state_default else R.drawable.ic_card_state
+    val colorAttr =
         when (this) {
-            null -> R.drawable.ic_card_state_default
-            CardState.New -> R.drawable.ic_card_state_new
-            CardState.Learning -> R.drawable.ic_card_state_learning
-            CardState.Review -> R.drawable.ic_card_state_review
-            CardState.Buried -> R.drawable.ic_card_state_buried
-            CardState.Suspended -> R.drawable.ic_card_state_suspended
+            null -> androidx.appcompat.R.attr.colorPrimary
+            CardState.New -> CommonR.attr.newCountColor
+            CardState.Learning -> CommonR.attr.learnCountColor
+            CardState.Review -> CommonR.attr.reviewCountColor
+            CardState.Buried -> CommonR.attr.buriedColor
+            CardState.Suspended -> CommonR.attr.suspendedColor
         }
+    return ContextCompat.getDrawable(context, iconRes)?.mutate()?.also {
+        DrawableCompat.setTint(it, MaterialColors.getColor(context, colorAttr, 0))
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/SavedSearches.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/SavedSearches.kt
index bad2c71e6e1d..c6820608468e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/SavedSearches.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/SavedSearches.kt
@@ -3,25 +3,9 @@
 package com.ichi2.anki.browser.search
 
 import com.ichi2.anki.CollectionManager.withCol
-import com.ichi2.anki.libanki.Config
+import com.ichi2.anki.common.utils.ext.savedFilters
 import timber.log.Timber
 
-/**
- * A named query for the Card Browser
- *
- * Selecting a saved search quickly allows a user to either:
- * - search the given query
- * - add additional terms to the query before searching
- *
- * @see SavedSearches
- */
-data class SavedSearch(
-    val name: String,
-    val query: String,
-) {
-    fun normalize() = SavedSearch(name = this.name, query = this.query.trim())
-}
-
 /**
  * Manages saved searches (named search queries in the Card Browser)
  *
@@ -88,20 +72,3 @@ object SavedSearches {
     /** Removes all saved searches from the Anki collection */
     suspend fun clear() = saveToConfig(emptyList())
 }
-
-/**
- * The list of saved searches in the Anki Collection
- *
- * Ordering is NOT preserved in Anki Desktop. Searches are ordered based on the name and are
- * case-sensitive
- */
-var Config.savedFilters: List<SavedSearch>
-    get() =
-        get<Map<String, String>>("savedFilters")
-            .orEmpty()
-            .map { (key, value) -> SavedSearch(name = key, query = value) }
-    set(value) {
-        set("savedFilters", value.toMap())
-    }
-
-fun List<SavedSearch>.toMap(): Map<String, String> = associate { it.name to it.query }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/StandardSearchFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/StandardSearchFragment.kt
index bbfbf70c7e57..1a131aa6ed40 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/StandardSearchFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/StandardSearchFragment.kt
@@ -132,15 +132,7 @@ class StandardSearchFragment :
             binding.decksChip.text = it.decks.firstOrNull()?.name ?: TR.sentenceCase.allDecks
             binding.tagsChip.text = formatChipDescription(it.tags, emptyValue = "Tags")
             binding.cardStateChip.text = formatChipDescription(it.cardStates.map { it.label }, emptyValue = "Card state")
-            binding.cardStateChip.chipIcon =
-                ContextCompat.getDrawable(requireContext(), it.cardStates.firstOrNull().iconRes)?.also { drawable ->
-                    if (it.cardStates.isEmpty()) {
-                        DrawableCompat.setTint(
-                            drawable.mutate(),
-                            MaterialColors.getColor(requireContext(), androidx.appcompat.R.attr.colorPrimary, 0),
-                        )
-                    }
-                }
+            binding.cardStateChip.chipIcon = it.cardStates.firstOrNull().getIcon(requireContext())
 
             binding.flagsChip.text =
                 formatChipDescription(
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/ui/SortPill.kt b/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/ui/SortPill.kt
index 11011ac8e658..37b54352f61f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/ui/SortPill.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/browser/search/ui/SortPill.kt
@@ -23,7 +23,7 @@ import com.google.android.material.shape.AbsoluteCornerSize
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
 import com.ichi2.anki.browser.ColumnType
-import com.ichi2.utils.dp
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.utils.updatePaddingRelative
 
 /** Direction expressed by a [SortPill] half — which side is the "active" sort. */
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/TypeAnswer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/TypeAnswer.kt
index 074ae75fa06d..89a6bd612cb4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/TypeAnswer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/TypeAnswer.kt
@@ -153,14 +153,7 @@ class TypeAnswer(
                 """<center>
 <input type="text" name="typed" id="typeans" data-focus="$autoFocus" onfocus="taFocus();" oninput='taChange(this);' onKeyPress="return taKey(this, event)" autocomplete="off" """,
             )
-            if (noSuggest) {
-                // in JS: ankidroidNosuggest
-                // see 'Keyboard: setNoSuggest'
-                sb.append("data-ankidroid-nosuggest=\"true\"")
-                sb.append(' ')
-                sb.append("enterkeyhint=\"done\"")
-                sb.append(' ')
-            }
+            if (noSuggest) sb.appendNoSuggestAttributes()
             // We have to watch out. For the preview we don’t know the font or font size. Skip those there. (Anki
             // desktop just doesn't show the input tag there. Do it with standard values here instead.)
             if (font.isNotEmpty() && size > 0) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/TypeAnswerKeyboard.kt b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/TypeAnswerKeyboard.kt
new file mode 100644
index 000000000000..8787ef1676bf
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/TypeAnswerKeyboard.kt
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.cardviewer
+
+/** Appends the HTML answer's keyboard attributes, including a trailing space. */
+internal fun StringBuilder.appendNoSuggestAttributes() {
+    append("data-ankidroid-nosuggest=\"true\"")
+    append(' ')
+    append("enterkeyhint=\"done\"")
+    append(' ')
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/TypeAnswerWebView.kt b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/TypeAnswerWebView.kt
index 42327e1e81c5..9de1937c4ff9 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/TypeAnswerWebView.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/TypeAnswerWebView.kt
@@ -3,12 +3,14 @@
 package com.ichi2.anki.cardviewer
 
 import android.content.Context
+import android.util.AttributeSet
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputConnection
 import android.view.inputmethod.InputMethodManager
 import android.webkit.JavascriptInterface
 import android.webkit.WebView
 import androidx.core.content.getSystemService
+import com.ichi2.anki.workarounds.SafeWebViewLayout
 import com.ichi2.ui.applyNoSuggest
 
 /** Applies `nosuggest` to the focused HTML answer field's keyboard connection. */
@@ -47,3 +49,11 @@ open class TypeAnswerWebView(
         super.destroy()
     }
 }
+
+/** Uses the same keyboard support when the new reviewer recreates its WebView after a crash. */
+class TypeAnswerWebViewLayout(
+    context: Context,
+    attrs: AttributeSet?,
+) : SafeWebViewLayout(context, attrs) {
+    override fun createWebView(): WebView = TypeAnswerWebView(context)
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
index 082f1f1c2826..31e47d728467 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/cardviewer/ViewerCommand.kt
@@ -4,11 +4,12 @@ package com.ichi2.anki.cardviewer
 
 import android.content.SharedPreferences
 import android.view.KeyEvent
-import com.ichi2.anki.reviewer.Binding.Companion.keyCode
 import com.ichi2.anki.reviewer.Binding.Companion.unicode
+import com.ichi2.anki.reviewer.Binding.KeyCode
 import com.ichi2.anki.reviewer.Binding.ModifierKeys
 import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.ctrl
 import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.shift
+import com.ichi2.anki.reviewer.BindingUnicodeCharacter
 import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.MappableAction
 import com.ichi2.anki.reviewer.ReviewerBinding
@@ -108,11 +109,11 @@ enum class ViewerCommand : MappableAction<ReviewerBinding> {
                         keyCode(KeyEvent.KEYCODE_NUMPAD_4, CardSide.ANSWER),
                     )
                 EDIT -> listOf(keyCode(KeyEvent.KEYCODE_E, CardSide.BOTH))
-                MARK -> listOf(unicode('*', CardSide.BOTH))
-                BURY_CARD -> listOf(unicode('-', CardSide.BOTH))
-                BURY_NOTE -> listOf(unicode('=', CardSide.BOTH))
-                SUSPEND_CARD -> listOf(unicode('@', CardSide.BOTH))
-                SUSPEND_NOTE -> listOf(unicode('!', CardSide.BOTH))
+                MARK -> listOf(unicode(BindingUnicodeCharacter('*'), CardSide.BOTH))
+                BURY_CARD -> listOf(unicode(BindingUnicodeCharacter('-'), CardSide.BOTH))
+                BURY_NOTE -> listOf(unicode(BindingUnicodeCharacter('='), CardSide.BOTH))
+                SUSPEND_CARD -> listOf(unicode(BindingUnicodeCharacter('@'), CardSide.BOTH))
+                SUSPEND_NOTE -> listOf(unicode(BindingUnicodeCharacter('!'), CardSide.BOTH))
                 PLAY_MEDIA -> listOf(keyCode(KeyEvent.KEYCODE_R, CardSide.BOTH), keyCode(KeyEvent.KEYCODE_F5, CardSide.BOTH))
                 REPLAY_VOICE -> listOf(keyCode(KeyEvent.KEYCODE_V, CardSide.BOTH))
                 RECORD_VOICE -> listOf(keyCode(KeyEvent.KEYCODE_V, CardSide.BOTH, shift()))
@@ -192,10 +193,10 @@ enum class ViewerCommand : MappableAction<ReviewerBinding> {
         keycode: Int,
         side: CardSide,
         keys: ModifierKeys = ModifierKeys.none(),
-    ): ReviewerBinding = ReviewerBinding(keyCode(keycode, keys), side)
+    ): ReviewerBinding = ReviewerBinding(KeyCode(keycode, keys), side)
 
     private fun unicode(
-        c: Char,
+        c: BindingUnicodeCharacter,
         side: CardSide,
     ): ReviewerBinding = ReviewerBinding(unicode(c), side)
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/contextmenu/MouseContextMenuHandler.kt b/AnkiDroid/src/main/java/com/ichi2/anki/contextmenu/MouseContextMenuHandler.kt
index c4e1bfe3c824..5b1e51e0c251 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/contextmenu/MouseContextMenuHandler.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/contextmenu/MouseContextMenuHandler.kt
@@ -6,7 +6,7 @@ package com.ichi2.anki.contextmenu
 import android.view.View
 import android.view.ViewGroup
 import android.widget.PopupMenu
-import com.ichi2.anki.R
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Helper class to build a context menu for mouse right-click events.
@@ -46,7 +46,7 @@ open class MouseContextMenuHandler(
 
         viewGroup.addView(anchorView)
 
-        val popupMenu = PopupMenu(context, anchorView, 0, 0, R.style.OverflowMenuStyle)
+        val popupMenu = PopupMenu(context, anchorView, 0, 0, CommonR.style.OverflowMenuStyle)
 
         menuContentProvider.populateMenu(popupMenu.menu)
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/deckpicker/DeckPickerViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/deckpicker/DeckPickerViewModel.kt
index 7275d8faf50f..d3d9eeedfe09 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/deckpicker/DeckPickerViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/deckpicker/DeckPickerViewModel.kt
@@ -118,7 +118,10 @@ class DeckPickerViewModel :
             if (tree == null) return@combine FlattenedDeckList.empty
 
             // TODO: use flowOfFocusedDeck once it's set on all instances
-            val currentDeckId = withCol { decks.current().getLong("id") }
+            // This flow can outlive the visible screen. Do not reopen the collection just to redraw it.
+            val currentDeckId =
+                withOpenColOrNull { decks.current().id }
+                    ?: return@combine FlattenedDeckList.empty
             Timber.i("currentDeckId: %d", currentDeckId)
 
             FlattenedDeckList(
@@ -207,21 +210,17 @@ class DeckPickerViewModel :
         val isFilteredDeck: Boolean,
     )
 
-    /** Prepares a confirmation dialog for deleting the focused deck. */
+    /** Prepares a confirmation dialog for deleting the selected deck. */
     fun requestDeleteDeckConfirmation() =
         launchCatchingIO {
-            val deckId =
-                focusedDeck ?: run {
-                    Timber.w("no focused deck")
-                    return@launchCatchingIO
-                }
             val request =
                 withCol {
+                    val deck = decks.current()
                     DeleteDeckConfirmationRequest(
-                        deckId = deckId,
-                        deckName = decks.name(deckId),
-                        totalCards = decks.cardCount(deckId, includeSubdecks = true),
-                        isFilteredDeck = decks.isFiltered(deckId),
+                        deckId = deck.id,
+                        deckName = deck.name,
+                        totalCards = decks.cardCount(deck.id, includeSubdecks = true),
+                        isFilteredDeck = deck.isFiltered,
                     )
                 }
             flowOfDeleteDeckConfirmation.emit(request)
@@ -490,6 +489,8 @@ class DeckPickerViewModel :
                 focusedDeck = withCol { decks.current().id }
                 refreshUndoMenuState()
 
+                // Reopening can leave the counts and selection unchanged after a skipped display refresh.
+                flowOfRefreshDeckList.emit(Unit)
                 flowOfDecksReloaded.emit(Unit)
             }
         this.loadDeckCounts = loadDeckCounts
@@ -747,17 +748,17 @@ class DeckPickerViewModel :
     ): Long {
         var previous: Long
         try {
-            previous = preferences.getLong(UPGRADE_VERSION_KEY, current)
+            previous = preferences.getLong(PREF_LAST_UPGRADE_VERSION, current)
         } catch (e: ClassCastException) {
             Timber.w(e)
             previous =
                 try {
                     // set 20900203 to default value, as it's the latest version that stores integer in shared prefs
-                    preferences.getInt(UPGRADE_VERSION_KEY, 20900203).toLong()
+                    preferences.getInt(PREF_LAST_UPGRADE_VERSION, 20900203).toLong()
                 } catch (cce: ClassCastException) {
                     Timber.w(cce)
                     // Previous versions stored this as a string.
-                    val s = preferences.getString(UPGRADE_VERSION_KEY, "")
+                    val s = preferences.getString(PREF_LAST_UPGRADE_VERSION, "")
                     // The last version of AnkiDroid that stored this as a string was 2.0.2.
                     // We manually set the version here, but anything older will force a DB check.
                     if ("2.0.2" == s) {
@@ -766,16 +767,16 @@ class DeckPickerViewModel :
                         0
                     }
                 }
-            Timber.d("Updating shared preferences stored key %s type to long", UPGRADE_VERSION_KEY)
+            Timber.d("Updating shared preferences stored key %s type to long", PREF_LAST_UPGRADE_VERSION)
             // Expected Editor.putLong to be called later to update the value in shared prefs
-            preferences.edit().remove(UPGRADE_VERSION_KEY).apply()
+            preferences.edit().remove(PREF_LAST_UPGRADE_VERSION).apply()
         }
         Timber.i("Previous AnkiDroid version: %s", previous)
         return previous
     }
 
     companion object {
-        const val UPGRADE_VERSION_KEY = "lastUpgradeVersion"
+        const val PREF_LAST_UPGRADE_VERSION = "lastUpgradeVersion"
     }
 }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BackupPromptDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BackupPromptDialog.kt
index 209fd02b2bd6..60f7490c42f0 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BackupPromptDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BackupPromptDialog.kt
@@ -17,7 +17,7 @@ import com.ichi2.anki.common.time.TimeManager
 import com.ichi2.anki.compat.CompatHelper.Companion.getPackageInfoCompat
 import com.ichi2.anki.compat.PackageInfoFlagsCompat
 import com.ichi2.anki.isLoggedIn
-import com.ichi2.anki.millisecondsSinceLastSync
+import com.ichi2.anki.millisecondsSinceLastSyncAttempt
 import com.ichi2.anki.servicelayer.ScopedStorageService.collectionWillBeMadeInaccessibleAfterUninstall
 import com.ichi2.anki.servicelayer.ScopedStorageService.userIsPromptedToDeleteCollectionOnUninstall
 import com.ichi2.utils.Permissions
@@ -242,8 +242,8 @@ class BackupPromptDialog private constructor(
         // If we are on a 'full' build, the user can always restore access to their collection.
         // But we want them to sync regularly as a backup
         if (isLoggedIn()) {
-            // Show dialog to sync if user hasn't synced in a while
-            return millisecondsSinceLastSync() >= ONE_DAY_IN_MS * 7
+            // Show dialog to sync if no sync attempt has been recorded in a while
+            return millisecondsSinceLastSyncAttempt() >= ONE_DAY_IN_MS * 7
         }
 
         // Android proposes the user deletes non-legacy locations on uninstall
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BrowserOptionsDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BrowserOptionsDialog.kt
index 3c58d7e33298..6eddfbd595d3 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BrowserOptionsDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BrowserOptionsDialog.kt
@@ -47,7 +47,7 @@ class BrowserOptionsDialog : AppCompatDialogFragment(R.layout.dialog_browser_opt
     }
 
     private val cardsOrNotes by lazy {
-        when (arguments?.getBoolean(CARDS_OR_NOTES_KEY)) {
+        when (arguments?.getBoolean(ARG_CARDS_OR_NOTES)) {
             true -> CardsOrNotes.CARDS
             false -> CardsOrNotes.NOTES
             null -> {
@@ -59,7 +59,7 @@ class BrowserOptionsDialog : AppCompatDialogFragment(R.layout.dialog_browser_opt
     }
 
     private val isTruncated by lazy {
-        arguments?.getBoolean(IS_TRUNCATED_KEY) ?: run {
+        arguments?.getBoolean(ARG_IS_TRUNCATED) ?: run {
             Timber.w("BrowserOptionsDialog instantiated without configuration.")
             false
         }
@@ -120,8 +120,8 @@ class BrowserOptionsDialog : AppCompatDialogFragment(R.layout.dialog_browser_opt
     }
 
     companion object {
-        private const val CARDS_OR_NOTES_KEY = "cardsOrNotes"
-        private const val IS_TRUNCATED_KEY = "isTruncated"
+        private const val ARG_CARDS_OR_NOTES = "cardsOrNotes"
+        private const val ARG_IS_TRUNCATED = "isTruncated"
 
         fun newInstance(
             cardsOrNotes: CardsOrNotes,
@@ -131,8 +131,8 @@ class BrowserOptionsDialog : AppCompatDialogFragment(R.layout.dialog_browser_opt
             return BrowserOptionsDialog().apply {
                 arguments =
                     Bundle().apply {
-                        putBoolean(CARDS_OR_NOTES_KEY, cardsOrNotes == CardsOrNotes.CARDS)
-                        putBoolean(IS_TRUNCATED_KEY, isTruncated)
+                        putBoolean(ARG_CARDS_OR_NOTES, cardsOrNotes == CardsOrNotes.CARDS)
+                        putBoolean(ARG_IS_TRUNCATED, isTruncated)
                     }
             }
         }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialog.kt
index 500a5921957e..ae5247f4d2a4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialog.kt
@@ -77,6 +77,7 @@ import com.ichi2.utils.boldList
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.launch
 import timber.log.Timber
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Supports bulk remapping of notes a different note type, remapping fields and templates
@@ -211,7 +212,7 @@ class ChangeNoteTypeDialog : AnalyticsDialogFragment(R.layout.dialog_change_note
             android.R.layout.simple_spinner_dropdown_item,
             noteTypes,
         ) {
-            var clozeColor = MaterialColors.getColor(context, R.attr.clozeColor, Color.BLUE)
+            var clozeColor = MaterialColors.getColor(context, CommonR.attr.clozeColor, Color.BLUE)
 
             private val defaultViewTextColor: Int by lazy {
                 (super.getView(0, null, Spinner(context)) as CheckedTextView).currentTextColor
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckOptionsSelectionDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckOptionsSelectionDialog.kt
index e9a4091927dc..ab32beb8c6d7 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckOptionsSelectionDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckOptionsSelectionDialog.kt
@@ -21,6 +21,7 @@ import com.ichi2.utils.create
 import com.ichi2.utils.customView
 import com.ichi2.utils.title
 import timber.log.Timber
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Shows a list of decks from which the user can select one to display its deck options.
@@ -39,7 +40,7 @@ fun Context.showDeckOptionsSelectionDialog(
             getColor(0, 0)
         }
     val dynamicDeckNameColor: Int =
-        usingStyledAttributes(null, intArrayOf(R.attr.dynDeckColor)) {
+        usingStyledAttributes(null, intArrayOf(CommonR.attr.dynDeckColor)) {
             getColor(0, 0)
         }
     val dialog =
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerContextMenu.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerContextMenu.kt
index 85f24b7ec1de..850022f79f6b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerContextMenu.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerContextMenu.kt
@@ -134,19 +134,19 @@ data class DeckPickerContextMenuResult(
 ) {
     fun toBundle(): Bundle =
         Bundle().apply {
-            putLong(ARG_DECK_ID, deckId)
-            putSerializable(ARG_OPTION, option)
+            putLong(RESULT_DECK_ID, deckId)
+            putSerializable(RESULT_CONTEXT_MENU_OPTION, option)
         }
 
     companion object {
         const val REQUEST_KEY = "request_key_deck_picker_context_menu"
-        private const val ARG_DECK_ID = "deck_id"
-        private const val ARG_OPTION = "option"
+        private const val RESULT_DECK_ID = "deck_id"
+        private const val RESULT_CONTEXT_MENU_OPTION = "option"
 
         fun fromBundle(bundle: Bundle) =
             DeckPickerContextMenuResult(
-                deckId = bundle.requireLong(ARG_DECK_ID),
-                option = bundle.requireSerializableCompat<DeckPickerContextMenuOption>(ARG_OPTION),
+                deckId = bundle.requireLong(RESULT_DECK_ID),
+                option = bundle.requireSerializableCompat<DeckPickerContextMenuOption>(RESULT_CONTEXT_MENU_OPTION),
             )
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckSelectionDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckSelectionDialog.kt
index 44a83beb5447..c873582488db 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckSelectionDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckSelectionDialog.kt
@@ -25,7 +25,6 @@ import androidx.fragment.app.setFragmentResultListener
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.RecyclerView
 import anki.decks.deckTreeNode
-import com.ichi2.anki.AnkiActivity
 import com.ichi2.anki.CardTemplateEditor
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CollectionManager.withCol
@@ -38,8 +37,8 @@ import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.databinding.DialogDeckPickerBinding
 import com.ichi2.anki.databinding.ItemDeckPickerDialogBinding
 import com.ichi2.anki.deckpicker.DeckFilters
-import com.ichi2.anki.dialogs.DeckSelectionDialog.Companion.ARG_SELECTED_DECK
 import com.ichi2.anki.dialogs.DeckSelectionDialog.Companion.REQUEST_SELECT_DECK
+import com.ichi2.anki.dialogs.DeckSelectionDialog.Companion.RESULT_SELECTED_DECK
 import com.ichi2.anki.launchCatchingTask
 import com.ichi2.anki.libanki.Consts.DEFAULT_DECK_ID
 import com.ichi2.anki.libanki.DeckId
@@ -56,6 +55,7 @@ import com.ichi2.utils.customView
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.positiveButton
 import timber.log.Timber
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * A fragment which allows the user to select one or multiple decks from a list of decks. It also
@@ -113,7 +113,7 @@ class DeckSelectionDialog : AnalyticsDialogFragment() {
     }
 
     private fun getDeckNames(): ArrayList<SelectableDeck> =
-        BundleCompat.getParcelableArrayList(requireArguments(), DECK_NAMES, SelectableDeck::class.java)!!
+        BundleCompat.getParcelableArrayList(requireArguments(), ARG_DECK_NAMES, SelectableDeck::class.java)!!
 
     private fun setupMenu() {
         val toolbar: Toolbar = binding.toolbar
@@ -187,7 +187,7 @@ class DeckSelectionDialog : AnalyticsDialogFragment() {
         parentFragmentManager.setFragmentResult(
             requestKey,
             Bundle().apply {
-                putParcelable(ARG_SELECTED_DECK, deck)
+                putParcelable(RESULT_SELECTED_DECK, deck)
             },
         )
     }
@@ -222,8 +222,8 @@ class DeckSelectionDialog : AnalyticsDialogFragment() {
 
         val attrs =
             intArrayOf(
-                R.attr.expandRef,
-                R.attr.collapseRef,
+                CommonR.attr.expandRef,
+                CommonR.attr.collapseRef,
             )
 
         inner class ViewHolder(
@@ -414,14 +414,14 @@ class DeckSelectionDialog : AnalyticsDialogFragment() {
     companion object {
         const val TAG = "DeckSelectionDialog"
         const val REQUEST_SELECT_DECK = "request_select_deck"
-        const val ARG_SELECTED_DECK = "arg_selected_deck"
+        const val RESULT_SELECTED_DECK = "arg_selected_deck"
         const val ARG_REQUEST_KEY = "arg_request_key"
         const val ARG_ALLOW_ALL = "arg_allow_all"
         const val ARG_ALLOW_FILTERED = "arg_allow_filtered"
         const val ARG_SKIP_EMPTY_DEFAULT = "arg_skip_empty_default"
         private const val ARG_TITLE = "arg_title"
         private const val ARG_TEMPLATE_EDITOR_MESSAGE = "arg_template_editor_message"
-        private const val DECK_NAMES = "deckNames"
+        private const val ARG_DECK_NAMES = "deckNames"
         private const val ARG_ALLOW_MULTIPLE_SELECTION = "arg_allow_multiple_selection"
 
         /** Creates a new instance of [DeckSelectionDialog]. */
@@ -440,7 +440,7 @@ class DeckSelectionDialog : AnalyticsDialogFragment() {
                     Bundle().apply {
                         putString(ARG_TEMPLATE_EDITOR_MESSAGE, templateEditorMessage)
                         putString(ARG_TITLE, title)
-                        putParcelableArrayList(DECK_NAMES, ArrayList(decks))
+                        putParcelableArrayList(ARG_DECK_NAMES, ArrayList(decks))
                         putString(ARG_REQUEST_KEY, requestKey)
                         putBoolean(ARG_ALLOW_MULTIPLE_SELECTION, allowMultipleSelection)
                         putBoolean(ARG_ALLOW_ALL, allowAll)
@@ -462,7 +462,7 @@ fun FragmentActivity.registerDeckSelectedHandler(
     action: (deck: SelectableDeck?) -> Unit,
 ) {
     setFragmentResultListener(requestKey) { _, bundle ->
-        val selectedDeck = bundle.getParcelableCompat<SelectableDeck?>(ARG_SELECTED_DECK)
+        val selectedDeck = bundle.getParcelableCompat<SelectableDeck?>(RESULT_SELECTED_DECK)
         action(selectedDeck)
     }
 }
@@ -479,7 +479,7 @@ fun Fragment.registerDeckSelectedHandler(
     action: (deck: SelectableDeck?) -> Unit,
 ) {
     setFragmentResultListener(requestKey) { _, bundle ->
-        val selectedDeck = bundle.getParcelableCompat<SelectableDeck?>(ARG_SELECTED_DECK)
+        val selectedDeck = bundle.getParcelableCompat<SelectableDeck?>(RESULT_SELECTED_DECK)
         action(selectedDeck)
     }
 }
@@ -557,7 +557,7 @@ fun Fragment.startDeckSelection(
  * @param allowFiltered shows filtered decks if true
  * @param skipEmptyDefault if true, hides the 'Default' deck if it has no cards or subdecks
  */
-fun AnkiActivity.startDeckSelection(
+fun FragmentActivity.startDeckSelection(
     title: String? = null,
     templateEditorMessage: String? = null,
     requestKey: String = REQUEST_SELECT_DECK,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/EditDeckDescriptionDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/EditDeckDescriptionDialog.kt
index 750c13576612..4c5733f6811f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/EditDeckDescriptionDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/EditDeckDescriptionDialog.kt
@@ -17,7 +17,6 @@ import androidx.lifecycle.lifecycleScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CommonString
-import com.ichi2.anki.R
 import com.ichi2.anki.StudyOptionsFragment
 import com.ichi2.anki.databinding.DialogDeckDescriptionBinding
 import com.ichi2.anki.dialogs.EditDeckDescriptionDialogViewModel.DismissType
@@ -35,6 +34,7 @@ import com.ichi2.utils.show
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.launch
 import timber.log.Timber
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Allows a user to edit the [deck description][com.ichi2.anki.libanki.Deck.description]
@@ -115,7 +115,7 @@ class EditDeckDescriptionDialog : DialogFragment() {
             setOnClickListener {
                 MaterialAlertDialogBuilder(requireContext()).show {
                     setTitle(binding.formatAsMarkdownInput.text)
-                    setIcon(R.drawable.ic_help_black_24dp)
+                    setIcon(CommonR.drawable.ic_help_black_24dp)
                     // FIXME: the upstream string unexpectedly contains newlines
                     setMessage(TR.deckConfigDescriptionNewHandlingHint().replace("\n", " ").replace("  ", " "))
                 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ExportReadyDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ExportReadyDialog.kt
index ea40a215ccee..e9db081842ee 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ExportReadyDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ExportReadyDialog.kt
@@ -16,7 +16,7 @@ import timber.log.Timber
 
 class ExportReadyDialog : DialogFragment() {
     private val exportPath
-        get() = requireArguments().requireString(KEY_EXPORT_PATH)
+        get() = requireArguments().requireString(ARG_EXPORT_PATH)
     private val asText: Boolean
         get() = requireArguments().getBoolean(ARG_SHARE_AS_TEXT, false)
 
@@ -28,14 +28,14 @@ class ExportReadyDialog : DialogFragment() {
             .positiveButton(CommonString.export_choice_save_to) {
                 parentFragmentManager.setFragmentResult(
                     REQUEST_EXPORT_SAVE,
-                    Bundle().apply { putString(KEY_EXPORT_PATH, exportPath) },
+                    Bundle().apply { putString(RESULT_EXPORT_PATH, exportPath) },
                 )
             }.negativeButton(CommonString.export_choice_share) {
                 parentFragmentManager.setFragmentResult(
                     REQUEST_EXPORT_SHARE,
                     Bundle().apply {
-                        putString(KEY_EXPORT_PATH, exportPath)
-                        putBoolean(ARG_SHARE_AS_TEXT, asText)
+                        putString(RESULT_EXPORT_PATH, exportPath)
+                        putBoolean(RESULT_SHARE_AS_TEXT, asText)
                     },
                 )
             }
@@ -46,8 +46,11 @@ class ExportReadyDialog : DialogFragment() {
     companion object {
         const val REQUEST_EXPORT_SAVE = "request_export_save"
         const val REQUEST_EXPORT_SHARE = "request_export_share"
-        const val KEY_EXPORT_PATH = "key_export_path"
-        const val ARG_SHARE_AS_TEXT = "arg_share_as_text"
+        const val RESULT_EXPORT_PATH = "key_export_path"
+        const val RESULT_SHARE_AS_TEXT = "arg_share_as_text"
+
+        private const val ARG_EXPORT_PATH = "key_export_path"
+        private const val ARG_SHARE_AS_TEXT = "arg_share_as_text"
 
         fun newInstance(
             exportPath: String,
@@ -55,7 +58,7 @@ class ExportReadyDialog : DialogFragment() {
         ) = ExportReadyDialog().apply {
             arguments =
                 Bundle().apply {
-                    putString(KEY_EXPORT_PATH, exportPath)
+                    putString(ARG_EXPORT_PATH, exportPath)
                     putBoolean(ARG_SHARE_AS_TEXT, asText)
                 }
         }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/FieldSelectionDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/FieldSelectionDialog.kt
index b68c78ac1c46..9718f0dde87f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/FieldSelectionDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/FieldSelectionDialog.kt
@@ -36,7 +36,7 @@ class FieldSelectionDialog : DialogFragment() {
             }
 
     val resultType: ResultType by lazy {
-        requireArguments().requireParcelable(RESULT_TYPE)
+        requireArguments().requireParcelable(ARG_RESULT_TYPE)
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
@@ -73,6 +73,7 @@ class FieldSelectionDialog : DialogFragment() {
          * Default value: `""`
          */
         private const val RESULT_TYPE = "resultType"
+        private const val ARG_RESULT_TYPE = "resultType"
 
         /**
          * @param resultType optional result string returned in the Fragment Result API bundle under
@@ -88,7 +89,7 @@ class FieldSelectionDialog : DialogFragment() {
 
             val bundle =
                 Bundle().apply {
-                    putParcelable(RESULT_TYPE, resultType)
+                    putParcelable(ARG_RESULT_TYPE, resultType)
                     putStringArrayList(ARG_FIELD_NAMES, ArrayList(fieldNames))
                 }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ImportDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ImportDialog.kt
index 1eed98a0ecb7..e3dd8a3f288c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ImportDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ImportDialog.kt
@@ -22,10 +22,10 @@ class ImportDialog : AsyncDialogFragment() {
     private val importViewModel: ImportViewModel by activityViewModels()
 
     private val dialogType: Type
-        get() = Type.fromCode(requireArguments().getInt(IMPORT_DIALOG_TYPE_KEY))
+        get() = Type.fromCode(requireArguments().getInt(ARG_DIALOG_TYPE))
 
     private val packagePath: String
-        get() = requireArguments().getString(IMPORT_DIALOG_PACKAGE_PATH_KEY)!!
+        get() = requireArguments().getString(ARG_PACKAGE_PATH)!!
 
     override fun onCreateDialog(savedInstanceState: Bundle?): AlertDialog {
         val dialog = AlertDialog.Builder(requireActivity())
@@ -90,8 +90,8 @@ class ImportDialog : AsyncDialogFragment() {
     }
 
     companion object {
-        const val IMPORT_DIALOG_TYPE_KEY = "dialogType"
-        const val IMPORT_DIALOG_PACKAGE_PATH_KEY = "packagePath"
+        const val ARG_DIALOG_TYPE = "dialogType"
+        const val ARG_PACKAGE_PATH = "packagePath"
 
         /**
          * A set of dialogs which deal with importing a file
@@ -107,8 +107,8 @@ class ImportDialog : AsyncDialogFragment() {
             ImportDialog().apply {
                 arguments =
                     Bundle().apply {
-                        putInt(IMPORT_DIALOG_TYPE_KEY, dialogType.code)
-                        putString(IMPORT_DIALOG_PACKAGE_PATH_KEY, packagePath)
+                        putInt(ARG_DIALOG_TYPE, dialogType.code)
+                        putString(ARG_PACKAGE_PATH, packagePath)
                     }
             }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/InsertFieldDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/InsertFieldDialog.kt
index d0710c2dd91f..756b15c3f0c2 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/InsertFieldDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/InsertFieldDialog.kt
@@ -32,20 +32,21 @@ import com.ichi2.anki.CardTemplateEditor
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.Flag
 import com.ichi2.anki.R
-import com.ichi2.anki.databinding.DialogGenericRecyclerViewBinding
+import com.ichi2.anki.common.android.databinding.DialogGenericRecyclerViewBinding
 import com.ichi2.anki.databinding.DialogInsertFieldBinding
 import com.ichi2.anki.databinding.ItemInsertSpecialFieldBinding
-import com.ichi2.anki.dialogs.InsertFieldDialogViewModel.Companion.KEY_FIELD_ITEMS
-import com.ichi2.anki.dialogs.InsertFieldDialogViewModel.Companion.KEY_INSERT_FIELD_METADATA
-import com.ichi2.anki.dialogs.InsertFieldDialogViewModel.Companion.KEY_REQUEST_KEY
+import com.ichi2.anki.dialogs.InsertFieldDialogViewModel.Companion.ARG_FIELD_NAMES
+import com.ichi2.anki.dialogs.InsertFieldDialogViewModel.Companion.ARG_INSERT_FIELD_METADATA
+import com.ichi2.anki.dialogs.InsertFieldDialogViewModel.Companion.ARG_REQUEST_KEY
 import com.ichi2.anki.dialogs.InsertFieldDialogViewModel.Tab
-import com.ichi2.anki.launchCatchingTask
+import com.ichi2.anki.launchCatchingViewTask
 import com.ichi2.anki.model.SpecialField
 import com.ichi2.anki.model.SpecialFields
 import com.ichi2.anki.utils.ext.requireString
 import com.ichi2.themes.Themes
 import dev.androidbroadcast.vbpd.viewBinding
 import org.jetbrains.annotations.VisibleForTesting
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Dialog fragment used to show the fields that the user can insert in the card editor. This
@@ -56,7 +57,7 @@ import org.jetbrains.annotations.VisibleForTesting
 class InsertFieldDialog : DialogFragment(R.layout.dialog_insert_field) {
     private val viewModel by viewModels<InsertFieldDialogViewModel>()
     private val requestKey: String by lazy {
-        requireArguments().requireString(KEY_REQUEST_KEY)
+        requireArguments().requireString(ARG_REQUEST_KEY)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -102,12 +103,12 @@ class InsertFieldDialog : DialogFragment(R.layout.dialog_insert_field) {
         )
 
         // setup flows
-        launchCatchingTask {
+        launchCatchingViewTask {
             viewModel.selectedFieldFlow.collect { field ->
                 if (field == null) return@collect
                 parentFragmentManager.setFragmentResult(
                     requestKey,
-                    Bundle().apply { putString(KEY_INSERTED_FIELD, field.renderToTemplateTag()) },
+                    Bundle().apply { putString(RESULT_INSERTED_FIELD, field.renderToTemplateTag()) },
                 )
                 dismiss()
             }
@@ -132,7 +133,7 @@ class InsertFieldDialog : DialogFragment(R.layout.dialog_insert_field) {
          *
          * Represents the template tag for the selected field: `{{Front}}`
          */
-        const val KEY_INSERTED_FIELD = "key_inserted_field"
+        const val RESULT_INSERTED_FIELD = "key_inserted_field"
 
         /**
          * Creates a new instance of [InsertFieldDialog]
@@ -149,9 +150,9 @@ class InsertFieldDialog : DialogFragment(R.layout.dialog_insert_field) {
             InsertFieldDialog().apply {
                 arguments =
                     Bundle().apply {
-                        putStringArrayList(KEY_FIELD_ITEMS, ArrayList(fieldItems))
-                        putParcelable(KEY_INSERT_FIELD_METADATA, metadata)
-                        putString(KEY_REQUEST_KEY, requestKey)
+                        putStringArrayList(ARG_FIELD_NAMES, ArrayList(fieldItems))
+                        putParcelable(ARG_INSERT_FIELD_METADATA, metadata)
+                        putString(ARG_REQUEST_KEY, requestKey)
                     }
             }
     }
@@ -169,7 +170,7 @@ class InsertFieldDialog : DialogFragment(R.layout.dialog_insert_field) {
         override fun getItemCount() = 2
     }
 
-    class SelectBasicFieldFragment : Fragment(R.layout.dialog_generic_recycler_view) {
+    class SelectBasicFieldFragment : Fragment(CommonR.layout.dialog_generic_recycler_view) {
         val viewModel by viewModels<InsertFieldDialogViewModel>(
             ownerProducer = { requireParentFragment() as InsertFieldDialog },
         )
@@ -207,7 +208,7 @@ class InsertFieldDialog : DialogFragment(R.layout.dialog_insert_field) {
         }
     }
 
-    class SelectSpecialFieldFragment : Fragment(R.layout.dialog_generic_recycler_view) {
+    class SelectSpecialFieldFragment : Fragment(CommonR.layout.dialog_generic_recycler_view) {
         val viewModel by viewModels<InsertFieldDialogViewModel>(
             ownerProducer = { requireParentFragment() as InsertFieldDialog },
         )
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/InsertFieldDialogViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/InsertFieldDialogViewModel.kt
index 2279977c85fd..fbc73ca6c1bd 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/InsertFieldDialogViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/InsertFieldDialogViewModel.kt
@@ -36,14 +36,14 @@ class InsertFieldDialogViewModel(
     var currentTab by currentTabFlow.asVar()
 
     /** The field names of the note type */
-    val fieldNames = savedStateHandle.require<ArrayList<String>>(KEY_FIELD_ITEMS).map(::FieldName)
+    val fieldNames = savedStateHandle.require<ArrayList<String>>(ARG_FIELD_NAMES).map(::FieldName)
 
     /**
      * State of the selected card when the screen was opened
      *
      * Used for providing [special fields][SpecialFields] with the output they'd produce.
      */
-    val metadata = savedStateHandle.require<InsertFieldMetadata>(KEY_INSERT_FIELD_METADATA)
+    val metadata = savedStateHandle.require<InsertFieldMetadata>(ARG_INSERT_FIELD_METADATA)
 
     val selectedFieldFlow = MutableStateFlow<SelectedField?>(null)
 
@@ -112,9 +112,9 @@ class InsertFieldDialogViewModel(
     }
 
     companion object {
-        const val KEY_FIELD_ITEMS = "key_field_items"
-        const val KEY_INSERT_FIELD_METADATA = "key_field_options"
-        const val KEY_REQUEST_KEY = "key_request_key"
+        const val ARG_FIELD_NAMES = "key_field_items"
+        const val ARG_INSERT_FIELD_METADATA = "key_field_options"
+        const val ARG_REQUEST_KEY = "key_request_key"
 
         const val STATE_TAB = "state_tab"
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/IntegerDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/IntegerDialog.kt
index 8e39bf13cebc..cd3eca6ca409 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/IntegerDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/IntegerDialog.kt
@@ -7,7 +7,6 @@ import android.os.Bundle
 import android.text.InputType
 import androidx.appcompat.app.AlertDialog
 import com.ichi2.anki.CommonString
-import com.ichi2.anki.R
 import com.ichi2.anki.analytics.AnalyticsDialogFragment
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.utils.input
@@ -17,6 +16,7 @@ import com.ichi2.utils.show
 import com.ichi2.utils.title
 import timber.log.Timber
 import java.util.function.Consumer
+import com.ichi2.anki.common.android.R as CommonR
 
 // TODO: Pass optional validation condition i.e. Positive button not enabled if condition is true
 open class IntegerDialog : AnalyticsDialogFragment() {
@@ -52,7 +52,7 @@ open class IntegerDialog : AnalyticsDialogFragment() {
                 positiveButton(CommonString.dialog_ok)
                 negativeButton(CommonString.dialog_cancel)
                 setMessage(requireArguments().getString("content"))
-                setView(R.layout.dialog_generic_text_input)
+                setView(CommonR.layout.dialog_generic_text_input)
             }.input(
                 hint = requireArguments().getString("prompt"),
                 inputType = InputType.TYPE_CLASS_NUMBER,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/LoadingDialogFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/LoadingDialogFragment.kt
index 1de223be8fcf..8d7c317e4a4e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/LoadingDialogFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/LoadingDialogFragment.kt
@@ -23,10 +23,10 @@ import com.ichi2.utils.customView
 class LoadingDialogFragment : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val dialogView = layoutInflater.inflate(R.layout.fragment_loading, null)
-        val canBeCancelled = arguments?.getBoolean(KEY_CANCELLABLE) ?: true
+        val canBeCancelled = arguments?.getBoolean(ARG_CANCELLABLE) ?: true
         isCancelable = canBeCancelled
         dialogView.findViewById<TextView>(R.id.text).text =
-            arguments?.getString(KEY_MESSAGE) ?: getString(CommonString.dialog_processing)
+            arguments?.getString(ARG_MESSAGE) ?: getString(CommonString.dialog_processing)
         return AlertDialog
             .Builder(requireContext())
             .create {
@@ -37,8 +37,8 @@ class LoadingDialogFragment : DialogFragment() {
 
     companion object {
         const val TAG = "LoadingDialogFragment"
-        private const val KEY_MESSAGE = "key_message"
-        private const val KEY_CANCELLABLE = "key_cancellable"
+        private const val ARG_MESSAGE = "key_message"
+        private const val ARG_CANCELLABLE = "key_cancellable"
 
         /**
          * Creates an instance of [LoadingDialogFragment].
@@ -53,8 +53,8 @@ class LoadingDialogFragment : DialogFragment() {
         ) = LoadingDialogFragment().apply {
             arguments =
                 Bundle().apply {
-                    putString(KEY_MESSAGE, message)
-                    putBoolean(KEY_CANCELLABLE, cancellable)
+                    putString(ARG_MESSAGE, message)
+                    putBoolean(ARG_CANCELLABLE, cancellable)
                 }
             isCancelable = cancellable
         }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/LocaleSelectionDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/LocaleSelectionDialog.kt
index 3f9dfb1d318b..96eb5a1dd79f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/LocaleSelectionDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/LocaleSelectionDialog.kt
@@ -87,7 +87,7 @@ class LocaleSelectionDialog : AnalyticsDialogFragment() {
     private fun sendSelectionResult(locale: Locale? = null) {
         parentFragmentManager.setFragmentResult(
             REQUEST_HINT_LOCALE_SELECTION,
-            Bundle().apply { putSerializable(KEY_SELECTED_LOCALE, locale) },
+            Bundle().apply { putSerializable(RESULT_SELECTED_LOCALE, locale) },
         )
     }
 
@@ -151,7 +151,7 @@ class LocaleSelectionDialog : AnalyticsDialogFragment() {
 
     companion object {
         const val REQUEST_HINT_LOCALE_SELECTION = "request_hint_locale_selection"
-        const val KEY_SELECTED_LOCALE = "key_selected_locale"
+        const val RESULT_SELECTED_LOCALE = "key_selected_locale"
 
         /**
          * Language identifier for International Phonetic Alphabet. This isn't available from [Locale.getAvailableLocales], but
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/NoteTypeFieldEditorContextMenu.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/NoteTypeFieldEditorContextMenu.kt
index d52a35009ba7..023f4fa3746b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/NoteTypeFieldEditorContextMenu.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/NoteTypeFieldEditorContextMenu.kt
@@ -23,7 +23,7 @@ class NoteTypeFieldEditorContextMenu : AnalyticsDialogFragment() {
         val availableItems = NoteTypeFieldEditorContextMenuAction.entries.sortedBy { it.order }
 
         return AlertDialog.Builder(requireActivity()).create {
-            setTitle(requireArguments().getString(KEY_LABEL))
+            setTitle(requireArguments().getString(ARG_LABEL))
             setItems(availableItems.map { resources.getString(it.actionTextId) }.toTypedArray()) { _, index ->
                 (activity as? NoteTypeFieldEditor)?.run { handleAction(availableItems[index]) }
                     ?: Timber.e("ContextMenu used from outside of its target activity!")
@@ -44,11 +44,11 @@ class NoteTypeFieldEditorContextMenu : AnalyticsDialogFragment() {
 
     companion object {
         @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-        const val KEY_LABEL = "key_label"
+        const val ARG_LABEL = "key_label"
 
         fun newInstance(label: String): NoteTypeFieldEditorContextMenu =
             NoteTypeFieldEditorContextMenu().apply {
-                arguments = Bundle().apply { putString(KEY_LABEL, label) }
+                arguments = Bundle().apply { putString(ARG_LABEL, label) }
             }
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SaveBrowserSearchDialogFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SaveBrowserSearchDialogFragment.kt
index eef776c9af4d..40ebe3aa4527 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SaveBrowserSearchDialogFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SaveBrowserSearchDialogFragment.kt
@@ -11,10 +11,9 @@ import androidx.fragment.app.setFragmentResult
 import com.google.android.material.snackbar.Snackbar
 import com.ichi2.anki.CardBrowser
 import com.ichi2.anki.CommonString
-import com.ichi2.anki.R
 import com.ichi2.anki.browser.search.SavedSearch
-import com.ichi2.anki.dialogs.SaveBrowserSearchDialogFragment.Companion.ARG_SEARCH_QUERY
-import com.ichi2.anki.dialogs.SaveBrowserSearchDialogFragment.Companion.ARG_SEARCH_QUERY_NAME
+import com.ichi2.anki.dialogs.SaveBrowserSearchDialogFragment.Companion.RESULT_SEARCH_QUERY
+import com.ichi2.anki.dialogs.SaveBrowserSearchDialogFragment.Companion.RESULT_SEARCH_QUERY_NAME
 import com.ichi2.anki.launchCatchingTask
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.utils.input
@@ -23,6 +22,7 @@ import com.ichi2.utils.positiveButton
 import com.ichi2.utils.show
 import com.ichi2.utils.title
 import timber.log.Timber
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Dialog that allows the user to save searches made in [CardBrowser] to make them available for
@@ -42,7 +42,7 @@ class SaveBrowserSearchDialogFragment : DialogFragment() {
                 title(text = getString(CommonString.card_browser_list_my_searches_save))
                 positiveButton(CommonString.dialog_ok)
                 negativeButton(CommonString.dialog_cancel)
-                setView(R.layout.dialog_generic_text_input)
+                setView(CommonR.layout.dialog_generic_text_input)
             }.input(
                 hint = getString(CommonString.card_browser_list_my_searches_new_name),
                 allowEmpty = false,
@@ -53,8 +53,8 @@ class SaveBrowserSearchDialogFragment : DialogFragment() {
                 setFragmentResult(
                     REQUEST_SAVE_SEARCH,
                     Bundle().apply {
-                        putString(ARG_SEARCH_QUERY, searchQuery)
-                        putCharSequence(ARG_SEARCH_QUERY_NAME, name)
+                        putString(RESULT_SEARCH_QUERY, searchQuery)
+                        putCharSequence(RESULT_SEARCH_QUERY_NAME, name)
                     },
                 )
                 dialog.dismiss()
@@ -67,12 +67,14 @@ class SaveBrowserSearchDialogFragment : DialogFragment() {
         /**
          * The actual search query that the user is saving to use later.
          */
-        const val ARG_SEARCH_QUERY = "arg_search_query"
+        const val RESULT_SEARCH_QUERY = "arg_search_query"
+
+        private const val ARG_SEARCH_QUERY = "arg_search_query"
 
         /**
          * The name given by the user to the saved search.
          */
-        const val ARG_SEARCH_QUERY_NAME = "arg_search_query_name"
+        const val RESULT_SEARCH_QUERY_NAME = "arg_search_query_name"
 
         fun newInstance(searchQuery: String): SaveBrowserSearchDialogFragment =
             SaveBrowserSearchDialogFragment().apply {
@@ -94,7 +96,7 @@ fun CardBrowser.registerSaveSearchHandler() {
         this,
     ) { _, bundle ->
         val savedSearchName =
-            bundle.getString(ARG_SEARCH_QUERY_NAME)
+            bundle.getString(RESULT_SEARCH_QUERY_NAME)
         if (savedSearchName.isNullOrEmpty()) {
             showSnackbar(
                 CommonString.card_browser_list_my_searches_new_search_error_empty_name,
@@ -105,7 +107,7 @@ fun CardBrowser.registerSaveSearchHandler() {
         val toSave =
             SavedSearch(
                 name = savedSearchName,
-                query = bundle.getString(ARG_SEARCH_QUERY) ?: return@setFragmentResultListener,
+                query = bundle.getString(RESULT_SEARCH_QUERY) ?: return@setFragmentResultListener,
             )
 
         launchCatchingTask {
@@ -125,7 +127,7 @@ fun Fragment.registerSaveSearchHandler(onSaveSearch: (SavedSearch) -> Unit) {
         this,
     ) { _, bundle ->
         val savedSearchName =
-            bundle.getString(ARG_SEARCH_QUERY_NAME)
+            bundle.getString(RESULT_SEARCH_QUERY_NAME)
         if (savedSearchName.isNullOrEmpty()) {
             showSnackbar(
                 CommonString.card_browser_list_my_searches_new_search_error_empty_name,
@@ -137,7 +139,7 @@ fun Fragment.registerSaveSearchHandler(onSaveSearch: (SavedSearch) -> Unit) {
         val savedSearch =
             SavedSearch(
                 name = savedSearchName,
-                query = bundle.getString(ARG_SEARCH_QUERY) ?: return@setFragmentResultListener,
+                query = bundle.getString(RESULT_SEARCH_QUERY) ?: return@setFragmentResultListener,
             )
 
         onSaveSearch(savedSearch)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SavedBrowserSearchesDialogFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SavedBrowserSearchesDialogFragment.kt
index bb007d5974b2..0883f6903375 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SavedBrowserSearchesDialogFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SavedBrowserSearchesDialogFragment.kt
@@ -16,7 +16,7 @@ import com.ichi2.anki.browser.search.SavedSearches
 import com.ichi2.anki.browser.search.toMap
 import com.ichi2.anki.compat.CompatHelper.Companion.getSerializableCompat
 import com.ichi2.anki.databinding.ItemSavedSearchBinding
-import com.ichi2.anki.dialogs.SavedBrowserSearchesDialogFragment.Companion.ARG_SAVED_SEARCH
+import com.ichi2.anki.dialogs.SavedBrowserSearchesDialogFragment.Companion.RESULT_SAVED_SEARCH
 import com.ichi2.anki.dialogs.SavedBrowserSearchesDialogFragment.Companion.TYPE_SEARCH_REMOVED
 import com.ichi2.anki.dialogs.SavedBrowserSearchesDialogFragment.Companion.TYPE_SEARCH_SELECTED
 import com.ichi2.anki.launchCatchingTask
@@ -51,8 +51,8 @@ class SavedBrowserSearchesDialogFragment : AnalyticsDialogFragment() {
                     parentFragmentManager.setFragmentResult(
                         REQUEST_SAVED_SEARCH_ACTION,
                         Bundle().apply {
-                            putInt(ARG_TYPE, TYPE_SEARCH_SELECTED)
-                            putString(ARG_SAVED_SEARCH, searchName)
+                            putInt(RESULT_SAVED_SEARCH_ACTION, TYPE_SEARCH_SELECTED)
+                            putString(RESULT_SAVED_SEARCH, searchName)
                         },
                     )
                     dismiss()
@@ -77,8 +77,8 @@ class SavedBrowserSearchesDialogFragment : AnalyticsDialogFragment() {
                 parentFragmentManager.setFragmentResult(
                     REQUEST_SAVED_SEARCH_ACTION,
                     Bundle().apply {
-                        putInt(ARG_TYPE, TYPE_SEARCH_REMOVED)
-                        putString(ARG_SAVED_SEARCH, searchName)
+                        putInt(RESULT_SAVED_SEARCH_ACTION, TYPE_SEARCH_REMOVED)
+                        putString(RESULT_SAVED_SEARCH, searchName)
                     },
                 )
                 dialog?.dismiss() // Dismiss the root dialog
@@ -127,14 +127,14 @@ class SavedBrowserSearchesDialogFragment : AnalyticsDialogFragment() {
         /**
          * The user given name for the saved search that can be used as an identifier.
          */
-        const val ARG_SAVED_SEARCH = "arg_saved_search"
+        const val RESULT_SAVED_SEARCH = "arg_saved_search"
 
         /**
          * [Int] number identifying the type of action for the saved search specified by
-         * [ARG_SAVED_SEARCH]. Currently there are just two possible values [TYPE_SEARCH_SELECTED]
+         * [RESULT_SAVED_SEARCH]. Currently there are just two possible values [TYPE_SEARCH_SELECTED]
          * and [TYPE_SEARCH_REMOVED].
          */
-        const val ARG_TYPE = "arg_type"
+        const val RESULT_SAVED_SEARCH_ACTION = "arg_type"
         private const val ARG_SAVED_FILTERS = "arg_saved_filters"
 
         fun newInstance(savedFilters: List<SavedSearch>): SavedBrowserSearchesDialogFragment =
@@ -156,8 +156,8 @@ fun CardBrowser.registerSavedSearchActionHandler(action: (Int, String?) -> Unit)
         SavedBrowserSearchesDialogFragment.REQUEST_SAVED_SEARCH_ACTION,
         this,
     ) { _, bundle ->
-        val type = bundle.getInt(SavedBrowserSearchesDialogFragment.ARG_TYPE)
-        val searchName = bundle.getString(ARG_SAVED_SEARCH)
+        val type = bundle.getInt(SavedBrowserSearchesDialogFragment.RESULT_SAVED_SEARCH_ACTION)
+        val searchName = bundle.getString(RESULT_SAVED_SEARCH)
         Timber.d("On user saved search selection named: %s", searchName)
         action(type, searchName)
     }
@@ -172,8 +172,8 @@ fun Fragment.registerSavedSearchActionHandler(action: (ManageSavedSearchAction)
         SavedBrowserSearchesDialogFragment.REQUEST_SAVED_SEARCH_ACTION,
         this,
     ) { _, bundle ->
-        val type = bundle.getInt(SavedBrowserSearchesDialogFragment.ARG_TYPE)
-        val searchName = bundle.getString(SavedBrowserSearchesDialogFragment.ARG_SAVED_SEARCH) ?: return@setFragmentResultListener
+        val type = bundle.getInt(SavedBrowserSearchesDialogFragment.RESULT_SAVED_SEARCH_ACTION)
+        val searchName = bundle.getString(SavedBrowserSearchesDialogFragment.RESULT_SAVED_SEARCH) ?: return@setFragmentResultListener
         Timber.d("On user saved search selection named: %s", searchName)
 
         launchCatchingTask {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SchedulerUpgradeDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SchedulerUpgradeDialog.kt
index 69761a278b69..2264b7a1141a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SchedulerUpgradeDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SchedulerUpgradeDialog.kt
@@ -3,9 +3,10 @@
 
 package com.ichi2.anki.dialogs
 
+import android.os.Bundle
 import android.view.KeyEvent
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CommonString
@@ -19,62 +20,60 @@ import com.ichi2.anki.utils.openUrl
  * This dialog is intended to be shown when the collection is using an outdated scheduler (v1),
  * and prevents interaction with the app until the upgrade is acknowledged or canceled.
  *
- * @param activity The host activity used to show the dialog.
- * @param onUpgrade Callback invoked when the user confirms the upgrade (via the positive button).
- * @param onCancel Callback invoked when the dialog is canceled (via negative button or back press).
+ * Reports the decision to the current activity without retaining an activity-owned callback.
  */
 
-class SchedulerUpgradeDialog(
-    private val activity: AppCompatActivity,
-    private val onUpgrade: () -> Unit,
-    private val onCancel: (() -> Unit)? = null,
-) {
-    fun showDialog() {
-        val dialog =
-            MaterialAlertDialogBuilder(activity)
-                .setTitle(CommonString.scheduler_upgrade_required_dialog_title)
-                .setMessage(TR.schedulingUpdateRequired())
-                .setPositiveButton(CommonString.dialog_ok, null)
-                .setNegativeButton(CommonString.dialog_cancel, null)
-                .apply {
-                    if (AdaptionUtil.hasWebBrowser(activity)) {
-                        setNeutralButton(TR.schedulingUpdateMoreInfoButton(), null)
-                    }
-                }.create()
+class SchedulerUpgradeDialog : DialogFragment() {
+    override fun onCreateDialog(savedInstanceState: Bundle?): AlertDialog {
+        isCancelable = false
+        return MaterialAlertDialogBuilder(requireContext())
+            .setTitle(CommonString.scheduler_upgrade_required_dialog_title)
+            .setMessage(TR.schedulingUpdateRequired())
+            .setPositiveButton(CommonString.dialog_ok, null)
+            .setNegativeButton(CommonString.dialog_cancel, null)
+            .apply {
+                if (AdaptionUtil.hasWebBrowser(requireActivity())) {
+                    setNeutralButton(TR.schedulingUpdateMoreInfoButton(), null)
+                }
+            }.create()
+    }
 
-        dialog.setCancelable(false)
+    override fun onStart() {
+        super.onStart()
+        val dialog = requireDialog() as AlertDialog
         dialog.setCanceledOnTouchOutside(false)
-
-        fun dismissAndCancel() {
-            dialog.dismiss()
-            onCancel?.invoke()
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE)?.setOnClickListener {
+            it.isEnabled = false // prevent multiple taps
+            reportDecision(upgrade = true)
         }
 
-        dialog.setOnShowListener {
-            dialog.getButton(AlertDialog.BUTTON_POSITIVE)?.setOnClickListener {
-                it.isEnabled = false // prevent multiple taps
-                onUpgrade.invoke()
-                dialog.dismiss()
-            }
+        dialog.getButton(AlertDialog.BUTTON_NEGATIVE)?.setOnClickListener {
+            reportDecision(upgrade = false)
+        }
 
-            dialog.getButton(AlertDialog.BUTTON_NEGATIVE)?.setOnClickListener {
-                dismissAndCancel()
-            }
+        dialog.getButton(AlertDialog.BUTTON_NEUTRAL)?.setOnClickListener {
+            requireActivity().openUrl(R.string.link_scheduler_upgrade_faq)
+        }
 
-            dialog.getButton(AlertDialog.BUTTON_NEUTRAL)?.setOnClickListener {
-                activity.openUrl(R.string.link_scheduler_upgrade_faq)
+        dialog.setOnKeyListener { _, keyCode, event ->
+            if (keyCode != KeyEvent.KEYCODE_BACK || event.action != KeyEvent.ACTION_UP) {
+                return@setOnKeyListener false
             }
 
-            dialog.setOnKeyListener { _, keyCode, event ->
-                if (keyCode != KeyEvent.KEYCODE_BACK || event.action != KeyEvent.ACTION_UP) {
-                    return@setOnKeyListener false
-                }
-
-                dismissAndCancel()
-                true
-            }
+            reportDecision(upgrade = false)
+            true
         }
+    }
+
+    private fun reportDecision(upgrade: Boolean) {
+        val manager = parentFragmentManager
+        dismiss()
+        manager.setFragmentResult(REQUEST_SCHEDULER_UPGRADE, Bundle().apply { putBoolean(RESULT_UPGRADE, upgrade) })
+    }
 
-        dialog.show()
+    companion object {
+        const val TAG = "schedulerUpgrade"
+        const val REQUEST_SCHEDULER_UPGRADE = "request_scheduler_upgrade"
+        const val RESULT_UPGRADE = "upgrade"
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt
index 64af9a440abc..341891a3e3e4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt
@@ -61,7 +61,7 @@ class SyncErrorDialog : AsyncDialogFragment() {
 
     /** The type of the sync error dialog*/
     private val dialogType: Type
-        get() = Type.fromCode(requireArguments().getInt(SYNC_ERROR_DIALOG_TYPE_KEY))
+        get() = Type.fromCode(requireArguments().getInt(ARG_DIALOG_TYPE))
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val dialog =
@@ -254,7 +254,7 @@ class SyncErrorDialog : AsyncDialogFragment() {
                         CommonString.sync_conflict_remote_confirm_new,
                     )
                 DIALOG_SYNC_CORRUPT_COLLECTION -> {
-                    val syncMessage = requireArguments().getString(DIALOG_MESSAGE_KEY)
+                    val syncMessage = requireArguments().getString(ARG_DIALOG_MESSAGE)
                     val repairUrl = res().getString(R.string.repair_deck)
                     val dialogMessage = res().getString(CommonString.sync_corrupt_database, repairUrl)
                     joinSyncMessages(dialogMessage, syncMessage)
@@ -262,10 +262,10 @@ class SyncErrorDialog : AsyncDialogFragment() {
                 DIALOG_SYNC_CLOCK_OFF ->
                     res().getString(
                         CommonString.sync_clock_off_with_current_time,
-                        requireArguments().getString(DIALOG_MESSAGE_KEY).orEmpty(),
+                        requireArguments().getString(ARG_DIALOG_MESSAGE).orEmpty(),
                         DateFormat.getDateTimeInstance().format(TimeManager.time.currentDate),
                     )
-                else -> requireArguments().getString(DIALOG_MESSAGE_KEY)
+                else -> requireArguments().getString(ARG_DIALOG_MESSAGE)
             }
 
     private fun joinSyncMessages(
@@ -302,7 +302,7 @@ class SyncErrorDialog : AsyncDialogFragment() {
 
     override val dialogHandlerMessage: SyncErrorDialogMessageHandler
         get() {
-            val dialogMessage = requireArguments().getString(DIALOG_MESSAGE_KEY)
+            val dialogMessage = requireArguments().getString(ARG_DIALOG_MESSAGE)
             return SyncErrorDialogMessageHandler(dialogType, dialogMessage)
         }
 
@@ -341,12 +341,12 @@ class SyncErrorDialog : AsyncDialogFragment() {
         /**
          * Key for the ordinal of the sync error in Type
          */
-        const val SYNC_ERROR_DIALOG_TYPE_KEY = "dialogType"
+        const val ARG_DIALOG_TYPE = "dialogType"
 
         /**
          * Key for the message to display in the dialog
          */
-        const val DIALOG_MESSAGE_KEY = "dialogMessage"
+        const val ARG_DIALOG_MESSAGE = "dialogMessage"
 
         /**
          * A set of dialogs belonging to AnkiActivity which deal with sync problems
@@ -361,8 +361,8 @@ class SyncErrorDialog : AsyncDialogFragment() {
         ) = SyncErrorDialog().apply {
             arguments =
                 Bundle().apply {
-                    putInt(SYNC_ERROR_DIALOG_TYPE_KEY, dialogType.code)
-                    putString(DIALOG_MESSAGE_KEY, dialogMessage)
+                    putInt(ARG_DIALOG_TYPE, dialogType.code)
+                    putString(ARG_DIALOG_MESSAGE, dialogMessage)
                 }
         }
     }
@@ -383,15 +383,15 @@ class SyncErrorDialog : AsyncDialogFragment() {
                 what = this@SyncErrorDialogMessageHandler.what
                 data =
                     Bundle().apply {
-                        putInt(SYNC_ERROR_DIALOG_TYPE_KEY, dialogType.code)
-                        putString(DIALOG_MESSAGE_KEY, dialogMessage)
+                        putInt(ARG_DIALOG_TYPE, dialogType.code)
+                        putString(ARG_DIALOG_MESSAGE, dialogMessage)
                     }
             }
 
         companion object {
             fun fromMessage(message: Message): SyncErrorDialogMessageHandler {
-                val dialogType = Type.fromCode(message.data.getInt(SYNC_ERROR_DIALOG_TYPE_KEY))
-                val dialogMessage = message.data.getString(DIALOG_MESSAGE_KEY)
+                val dialogType = Type.fromCode(message.data.getInt(ARG_DIALOG_TYPE))
+                val dialogMessage = message.data.getString(ARG_DIALOG_MESSAGE)
                 return SyncErrorDialogMessageHandler(dialogType, dialogMessage)
             }
         }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/TtsPlaybackErrorDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/TtsPlaybackErrorDialog.kt
index f9038af6eecc..c421a91904fd 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/TtsPlaybackErrorDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/TtsPlaybackErrorDialog.kt
@@ -22,8 +22,9 @@ object TtsPlaybackErrorDialog {
         fragmentManager: FragmentManager,
         ttsTag: TTSTag?,
     ) {
-        Timber.i("Dialog is shown to guide users correctly to troubleshoot the Tts error: Missing voice error")
         activity.runOnUiThread {
+            if (showMissingEngineDialogIfNeeded(activity)) return@runOnUiThread
+            Timber.i("Displaying TTS Error: 'Language not supported'")
             AlertDialog.Builder(activity).show {
                 setTitle(activity.getString(CommonString.tts_error_dialog_title))
                 setMessage(activity.getString(CommonString.tts_error_dialog_reason_text, TtsVoices.ttsEngine, ttsTag?.lang))
@@ -38,6 +39,26 @@ object TtsPlaybackErrorDialog {
         }
     }
 
+    /**
+     * Shows installation guidance if no TTS engine is installed.
+     *
+     * @return `true` if the dialog is shown or queued on the UI thread; `false` if an engine is installed.
+     */
+    fun showMissingEngineDialogIfNeeded(activity: Activity): Boolean {
+        if (TtsVoices.hasInstalledEngine(activity)) return false
+
+        Timber.w("no TTS engines installed")
+        activity.runOnUiThread {
+            AlertDialog.Builder(activity).show {
+                setTitle(CommonString.tts_no_engine_title)
+                setMessage(CommonString.tts_no_engine_message)
+                setPositiveButton(CommonString.dialog_ok, null)
+                setNeutralButton(CommonString.help) { _, _ -> activity.openUrl(R.string.link_faq_tts_no_engine) }
+            }
+        }
+        return true
+    }
+
     private fun openSettings(activity: Activity) {
         try {
             Timber.i("Opening TextToSpeech engine settings to change the engine")
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt
index b8a2216b11c3..64a2a7c96c21 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt
@@ -10,13 +10,13 @@ import android.os.Bundle
 import android.os.Parcelable
 import android.text.InputFilter
 import android.util.TypedValue
+import android.view.Gravity
+import android.view.LayoutInflater
 import android.view.WindowManager
 import android.view.inputmethod.EditorInfo
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.FrameLayout
-import android.widget.LinearLayout
-import android.widget.ScrollView
 import android.widget.TextView
 import androidx.annotation.VisibleForTesting
 import androidx.annotation.VisibleForTesting.Companion.PRIVATE
@@ -25,9 +25,9 @@ import androidx.core.content.edit
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.core.widget.doAfterTextChanged
-import androidx.fragment.app.setFragmentResult
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.withResumed
 import anki.scheduler.CustomStudyDefaultsResponse
 import anki.scheduler.CustomStudyRequest.Cram.CramKind
 import anki.scheduler.copy
@@ -44,42 +44,40 @@ import com.ichi2.anki.asyncIO
 import com.ichi2.anki.browser.search.CardState
 import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.common.preferences.sharedPrefs
-import com.ichi2.anki.common.utils.annotation.KotlinCleanup
+import com.ichi2.anki.common.utils.dp
+import com.ichi2.anki.databinding.DialogCustomStudyMenuBinding
 import com.ichi2.anki.databinding.FragmentCustomStudyBinding
-import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.Companion.deferredDefaults
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.ContextMenuOption.EXTEND_NEW
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.ContextMenuOption.EXTEND_REV
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.ContextMenuOption.STUDY_AHEAD
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.ContextMenuOption.STUDY_FORGOT
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.ContextMenuOption.STUDY_PREVIEW
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.ContextMenuOption.STUDY_TAGS
-import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.CustomStudyDefaults.Companion.toDomainModel
 import com.ichi2.anki.dialogs.tags.TagsDialog
-import com.ichi2.anki.dialogs.tags.TagsDialogListener.Companion.ON_SELECTED_TAGS_KEY
-import com.ichi2.anki.dialogs.tags.TagsDialogListener.Companion.ON_SELECTED_TAGS__SELECTED_TAGS
+import com.ichi2.anki.dialogs.tags.TagsDialogListener.Companion.REQUEST_SELECT_TAGS
+import com.ichi2.anki.dialogs.tags.TagsDialogListener.Companion.RESULT_SELECTED_TAGS
 import com.ichi2.anki.launchCatchingTask
+import com.ichi2.anki.libanki.Consts
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.observability.undoableOp
+import com.ichi2.anki.requireActivity
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.anki.ui.NonLeadingZeroInputFilter
 import com.ichi2.anki.ui.internationalization.sentenceCase
 import com.ichi2.anki.utils.ext.dismissAllDialogFragments
 import com.ichi2.anki.utils.ext.getIntOrNull
-import com.ichi2.anki.utils.ext.sharedPrefs
 import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.anki.withProgress
-import com.ichi2.utils.cancelable
 import com.ichi2.utils.coMeasureTime
 import com.ichi2.utils.customView
-import com.ichi2.utils.dp
+import com.ichi2.utils.moveCursorToEnd
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.positiveButton
-import com.ichi2.utils.setPaddingRelative
 import com.ichi2.utils.textAsIntOrNull
 import com.ichi2.utils.title
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
 import net.ankiweb.rsdroid.BackendException
 import timber.log.Timber
@@ -114,7 +112,6 @@ import timber.log.Timber
  *
  * @see TagLimitFragment
  */
-@KotlinCleanup("remove 'runBlocking' call'")
 class CustomStudyDialog : AnalyticsDialogFragment() {
     @VisibleForTesting(otherwise = PRIVATE)
     lateinit var binding: FragmentCustomStudyBinding
@@ -135,11 +132,17 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
     /** The search for cards to review ahead. Cancelled when the input changes, so only the latest input counts */
     private var searchJob: Job? = null
 
+    /** Whether a menu availability check or transition is already in progress. */
+    private var menuSelectionInProgress = false
+
+    /** Defaults captured for this input dialog when its main menu finishes loading. */
+    private lateinit var defaults: CustomStudyDefaults
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        parentFragmentManager.setFragmentResultListener(ON_SELECTED_TAGS_KEY, this) { _, bundle ->
-            val tagsToInclude = bundle.getStringArrayList(ON_SELECTED_TAGS__SELECTED_TAGS) ?: emptyList<String>()
-            val option = selectedSubDialog ?: return@setFragmentResultListener
+        val option = selectedSubDialog ?: return
+        parentFragmentManager.setFragmentResultListener(REQUEST_SELECT_TAGS, this) { _, bundle ->
+            val tagsToInclude = bundle.getStringArrayList(RESULT_SELECTED_TAGS) ?: emptyList<String>()
             val selectedCardStateIndex = viewModel.selectedCardStateIndex
             if (selectedCardStateIndex == AdapterView.INVALID_POSITION) return@setFragmentResultListener
             val kind = viewModel.selectedKind
@@ -156,16 +159,36 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
         tagsToInclude: List<String> = emptyList(),
         tagsToExclude: List<String> = emptyList(),
     ) {
-        requireActivity().launchCatchingTask(
+        // The activity owns this operation, which can outlive the dialog.
+        val activity = requireActivity(simpleName = true)
+        val fragmentManager = parentFragmentManager
+        val deckId = viewModel.deckId
+        val preferences = activity.sharedPrefs()
+        activity.launchCatchingTask(
             // net.ankiweb.rsdroid.BackendException: No cards matched the criteria you provided.
             // TODO (Backend#256: make this BackendCustomStudyException)
             skipCrashReport = { it is BackendException },
         ) {
-            withProgress {
+            activity.withProgress {
                 try {
-                    customStudy(option, cardsAmount, kind, tagsToInclude, tagsToExclude)
+                    val action = customStudy(deckId, option, cardsAmount, kind, tagsToInclude, tagsToExclude)
+                    fragmentManager.setFragmentResult(
+                        CustomStudyAction.REQUEST_KEY,
+                        Bundle().apply { putInt(CustomStudyAction.RESULT_CUSTOM_STUDY_ACTION, action.ordinal) },
+                    )
+
+                    // Save the default values (not in upstream).
+                    when (option) {
+                        STUDY_FORGOT -> preferences.edit { putInt("forgottenDays", cardsAmount) }
+                        STUDY_AHEAD -> preferences.edit { putInt("aheadDays", cardsAmount) }
+                        STUDY_PREVIEW -> preferences.edit { putInt("previewDays", cardsAmount) }
+                        STUDY_TAGS -> preferences.edit { putInt("amountOfCards", cardsAmount) }
+                        EXTEND_NEW, EXTEND_REV -> {
+                            // The backend provides the default value.
+                        }
+                    }
                 } finally {
-                    requireActivity().dismissAllDialogFragments()
+                    activity.dismissAllDialogFragments()
                 }
             }
         }
@@ -173,14 +196,17 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val option = selectedSubDialog
-        return if (option == null || !defaultsAreInitialized()) {
+        val ready = readyInitialization()
+        return if (option == null || (option.checkAvailability != null && ready?.deckId != viewModel.deckId)) {
             Timber.i("Showing Custom Study main menu")
-            deferredDefaults = loadCustomStudyDefaults()
-            // Select the specified deck
-            runBlocking { withCol { decks.select(viewModel.deckId) } }
-            buildContextMenu()
+            val initialization = loadInitialization()
+            deferredInitialization = initialization
+            buildContextMenu(initialization)
         } else {
             Timber.i("Showing Custom Study dialog: $option")
+            if (ready?.deckId == viewModel.deckId) {
+                defaults = ready.defaults
+            }
             buildInputDialog(option)
         }
     }
@@ -189,53 +215,85 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
      * Continues the custom study process by showing an input dialog where the user can enter an
      * amount specific to that type of custom study(eg. cards, days etc).
      */
-    private suspend fun onMenuItemSelected(item: ContextMenuOption) {
-        // on a slow phone, 'extend limits' may be clicked before we know there's no new/review cards
-        // show 'no cards due' if this occurs
-        if (item.checkAvailability != null) {
-            val defaults = withProgress { deferredDefaults.await() }
-            if (!item.checkAvailability(defaults)) {
-                showSnackbar(getString((CommonString.studyoptions_no_cards_due)))
+    private suspend fun onMenuItemSelected(
+        menuDialog: Dialog,
+        item: ContextMenuOption,
+        defaults: CustomStudyDefaults,
+        onEmptyDeck: () -> Unit,
+    ) {
+        if (menuSelectionInProgress) return
+        menuSelectionInProgress = true
+        try {
+            // The deck may have changed since this menu loaded.
+            val isUnavailable = withProgress { viewModel.isDeckEmptyOrHidden() }
+            // The fragment can outlive this dialog and recreate it while the check is queued.
+            if (
+                this.dialog !== menuDialog ||
+                !menuDialog.isShowing ||
+                !isResumed ||
+                requireActivity().isFinishing ||
+                parentFragmentManager.isStateSaved
+            ) {
+                return
+            }
+            if (isUnavailable) {
+                onEmptyDeck()
+                return
+            }
+            if (item.checkAvailability?.invoke(defaults) == false) {
+                showSnackbar(getString(CommonString.studyoptions_no_cards_due))
                 return
             }
-        }
 
-        val dialog: CustomStudyDialog = createSubDialog(viewModel.deckId, item)
-        requireActivity().showDialogFragment(dialog)
+            val dialog: CustomStudyDialog = createSubDialog(viewModel.deckId, item)
+            requireActivity().showDialogFragment(dialog)
+        } finally {
+            menuSelectionInProgress = false
+        }
     }
 
-    private fun buildContextMenu(): AlertDialog {
-        val customMenuView = ScrollView(requireContext())
-        val container =
-            LinearLayout(requireContext())
-                .apply {
-                    orientation = LinearLayout.VERTICAL
-                    setPaddingRelative(9.dp.toPx(requireContext()))
+    private fun buildContextMenu(initialization: Deferred<CustomStudyInitialization>): AlertDialog {
+        val dialog =
+            object : AlertDialog(requireActivity()) {
+                override fun onStop() {
+                    // Native dismissal happens before DialogFragment receives its queued callback.
+                    initialization.cancel()
+                    super.onStop()
                 }
-        customMenuView.addView(
-            container,
-            FrameLayout.LayoutParams(
-                FrameLayout.LayoutParams.MATCH_PARENT,
-                FrameLayout.LayoutParams.WRAP_CONTENT,
-            ),
+            }
+        val inflater = LayoutInflater.from(dialog.context)
+        val menuBinding = DialogCustomStudyMenuBinding.inflate(inflater)
+        val container = menuBinding.menuItems
+        dialog.setTitle(TR.sentenceCase.customStudy)
+        dialog.setCancelable(true)
+        dialog.setCanceledOnTouchOutside(true)
+        dialog.setView(
+            FrameLayout(dialog.context).apply {
+                addView(
+                    menuBinding.root,
+                    FrameLayout.LayoutParams(
+                        FrameLayout.LayoutParams.MATCH_PARENT,
+                        FrameLayout.LayoutParams.WRAP_CONTENT,
+                    ),
+                )
+            },
         )
+
         val ta = TypedValue()
-        requireContext().theme.resolveAttribute(android.R.attr.selectableItemBackground, ta, true)
+        dialog.context.theme.resolveAttribute(android.R.attr.selectableItemBackground, ta, true)
 
-        fun buildMenuItems() {
+        fun buildMenuItems(
+            defaults: CustomStudyDefaults,
+            onEmptyDeck: () -> Unit,
+        ) {
             ContextMenuOption.entries
                 .map { option ->
                     Pair(
                         option,
-                        // if there's no availability check, it's enabled
-                        option.checkAvailability == null ||
-                            // if data hasn't loaded, defer the check and assume it's enabled
-                            !deferredDefaults.isCompleted ||
-                            // if unavailable, disable the item
-                            option.checkAvailability(deferredDefaults.getCompleted()),
+                        option.checkAvailability?.invoke(defaults) != false,
                     )
                 }.forEach { (menuItem, isItemEnabled) ->
-                    (layoutInflater.inflate(android.R.layout.simple_list_item_1, container, false) as TextView)
+                    (inflater.inflate(android.R.layout.simple_list_item_1, container, false) as TextView)
                         .apply {
                             updatePadding(
                                 top = 12.dp.toPx(requireContext()),
@@ -246,30 +304,41 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
                             setBackgroundResource(ta.resourceId)
                             setTextAppearance(android.R.style.TextAppearance_Material_Body1)
                             setOnClickListener {
-                                launchCatchingTask { onMenuItemSelected(menuItem) }
+                                launchCatchingTask {
+                                    onMenuItemSelected(dialog, menuItem, defaults, onEmptyDeck)
+                                }
                             }
                         }.also { container.addView(it) }
                 }
         }
 
-        buildMenuItems()
+        fun render(state: CustomStudyInitialization) {
+            container.removeAllViews()
+            menuBinding.progressBar.isVisible = state is CustomStudyInitialization.Loading
+            menuBinding.menuItems.isVisible = state is CustomStudyInitialization.Ready
+            when (state) {
+                CustomStudyInitialization.Loading -> Unit
+                CustomStudyInitialization.Empty ->
+                    lifecycleScope.launch {
+                        lifecycle.withResumed {
+                            val host = activity ?: return@withResumed
+                            if (!dialog.isShowing || host.isFinishing || parentFragmentManager.isStateSaved) return@withResumed
+                            dismiss()
+                            host.showSnackbar(CommonString.empty_deck)
+                        }
+                    }
+                is CustomStudyInitialization.Ready -> buildMenuItems(state.defaults) { render(CustomStudyInitialization.Empty) }
+            }
+        }
 
-        // add a continuation if 'defaults' was not loaded
-        if (!deferredDefaults.isCompleted) {
+        render(CustomStudyInitialization.Loading)
+        dialog.setOnShowListener {
             launchCatchingTask {
-                Timber.d("awaiting 'defaults' continuation")
-                deferredDefaults.await()
-                container.removeAllViews()
-                buildMenuItems()
+                render(initialization.await())
             }
         }
 
-        return AlertDialog
-            .Builder(requireActivity())
-            .title(text = TR.sentenceCase.customStudy)
-            .cancelable(true)
-            .customView(customMenuView)
-            .create()
+        return dialog
     }
 
     /**
@@ -278,7 +347,6 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
      */
     @NeedsTest("17757: fragment not dismissed before result is output")
     private fun buildInputDialog(contextMenuOption: ContextMenuOption): AlertDialog {
-        require(deferredDefaults.isCompleted || selectedSubDialog!!.checkAvailability == null)
         /*
             TODO: Try to change to a standard input dialog (currently the thing holding us back is having the extra
             TODO: hint line for the number of cards available, and having the pre-filled text selected by default)
@@ -288,10 +356,19 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
         @SuppressLint("InflateParams")
         binding = FragmentCustomStudyBinding.inflate(requireActivity().layoutInflater)
 
-        binding.detailsText1.text = text1
+        val isExtendLimits = contextMenuOption == EXTEND_NEW || contextMenuOption == EXTEND_REV
         // 'review ahead' has a dialog title, so the empty label would only add a blank line
-        binding.detailsText1.isVisible = contextMenuOption != STUDY_AHEAD && contextMenuOption != STUDY_PREVIEW
+        binding.detailsText1.isVisible =
+            contextMenuOption != STUDY_AHEAD &&
+            contextMenuOption != STUDY_PREVIEW &&
+            !isExtendLimits
         binding.detailsText2.text = text2
+        binding.detailsAvailableCards.text = text1
+        binding.detailsAvailableCards.isVisible = isExtendLimits
+        binding.detailsDecrementButton.isVisible = isExtendLimits
+        binding.detailsIncrementButton.isVisible = isExtendLimits
+        binding.detailsDecrementButton.setOnClickListener { stepUserInputValue(-1) }
+        binding.detailsIncrementButton.setOnClickListener { stepUserInputValue(1) }
 
         binding.cardsStateSelectorLayout.isVisible = contextMenuOption == STUDY_TAGS
         binding.cardsStateSelector.apply {
@@ -322,18 +399,19 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
             setAdapterAndSelection(cardStates, viewModel.selectedCardStateIndex)
         }
         binding.detailsEditText2.apply {
-            setText(defaultValue)
+            setText(viewModel.userInputText ?: defaultValue)
             // Give EditText focus and show keyboard
             setSelectAllOnFocus(true)
             requestFocus()
             // a user may enter a negative value when extending limits
-            if (contextMenuOption == EXTEND_NEW || contextMenuOption == EXTEND_REV) {
+            if (isExtendLimits) {
                 inputType = EditorInfo.TYPE_CLASS_NUMBER or EditorInfo.TYPE_NUMBER_FLAG_SIGNED
+                gravity = Gravity.CENTER
             }
             if (contextMenuOption == STUDY_AHEAD || contextMenuOption == STUDY_PREVIEW) {
                 inputType = EditorInfo.TYPE_CLASS_NUMBER
                 filters += arrayOf(InputFilter.LengthFilter(5), NonLeadingZeroInputFilter)
-                setSuffixText(defaultValue.toInt())
+                setSuffixText(userInputValue ?: defaultValue.toInt())
             }
         }
         val positiveBtnLabel =
@@ -341,6 +419,8 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
                 TR.sentenceCase.chooseTags
             } else if (contextMenuOption == STUDY_AHEAD || contextMenuOption == STUDY_PREVIEW) {
                 getString(CommonString.dialog_positive_create)
+            } else if (isExtendLimits) {
+                getString(CommonString.custom_study_increase)
             } else {
                 getString(CommonString.dialog_ok)
             }
@@ -355,6 +435,8 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
                 .apply {
                     if (contextMenuOption == STUDY_AHEAD || contextMenuOption == STUDY_PREVIEW) {
                         title(text = contextMenuOption.getTitle(resources))
+                    } else if (isExtendLimits) {
+                        title(text = getString(CommonString.custom_study_extend_limits_title))
                     }
                 }.customView(
                     view = binding.root,
@@ -425,21 +507,12 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
                 }
                 launchCustomStudy(contextMenuOption, n)
             }
-            if (contextMenuOption == STUDY_AHEAD || contextMenuOption == STUDY_PREVIEW) {
-                // the stored default may match no cards
-                searchJob = launchCatchingTask { updateCreateButtonState(dialog, userInputValue) }
-            }
+            validateInput(dialog, contextMenuOption)
         }
 
         binding.detailsEditText2.doAfterTextChanged {
-            val value = userInputValue
-            if (contextMenuOption != STUDY_AHEAD && contextMenuOption != STUDY_PREVIEW) {
-                dialog.positiveButton.isEnabled = value != null && value != 0
-                return@doAfterTextChanged
-            }
-            value?.let { setSuffixText(it) }
-            searchJob?.cancel()
-            searchJob = launchCatchingTask { updateCreateButtonState(dialog, value) }
+            viewModel.userInputText = it?.toString()
+            validateInput(dialog, contextMenuOption)
         }
 
         // Show soft keyboard
@@ -447,15 +520,50 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
         return dialog
     }
 
+    private fun validateInput(
+        dialog: AlertDialog,
+        contextMenuOption: ContextMenuOption,
+    ) {
+        val rawText = binding.detailsEditText2.text?.toString() ?: ""
+        val value = userInputValue
+        val range = contextMenuOption.validRange
+
+        if (contextMenuOption == STUDY_AHEAD || contextMenuOption == STUDY_PREVIEW) {
+            value?.let { setSuffixText(it) }
+            searchJob?.cancel()
+            searchJob = launchCatchingTask { updateCreateButtonState(dialog, value) }
+            return
+        }
+
+        val isValid = value != null && value != 0 && value in range
+        dialog.positiveButton.isEnabled = isValid
+
+        binding.detailsEditText2Layout.error =
+            when {
+                rawText.isEmpty() || rawText == "-" -> null
+                value == null || value > range.last -> getString(CommonString.maximum_value_is, range.last)
+                value < range.first -> getString(CommonString.minimum_value_is, range.first)
+                else -> null
+            }
+    }
+
     /** Sets the suffix of the days input: `[1] day`, `[3] days` */
     private fun setSuffixText(days: Int) {
         binding.detailsEditText2Layout.suffixText = resources.getQuantityString(CommonPlurals.set_due_date_label_suffix, days)
     }
 
+    private fun stepUserInputValue(delta: Int) {
+        val range = selectedSubDialog?.validRange ?: return
+        val newValue = ((userInputValue ?: 0) + delta).coerceIn(range)
+        binding.detailsEditText2.setText(newValue.toString())
+        binding.detailsEditText2.moveCursorToEnd()
+    }
+
     /**
-     * Whether the deck has new cards added in the last [days] days.
+     * Whether there are new cards added within [days] days in the deck for previewing.
      *
-     * Upstream: https://github.com/ankitects/anki/blob/618c1787c83ac9baace0527a2f572631b86b7aee/qt/aqt/customstudy.py
+     * Mirrors the upstream logic:
+     * [https://github.com/ankitects/anki/blob/main/qt/aqt/customstudy.py](https://github.com/ankitects/anki/blob/main/qt/aqt/customstudy.py)
      */
     private suspend fun hasPreviewCards(days: Int): Boolean =
         withCol {
@@ -468,13 +576,21 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
             findCards(buildSearchString(search)).isNotEmpty()
         }
 
-    /** Enables 'Create' only if some cards would be reviewed ahead by [days] */
+    /** Enables 'Create' only if some cards would be reviewed ahead/previewed by [days] */
     private suspend fun updateCreateButtonState(
         dialog: AlertDialog,
         days: Int?,
     ) {
-        if (days == null || days == 0) {
-            binding.detailsEditText2Layout.error = if (days == 0) getString(CommonString.minimum_value_is, 1) else null
+        val range = selectedSubDialog?.validRange ?: ContextMenuOption.STUDY_AHEAD.validRange
+        val rawText = binding.detailsEditText2.text?.toString() ?: ""
+        if (days == null || days !in range) {
+            binding.detailsEditText2Layout.error =
+                when {
+                    rawText.isEmpty() -> null
+                    days == null || days > range.last -> getString(CommonString.maximum_value_is, range.last)
+                    days < range.first -> getString(CommonString.minimum_value_is, range.first)
+                    else -> null
+                }
             dialog.positiveButton.isEnabled = false
             return
         }
@@ -502,17 +618,18 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
     // TODO cram kind and the included/excluded tags lists are only relevant for STUDY_TAGS and
     //  should be included in the option to not leak in the method's api
     private suspend fun customStudy(
+        deckId: DeckId,
         contextMenuOption: ContextMenuOption,
         userEntry: Int,
         cramKind: CramKind,
         tagsSelectedForInclude: List<String>,
         tagsSelectedForExclude: List<String>,
-    ) {
+    ): CustomStudyAction {
         Timber.i("Custom study: $contextMenuOption; input = $userEntry")
 
         val request =
             customStudyRequest {
-                deckId = viewModel.deckId
+                this.deckId = deckId
                 when (contextMenuOption) {
                     EXTEND_NEW -> newLimitDelta = userEntry
                     EXTEND_REV -> reviewLimitDelta = userEntry
@@ -533,23 +650,9 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
             }
 
         undoableOp { sched.customStudy(request) }
-        val action =
-            when (contextMenuOption) {
-                EXTEND_NEW, EXTEND_REV -> CustomStudyAction.EXTEND_STUDY_LIMITS
-                STUDY_FORGOT, STUDY_AHEAD, STUDY_PREVIEW, STUDY_TAGS -> CustomStudyAction.CUSTOM_STUDY_SESSION
-            }
-
-        setFragmentResult(CustomStudyAction.REQUEST_KEY, Bundle().apply { putInt(CustomStudyAction.BUNDLE_KEY, action.ordinal) })
-
-        // save the default values (not in upstream)
-        when (contextMenuOption) {
-            STUDY_FORGOT -> sharedPrefs().edit { putInt("forgottenDays", userEntry) }
-            STUDY_AHEAD -> sharedPrefs().edit { putInt("aheadDays", userEntry) }
-            STUDY_PREVIEW -> sharedPrefs().edit { putInt("previewDays", userEntry) }
-            EXTEND_NEW, EXTEND_REV -> {
-                // Nothing to do in ankidroid. The default value is provided by the backend.
-            }
-            STUDY_TAGS -> sharedPrefs().edit { putInt("amountOfCards", userEntry) }
+        return when (contextMenuOption) {
+            EXTEND_NEW, EXTEND_REV -> CustomStudyAction.EXTEND_STUDY_LIMITS
+            STUDY_FORGOT, STUDY_AHEAD, STUDY_PREVIEW, STUDY_TAGS -> CustomStudyAction.CUSTOM_STUDY_SESSION
         }
     }
 
@@ -558,12 +661,14 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
      *
      * This method may be slow (> 1s)
      */
-    private fun loadCustomStudyDefaults() =
-        lifecycleScope.asyncIO {
+    private fun loadInitialization(): Deferred<CustomStudyInitialization> {
+        val host = requireActivity()
+        return lifecycleScope.asyncIO {
             coMeasureTime("loadCustomStudyDefaults") {
-                withCol { sched.customStudyDefaults(viewModel.deckId).toDomainModel() }
+                viewModel.initialize { !host.isFinishing }
             }
         }
+    }
 
     /**
      * Line 1 of the number entry dialog
@@ -575,8 +680,8 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
     private val text1: String
         get() =
             when (selectedSubDialog) {
-                EXTEND_NEW -> deferredDefaults.getCompleted().labelForNewQueueAvailable()
-                EXTEND_REV -> deferredDefaults.getCompleted().labelForReviewQueueAvailable()
+                EXTEND_NEW -> defaults.labelForNewQueueAvailable()
+                EXTEND_REV -> defaults.labelForReviewQueueAvailable()
                 STUDY_FORGOT,
                 STUDY_AHEAD,
                 STUDY_PREVIEW,
@@ -590,8 +695,8 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
         get() {
             val res = resources
             return when (selectedSubDialog) {
-                EXTEND_NEW -> res.getString(CommonString.custom_study_new_extend)
-                EXTEND_REV -> res.getString(CommonString.custom_study_rev_extend)
+                EXTEND_NEW -> TR.customStudyIncreaseTodaysNewCardLimitBy()
+                EXTEND_REV -> TR.customStudyIncreaseTodaysReviewLimitBy()
                 STUDY_FORGOT -> res.getString(CommonString.custom_study_forgotten)
                 STUDY_AHEAD -> res.getString(CommonString.custom_study_ahead_description)
                 STUDY_PREVIEW -> res.getString(CommonString.custom_study_preview)
@@ -609,16 +714,8 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
         get() {
             val prefs = requireActivity().sharedPrefs()
             return when (selectedSubDialog) {
-                EXTEND_NEW ->
-                    deferredDefaults
-                        .getCompleted()
-                        .extendNew.initialValue
-                        .toString()
-                EXTEND_REV ->
-                    deferredDefaults
-                        .getCompleted()
-                        .extendReview.initialValue
-                        .toString()
+                EXTEND_NEW -> defaults.extendNew.initialValue.toString()
+                EXTEND_REV -> defaults.extendReview.initialValue.toString()
                 STUDY_FORGOT -> prefs.getInt("forgottenDays", 1).toString()
                 STUDY_AHEAD -> prefs.getInt("aheadDays", 1).toString()
                 STUDY_PREVIEW -> prefs.getInt("previewDays", 1).toString()
@@ -640,11 +737,11 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
 
         companion object {
             const val REQUEST_KEY = "CustomStudyDialog"
-            const val BUNDLE_KEY = "action"
+            const val RESULT_CUSTOM_STUDY_ACTION = "action"
 
             /** Extracts a [CustomStudyAction] from a [Bundle] */
             fun fromBundle(bundle: Bundle): CustomStudyAction =
-                bundle.getInt(CustomStudyAction.BUNDLE_KEY).let { actionOrdinal ->
+                bundle.getInt(CustomStudyAction.RESULT_CUSTOM_STUDY_ACTION).let { actionOrdinal ->
                     entries.first { it.ordinal == actionOrdinal }
                 }
         }
@@ -658,25 +755,34 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
     @VisibleForTesting(otherwise = PRIVATE)
     enum class ContextMenuOption(
         val getTitle: Resources.() -> String,
+        val validRange: IntRange,
         val checkAvailability: ((CustomStudyDefaults) -> Boolean)? = null,
     ) {
         /** Increase today's new card limit */
-        EXTEND_NEW({ TR.customStudyIncreaseTodaysNewCardLimit() }, checkAvailability = { it.extendNew.isUsable }),
+        EXTEND_NEW(
+            { TR.customStudyIncreaseTodaysNewCardLimit() },
+            validRange = -Consts.DYN_MAX_SIZE..Consts.DYN_MAX_SIZE,
+            checkAvailability = { it.extendNew.isUsable },
+        ),
 
         /** Increase today's review card limit */
-        EXTEND_REV({ TR.customStudyIncreaseTodaysReviewCardLimit() }, checkAvailability = { it.extendReview.isUsable }),
+        EXTEND_REV(
+            { TR.customStudyIncreaseTodaysReviewCardLimit() },
+            validRange = -Consts.DYN_MAX_SIZE..Consts.DYN_MAX_SIZE,
+            checkAvailability = { it.extendReview.isUsable },
+        ),
 
         /** Review forgotten cards */
-        STUDY_FORGOT({ TR.customStudyReviewForgottenCards() }),
+        STUDY_FORGOT({ TR.customStudyReviewForgottenCards() }, validRange = 1..FORGOT_MAX_DAYS),
 
         /** Review ahead */
-        STUDY_AHEAD({ TR.customStudyReviewAhead() }),
+        STUDY_AHEAD({ TR.customStudyReviewAhead() }, validRange = 1..Consts.DYN_MAX_SIZE),
 
         /** Preview new cards */
-        STUDY_PREVIEW({ TR.customStudyPreviewNewCards() }),
+        STUDY_PREVIEW({ TR.customStudyPreviewNewCards() }, validRange = 1..Consts.DYN_MAX_SIZE),
 
         /** Limit to particular tags */
-        STUDY_TAGS({ TR.customStudyStudyByCardStateOrTag() }),
+        STUDY_TAGS({ TR.customStudyStudyByCardStateOrTag() }, validRange = 1..Consts.DYN_MAX_SIZE),
     }
 
     @Parcelize
@@ -804,14 +910,20 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
          * Singleton; initialized when the main screen is loaded
          * This exists so we don't need to pass an unbounded object between fragments
          */
-        private lateinit var deferredDefaults: Deferred<CustomStudyDefaults>
+        private lateinit var deferredInitialization: Deferred<CustomStudyInitialization>
 
         /**
-         * Whether [deferredDefaults] is initialized; false on restoring the dialog from process
-         * death
+         * Completed defaults shared with subdialogs. Restore the main menu if the loading
+         * dialog was cancelled or its process died.
          */
-        // This exists as `isInitialized` can't be checked in an instance of CustomStudyDialog
-        private fun defaultsAreInitialized(): Boolean = ::deferredDefaults.isInitialized
+        private fun readyInitialization(): CustomStudyInitialization.Ready? {
+            if (!::deferredInitialization.isInitialized || !deferredInitialization.isCompleted ||
+                deferredInitialization.isCancelled
+            ) {
+                return null
+            }
+            return deferredInitialization.getCompleted() as? CustomStudyInitialization.Ready
+        }
 
         /**
          * Creates an instance of the Custom Study Dialog: a user can select a custom study type
@@ -820,7 +932,7 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
             CustomStudyDialog().apply {
                 arguments =
                     Bundle().apply {
-                        putLong(CustomStudyViewModel.KEY_DID, deckId)
+                        putLong(CustomStudyViewModel.ARG_DECK_ID, deckId)
                     }
             }
 
@@ -837,11 +949,13 @@ class CustomStudyDialog : AnalyticsDialogFragment() {
             CustomStudyDialog().apply {
                 arguments =
                     Bundle().apply {
-                        putLong(CustomStudyViewModel.KEY_DID, deckId)
+                        putLong(CustomStudyViewModel.ARG_DECK_ID, deckId)
                         putInt(ARG_SUB_DIALOG_ID, contextMenuAttribute.ordinal)
                     }
             }
 
+        const val FORGOT_MAX_DAYS = 30
+
         /**
          * (optional) Key for the ordinal of the [ContextMenuOption] to display.
          * @see CustomStudyDialog.selectedSubDialog
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyViewModel.kt
index 4e84e06cad03..440c77a715d4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyViewModel.kt
@@ -6,9 +6,16 @@ import android.widget.AdapterView
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import anki.scheduler.CustomStudyRequest.Cram.CramKind
+import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.CustomStudyCardState
+import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.CustomStudyDefaults
+import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.CustomStudyDefaults.Companion.toDomainModel
+import com.ichi2.anki.libanki.Collection
 import com.ichi2.anki.libanki.Deck
 import com.ichi2.anki.libanki.DeckId
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.currentCoroutineContext
+import kotlinx.coroutines.ensureActive
 
 /**
  * @see CustomStudyDialog
@@ -27,9 +34,43 @@ class CustomStudyViewModel(
             savedStateHandle[KEY_CARDS_SELECTION_INDEX] = value
         }
 
+    var userInputText: String?
+        get() = savedStateHandle[KEY_USER_INPUT_TEXT]
+        set(value) {
+            savedStateHandle[KEY_USER_INPUT_TEXT] = value
+        }
+
     /** Required [DeckId] of the [Deck] for which the custom study session is being built. */
     val deckId: DeckId
-        get() = savedStateHandle.get<DeckId>(KEY_DID) ?: error("Deck id was not provided!")
+        get() = savedStateHandle.get<DeckId>(ARG_DECK_ID) ?: error("Deck id was not provided!")
+
+    /**
+     * Check the requested deck before loading defaults or changing selection.
+     * [canSelectDeck] is checked on the collection queue immediately before selecting.
+     */
+    suspend fun initialize(canSelectDeck: () -> Boolean = { true }): CustomStudyInitialization {
+        val context = currentCoroutineContext()
+        return withCol {
+            if (!hasCustomStudyCards()) {
+                CustomStudyInitialization.Empty
+            } else {
+                val defaults = sched.customStudyDefaults(deckId).toDomainModel()
+                // The dialog may have closed while the backend was loading defaults.
+                context.ensureActive()
+                if (!canSelectDeck()) throw CancellationException("Custom Study initialization is no longer needed")
+                decks.select(deckId)
+                CustomStudyInitialization.Ready(deckId, defaults)
+            }
+        }
+    }
+
+    suspend fun isDeckEmptyOrHidden(): Boolean = withCol { !hasCustomStudyCards() }
+
+    private fun Collection.hasCustomStudyCards(): Boolean =
+        // Check listing first: counting child-deck cards requires the deck to exist.
+        // Default may also be hidden while cardCount still includes its borrowed cards.
+        sched.deckTree(includeCounts = false).find(deckId) != null &&
+            decks.cardCount(deckId, includeSubdecks = true) > 0
 
     /*
      * Translates the user's selection into a specific study type.
@@ -48,7 +89,19 @@ class CustomStudyViewModel(
         /**
          * Required key for a [DeckId] which [CustomStudyDialog] expects to receive as an argument.
          */
-        const val KEY_DID = "key_did"
+        const val ARG_DECK_ID = "key_did"
         private const val KEY_CARDS_SELECTION_INDEX = "key_cards_selection_index"
+        private const val KEY_USER_INPUT_TEXT = "key_user_input_text"
     }
 }
+
+sealed interface CustomStudyInitialization {
+    data object Loading : CustomStudyInitialization
+
+    data object Empty : CustomStudyInitialization
+
+    data class Ready(
+        val deckId: DeckId,
+        val defaults: CustomStudyDefaults,
+    ) : CustomStudyInitialization
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt
index 3260ebd6f8e8..228b73280737 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt
@@ -98,8 +98,8 @@ class TagLimitFragment : DialogFragment() {
                 setFragmentResult(
                     REQUEST_CUSTOM_STUDY_TAGS,
                     Bundle().apply {
-                        putStringArrayList(KEY_INCLUDED_TAGS, ArrayList(tagsToInclude))
-                        putStringArrayList(KEY_EXCLUDED_TAGS, ArrayList(tagsToExclude))
+                        putStringArrayList(RESULT_INCLUDED_TAGS, ArrayList(tagsToInclude))
+                        putStringArrayList(RESULT_EXCLUDED_TAGS, ArrayList(tagsToExclude))
                     },
                 )
                 dismiss()
@@ -133,8 +133,8 @@ class TagLimitFragment : DialogFragment() {
     companion object {
         const val TAG = "TagLimitFragment"
         const val REQUEST_CUSTOM_STUDY_TAGS = "request_custom_study_tags"
-        const val KEY_INCLUDED_TAGS = "key_included_tags"
-        const val KEY_EXCLUDED_TAGS = "key_excluded_tags"
+        const val RESULT_INCLUDED_TAGS = "key_included_tags"
+        const val RESULT_EXCLUDED_TAGS = "key_excluded_tags"
         private const val ARG_DECK_ID = "arg_deck_id"
 
         fun newInstance(deckId: DeckId) =
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/help/HelpDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/help/HelpDialog.kt
index 8e0ad1126150..2a5bca2ebfed 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/help/HelpDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/help/HelpDialog.kt
@@ -21,6 +21,7 @@ import com.ichi2.anki.ankiActivity
 import com.ichi2.anki.common.analytics.Analytics
 import com.ichi2.anki.common.analytics.AnalyticsEvent.LinkClicked
 import com.ichi2.anki.common.analytics.LinkAction
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.DialogHelpBinding
 import com.ichi2.anki.databinding.FragmentHelpPageBinding
 import com.ichi2.anki.databinding.ItemHelpEntryBinding
@@ -31,9 +32,9 @@ import com.ichi2.anki.dialogs.help.HelpItem.Action.SendReport
 import com.ichi2.anki.utils.ext.setCompoundDrawablesRelativeWithIntrinsicBoundsKt
 import com.ichi2.utils.createAndApply
 import com.ichi2.utils.customView
-import com.ichi2.utils.dp
 import com.ichi2.utils.title
 import dev.androidbroadcast.vbpd.viewBinding
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * [DialogFragment] responsible for showing the help/support menus.
@@ -82,7 +83,7 @@ class HelpDialog : AnalyticsDialogFragment() {
         val selectedItem =
             BundleCompat.getParcelable(
                 from,
-                ARG_SELECTED_MENU_ITEM,
+                RESULT_SELECTED_MENU_ITEM,
                 HelpItem::class.java,
             ) ?: return
         when (selectedItem.action) {
@@ -173,7 +174,7 @@ internal fun Fragment.requireArgsHelpEntries(): Array<HelpItem> {
 
 internal const val ARG_MENU_ITEMS = "arg_menu_items"
 internal const val REQUEST_HELP_PAGE = "request_help_page"
-internal const val ARG_SELECTED_MENU_ITEM = " selected_menu_item"
+internal const val RESULT_SELECTED_MENU_ITEM = " selected_menu_item"
 
 /**
  * This fragment is responsible for showing a list of menu items in the application's [HelpDialog].
@@ -196,7 +197,7 @@ class HelpPageFragment : Fragment(R.layout.fragment_help_page) {
                     Analytics.send(LinkClicked(menuItem.analyticsId))
                     parentFragmentManager.setFragmentResult(
                         REQUEST_HELP_PAGE,
-                        Bundle().apply { putParcelable(ARG_SELECTED_MENU_ITEM, menuItem) },
+                        Bundle().apply { putParcelable(RESULT_SELECTED_MENU_ITEM, menuItem) },
                     )
                 }
                 binding.pageContent.addView(this)
@@ -222,7 +223,7 @@ internal val mainHelpMenuItems =
         ),
         HelpItem(
             titleResId = CommonString.help_title_get_help,
-            iconResId = R.drawable.ic_help_black_24dp,
+            iconResId = CommonR.drawable.ic_help_black_24dp,
             analyticsId = LinkAction.OPENED_GET_HELP,
             id = 2,
         ),
@@ -274,7 +275,7 @@ internal val supportMenuItems =
         ),
         HelpItem(
             titleResId = CommonString.help_item_support_other_ankidroid,
-            iconResId = R.drawable.ic_help_black_24dp,
+            iconResId = CommonR.drawable.ic_help_black_24dp,
             analyticsId = LinkAction.OPENED_OTHER,
             id = 9,
             action = OpenUrlResource(R.string.link_contribution),
@@ -310,7 +311,7 @@ internal val childHelpMenuItems =
         ),
         HelpItem(
             titleResId = CommonString.help_item_ankidroid_faq,
-            iconResId = R.drawable.ic_help_black_24dp,
+            iconResId = CommonR.drawable.ic_help_black_24dp,
             analyticsId = LinkAction.OPENED_ANKIDROID_FAQ,
             id = 102,
             parentId = 1,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapter.kt
index 83e4d4ada92e..263bc8f55dd1 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapter.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapter.kt
@@ -25,6 +25,7 @@ import com.ichi2.utils.TypedFilter
 import java.util.Locale
 import java.util.Stack
 import java.util.TreeSet
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * @param tags A reference to the [TagsList]
@@ -412,7 +413,7 @@ class TagsArrayAdapter(
         // For example, display some icon if the node is a leaf? (assets required)
         when (node.isExpanded) {
             true -> button.setBackgroundResource(R.drawable.ic_expand_more_black_24dp_xml)
-            false -> button.setBackgroundResource(R.drawable.ic_baseline_chevron_right_24)
+            false -> button.setBackgroundResource(CommonR.drawable.ic_baseline_chevron_right_24)
         }
     }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt
index 9285a7a87666..4684cd0f6de8 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialog.kt
@@ -332,7 +332,7 @@ class TagsDialog : AnalyticsDialogFragment {
 
         val toolbarAddItem = toolbar.menu.findItem(R.id.tags_dialog_action_add)
         val drawable = ContextCompat.getDrawable(requireContext(), CommonR.drawable.ic_add)
-        drawable?.setTint(requireContext().getColor(R.color.white))
+        drawable?.setTint(requireContext().getColor(CommonR.color.white))
         toolbarAddItem.icon = drawable
 
         toolbarAddItem.setOnMenuItemClickListener {
@@ -399,7 +399,7 @@ class TagsDialog : AnalyticsDialogFragment {
                     title(text = getString(CommonString.add_tag))
                     positiveButton(CommonString.menu_add)
                     negativeButton(CommonString.dialog_cancel)
-                    setView(R.layout.dialog_generic_text_input)
+                    setView(CommonR.layout.dialog_generic_text_input)
                 }.input(
                     hint = TR.actionsName().dropLastWhile { it == ':' },
                     inputType = InputType.TYPE_CLASS_TEXT,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialogListener.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialogListener.kt
index 3de706901c52..3c2c2efd8e5c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialogListener.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsDialogListener.kt
@@ -30,14 +30,14 @@ interface TagsDialogListener {
 
     fun <F> F.registerFragmentResultReceiver() where F : Fragment, F : TagsDialogListener {
         parentFragmentManager.setFragmentResultListener(
-            ON_SELECTED_TAGS_KEY,
+            REQUEST_SELECT_TAGS,
             this,
         ) { _: String?, bundle: Bundle ->
             val selectedTags: List<String> =
-                bundle.getStringArrayList(ON_SELECTED_TAGS__SELECTED_TAGS)!!
+                bundle.getStringArrayList(RESULT_SELECTED_TAGS)!!
             val indeterminateTags: List<String> =
-                bundle.getStringArrayList(ON_SELECTED_TAGS__INDETERMINATE_TAGS)!!
-            val option = bundle.getSerializableCompat<CardStateFilter>(ON_SELECTED_TAGS__OPTION)!!
+                bundle.getStringArrayList(RESULT_INDETERMINATE_TAGS)!!
+            val option = bundle.getSerializableCompat<CardStateFilter>(RESULT_CARD_STATE_FILTER)!!
             onSelectedTags(selectedTags, indeterminateTags, option)
         }
     }
@@ -52,17 +52,17 @@ interface TagsDialogListener {
                 ) {
                     val bundle =
                         Bundle().apply {
-                            putStringArrayList(ON_SELECTED_TAGS__SELECTED_TAGS, ArrayList(selectedTags))
-                            putStringArrayList(ON_SELECTED_TAGS__INDETERMINATE_TAGS, ArrayList(indeterminateTags))
-                            putSerializable(ON_SELECTED_TAGS__OPTION, stateFilter)
+                            putStringArrayList(RESULT_SELECTED_TAGS, ArrayList(selectedTags))
+                            putStringArrayList(RESULT_INDETERMINATE_TAGS, ArrayList(indeterminateTags))
+                            putSerializable(RESULT_CARD_STATE_FILTER, stateFilter)
                         }
-                    fragmentManager.setFragmentResult(ON_SELECTED_TAGS_KEY, bundle)
+                    fragmentManager.setFragmentResult(REQUEST_SELECT_TAGS, bundle)
                 }
             }
 
-        const val ON_SELECTED_TAGS_KEY = "ON_SELECTED_TAGS_KEY"
-        const val ON_SELECTED_TAGS__SELECTED_TAGS = "SELECTED_TAGS"
-        const val ON_SELECTED_TAGS__INDETERMINATE_TAGS = "INDETERMINATE_TAGS"
-        const val ON_SELECTED_TAGS__OPTION = "OPTION"
+        const val REQUEST_SELECT_TAGS = "ON_SELECTED_TAGS_KEY"
+        const val RESULT_SELECTED_TAGS = "SELECTED_TAGS"
+        const val RESULT_INDETERMINATE_TAGS = "INDETERMINATE_TAGS"
+        const val RESULT_CARD_STATE_FILTER = "OPTION"
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsList.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsList.kt
index 07c928de51d4..cc9787ef021c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsList.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/tags/TagsList.kt
@@ -55,17 +55,23 @@ class TagsList(
         indeterminateTags = TreeSet(java.lang.String.CASE_INSENSITIVE_ORDER)
         if (uncheckedTags != null) {
             this.allTags.addAll(uncheckedTags)
-            // intersection between mCheckedTags and uncheckedTags
-            indeterminateTags.addAll(this.checkedTags)
-            val uncheckedSet: MutableSet<String> = TreeSet(java.lang.String.CASE_INSENSITIVE_ORDER)
-            uncheckedSet.addAll(uncheckedTags)
-            indeterminateTags.retainAll(uncheckedSet)
+            for (tag in uncheckedTags) {
+                val checkedTag = findCheckedTagIgnoringCase(tag) ?: continue
+                indeterminateTags.add(checkedTag)
+            }
             this.checkedTags.removeAll(indeterminateTags)
         }
         partiallySelectedTags.addAll(indeterminateTags)
         prepareTagHierarchy()
     }
 
+    /** Returns the matching checked tag with its stored spelling, or `null` if absent. */
+    private fun findCheckedTagIgnoringCase(tag: String): String? {
+        // O(log n); returns "Biology" for a "biology" search or vice versa
+        val candidate = checkedTags.ceiling(tag) ?: return null
+        return candidate.takeIf { it.equals(tag, ignoreCase = true) }
+    }
+
     /**
      * Return true if a tag is checked given its index in the list
      *
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/exception/SanitizedReportCollector.kt b/AnkiDroid/src/main/java/com/ichi2/anki/exception/SanitizedReportCollector.kt
new file mode 100644
index 000000000000..b79e7dab0087
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/exception/SanitizedReportCollector.kt
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.exception
+
+import android.content.Context
+import org.acra.ReportField
+import org.acra.builder.ReportBuilder
+import org.acra.collector.Collector
+import org.acra.config.CoreConfiguration
+import org.acra.data.CrashReportData
+
+/**
+ * Filters logcat from sanitized reports due to PII: private messages may have been logged before
+ * the uncaught exception handler ran. ACRA saves the report after all collectors have finished.
+ */
+class SanitizedReportCollector : Collector {
+    // LogCatCollector runs FIRST; filter its output after collection, including in parallel mode.
+    override val order = Collector.Order.LAST
+
+    override fun collect(
+        context: Context,
+        config: CoreConfiguration,
+        reportBuilder: ReportBuilder,
+        crashReportData: CrashReportData,
+    ) {
+        if (reportBuilder.exception is SanitizedThrowable && crashReportData.containsKey(ReportField.LOGCAT)) {
+            crashReportData.put(
+                ReportField.LOGCAT,
+                "Logcat filtered because it may contain personally identifiable information (PII).",
+            )
+        }
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/exception/SanitizedThrowable.kt b/AnkiDroid/src/main/java/com/ichi2/anki/exception/SanitizedThrowable.kt
new file mode 100644
index 000000000000..2e0b58630838
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/exception/SanitizedThrowable.kt
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.exception
+
+import com.ichi2.utils.ExceptionUtil.causesAndSuppressed
+import java.util.IdentityHashMap
+
+/**
+ * Wraps an exception, stripping PII.
+ */
+internal class SanitizedThrowable private constructor(
+    original: Throwable,
+) : Throwable(original.javaClass.name) {
+    init {
+        stackTrace = original.stackTrace
+    }
+
+    // ACRA prints the throwable, so retain the original class name in its stack trace.
+    override fun toString(): String = message!!
+
+    companion object {
+        /** Copy causes and suppressed exceptions, breaking cycles for downstream crash reporters. */
+        fun from(throwable: Throwable): SanitizedThrowable {
+            val copies = IdentityHashMap<Throwable, SanitizedThrowable>()
+            // Build from leaves to root, linking only to completed copies to break cycles.
+            for (original in throwable.causesAndSuppressed().toList().asReversed()) {
+                val copy = SanitizedThrowable(original)
+                copy.initCause(copies[original.cause])
+                original.suppressed.mapNotNull { copies[it] }.forEach(copy::addSuppressed)
+                copies[original] = copy
+            }
+            return copies.getValue(throwable)
+        }
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/filtered/FilteredDeckOptionsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/filtered/FilteredDeckOptionsFragment.kt
index c784b782fd04..0fc8098af94c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/filtered/FilteredDeckOptionsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/filtered/FilteredDeckOptionsFragment.kt
@@ -25,9 +25,6 @@ import androidx.core.view.updatePadding
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import com.google.android.material.materialswitch.MaterialSwitch
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
@@ -40,6 +37,7 @@ import com.ichi2.anki.databinding.FragmentFilteredDeckOptionsBinding
 import com.ichi2.anki.dialogs.DiscardChangesDialog
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.utils.ConfigAwareSingleFragmentActivity
+import com.ichi2.anki.utils.ext.launchCollectionInViewLifecycleScope
 import com.ichi2.anki.utils.ext.window
 import com.ichi2.anki.utils.openUrl
 import com.ichi2.utils.cancelable
@@ -49,7 +47,6 @@ import com.ichi2.utils.positiveButton
 import com.ichi2.utils.show
 import com.ichi2.utils.title
 import dev.androidbroadcast.vbpd.viewBinding
-import kotlinx.coroutines.launch
 import java.util.Locale.getDefault
 
 /**
@@ -108,67 +105,66 @@ class FilteredDeckOptionsFragment : Fragment(R.layout.fragment_filtered_deck_opt
         binding.filterLimitInput.filters = arrayOf(InputFilter.LengthFilter(5))
         binding.secondFilterLimitInput.filters = arrayOf(InputFilter.LengthFilter(5))
         bindLabels()
-        bindListeners()
         requireActivity().onBackPressedDispatcher.addCallback(
             viewLifecycleOwner,
             discardBackHandler,
         )
-        viewLifecycleOwner.lifecycleScope.launch {
-            viewModel.hasUnsavedChanges.collect { status ->
-                discardBackHandler.isEnabled = status
-            }
+        viewModel.hasUnsavedChanges.launchCollectionInViewLifecycleScope { status ->
+            discardBackHandler.isEnabled = status
         }
-        viewLifecycleOwner.lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.STARTED) {
-                viewModel.state.collect { state ->
-                    when (state) {
-                        is Initializing -> {
-                            if (state.throwable != null) {
-                                // we can't recover from an initialization error so just exit
-                                AlertDialog.Builder(requireActivity()).show {
-                                    setTitle(CommonString.import_title_error)
-                                    message(text = state.throwable.toString())
-                                    cancelable(false)
-                                    positiveButton(CommonString.dialog_exit) { requireActivity().finish() }
-                                }
-                            } else {
-                                binding.loadingIndicator.isVisible = true
-                                binding.scrollView.isVisible = false
-                            }
+        viewModel.state.launchCollectionInViewLifecycleScope { state ->
+            when (state) {
+                is Initializing -> {
+                    if (state.throwable != null) {
+                        // we can't recover from an initialization error so just exit
+                        AlertDialog.Builder(requireActivity()).show {
+                            setTitle(CommonString.import_title_error)
+                            message(text = state.throwable.toString())
+                            cancelable(false)
+                            positiveButton(CommonString.dialog_exit) { requireActivity().finish() }
                         }
+                    } else {
+                        binding.loadingIndicator.isVisible = true
+                        binding.scrollView.isVisible = false
+                    }
+                }
 
-                        is DeckBuilt -> {
-                            // TODO desktop doesn't do this but maybe also show a toast here?
-                            // the filtered deck is built/updated so exit the screen
-                            requireActivity().finish()
-                        }
+                is DeckBuilt -> {
+                    // TODO desktop doesn't do this but maybe also show a toast here?
+                    // the filtered deck is built/updated so exit the screen
+                    requireActivity().finish()
+                }
 
-                        is FilteredDeckOptions -> {
-                            setupMenuIfNeeded()
-                            // the button is hidden initially until we load the data
-                            binding.btnBuild.isVisible = true
-                            bindState(state)
-                            // show any errors we might have
-                            if (state.throwable != null) {
-                                AlertDialog.Builder(requireActivity()).show {
-                                    title(CommonString.import_title_error)
-                                    message(text = state.throwable.message)
-                                    positiveButton(CommonString.dialog_ok)
-                                    setOnDismissListener { viewModel.clearError() }
-                                }
-                                return@collect
-                            }
-                            if (state.browserQuery != null) {
-                                navigate(BrowserDestination.Search(query = state.browserQuery, allDecks = false))
-                                viewModel.clearSearchInBrowser()
-                            }
+                is FilteredDeckOptions -> {
+                    setupMenuIfNeeded()
+                    // the button is hidden initially until we load the data
+                    binding.btnBuild.isVisible = true
+                    bindState(state)
+                    // show any errors we might have
+                    if (state.throwable != null) {
+                        AlertDialog.Builder(requireActivity()).show {
+                            title(CommonString.import_title_error)
+                            message(text = state.throwable.message)
+                            positiveButton(CommonString.dialog_ok)
+                            setOnDismissListener { viewModel.clearError() }
                         }
+                        return@launchCollectionInViewLifecycleScope
+                    }
+                    if (state.browserQuery != null) {
+                        navigate(BrowserDestination.Search(query = state.browserQuery, allDecks = false))
+                        viewModel.clearSearchInBrowser()
                     }
                 }
             }
         }
     }
 
+    override fun onViewStateRestored(savedInstanceState: Bundle?) {
+        super.onViewStateRestored(savedInstanceState)
+        // Restored text must not call into the view model before its initialization finishes.
+        bindListeners()
+    }
+
     private fun setupMenuIfNeeded() {
         val helpMenuItem: MenuItem? = binding.toolbar.menu.findItem(R.id.action_help)
         if (helpMenuItem == null) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/introduction/SetupCollectionFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/introduction/SetupCollectionFragment.kt
index 1398ab3a170e..61f491a2b583 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/introduction/SetupCollectionFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/introduction/SetupCollectionFragment.kt
@@ -64,7 +64,7 @@ class SetupCollectionFragment : Fragment(R.layout.fragment_introduction) {
     }
 
     private fun setResult(option: CollectionSetupOption) {
-        setFragmentResult(FRAGMENT_KEY, Bundle().apply { putParcelable(RESULT_KEY, option) })
+        setFragmentResult(REQUEST_COLLECTION_SETUP, Bundle().apply { putParcelable(RESULT_KEY, option) })
     }
 
     @Parcelize
@@ -77,7 +77,7 @@ class SetupCollectionFragment : Fragment(R.layout.fragment_introduction) {
     }
 
     companion object {
-        const val FRAGMENT_KEY = "collectionSetup"
+        const val REQUEST_COLLECTION_SETUP = "collectionSetup"
         const val RESULT_KEY = "result"
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/mediacheck/MediaCheckFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/mediacheck/MediaCheckFragment.kt
index c1f8e8a9fab6..e245f22f3197 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/mediacheck/MediaCheckFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/mediacheck/MediaCheckFragment.kt
@@ -10,7 +10,8 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import android.webkit.WebViewClient
+import android.webkit.WebView
+import androidx.annotation.CallSuper
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
@@ -19,7 +20,6 @@ import androidx.core.view.MenuProvider
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.lifecycleScope
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CommonPlurals
 import com.ichi2.anki.CommonString
@@ -30,8 +30,11 @@ import com.ichi2.anki.common.utils.android.getColorFromAttr
 import com.ichi2.anki.databinding.FragmentMediaCheckBinding
 import com.ichi2.anki.progress.observeProgress
 import com.ichi2.anki.ui.internationalization.sentenceCase
+import com.ichi2.anki.utils.ext.launchCollectionInViewLifecycleScope
 import com.ichi2.anki.utils.observeMessages
 import com.ichi2.anki.utils.showAndAwaitDismissal
+import com.ichi2.anki.workarounds.OnWebViewRecreatedListener
+import com.ichi2.anki.workarounds.SafeWebViewClient
 import com.ichi2.utils.cancelable
 import com.ichi2.utils.message
 import com.ichi2.utils.negativeButton
@@ -40,18 +43,20 @@ import com.ichi2.utils.show
 import com.ichi2.utils.title
 import com.ichi2.utils.toRGBHex
 import dev.androidbroadcast.vbpd.viewBinding
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.launch
 
 /**
  * MediaCheckFragment for displaying a list of media files that are either unused or missing.
  * It allows users to tag missing media files or delete unused ones.
  **/
-class MediaCheckFragment : Fragment(R.layout.fragment_media_check) {
+class MediaCheckFragment :
+    Fragment(R.layout.fragment_media_check),
+    OnWebViewRecreatedListener {
     private val viewModel: MediaCheckViewModel by viewModels()
 
     private val binding by viewBinding(FragmentMediaCheckBinding::bind)
 
+    private var lastReport: String? = null
+
     override fun onViewCreated(
         view: View,
         savedInstanceState: Bundle?,
@@ -70,14 +75,12 @@ class MediaCheckFragment : Fragment(R.layout.fragment_media_check) {
         observeProgress(viewModel) { progress -> getString(progress.messageRes) }
         viewModel.checkMedia()
 
-        lifecycleScope.launch {
-            viewModel.mediaCheckResult.collectLatest { result ->
-                updateWebView(result?.report.orEmpty())
-                if (result != null) {
-                    binding.tagMissingMediaButton.isVisible = result.missingCount != 0
-                    binding.deleteUsedMediaButton.isVisible = result.unusedCount != 0
-                    if (result.haveTrash) setupMenu()
-                }
+        viewModel.mediaCheckResult.launchCollectionInViewLifecycleScope { result ->
+            updateWebView(result?.report.orEmpty())
+            if (result != null) {
+                binding.tagMissingMediaButton.isVisible = result.missingCount != 0
+                binding.deleteUsedMediaButton.isVisible = result.unusedCount != 0
+                if (result.haveTrash) setupMenu()
             }
         }
 
@@ -123,6 +126,7 @@ class MediaCheckFragment : Fragment(R.layout.fragment_media_check) {
     }
 
     private fun updateWebView(report: String) {
+        lastReport = report
         val backgroundColor = getColorFromAttr(requireContext(), android.R.attr.colorBackground)
         val textColor = getColorFromAttr(requireContext(), android.R.attr.textColorPrimary)
 
@@ -142,10 +146,20 @@ class MediaCheckFragment : Fragment(R.layout.fragment_media_check) {
             </html>
             """.trimIndent()
 
-        binding.webView.webViewClient = WebViewClient()
+        binding.webView.setWebViewClient(object : SafeWebViewClient() {})
         binding.webView.loadDataWithBaseURL(null, html, "text/html", "UTF-8", null)
     }
 
+    override fun onWebViewRecreated(webView: WebView) {
+        lastReport?.let { updateWebView(it) }
+    }
+
+    @CallSuper
+    override fun onDestroyView() {
+        binding.webView.safeDestroy()
+        super.onDestroyView()
+    }
+
     private fun setupButtonListeners() {
         binding.tagMissingMediaButton.apply {
             // mediaCheckAddTag => "Tag Missing"
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/model/SortType.kt b/AnkiDroid/src/main/java/com/ichi2/anki/model/SortType.kt
index 9a6f682fff36..bf864be3e6a8 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/model/SortType.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/model/SortType.kt
@@ -9,6 +9,10 @@ import com.ichi2.anki.CardBrowser
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.R
 import com.ichi2.anki.browser.BrowserColumnKey
+import com.ichi2.anki.common.utils.ext.browserSortCardsBackwards
+import com.ichi2.anki.common.utils.ext.browserSortCardsColumn
+import com.ichi2.anki.common.utils.ext.browserSortNotesBackwards
+import com.ichi2.anki.common.utils.ext.browserSortNotesColumn
 import com.ichi2.anki.libanki.BrowserConfig
 import com.ichi2.anki.libanki.SortOrder
 import com.ichi2.anki.model.CardsOrNotes.NOTES
@@ -50,13 +54,18 @@ sealed class SortType : Parcelable {
         when (this) {
             is NoOrdering -> Prefs.cardBrowserNoSorting = true
             is CollectionOrdering -> {
-                val isNotesMode = cardsOrNotes == NOTES
-
-                val sortKey = BrowserConfig.sortColumnKey(isNotesMode)
-                val reverseKey = BrowserConfig.sortBackwardsKey(isNotesMode)
-
-                withCol { config.set(sortKey, this@SortType.key.value) }
-                withCol { config.set(reverseKey, this@SortType.reverse) }
+                withCol {
+                    when (cardsOrNotes) {
+                        CardsOrNotes.CARDS -> {
+                            config.browserSortCardsColumn = this@SortType.key.value
+                            config.browserSortCardsBackwards = this@SortType.reverse
+                        }
+                        NOTES -> {
+                            config.browserSortNotesColumn = this@SortType.key.value
+                            config.browserSortNotesBackwards = this@SortType.reverse
+                        }
+                    }
+                }
 
                 Prefs.cardBrowserNoSorting = false
             }
@@ -103,16 +112,12 @@ var PrefsRepository.cardBrowserNoSorting: Boolean
         putBoolean(R.string.pref_browser_no_sorting, value)
     }
 
-private suspend fun getBrowserColumnKey(cardsOrNotes: CardsOrNotes): String {
-    val isNotesMode = cardsOrNotes == NOTES
-    val sortKey = BrowserConfig.sortColumnKey(isNotesMode)
-
-    return withCol { config.get<String>(sortKey) } ?: "noteFld"
-}
-
-private suspend fun getSortBackwards(cardsOrNotes: CardsOrNotes): Boolean {
-    val isNotesMode = cardsOrNotes == NOTES
-    val sortBackwardsKey = BrowserConfig.sortBackwardsKey(isNotesMode)
+private suspend fun getBrowserColumnKey(cardsOrNotes: CardsOrNotes): String =
+    withCol {
+        if (cardsOrNotes == NOTES) config.browserSortNotesColumn else config.browserSortCardsColumn
+    }
 
-    return withCol { config.get<Boolean>(sortBackwardsKey) } ?: false
-}
+private suspend fun getSortBackwards(cardsOrNotes: CardsOrNotes): Boolean =
+    withCol {
+        if (cardsOrNotes == NOTES) config.browserSortNotesBackwards else config.browserSortCardsBackwards
+    }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/ExternalImageEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/ExternalImageEditor.kt
new file mode 100644
index 000000000000..eac55a832e04
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/ExternalImageEditor.kt
@@ -0,0 +1,191 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.multimedia
+
+import android.app.Activity
+import android.content.ClipData
+import android.content.ContentResolver
+import android.content.Context
+import android.content.Intent
+import android.graphics.BitmapFactory
+import android.net.Uri
+import android.provider.MediaStore
+import android.webkit.MimeTypeMap
+import androidx.activity.result.ActivityResult
+import androidx.core.content.FileProvider
+import com.ichi2.anki.utils.runWithOOMCheck
+import com.ichi2.utils.openInputStreamSafe
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.withContext
+import org.apache.commons.io.FileUtils
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
+
+/** File operations for external editing. Only the working copy is writable by the editor. */
+internal class ExternalImageEditor(
+    private val context: Context,
+    private val cacheDirectory: File,
+) {
+    /** A writable image copy and the chooser intent used to launch its external editor. */
+    data class Prepared(
+        val file: File,
+        val intent: Intent,
+    )
+
+    /** Return whether the source can be shared with an available external image editor. */
+    suspend fun canEdit(source: File): Boolean =
+        withContext(Dispatchers.IO) {
+            try {
+                createEditIntent(source, imageMimeType(source)).resolveActivity(context.packageManager) != null
+            } catch (e: IllegalArgumentException) {
+                Timber.w(e, "Unable to share image with an external editor")
+                false
+            }
+        }
+
+    /** Create a writable copy of the source and a chooser intent for editing it externally. */
+    suspend fun prepare(source: File): Prepared {
+        var copy: File? = null
+        try {
+            return withContext(Dispatchers.IO) {
+                val mimeType = imageMimeType(source)
+                val extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType) ?: source.extension
+                val file = File.createTempFile("img", ".$extension", cacheDirectory)
+                copy = file
+                source.copyTo(file, overwrite = true)
+                Prepared(
+                    file,
+                    Intent.createChooser(createEditIntent(file, mimeType), null),
+                )
+            }
+        } catch (e: Exception) {
+            withContext(NonCancellable + Dispatchers.IO) { copy?.delete() }
+            if (e is CancellationException) throw e
+            throw IOException("Unable to prepare image for external editing", e)
+        }
+    }
+
+    private fun uriForFile(file: File): Uri = FileProvider.getUriForFile(context, "${context.packageName}.apkgfileprovider", file)
+
+    private fun imageMimeType(file: File): String {
+        MimeTypeMap
+            .getSingleton()
+            .getMimeTypeFromExtension(file.extension.lowercase())
+            ?.takeIf { it.startsWith("image/") }
+            ?.let { return it }
+        return imageMimeTypeFromHeader(file) ?: "image/*"
+    }
+
+    /** Read the MIME type from image headers, or return null if reading or decoding fails or runs out of memory. */
+    private fun imageMimeTypeFromHeader(file: File): String? =
+        runWithOOMCheck(
+            action = {
+                try {
+                    val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+                    file.inputStream().use { BitmapFactory.decodeStream(it, null, options) }
+                    options.outMimeType?.takeIf { options.outWidth > 0 && options.outHeight > 0 }
+                } catch (e: IOException) {
+                    Timber.w(e, "Unable to read image headers")
+                    null
+                }
+            },
+            onError = { Timber.w(it, "Unable to read image headers") },
+        )
+
+    private fun createEditIntent(
+        file: File,
+        mimeType: String,
+    ): Intent =
+        Intent(Intent.ACTION_EDIT).apply {
+            val uri = uriForFile(file)
+            setDataAndType(uri, mimeType)
+            // Google Photos requires an explicit output URI for FileProvider images.
+            putExtra(MediaStore.EXTRA_OUTPUT, uri)
+            clipData = ClipData.newRawUri("image", uri)
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+        }
+
+    /**
+     * Import into a unique file, or return null on cancellation or unchanged contents.
+     *
+     * @param original the unmodified source image used to detect unchanged results.
+     * @param copy the writable copy shared with the editor.
+     * @param result the activity result from the editor, optionally containing an output URI.
+     */
+    suspend fun readResult(
+        original: File,
+        copy: File,
+        result: ActivityResult,
+    ): File? {
+        // An editor may write before the user cancels; only a successful result applies those changes.
+        if (result.resultCode != Activity.RESULT_OK) return null
+        var accepted: File? = null
+        try {
+            return withContext(Dispatchers.IO) {
+                // Some editors modify the supplied URI; others return a new content URI.
+                val returnedUri = result.data?.data?.takeUnless { it == uriForFile(copy) }
+                returnedUri?.let(::validateReturnedUri)
+                // Never trust provider display names as paths or allow them to overwrite an existing image.
+                val destination = File.createTempFile("img", null, cacheDirectory)
+                accepted = destination
+                if (returnedUri == null) {
+                    // Detach the accepted image from the file the external app could still write to.
+                    copy.copyTo(destination, overwrite = true)
+                } else {
+                    val input =
+                        context.contentResolver.openInputStreamSafe(returnedUri)
+                            ?: throw IOException("Unable to open externally edited image")
+                    input.use { source -> destination.outputStream().use { source.copyTo(it) } }
+                }
+                if (destination.length() == 0L) throw IOException("External editor returned an empty image")
+                if (FileUtils.contentEquals(original, destination)) {
+                    destination.delete()
+                    null
+                } else {
+                    // Validate the copied bytes; provider MIME types and the working extension can be wrong.
+                    val mimeType =
+                        imageMimeTypeFromHeader(destination)?.takeIf { it.startsWith("image/") }
+                            ?: throw IOException("External editor did not return a decodable image")
+                    val extension =
+                        MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType)
+                            ?: throw IOException("External editor returned an unsupported image type: $mimeType")
+                    val image = File.createTempFile("img", ".$extension", cacheDirectory)
+                    if (!destination.renameTo(image)) {
+                        image.delete()
+                        throw IOException("Unable to rename externally edited image")
+                    }
+                    accepted = image
+                    image
+                }
+            }
+        } catch (e: Exception) {
+            withContext(NonCancellable + Dispatchers.IO) { accepted?.delete() }
+            if (e is CancellationException) throw e
+            throw IOException("Unable to read externally edited image", e)
+        }
+    }
+
+    private fun validateReturnedUri(uri: Uri) {
+        if (uri.scheme != ContentResolver.SCHEME_CONTENT) {
+            throw IOException("External editor returned an unsupported URI")
+        }
+        // Do not use our privileges to read an unshared file from our own providers.
+        val authority = uri.authority?.substringAfterLast('@')
+        if (authority != null && context.packageManager.resolveContentProvider(authority, 0)?.packageName == context.packageName) {
+            throw IOException("External editor returned an unshared internal URI")
+        }
+    }
+
+    /** Revoke access even when the owning screen was closed during an operation. */
+    suspend fun clear(file: File?) =
+        withContext(NonCancellable + Dispatchers.IO) {
+            file?.let {
+                context.revokeUriPermission(uriForFile(it), Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+                it.delete()
+            }
+            Unit
+        }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/ExternalImageEditorViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/ExternalImageEditorViewModel.kt
new file mode 100644
index 000000000000..36a3576b9621
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/ExternalImageEditorViewModel.kt
@@ -0,0 +1,148 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.multimedia
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Parcelable
+import androidx.activity.result.ActivityResult
+import androidx.annotation.StringRes
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.ichi2.anki.CommonString
+import com.ichi2.anki.utils.ViewModelSavedStateHandle
+import kotlinx.coroutines.CoroutineStart
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlinx.parcelize.Parcelize
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
+
+/** Retains only the external-edit operation, including results delivered during recreation. */
+internal class ExternalImageEditorViewModel(
+    private val savedState: ViewModelSavedStateHandle,
+    val editor: ExternalImageEditor,
+) : ViewModel() {
+    val state: StateFlow<Edit?> = savedState.getStateFlow("externalEdit", null)
+
+    init {
+        resumeOperation()
+    }
+
+    fun prepare(source: File) {
+        if (state.value != null) return
+        update(Edit.Preparing(source.absolutePath))
+        resumeOperation()
+    }
+
+    fun launched() {
+        val ready = state.value as? Edit.Ready ?: return
+        update(Edit.Editing(ready.originalPath, ready.workingPath))
+    }
+
+    fun readResult(result: ActivityResult) {
+        val edit = state.value as? Edit.Editing ?: return
+        // Retain only the URI; editor extras can contain bitmaps that exceed saved-state limits.
+        val pendingResult = ActivityResult(result.resultCode, result.data?.data?.let { Intent().setData(it) })
+        update(Edit.Importing(edit.originalPath, edit.workingPath, pendingResult))
+        resumeOperation()
+    }
+
+    fun launchFailed() {
+        val edit = state.value ?: return
+        update(Edit.Finished(edit.originalPath, edit.workingPath, error = CommonString.activity_start_failed))
+    }
+
+    /** The fragment has displayed the result (or error); release only the editor's working copy. */
+    fun consumed() {
+        val edit = state.value as? Edit.Finished ?: return
+        update(null)
+        viewModelScope.launch(start = CoroutineStart.UNDISPATCHED) { editor.clear(edit.workingPath?.let(::File)) }
+    }
+
+    /** Release files on dismissal; clearing a ViewModel alone can still be followed by restoration. */
+    fun discard() {
+        viewModelScope.cancel()
+        val edit = state.value
+        // Fragment destruction can follow ViewModel clearing, so cleanup must also work in a cancelled scope.
+        viewModelScope.launch(start = CoroutineStart.UNDISPATCHED) {
+            withContext(NonCancellable) {
+                editor.clear(edit?.workingPath?.let(::File))
+                editor.clear((edit as? Edit.Finished)?.acceptedPath?.let(::File))
+            }
+        }
+    }
+
+    private fun update(edit: Edit?) {
+        savedState["externalEdit"] = edit
+    }
+
+    private fun resumeOperation() {
+        val edit = state.value ?: return
+        if (edit !is Edit.Preparing && edit !is Edit.Importing) return
+        viewModelScope.launch {
+            try {
+                update(
+                    when (edit) {
+                        is Edit.Preparing -> {
+                            val prepared = editor.prepare(File(edit.originalPath))
+                            Edit.Ready(edit.originalPath, prepared.file.absolutePath, prepared.intent)
+                        }
+                        is Edit.Importing -> {
+                            val accepted = editor.readResult(File(edit.originalPath), File(edit.workingPath), edit.result)
+                            Edit.Finished(
+                                edit.originalPath,
+                                edit.workingPath,
+                                accepted?.absolutePath,
+                                unchanged = edit.result.resultCode == Activity.RESULT_OK && accepted == null,
+                            )
+                        }
+                    },
+                )
+            } catch (e: IOException) {
+                Timber.w(e, "External image editing failed")
+                update(Edit.Finished(edit.originalPath, edit.workingPath, error = CommonString.multimedia_editor_something_wrong))
+            }
+        }
+    }
+
+    /** Only file paths and the pending Android result are saved, never image contents. */
+    @Parcelize
+    sealed class Edit : Parcelable {
+        abstract val originalPath: String
+        open val workingPath: String? get() = null
+
+        data class Preparing(
+            override val originalPath: String,
+        ) : Edit()
+
+        data class Ready(
+            override val originalPath: String,
+            override val workingPath: String,
+            val intent: Intent,
+        ) : Edit()
+
+        data class Editing(
+            override val originalPath: String,
+            override val workingPath: String,
+        ) : Edit()
+
+        data class Importing(
+            override val originalPath: String,
+            override val workingPath: String,
+            val result: ActivityResult,
+        ) : Edit()
+
+        data class Finished(
+            override val originalPath: String,
+            override val workingPath: String?,
+            val acceptedPath: String? = null,
+            @StringRes val error: Int? = null,
+            val unchanged: Boolean = false,
+        ) : Edit()
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/ImageEditorToolbar.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/ImageEditorToolbar.kt
index 871e7c6a9b6e..dd7093865113 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/ImageEditorToolbar.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/ImageEditorToolbar.kt
@@ -3,7 +3,6 @@
 package com.ichi2.anki.multimedia
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -33,6 +32,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
+import com.ichi2.anki.ui.internationalization.tr
 import com.ichi2.compose.ui.preview.AnkiDroidPreview
 import com.ichi2.compose.ui.preview.ThemePreviews
 
@@ -41,25 +41,51 @@ import com.ichi2.compose.ui.preview.ThemePreviews
  *
  * * Replace
  * * Crop
+ * * Edit
  */
 @Composable
 internal fun ImageEditorToolbar(
     hasImage: Boolean,
+    hasExternalEditor: Boolean,
     @DrawableRes replaceIcon: Int,
     onReplace: () -> Unit,
     onCrop: () -> Unit,
+    onEditExternally: () -> Unit,
     modifier: Modifier = Modifier,
+    enabled: Boolean = true,
 ) {
     Box(modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 12.dp), contentAlignment = Alignment.Center) {
         Surface(
-            modifier = Modifier.widthIn(max = 240.dp).fillMaxWidth(),
+            modifier = Modifier.widthIn(max = if (hasExternalEditor) 360.dp else 240.dp).fillMaxWidth(),
             shape = RoundedCornerShape(24.dp),
             color = MaterialTheme.colorScheme.surfaceContainer,
         ) {
             Row(modifier = Modifier.padding(horizontal = 4.dp), verticalAlignment = Alignment.CenterVertically) {
-                ImageEditorAction(CommonString.dialog_positive_replace, replaceIcon, onReplace, Modifier.weight(1f))
+                ImageEditorAction(
+                    stringResource(CommonString.dialog_positive_replace),
+                    replaceIcon,
+                    onReplace,
+                    Modifier.weight(1f),
+                    enabled = enabled,
+                )
                 ImageEditorDivider()
-                ImageEditorAction(CommonString.crop_button, R.drawable.ic_crop, onCrop, Modifier.weight(1f), enabled = hasImage)
+                ImageEditorAction(
+                    stringResource(CommonString.crop_button),
+                    R.drawable.ic_crop,
+                    onCrop,
+                    Modifier.weight(1f),
+                    enabled = enabled && hasImage,
+                )
+                if (hasExternalEditor) {
+                    ImageEditorDivider()
+                    ImageEditorAction(
+                        tr().studyingEdit(),
+                        R.drawable.ic_round_open_in_new,
+                        onEditExternally,
+                        Modifier.weight(1f),
+                        enabled = enabled && hasImage,
+                    )
+                }
             }
         }
     }
@@ -67,7 +93,7 @@ internal fun ImageEditorToolbar(
 
 @Composable
 private fun ImageEditorAction(
-    @StringRes label: Int,
+    label: String,
     @DrawableRes icon: Int,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
@@ -82,7 +108,7 @@ private fun ImageEditorAction(
     ) {
         Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(2.dp)) {
             Icon(painterResource(icon), contentDescription = null, modifier = Modifier.size(22.dp))
-            Text(stringResource(label), style = MaterialTheme.typography.labelMedium, textAlign = TextAlign.Center)
+            Text(label, style = MaterialTheme.typography.labelMedium, textAlign = TextAlign.Center)
         }
     }
 }
@@ -113,6 +139,13 @@ private fun EmptyImageEditorToolbarPreview() {
 @Composable
 private fun ImageEditorToolbarPreviewContent(hasImage: Boolean) {
     AnkiDroidPreview {
-        ImageEditorToolbar(hasImage = hasImage, replaceIcon = R.drawable.ic_photo_library, onReplace = {}, onCrop = {})
+        ImageEditorToolbar(
+            hasImage = hasImage,
+            hasExternalEditor = hasImage,
+            replaceIcon = R.drawable.ic_photo_library,
+            onReplace = {},
+            onCrop = {},
+            onEditExternally = {},
+        )
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaActivity.kt
index 78ddc8436212..c470f94a5770 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaActivity.kt
@@ -10,6 +10,9 @@ import android.os.Bundle
 import android.view.View
 import androidx.activity.SystemBarStyle
 import androidx.activity.enableEdgeToEdge
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@@ -63,6 +66,8 @@ class MultimediaActivity :
     BaseSnackbarBuilderProvider {
     private val binding by viewBinding(ActivityMultimediaBinding::bind)
 
+    internal var isImageEditorBusy by mutableStateOf(false)
+
     override val analyticsScreenName: String
         get() = intent.getStringExtra(EXTRA_FRAGMENT_NAME)?.substringAfterLast('.') ?: super.analyticsScreenName
 
@@ -127,7 +132,7 @@ class MultimediaActivity :
             setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
             setContent {
                 AnkiDroidTheme {
-                    HeroToolbarActionButton(onClick = {
+                    HeroToolbarActionButton(enabled = !isImageEditorBusy, onClick = {
                         val fragment = supportFragmentManager.findFragmentById(R.id.fragment_container) as? MultimediaImageFragment
                         fragment?.onDone()
                     })
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaImageFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaImageFragment.kt
index 8a6b54c8cc0c..57d242fa301a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaImageFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/multimedia/MultimediaImageFragment.kt
@@ -14,6 +14,7 @@ import android.graphics.drawable.BitmapDrawable
 import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
+import android.text.format.Formatter
 import android.view.View
 import android.webkit.WebView
 import androidx.activity.result.contract.ActivityResultContracts
@@ -21,13 +22,17 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.core.os.BundleCompat
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.DrawingFragment
@@ -45,12 +50,13 @@ import com.ichi2.anki.multimedia.MultimediaUtils.createNewCacheImageFile
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.anki.utils.ext.convertToString
 import com.ichi2.anki.utils.ext.toBase64Png
+import com.ichi2.anki.utils.savedStateViewModelFactory
 import com.ichi2.anki.workarounds.OnWebViewRecreatedListener
 import com.ichi2.anki.workarounds.SafeWebViewClient
 import com.ichi2.anki.workarounds.SafeWebViewLayout
 import com.ichi2.compose.theme.AnkiDroidTheme
 import com.ichi2.imagecropper.ImageCropper
-import com.ichi2.imagecropper.ImageCropper.Companion.CROP_IMAGE_RESULT
+import com.ichi2.imagecropper.ImageCropper.Companion.EXTRA_CROP_IMAGE_RESULT
 import com.ichi2.utils.BitmapUtil
 import com.ichi2.utils.ExifUtil
 import com.ichi2.utils.FileUtil
@@ -62,6 +68,7 @@ import com.ichi2.utils.show
 import dev.androidbroadcast.vbpd.viewBinding
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
@@ -91,6 +98,25 @@ class MultimediaImageFragment :
     /** Keeps track of the process in case `Don't keep activities` in turned on*/
     private var hasStartedImageSelection = false
 
+    private val externalEditorViewModel by viewModels<ExternalImageEditorViewModel> {
+        savedStateViewModelFactory { state ->
+            ExternalImageEditorViewModel(
+                state,
+                ExternalImageEditor(requireContext().applicationContext, File(requireNotNull(ankiCacheDirectory))),
+            )
+        }
+    }
+
+    private val externalImageEditor get() = externalEditorViewModel.editor
+
+    @VisibleForTesting
+    internal val isExternalEditPending get() = externalEditorViewModel.state.value != null
+
+    private val externalEditorLauncher =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            externalEditorViewModel.readResult(result)
+        }
+
     /**
      * Launches an activity to pick an image from the device's gallery.
      * This launcher is registered using `ActivityResultContracts.StartActivityForResult()`.
@@ -164,6 +190,8 @@ class MultimediaImageFragment :
                 else -> {
                     Timber.d("Camera aborted or some interruption, restoring multimedia data")
                     viewModel.restoreMultimedia()
+                    viewModel.currentMultimediaPath.value?.let(::updateAndDisplayImageSize)
+                    viewModel.currentMultimediaUri.value?.let(::previewImage)
                 }
             }
         }
@@ -177,7 +205,7 @@ class MultimediaImageFragment :
                 Activity.RESULT_OK -> {
                     result.data?.let {
                         val cropResultData =
-                            it.getParcelableExtraCompat<ImageCropper.CropResultData>(CROP_IMAGE_RESULT)
+                            it.getParcelableExtraCompat<ImageCropper.CropResultData>(EXTRA_CROP_IMAGE_RESULT)
                         Timber.d("Cropped image data: $cropResultData")
 
                         if (cropResultData?.uriPath == null || cropResultData.uriContent == null) return@registerForActivityResult
@@ -199,8 +227,21 @@ class MultimediaImageFragment :
             setContent {
                 AnkiDroidTheme {
                     val imageUri by viewModel.currentMultimediaUri.collectAsStateWithLifecycle()
+                    val externalEdit by externalEditorViewModel.state.collectAsStateWithLifecycle()
+                    val editorAvailability =
+                        remember(viewModel, externalImageEditor) {
+                            viewModel.currentMultimediaPath.map { image ->
+                                image?.let { externalImageEditor.canEdit(it) } ?: false
+                            }
+                        }
+                    val hasExternalEditor by editorAvailability.collectAsStateWithLifecycle(
+                        initialValue = false,
+                        minActiveState = Lifecycle.State.RESUMED,
+                    )
                     ImageEditorToolbar(
                         hasImage = imageUri != null,
+                        hasExternalEditor = hasExternalEditor,
+                        enabled = externalEdit == null,
                         replaceIcon =
                             when (selectedImageOptions) {
                                 ImageOptions.GALLERY -> R.drawable.ic_photo_library
@@ -215,6 +256,7 @@ class MultimediaImageFragment :
                             )
                             requestCrop()
                         },
+                        onEditExternally = ::requestExternalEdit,
                     )
                 }
             }
@@ -246,6 +288,11 @@ class MultimediaImageFragment :
             return
         }
 
+        externalEditorViewModel.state.value?.originalPath?.let(::File)?.let {
+            viewModel.updateCurrentMultimediaPath(it)
+            viewModel.updateCurrentMultimediaUri(getUriForFile(it))
+        }
+
         arguments?.let {
             selectedImageOptions = it.getSerializableCompat<ImageOptions>(EXTRA_MEDIA_OPTIONS) as ImageOptions
         }
@@ -257,9 +304,16 @@ class MultimediaImageFragment :
     ) {
         super.onViewCreated(view, savedInstanceState)
         setupImageActions()
+        observeExternalEdit()
 
         setupWebView()
-        handleImageUri()
+        val currentImage = viewModel.currentMultimediaPath.value
+        if (currentImage != null) {
+            previewImage(getUriForFile(currentImage))
+            updateAndDisplayImageSize(currentImage)
+        } else {
+            handleImageUri()
+        }
     }
 
     @NeedsTest("Verify the webview background color is transparent and matches the app theme")
@@ -283,8 +337,20 @@ class MultimediaImageFragment :
         outState.putBoolean("HAS_STARTED_IMAGE_SELECTION", hasStartedImageSelection)
     }
 
+    override fun onDestroy() {
+        if (isRemoving || activity?.isFinishing == true) {
+            externalEditorViewModel.discard()
+        }
+        super.onDestroy()
+    }
+
     private fun handleImageUri() {
-        if (imageUri != null) {
+        val currentImageUri = viewModel.currentMultimediaUri.value
+        if (currentImageUri != null) {
+            // The launch URI is only the initial image; cropping or replacement may have changed it.
+            previewImage(currentImageUri)
+            binding.imageFileSize.text = Formatter.formatFileSize(requireContext(), viewModel.selectedMediaFileSize)
+        } else if (imageUri != null) {
             // a content:// or a file:// already in our cache; resolveUriToFile handles both
             handleSelectImageIntent(imageUri)
         } else {
@@ -318,6 +384,7 @@ class MultimediaImageFragment :
 
     internal fun onDone() {
         Timber.d("MultimediaImageFragment:: Done button pressed")
+        if (isExternalEditPending) return
         if (viewModel.selectedMediaFileSize == 0L) {
             Timber.d("Image length is not valid")
             return
@@ -379,7 +446,7 @@ class MultimediaImageFragment :
         val imageUri =
             BundleCompat.getParcelable(
                 intent.extras!!,
-                DrawingFragment.IMAGE_PATH_KEY,
+                DrawingFragment.EXTRA_IMAGE_PATH,
                 Uri::class.java,
             )
 
@@ -605,8 +672,9 @@ class MultimediaImageFragment :
         Timber.i("Loading non-SVG image using WebView")
 
         try {
-            // read our own cache file directly, internalize anything else
-            val internalFile = (cachedFileOrNull(imageUri) ?: internalizeUri(imageUri))?.takeIf { it.exists() }
+            // Reuse the selected file for its FileProvider URI: importing it could copy it onto itself.
+            val selectedFile = viewModel.currentMultimediaPath.value?.takeIf { getUriForFile(it) == imageUri }
+            val internalFile = (selectedFile ?: cachedFileOrNull(imageUri) ?: internalizeUri(imageUri))?.takeIf { it.exists() }
             if (internalFile == null) {
                 Timber.w("loadImage() unable to resolve image from Uri %s", imageUri)
                 showSomethingWentWrong()
@@ -658,6 +726,51 @@ class MultimediaImageFragment :
         binding.multimediaWebView.loadDataWithBaseURL(null, errorHtml, "text/html", "UTF-8", null)
     }
 
+    @VisibleForTesting
+    internal fun requestExternalEdit() {
+        viewModel.currentMultimediaPath.value?.let(externalEditorViewModel::prepare)
+    }
+
+    private fun observeExternalEdit() {
+        fun handleEditState(edit: ExternalImageEditorViewModel.Edit?) {
+            (activity as? MultimediaActivity)?.isImageEditorBusy = edit != null
+            when (edit) {
+                is ExternalImageEditorViewModel.Edit.Ready -> {
+                    externalEditorViewModel.launched()
+                    hasStartedImageSelection = true
+                    try {
+                        externalEditorLauncher.launch(edit.intent)
+                    } catch (e: ActivityNotFoundException) {
+                        Timber.w(e, "No app found to edit image")
+                        externalEditorViewModel.launchFailed()
+                    }
+                }
+                is ExternalImageEditorViewModel.Edit.Finished -> {
+                    edit.acceptedPath?.let(::File)?.let { accepted ->
+                        val uri = getUriForFile(accepted)
+                        viewModel.updateCurrentMultimediaPath(accepted)
+                        viewModel.updateCurrentMultimediaUri(uri)
+                        updateAndDisplayImageSize(accepted)
+                        previewImage(uri)
+                    }
+                    edit.error?.let { showSnackbar(it) }
+                    if (edit.unchanged) {
+                        showSnackbar(CommonString.external_image_editor_no_changes)
+                    }
+                    hasStartedImageSelection = false
+                    externalEditorViewModel.consumed()
+                }
+                else -> Unit
+            }
+        }
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                externalEditorViewModel.state.collect(::handleEditState)
+            }
+        }
+    }
+
     private fun requestCrop() {
         val imageUri = viewModel.currentMultimediaUri.value ?: return
         Timber.i("launching crop")
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/multiprofile/ProfileManager.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multiprofile/ProfileManager.kt
index 683525a8d8bc..1ab9b041c851 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/multiprofile/ProfileManager.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/multiprofile/ProfileManager.kt
@@ -13,6 +13,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.edit
 import com.ichi2.anki.common.crashreporting.CrashReportService
 import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.anki.common.storage.AnkiDroidFolder
 import com.ichi2.anki.common.storage.CollectionHelper.PREF_COLLECTION_PATH
 import com.ichi2.anki.common.time.TimeManager
 import com.ichi2.anki.common.time.getTimestamp
@@ -79,16 +80,18 @@ class ProfileManager private constructor(
      * @param displayName The name to be associated with the new profile.
      * @return The unique [ProfileId] assigned to the newly created profile.
      *
+     * @throws IllegalArgumentException if another profile already uses [displayName], ignoring case.
      * @throws Exception if profile creation or persistence fails.
      */
     fun createNewProfile(displayName: ProfileName): ProfileId {
+        require(!isNameTaken(displayName)) { "Profile name is already in use" }
         val newProfileId = generateUniqueProfileId()
 
         val metadata = ProfileMetadata(displayName = displayName)
 
         profileRegistry.saveProfile(newProfileId, metadata)
 
-        Timber.i("Created new profile: ${displayName.value} (${newProfileId.value})")
+        Timber.i("Created new profile: ${newProfileId.value}")
         return newProfileId
     }
 
@@ -101,6 +104,11 @@ class ProfileManager private constructor(
      */
     fun getAllProfiles(): Map<ProfileId, ProfileMetadata> = profileRegistry.getAllProfiles()
 
+    private fun isNameTaken(
+        name: ProfileName,
+        ignoring: ProfileId? = null,
+    ): Boolean = name.existsIn(getAllProfiles().filterKeys { it != ignoring }.values.map { it.displayName.value })
+
     /**
      * Generates a unique [ProfileId] that does not collide with existing profiles.
      *
@@ -194,7 +202,11 @@ class ProfileManager private constructor(
         if (prefs.getString(PREF_COLLECTION_PATH, null) != null) return
 
         val profileCollectionDir =
-            getDefaultAnkiDroidDirectory(profileContext, directoryName = profileId.value).apply { mkdirs() }
+            getDefaultAnkiDroidDirectory(
+                profileContext,
+                directoryName = profileId.value,
+                folder = AnkiDroidFolder.APP_PRIVATE,
+            ).apply { mkdirs() }
 
         prefs.edit { putString(PREF_COLLECTION_PATH, profileCollectionDir.absolutePath) }
     }
@@ -293,7 +305,8 @@ class ProfileManager private constructor(
      * @param newDisplayName  The new user-facing name.
      *
      * @throws IllegalArgumentException if [profileId] does not
-     *   exist in the registry.
+     *   exist in the registry, or another profile already uses
+     *   [newDisplayName], ignoring case.
      */
     fun renameProfile(
         profileId: ProfileId,
@@ -310,6 +323,8 @@ class ProfileManager private constructor(
             return
         }
 
+        require(!isNameTaken(newDisplayName, ignoring = profileId)) { "Profile name is already in use" }
+
         val updated = existing.copy(displayName = newDisplayName)
         profileRegistry.saveProfile(profileId, updated)
 
@@ -577,7 +592,7 @@ class ProfileManager private constructor(
         private val globalPrefs: SharedPreferences,
     ) {
         fun getLastActiveProfileId(): ProfileId? {
-            val id = globalPrefs.getString(KEY_LAST_ACTIVE_PROFILE_ID, null)
+            val id = globalPrefs.getString(PREF_LAST_ACTIVE_PROFILE_ID, null)
             return id?.let { ProfileId(it) }
         }
 
@@ -585,16 +600,16 @@ class ProfileManager private constructor(
             id: ProfileId,
             commit: Boolean = false,
         ) {
-            globalPrefs.edit(commit = commit) { putString(KEY_LAST_ACTIVE_PROFILE_ID, id.value) }
+            globalPrefs.edit(commit = commit) { putString(PREF_LAST_ACTIVE_PROFILE_ID, id.value) }
         }
 
         fun getWebViewProfileId(): ProfileId? {
-            val id = globalPrefs.getString(KEY_WEBVIEW_PROFILE_ID, null)
+            val id = globalPrefs.getString(PREF_WEBVIEW_PROFILE_ID, null)
             return id?.let { ProfileId(it) }
         }
 
         fun setWebViewProfileId(id: ProfileId) {
-            globalPrefs.edit { putString(KEY_WEBVIEW_PROFILE_ID, id.value) }
+            globalPrefs.edit { putString(PREF_WEBVIEW_PROFILE_ID, id.value) }
         }
 
         /**
@@ -616,7 +631,7 @@ class ProfileManager private constructor(
             globalPrefs.edit {
                 putString(id.value, metadata.toJson())
                 if (isActive) {
-                    putString(KEY_LAST_ACTIVE_PROFILE_ID, id.value)
+                    putString(PREF_LAST_ACTIVE_PROFILE_ID, id.value)
                 }
             }
         }
@@ -635,7 +650,7 @@ class ProfileManager private constructor(
          * Retrieves all registered profiles from the global SharedPreferences.
          *
          * Iterates over all stored entries, skipping the
-         * [KEY_LAST_ACTIVE_PROFILE_ID] metadata key, and deserializes each
+         * [PREF_LAST_ACTIVE_PROFILE_ID] metadata key, and deserializes each
          * value into a [ProfileMetadata] instance. Entries that fail to parse
          * are logged and silently skipped.
          *
@@ -690,13 +705,13 @@ class ProfileManager private constructor(
     companion object {
         private const val MAX_ATTEMPTS = 10
         const val PROFILE_REGISTRY_FILENAME = "profiles_prefs"
-        const val KEY_LAST_ACTIVE_PROFILE_ID = "last_active_profile_id"
+        const val PREF_LAST_ACTIVE_PROFILE_ID = "last_active_profile_id"
 
         /** Profile whose data the shared WebView storage currently holds. Pre-API 28 only. */
-        const val KEY_WEBVIEW_PROFILE_ID = "webview_profile_id"
+        const val PREF_WEBVIEW_PROFILE_ID = "webview_profile_id"
 
         /** Registry keys that are not profile entries. */
-        private val BOOKKEEPING_KEYS = setOf(KEY_LAST_ACTIVE_PROFILE_ID, KEY_WEBVIEW_PROFILE_ID)
+        private val BOOKKEEPING_KEYS = setOf(PREF_LAST_ACTIVE_PROFILE_ID, PREF_WEBVIEW_PROFILE_ID)
 
         const val DEFAULT_PROFILE_DISPLAY_NAME = "Default"
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/multiprofile/ProfileName.kt b/AnkiDroid/src/main/java/com/ichi2/anki/multiprofile/ProfileName.kt
index 16f1f7865f2f..e694763cfd77 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/multiprofile/ProfileName.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/multiprofile/ProfileName.kt
@@ -16,6 +16,15 @@ value class ProfileName private constructor(
 ) {
     override fun toString(): String = value
 
+    /**
+     * Whether [names] already contains this name, ignoring case.
+     *
+     * Stricter than Anki Desktop, which compares with SQLite's `NOCASE` and only folds ASCII:
+     * `Ä` and `ä` are two names there but one name here. Profile names are never shared
+     * with Desktop, so the two checks never have to agree.
+     */
+    fun existsIn(names: Iterable<String>): Boolean = names.any { it.equals(value, ignoreCase = true) }
+
     companion object {
         const val MAX_LENGTH = 50
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/navigation/AnkiDroidNavigator.kt b/AnkiDroid/src/main/java/com/ichi2/anki/navigation/AnkiDroidNavigator.kt
index 465edb896116..86ac926f4572 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/navigation/AnkiDroidNavigator.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/navigation/AnkiDroidNavigator.kt
@@ -18,10 +18,12 @@ import com.ichi2.anki.common.destinations.PreferencesDestination
 import com.ichi2.anki.common.destinations.ReviewDeckDestination
 import com.ichi2.anki.common.destinations.StatisticsDestination
 import com.ichi2.anki.common.destinations.StudyOptionsDestination
+import com.ichi2.anki.common.destinations.WidgetConfigDestination
 import com.ichi2.anki.noteeditor.toIntent
 import com.ichi2.anki.pages.toIntent
 import com.ichi2.anki.preferences.toIntent
 import com.ichi2.anki.toIntent
+import com.ichi2.widget.toIntent
 
 /** AnkiDroid's [Navigator] implementation. */
 object AnkiDroidNavigator : Navigator {
@@ -44,6 +46,7 @@ object AnkiDroidNavigator : Navigator {
             is ReviewDeckDestination -> destination.toIntent(navContext)
             is StatisticsDestination -> destination.toIntent(navContext)
             is StudyOptionsDestination -> destination.toIntent(navContext)
+            is WidgetConfigDestination -> destination.toIntent(navContext)
         }
 }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/AudioRecordingViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/AudioRecordingViewModel.kt
index cf11c0fd590d..8b1db2d55ee7 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/AudioRecordingViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/AudioRecordingViewModel.kt
@@ -26,7 +26,7 @@ import kotlin.time.Duration.Companion.seconds
 class AudioRecordingViewModel(
     audioRecorder: AudioRecorder = AudioRecorder(appContext),
     createPlayer: () -> Player = { VoicePlayer.createExoPlayer(appContext) },
-    recordingsDirectory: File = File(appContext.cacheDir, VoiceRecorder.RECORDINGS_DIRECTORY),
+    recordingsDirectory: File = VoiceRecorder.recordingsDirectory(appContext),
 ) : ViewModel() {
     private val recorder = VoiceRecorder(audioRecorder, recordingsDirectory, viewModelScope)
     private val player = VoicePlayer(viewModelScope, createPlayer)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/FieldState.kt b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/FieldState.kt
index a93a6928dfd8..968d757163fc 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/FieldState.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/FieldState.kt
@@ -23,6 +23,13 @@ class FieldState private constructor(
 ) {
     private var customViewIds: List<Int>? = null
 
+    // Values beyond the current type's field count, retained until the draft is saved or discarded.
+    private var hiddenFieldValues: List<String> = emptyList()
+
+    /** All draft values, including fields temporarily hidden by a smaller note type. */
+    val currentFieldValues: List<String>
+        get() = editor.currentFieldStrings.map { it.orEmpty() } + hiddenFieldValues
+
     fun loadFieldEditLines(type: FieldChangeType): List<FieldEditLine> {
         val fieldEditLines: List<FieldEditLine> =
             if (type.type == Type.INIT && customViewIds != null) {
@@ -45,10 +52,13 @@ class FieldState private constructor(
             }
         }
         if (type.type == Type.CHANGE_FIELD_COUNT) {
-            val currentFieldStrings = editor.currentFieldStrings
-            for (i in 0 until min(currentFieldStrings.size, fieldEditLines.size)) {
-                fieldEditLines[i].setContent(currentFieldStrings[i], type.replaceNewlines)
+            val fieldValues = currentFieldValues
+            for (i in 0 until min(fieldValues.size, fieldEditLines.size)) {
+                fieldEditLines[i].setContent(fieldValues[i], type.replaceNewlines)
             }
+            hiddenFieldValues = fieldValues.drop(fieldEditLines.size)
+        } else if (type.type != Type.INIT) {
+            clearHiddenFields()
         }
         return fieldEditLines
     }
@@ -84,6 +94,18 @@ class FieldState private constructor(
 
     fun setInstanceState(savedInstanceState: Bundle?) {
         customViewIds = savedInstanceState?.getIntegerArrayList("customViewIds")
+        hiddenFieldValues = savedInstanceState?.getStringArrayList("hiddenFieldValues").orEmpty()
+    }
+
+    fun saveInstanceState(outState: Bundle) {
+        // Visible values are already saved by the field views; only save the hidden tail here.
+        if (hiddenFieldValues.isNotEmpty()) {
+            outState.putStringArrayList("hiddenFieldValues", ArrayList(hiddenFieldValues))
+        }
+    }
+
+    fun clearHiddenFields() {
+        hiddenFieldValues = emptyList()
     }
 
     /** How fields should be changed when the UI is rebuilt  */
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/NoteEditorDestination.kt b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/NoteEditorDestination.kt
index fc937d84d9c4..8e88af939210 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/NoteEditorDestination.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/NoteEditorDestination.kt
@@ -44,7 +44,7 @@ fun NoteEditorDestination.toIntent(context: Context): Intent =
             Intent(context, NoteEditorActivity::class.java).also { intent ->
                 intent.putExtra(NoteEditorFragment.EXTRA_CALLER, NoteEditorCaller.CARDBROWSER_ADD.value)
                 intent.putExtra(NoteEditorFragment.EXTRA_TEXT_FROM_SEARCH_VIEW, searchTerms)
-                intent.putExtra(NoteEditorFragment.IN_CARD_BROWSER_ACTIVITY, false)
+                intent.putExtra(NoteEditorFragment.EXTRA_IN_CARD_BROWSER_ACTIVITY, false)
                 deckId?.takeIf { it > 0 }?.let { intent.putExtra(NoteEditorFragment.EXTRA_DID, it) }
             }
         is NoteEditorDestination.EditSelection ->
@@ -55,7 +55,7 @@ fun NoteEditorDestination.toIntent(context: Context): Intent =
                 // To handle multi select and note edit
                 intent.putExtra(NoteEditorFragment.EXTRA_CARD_IDS, cardIds.toLongArray())
                 intent.putExtra(AnkiActivity.EXTRA_FINISH_ANIMATION, animation as Parcelable)
-                intent.putExtra(NoteEditorFragment.IN_CARD_BROWSER_ACTIVITY, inCardBrowserActivity)
+                intent.putExtra(NoteEditorFragment.EXTRA_IN_CARD_BROWSER_ACTIVITY, inCardBrowserActivity)
             }
         is NoteEditorDestination.CopyNote ->
             Intent(context, NoteEditorActivity::class.java).also { intent ->
@@ -63,6 +63,7 @@ fun NoteEditorDestination.toIntent(context: Context): Intent =
                 intent.putExtra(NoteEditorFragment.EXTRA_DID, deckId)
                 intent.putExtra(NoteEditorFragment.EXTRA_CONTENTS, fieldsText)
                 intent.putExtra(NoteEditorFragment.EXTRA_TAGS, tags.toTypedArray())
+                intent.putExtra(NoteEditorFragment.EXTRA_NOTE_TYPE_ID, noteTypeId)
             }
         is NoteEditorDestination.PassArguments ->
             Intent(context, NoteEditorActivity::class.java).also { intent ->
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/NoteEditorGalleryPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/NoteEditorGalleryPicker.kt
new file mode 100644
index 000000000000..07163f372680
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/NoteEditorGalleryPicker.kt
@@ -0,0 +1,65 @@
+// SPDX-FileCopyrightText: 2026 David Allison <62114487+david-allison@users.noreply.github.com>
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.noteeditor
+
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.provider.MediaStore
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.fragment.app.Fragment
+import com.ichi2.anki.CommonString
+import com.ichi2.anki.multimedia.PickedImage
+import com.ichi2.anki.snackbar.showSnackbar
+import timber.log.Timber
+
+/**
+ * Picks an image before opening the image editor, retaining the target note field across recreation.
+ * Must be constructed during fragment initialization to register its activity result launcher.
+ */
+internal class NoteEditorGalleryPicker(
+    private val fragment: Fragment,
+    onImagePicked: (fieldIndex: Int, imageUri: Uri) -> Unit,
+) {
+    private var pendingFieldIndex: Int? = null
+
+    private val launcher =
+        fragment.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            val fieldIndex = pendingFieldIndex ?: return@registerForActivityResult
+            pendingFieldIndex = null
+            if (result.resultCode != Activity.RESULT_OK) return@registerForActivityResult
+
+            val imageUri = result.data?.let { PickedImage(it).trustedUri }
+            if (imageUri == null) {
+                fragment.showSnackbar(CommonString.select_image_failed)
+                return@registerForActivityResult
+            }
+            onImagePicked(fieldIndex, imageUri)
+        }
+
+    fun launch(fieldIndex: Int) {
+        pendingFieldIndex = fieldIndex
+        try {
+            launcher.launch(Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI))
+        } catch (e: ActivityNotFoundException) {
+            pendingFieldIndex = null
+            Timber.w(e, "No app found to select image")
+            fragment.showSnackbar(CommonString.activity_start_failed)
+        }
+    }
+
+    fun onSaveInstanceState(outState: Bundle) {
+        pendingFieldIndex?.let { outState.putInt(STATE_KEY_FIELD_INDEX, it) }
+    }
+
+    fun onRestoreInstanceState(state: Bundle) {
+        pendingFieldIndex = state.getInt(STATE_KEY_FIELD_INDEX, -1).takeIf { it >= 0 }
+    }
+
+    companion object {
+        private const val STATE_KEY_FIELD_INDEX = "galleryFieldIndex"
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/NoteEditorMultimediaController.kt b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/NoteEditorMultimediaController.kt
index 9ee364fcbf1f..d927485fb0fc 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/NoteEditorMultimediaController.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/NoteEditorMultimediaController.kt
@@ -24,6 +24,7 @@ import com.ichi2.anki.multimedia.MultimediaActivityExtra
 import com.ichi2.anki.multimedia.MultimediaResult
 import com.ichi2.anki.multimediacard.fields.EFieldType
 import com.ichi2.anki.multimediacard.fields.IField
+import com.ichi2.anki.multimediacard.impl.MultimediaEditableNote
 import com.ichi2.anki.servicelayer.NoteService
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.utils.ContentResolverUtil
@@ -36,9 +37,8 @@ import java.io.File
 /**
  * Owns the multimedia capture lifecycle for a [NoteEditorFragment].
  *
- * The [launcher] must already be registered on the fragment (an
- * `ActivityResultLauncher` can only be created during fragment initialisation);
- * its callback forwards to [handleActions] / [handleResult].
+ * Must be created during fragment initialization to register the Gallery picker.
+ * The [launcher] must already be registered; its callback forwards to [handleActions] / [handleResult].
  */
 internal class NoteEditorMultimediaController(
     private val fragment: NoteEditorFragment,
@@ -46,6 +46,15 @@ internal class NoteEditorMultimediaController(
 ) {
     private var actionJob: Job? = null
 
+    private val galleryPicker =
+        NoteEditorGalleryPicker(fragment) { fieldIndex, imageUri ->
+            fragment.launchCatchingTask {
+                val note = fragment.getCurrentMultimediaEditableNote()
+                if (note.isEmpty) return@launchCatchingTask
+                launchEditor(MultimediaActionHandler.ImageFile, fieldIndex, note, imageUri)
+            }
+        }
+
     // Use the same HTML if the same image is pasted multiple times.
     private var pastedImageCache: HashMap<String, String> = HashMap()
 
@@ -64,18 +73,37 @@ internal class NoteEditorMultimediaController(
                 fragment.multimediaViewModel.multimediaAction.first { action ->
                     Timber.i("Selected multimedia action: %s", action)
                     val handler = MultimediaActionHandler.forAction(action)
-                    val field = handler.createField().also { note.setField(fieldIndex, it) }
-                    val intent =
-                        handler.buildIntent(
-                            fragment.requireContext(),
-                            MultimediaActivityExtra(fieldIndex, field, note),
-                        )
-                    launcher.launch(intent)
+                    if (handler == MultimediaActionHandler.ImageFile) {
+                        // An empty image editor would be exposed during the picker's back animation.
+                        galleryPicker.launch(fieldIndex)
+                    } else {
+                        launchEditor(handler, fieldIndex, note)
+                    }
                     true
                 }
             }
     }
 
+    private fun launchEditor(
+        handler: MultimediaActionHandler,
+        fieldIndex: Int,
+        note: MultimediaEditableNote,
+        imageUri: Uri? = null,
+    ) {
+        val field = handler.createField().also { note.setField(fieldIndex, it) }
+        val intent =
+            handler.buildIntent(
+                fragment.requireContext(),
+                MultimediaActivityExtra(fieldIndex, field, note, imageUri?.toString()),
+            )
+        if (imageUri != null) {
+            // The URI in the serialized arguments does not carry the picker's read grant.
+            intent.data = imageUri
+            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+        }
+        launcher.launch(intent)
+    }
+
     /**
      * Handles an image-share intent: extracts the source [Uri], persists URI permission,
      * copies it into the app's cache, and launches the image picker seeded with the
@@ -183,12 +211,14 @@ internal class NoteEditorMultimediaController(
 
     fun onSaveInstanceState(outState: Bundle) {
         outState.putSerializable(STATE_KEY_IMAGE_CACHE, pastedImageCache)
+        galleryPicker.onSaveInstanceState(outState)
     }
 
     fun onRestoreInstanceState(state: Bundle) {
         pastedImageCache =
             state.getSerializableCompat<HashMap<String, String>>(STATE_KEY_IMAGE_CACHE)
                 ?: HashMap()
+        galleryPicker.onRestoreInstanceState(state)
     }
 
     /**
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt
index 1b8393b1c903..8068fea2fa13 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt
@@ -38,20 +38,20 @@ import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
 import com.ichi2.anki.CommonString
-import com.ichi2.anki.NoteEditorFragment
 import com.ichi2.anki.R
-import com.ichi2.anki.common.android.appContext
 import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.compat.CompatHelper
+import com.ichi2.anki.noteeditor.data.ToolbarPreferences
 import com.ichi2.utils.AndroidUiUtils.showSoftInput
 import com.ichi2.utils.ViewGroupUtils
 import com.ichi2.utils.ViewGroupUtils.getAllChildrenRecursive
-import com.ichi2.utils.dp
 import com.ichi2.utils.show
 import com.ichi2.utils.title
 import timber.log.Timber
 import java.util.Objects
 import kotlin.math.ceil
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Handles the toolbar inside [com.ichi2.anki.NoteEditorFragment]
@@ -64,12 +64,13 @@ import kotlin.math.ceil
  *    * Handles generating the 'icon' for these custom buttons: [createDrawableForString]
  *    * Handles CTRL+ the tag of the button: [onKeyUp]. Allows for Ctrl+1..9 shortcuts
  * * Handles adding a dynamic number of buttons and aligning them into rows: [insertItem]
- *    * And handles whether these should be stacked or scrollable: [shouldScrollToolbar]
+ *    * And handles whether these should be stacked or scrollable: [ToolbarPreferences.isScrollable]
  */
 class Toolbar : FrameLayout {
     var formatListener: TextFormatListener? = null
     private val toolbar: LinearLayout
     private val toolbarLayout: LinearLayout
+    private val toolbarPreferences = ToolbarPreferences(context.sharedPrefs())
 
     @VisibleForTesting
     internal val scrollView: HorizontalScrollView
@@ -189,7 +190,7 @@ class Toolbar : FrameLayout {
     ): AppCompatImageButton {
         // we use the light theme here to ensure the tint is black on both
         // A null theme can be passed after colorControlNormal is defined (API 25)
-        val themeContext: Context = ContextThemeWrapper(context, R.style.Theme_Light)
+        val themeContext: Context = ContextThemeWrapper(context, CommonR.style.Theme_Light)
         val d = VectorDrawableCompat.create(context.resources, drawable, themeContext.theme)
         return insertItem(id, d, block)
     }
@@ -229,11 +230,7 @@ class Toolbar : FrameLayout {
         val twoDp = ceil((2 / context.resources.displayMetrics.density).toDouble()).toInt()
         button.setPaddingRelative(twoDp, twoDp, twoDp, twoDp)
         // end apply style
-        val shouldScroll =
-            appContext
-                .sharedPrefs()
-                .getBoolean(NoteEditorFragment.PREF_NOTE_EDITOR_SCROLL_TOOLBAR, true)
-        if (shouldScroll) {
+        if (toolbarPreferences.isScrollable) {
             toolbar.addView(button, toolbar.childCount)
         } else {
             addViewToToolbar(button)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialogHost.kt b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialogHost.kt
new file mode 100644
index 000000000000..f5c84eb0de69
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialogHost.kt
@@ -0,0 +1,128 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.noteeditor
+
+import android.os.Bundle
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import com.ichi2.anki.noteeditor.data.ToolbarPreferences
+import com.ichi2.anki.noteeditor.presentation.ToolbarLayoutMode
+import com.ichi2.anki.settings.enums.DayTheme
+import com.ichi2.anki.settings.enums.Theme
+import com.ichi2.compose.theme.AnkiDroidTheme
+import com.ichi2.compose.ui.preview.AnkiDroidPreview
+import com.ichi2.compose.ui.preview.AnkiDroidThemeProvider
+import com.ichi2.themes.Themes
+
+private const val STATE_TOOLBAR_LAYOUT_DIALOG = "toolbarLayoutDialog"
+
+/**
+ * Hosts the 'Toolbar layout' dialog and restores its visibility after recreation.
+ *
+ * @see ToolbarLayoutDialog
+ */
+internal class ToolbarLayoutDialogHost {
+    private var isShowing by mutableStateOf(false)
+
+    fun bind(
+        view: ComposeView,
+        preferences: ToolbarPreferences,
+        savedInstanceState: Bundle?,
+        onChanged: () -> Unit,
+    ) {
+        isShowing = savedInstanceState?.getBoolean(STATE_TOOLBAR_LAYOUT_DIALOG) ?: false
+        view.setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+        view.setContent {
+            AnkiDroidTheme {
+                if (isShowing) {
+                    ToolbarLayoutDialog(
+                        selected = preferences.layout,
+                        onSelect = { layout ->
+                            preferences.layout = layout
+                            isShowing = false
+                            onChanged()
+                        },
+                        onDismiss = { isShowing = false },
+                        showSelectionBackground = Themes.currentTheme != DayTheme.EINK,
+                    )
+                }
+            }
+        }
+    }
+
+    fun show() {
+        isShowing = true
+    }
+
+    fun onSaveInstanceState(outState: Bundle) {
+        outState.putBoolean(STATE_TOOLBAR_LAYOUT_DIALOG, isShowing)
+    }
+}
+
+// TODO: Move these previews to ToolbarLayoutDialog.kt once theming is available in :common:android.
+// https://github.com/ankidroid/Anki-Android/issues/22694
+@Preview(name = "Scroll")
+@Composable
+private fun ToolbarLayoutDialogPreview(
+    @PreviewParameter(AnkiDroidThemeProvider::class) theme: Theme,
+) {
+    AnkiDroidPreview(theme = theme) {
+        ToolbarLayoutDialog(
+            selected = ToolbarLayoutMode.SCROLL,
+            onSelect = {},
+            onDismiss = {},
+            showSelectionBackground = theme != DayTheme.EINK,
+        )
+    }
+}
+
+@Preview(name = "Stack")
+@Composable
+private fun ToolbarLayoutDialogStackPreview(
+    @PreviewParameter(AnkiDroidThemeProvider::class) theme: Theme,
+) {
+    AnkiDroidPreview(theme = theme) {
+        ToolbarLayoutDialog(
+            selected = ToolbarLayoutMode.STACK,
+            onSelect = {},
+            onDismiss = {},
+            showSelectionBackground = theme != DayTheme.EINK,
+        )
+    }
+}
+
+@Preview(name = "Hidden")
+@Composable
+private fun ToolbarLayoutDialogHiddenPreview(
+    @PreviewParameter(AnkiDroidThemeProvider::class) theme: Theme,
+) {
+    AnkiDroidPreview(theme = theme) {
+        ToolbarLayoutDialog(
+            selected = ToolbarLayoutMode.HIDDEN,
+            onSelect = {},
+            onDismiss = {},
+            showSelectionBackground = theme != DayTheme.EINK,
+        )
+    }
+}
+
+@Preview(name = "Large text - short window", widthDp = 320, heightDp = 240, fontScale = 2f)
+@Composable
+private fun ToolbarLayoutDialogLargeTextPreview(
+    @PreviewParameter(AnkiDroidThemeProvider::class) theme: Theme,
+) {
+    AnkiDroidPreview(theme = theme) {
+        ToolbarLayoutDialog(
+            selected = ToolbarLayoutMode.HIDDEN,
+            onSelect = {},
+            onDismiss = {},
+            showSelectionBackground = theme != DayTheme.EINK,
+        )
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/notetype/AddNewNotesType.kt b/AnkiDroid/src/main/java/com/ichi2/anki/notetype/AddNewNotesType.kt
index e684bfbc8d16..896e1a8c2243 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/notetype/AddNewNotesType.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/notetype/AddNewNotesType.kt
@@ -16,6 +16,7 @@ import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.common.time.TimeManager
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.DialogNewNoteTypeBinding
 import com.ichi2.anki.launchCatchingTask
 import com.ichi2.anki.libanki.Utils
@@ -28,7 +29,6 @@ import com.ichi2.anki.libanki.getStockNotetype
 import com.ichi2.anki.ui.internationalization.sentenceCase
 import com.ichi2.anki.withProgress
 import com.ichi2.utils.customView
-import com.ichi2.utils.dp
 import com.ichi2.utils.moveCursorToEnd
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.positiveButton
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/notetype/ManageNoteTypesState.kt b/AnkiDroid/src/main/java/com/ichi2/anki/notetype/ManageNoteTypesState.kt
index 345764127f64..1d87cb41cce4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/notetype/ManageNoteTypesState.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/notetype/ManageNoteTypesState.kt
@@ -16,8 +16,6 @@ import com.ichi2.anki.utils.Destination
 
 /** Encapsulates the entire state for [ManageNotetypes] */
 data class ManageNoteTypesState(
-    /** Indicator if the UI should show a "loading" view to the user */
-    val isLoading: Boolean = true,
     /** List of [Notetype] to show */
     val noteTypes: List<NoteTypeItemState> = emptyList(),
     /** User entered string to use for filtering the [noteTypes] list */
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/notetype/ManageNoteTypesViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/notetype/ManageNoteTypesViewModel.kt
index 22fee2a794b5..0ea8ce636fcb 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/notetype/ManageNoteTypesViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/notetype/ManageNoteTypesViewModel.kt
@@ -23,6 +23,8 @@ import com.ichi2.anki.notetype.ManageNoteTypesState.FieldsEditor
 import com.ichi2.anki.notetype.ManageNoteTypesState.UserMessage
 import com.ichi2.anki.notetype.NoteTypeItemState.Companion.asModel
 import com.ichi2.anki.observability.undoableOp
+import com.ichi2.anki.progress.HasProgress
+import com.ichi2.anki.progress.ProgressManager
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
@@ -30,7 +32,11 @@ import kotlinx.coroutines.launch
 import net.ankiweb.rsdroid.BackendException
 import timber.log.Timber
 
-class ManageNoteTypesViewModel : ViewModel() {
+class ManageNoteTypesViewModel :
+    ViewModel(),
+    HasProgress<Nothing> {
+    override val progressManager = ProgressManager<Nothing>()
+
     val state: StateFlow<ManageNoteTypesState>
         field = MutableStateFlow(ManageNoteTypesState())
 
@@ -40,18 +46,19 @@ class ManageNoteTypesViewModel : ViewModel() {
 
     fun refreshNoteTypes() {
         Timber.i("Refreshing list of notetypes")
-        state.update { oldState -> oldState.copy(isLoading = true) }
         viewModelScope.launch {
-            withCol { safeGetNotetypeNameIdUseCount() }
-                .onFailure {
-                    state.update { oldState ->
-                        oldState.copy(isLoading = false, error = ReportableException(it))
-                    }
-                }.onSuccess {
-                    state.update { oldState ->
-                        oldState.copy(isLoading = false, noteTypes = it)
+            progressManager.withProgress {
+                withCol { safeGetNotetypeNameIdUseCount() }
+                    .onFailure {
+                        state.update { oldState ->
+                            oldState.copy(error = ReportableException(it))
+                        }
+                    }.onSuccess {
+                        state.update { oldState ->
+                            oldState.copy(noteTypes = it)
+                        }
                     }
-                }
+            }
         }
     }
 
@@ -62,7 +69,7 @@ class ManageNoteTypesViewModel : ViewModel() {
                 oldState.noteTypes.map {
                     it.copy(shouldBeDisplayed = it.name.contains(query, ignoreCase = true))
                 }
-            oldState.copy(isLoading = false, noteTypes = matchedNoteTypes, searchQuery = query)
+            oldState.copy(noteTypes = matchedNoteTypes, searchQuery = query)
         }
     }
 
@@ -71,30 +78,30 @@ class ManageNoteTypesViewModel : ViewModel() {
         name: String,
     ) {
         Timber.i("Renaming notetype with id $ntid")
-        state.update { oldState -> oldState.copy(isLoading = true) }
         viewModelScope.launch {
-            undoableOp<OpChanges> {
-                safeRenameNoteType(ntid, name)
-                    .onSuccess { changes ->
-                        state.update { oldState ->
-                            val updatedNoteTypes =
-                                oldState.noteTypes.withUpdatedItem(ntid) { old -> old.copy(name = name) }
-                            oldState.copy(isLoading = false, noteTypes = updatedNoteTypes)
-                        }
-                        return@undoableOp changes
-                    }.onFailure {
-                        // TODO: Change to CardTypeException: https://github.com/ankidroid/Anki-Android-Backend/issues/537
-                        // Card template 1 in note type 'character' has a problem.
-                        // Expected to find a field replacement on the front of the card template.
-                        state.update { oldState ->
-                            oldState.copy(
-                                isLoading = false,
-                                error = ReportableException(it, it !is BackendException),
-                            )
+            progressManager.withProgress {
+                undoableOp<OpChanges> {
+                    safeRenameNoteType(ntid, name)
+                        .onSuccess { changes ->
+                            state.update { oldState ->
+                                val updatedNoteTypes =
+                                    oldState.noteTypes.withUpdatedItem(ntid) { old -> old.copy(name = name) }
+                                oldState.copy(noteTypes = updatedNoteTypes)
+                            }
+                            return@undoableOp changes
+                        }.onFailure {
+                            // TODO: Change to CardTypeException: https://github.com/ankidroid/Anki-Android-Backend/issues/537
+                            // Card template 1 in note type 'character' has a problem.
+                            // Expected to find a field replacement on the front of the card template.
+                            state.update { oldState ->
+                                oldState.copy(
+                                    error = ReportableException(it, it !is BackendException),
+                                )
+                            }
+                            OpChanges.getDefaultInstance()
                         }
-                        OpChanges.getDefaultInstance()
-                    }
-                OpChanges.getDefaultInstance()
+                    OpChanges.getDefaultInstance()
+                }
             }
         }
     }
@@ -102,34 +109,31 @@ class ManageNoteTypesViewModel : ViewModel() {
     /** Deletes the note type with [ntid] and also updates the multi select mode status if needed */
     fun delete(ntid: NoteTypeId) {
         Timber.i("Deleting notetype with id $ntid")
-        state.update { oldState -> oldState.copy(isLoading = true) }
-        val noteTypesCount = state.value.noteTypes.size
+        if (state.value.noteTypes.size <= 1) {
+            state.update { oldState -> oldState.copy(message = UserMessage.DeletingLastModel) }
+            return
+        }
         viewModelScope.launch {
-            undoableOp<OpChanges> {
-                if (noteTypesCount <= 1) {
-                    state.update { oldState ->
-                        oldState.copy(isLoading = false, message = UserMessage.DeletingLastModel)
-                    }
-                    return@undoableOp OpChanges.getDefaultInstance()
-                }
-                safeRemoveNoteType(ntid)
-                    .onSuccess { changes ->
-                        state.update { oldState ->
-                            val updatedNoteTypes = oldState.noteTypes.filterNot { it.id == ntid }
-                            oldState.copy(
-                                isLoading = false,
-                                noteTypes = updatedNoteTypes,
-                                isInMultiSelectMode = updatedNoteTypes.multiSelectModeStatus,
-                            )
-                        }
-                        return@undoableOp changes
-                    }.onFailure {
-                        state.update { oldState ->
-                            oldState.copy(isLoading = false, error = ReportableException(it))
+            progressManager.withProgress {
+                undoableOp<OpChanges> {
+                    safeRemoveNoteType(ntid)
+                        .onSuccess { changes ->
+                            state.update { oldState ->
+                                val updatedNoteTypes = oldState.noteTypes.filterNot { it.id == ntid }
+                                oldState.copy(
+                                    noteTypes = updatedNoteTypes,
+                                    isInMultiSelectMode = updatedNoteTypes.multiSelectModeStatus,
+                                )
+                            }
+                            return@undoableOp changes
+                        }.onFailure {
+                            state.update { oldState ->
+                                oldState.copy(error = ReportableException(it))
+                            }
+                            return@undoableOp OpChanges.getDefaultInstance()
                         }
-                        return@undoableOp OpChanges.getDefaultInstance()
-                    }
-                OpChanges.getDefaultInstance()
+                    OpChanges.getDefaultInstance()
+                }
             }
         }
     }
@@ -225,39 +229,39 @@ class ManageNoteTypesViewModel : ViewModel() {
                     noteType.copy(isSelected = false)
                 }
             oldState.copy(
-                isLoading = true,
                 noteTypes = updateNotetypes,
                 isInMultiSelectMode = false,
             )
         }
         viewModelScope.launch {
-            val errors = mutableMapOf<NoteTypeItemState, Throwable>()
-            noteTypesToDelete.forEach { noteType ->
-                undoableOp<OpChanges> {
-                    safeRemoveNoteType(noteType.id)
-                        .onFailure { exception ->
-                            errors[noteType] = exception
-                            OpChanges.getDefaultInstance()
-                        }.onSuccess { return@undoableOp it }
-                    OpChanges.getDefaultInstance()
+            progressManager.withProgress {
+                val errors = mutableMapOf<NoteTypeItemState, Throwable>()
+                noteTypesToDelete.forEach { noteType ->
+                    undoableOp<OpChanges> {
+                        safeRemoveNoteType(noteType.id)
+                            .onFailure { exception ->
+                                errors[noteType] = exception
+                                OpChanges.getDefaultInstance()
+                            }.onSuccess { return@undoableOp it }
+                        OpChanges.getDefaultInstance()
+                    }
+                }
+                // look through any errors we might have and remove from our list of note types the ones
+                // that were in noteTypesToDelete but not in errors map(which presumably weren't deleted)
+                val removedIds = noteTypesToDelete.map { it.id } - errors.keys.map { it.id }.toSet()
+                val updatedNoteTypes = state.value.noteTypes.filterNot { it.id in removedIds }
+                val combinedException =
+                    CombinedException.from(
+                        errors.map { (state, throwable) ->
+                            "${state.name} - $throwable" to throwable
+                        },
+                    )
+                state.update { oldState ->
+                    oldState.copy(
+                        noteTypes = updatedNoteTypes,
+                        error = combinedException?.let { throwable -> ReportableException(throwable) },
+                    )
                 }
-            }
-            // look through any errors we might have and remove from our list of note types the ones
-            // that were in noteTypesToDelete but not in errors map(which presumably weren't deleted)
-            val removedIds = noteTypesToDelete.map { it.id } - errors.keys.map { it.id }.toSet()
-            val updatedNoteTypes = state.value.noteTypes.filterNot { it.id in removedIds }
-            val combinedException =
-                CombinedException.from(
-                    errors.map { (state, throwable) ->
-                        "${state.name} - $throwable" to throwable
-                    },
-                )
-            state.update { oldState ->
-                oldState.copy(
-                    isLoading = false,
-                    noteTypes = updatedNoteTypes,
-                    error = combinedException?.let { throwable -> ReportableException(throwable) },
-                )
             }
         }
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/notetype/ManageNotetypes.kt b/AnkiDroid/src/main/java/com/ichi2/anki/notetype/ManageNotetypes.kt
index 681ca558fe51..8d1b39942cf6 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/notetype/ManageNotetypes.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/notetype/ManageNotetypes.kt
@@ -8,7 +8,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.View
 import android.view.ViewGroup
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.enableEdgeToEdge
@@ -20,38 +19,36 @@ import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
 import androidx.appcompat.widget.Toolbar
-import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsCompat.Type.displayCutout
 import androidx.core.view.WindowInsetsCompat.Type.ime
 import androidx.core.view.WindowInsetsCompat.Type.systemBars
 import androidx.core.view.isVisible
+import androidx.core.view.marginBottom
 import androidx.core.view.updateMargins
 import androidx.core.view.updateMarginsRelative
 import androidx.core.view.updatePadding
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
-import com.google.android.material.behavior.HideViewOnScrollBehavior
 import com.ichi2.anki.AnkiActivity
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CommonPlurals
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
 import com.ichi2.anki.common.crashreporting.CrashReportService
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.ActivityManageNoteTypesBinding
-import com.ichi2.anki.dialogs.dismissLoadingDialog
-import com.ichi2.anki.dialogs.showLoadingDialog
 import com.ichi2.anki.launchCatchingTask
 import com.ichi2.anki.notetype.ManageNoteTypesState.UserMessage
+import com.ichi2.anki.progress.observeProgress
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.anki.startup.ensureStorageIsReady
 import com.ichi2.anki.sync.userAcceptsSchemaChange
 import com.ichi2.anki.utils.Destination
 import com.ichi2.themes.setTransparentStatusBar
 import com.ichi2.ui.AccessibleSearchView
-import com.ichi2.utils.dp
 import com.ichi2.utils.getInputField
 import com.ichi2.utils.getInputTextLayout
 import com.ichi2.utils.input
@@ -63,6 +60,7 @@ import com.ichi2.utils.title
 import dev.androidbroadcast.vbpd.viewBinding
 import kotlinx.coroutines.launch
 import timber.log.Timber
+import com.ichi2.anki.common.android.R as CommonR
 
 class ManageNotetypes : AnkiActivity(R.layout.activity_manage_note_types) {
     @VisibleForTesting
@@ -107,13 +105,12 @@ class ManageNotetypes : AnkiActivity(R.layout.activity_manage_note_types) {
         setTransparentStatusBar()
         enableToolbar()
         binding.noteTypesList.adapter = notetypesAdapter
+        observeProgress(viewModel) { it }
         binding.floatingActionButton.apply {
             setOnClickListener {
                 val addNewNotesType = AddNewNotesType(this@ManageNotetypes)
                 launchCatchingTask { addNewNotesType.showAddNewNotetypeDialog() }
             }
-            val params = (layoutParams as? CoordinatorLayout.LayoutParams)
-            (params?.behavior as? HideViewOnScrollBehavior<View>)?.setViewEdge(HideViewOnScrollBehavior.EDGE_BOTTOM)
         }
         binding.btnClearSelection.setOnClickListener { viewModel.clearSelection() }
 
@@ -169,15 +166,23 @@ class ManageNotetypes : AnkiActivity(R.layout.activity_manage_note_types) {
     }
 
     private fun applyInsets() {
+        // Material 3 supplies the FAB size before layout.
+        val fabSize = binding.floatingActionButton.customSize
+        val fabBottomMargin = binding.floatingActionButton.marginBottom
         ViewCompat.setOnApplyWindowInsetsListener(binding.rootLayout) { _, insets ->
             val constraints = insets.getInsets(systemBars() or displayCutout() or ime())
             Timber.d("Applying insets: $constraints")
             binding.appBarLayout.updatePadding(left = constraints.left, top = constraints.top, right = constraints.right)
-            binding.noteTypesList.updatePadding(left = constraints.left, right = constraints.right, bottom = constraints.bottom)
+            binding.noteTypesList.updatePadding(
+                left = constraints.left,
+                right = constraints.right,
+                // FAB size + its layout margin + a 16dp gap.
+                bottom = constraints.bottom + fabSize + fabBottomMargin + 16.dp.toPx(this),
+            )
             val fabLayoutParams = binding.floatingActionButton.layoutParams as ViewGroup.MarginLayoutParams
             // also applies the 32dp bottom/end margin to not sit right on top of navigation bar
             fabLayoutParams.updateMarginsRelative(
-                bottom = constraints.bottom + 32.dp.toPx(this),
+                bottom = constraints.bottom + fabBottomMargin,
                 end = constraints.right + 32.dp.toPx(this),
             )
             // needed otherwise the updated relative margins are not seen
@@ -205,11 +210,6 @@ class ManageNotetypes : AnkiActivity(R.layout.activity_manage_note_types) {
             viewModel.clearError()
             return
         }
-        if (state.isLoading) {
-            showLoadingDialog()
-        } else {
-            dismissLoadingDialog()
-        }
         // send only the items that should be displayed
         notetypesAdapter.submitList(state.noteTypes.filter { it.shouldBeDisplayed })
         notetypesAdapter.isInMultiSelectMode = state.isInMultiSelectMode
@@ -292,7 +292,7 @@ class ManageNotetypes : AnkiActivity(R.layout.activity_manage_note_types) {
                             viewModel.rename(state.id, userInput)
                         }
                         negativeButton(CommonString.dialog_cancel)
-                        setView(R.layout.dialog_generic_text_input)
+                        setView(CommonR.layout.dialog_generic_text_input)
                     }.input(
                         hint = TR.deckConfigNamePrompt(),
                         prefill = state.name,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/notetype/NoteTypesAdapter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/notetype/NoteTypesAdapter.kt
index 5dbed590b9d7..a8c11019ae77 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/notetype/NoteTypesAdapter.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/notetype/NoteTypesAdapter.kt
@@ -15,6 +15,7 @@ import com.ichi2.anki.R
 import com.ichi2.anki.databinding.ItemManageNoteTypeBinding
 import com.ichi2.anki.notetype.NoteTypesAdapter.NoteTypeViewHolder
 import com.ichi2.anki.utils.ext.usingStyledAttributes
+import com.ichi2.anki.common.android.R as CommonR
 
 private val notetypeNamesAndCountDiff =
     object : DiffUtil.ItemCallback<NoteTypeItemState>() {
@@ -91,7 +92,7 @@ internal class NoteTypesAdapter(
                 getResourceId(0, 0)
             }
         private val selectedNoteTypeBackground: Int =
-            context.usingStyledAttributes(null, intArrayOf(R.attr.currentDeckBackground)) {
+            context.usingStyledAttributes(null, intArrayOf(CommonR.attr.currentDeckBackground)) {
                 getResourceId(0, 0)
             }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/notetype/RenameCardTypeDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/notetype/RenameCardTypeDialog.kt
index 8e5721498b82..e8b6a485bed2 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/notetype/RenameCardTypeDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/notetype/RenameCardTypeDialog.kt
@@ -6,13 +6,13 @@ import android.content.Context
 import androidx.appcompat.app.AlertDialog
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.CommonString
-import com.ichi2.anki.R
 import com.ichi2.utils.ValidationResult
 import com.ichi2.utils.input
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.positiveButton
 import com.ichi2.utils.show
 import com.ichi2.utils.title
+import com.ichi2.anki.common.android.R as CommonR
 
 class RenameCardTypeDialog {
     companion object {
@@ -35,7 +35,7 @@ class RenameCardTypeDialog {
                     title(CommonString.rename_card_type)
                     positiveButton(CommonString.rename) { }
                     negativeButton(CommonString.dialog_cancel)
-                    setView(R.layout.dialog_generic_text_input)
+                    setView(CommonR.layout.dialog_generic_text_input)
                 }.input(
                     hint = CollectionManager.TR.actionsNewName().removeSuffix(":"),
                     displayKeyboard = true,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/notetype/RepositionCardTemplateDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/notetype/RepositionCardTemplateDialog.kt
index c4f54bfcb272..f1bd4e2ed705 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/notetype/RepositionCardTemplateDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/notetype/RepositionCardTemplateDialog.kt
@@ -7,12 +7,12 @@ import android.text.InputType
 import androidx.appcompat.app.AlertDialog
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.CommonString
-import com.ichi2.anki.R
 import com.ichi2.utils.getInputField
 import com.ichi2.utils.input
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.positiveButton
 import com.ichi2.utils.show
+import com.ichi2.anki.common.android.R as CommonR
 
 class RepositionCardTemplateDialog {
     companion object {
@@ -38,7 +38,7 @@ class RepositionCardTemplateDialog {
                         }
                         negativeButton(CommonString.dialog_cancel)
                         setMessage(CollectionManager.TR.cardTemplatesEnterNewCardPosition1(numberOfTemplates))
-                        setView(R.layout.dialog_generic_text_input)
+                        setView(CommonR.layout.dialog_generic_text_input)
                     }.input(
                         inputType = InputType.TYPE_CLASS_NUMBER,
                         displayKeyboard = true,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/AnkiPackageImporterFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/AnkiPackageImporterFragment.kt
index 470f8cec5825..56bd6f6077fe 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/AnkiPackageImporterFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/AnkiPackageImporterFragment.kt
@@ -19,7 +19,7 @@ import com.ichi2.utils.WebViewVersion
 
 class AnkiPackageImporterFragment : PageFragment() {
     override val pagePath: String by lazy {
-        val filePath = requireArguments().getString(KEY_FILE_PATH)
+        val filePath = requireArguments().getString(ARG_FILE_PATH)
         "import-anki-package$filePath"
     }
 
@@ -85,13 +85,13 @@ class AnkiPackageImporterFragment : PageFragment() {
     }
 
     companion object {
-        private const val KEY_FILE_PATH = "filePath"
+        private const val ARG_FILE_PATH = "filePath"
 
         fun getIntent(
             context: Context,
             filePath: String,
         ): Intent {
-            val arguments = Bundle().apply { putString(KEY_FILE_PATH, filePath) }
+            val arguments = Bundle().apply { putString(ARG_FILE_PATH, filePath) }
             return SingleFragmentActivity.getIntent(context, AnkiPackageImporterFragment::class, arguments)
         }
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/CardInfoDestination.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/CardInfoDestination.kt
index 9a465e6c4244..c58b5f626ba2 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/CardInfoDestination.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/CardInfoDestination.kt
@@ -17,8 +17,8 @@ fun CardInfoDestination.toIntent(context: Context): Intent {
     val title = entryPoint.toCardInfoTitle(context)
     val arguments =
         Bundle().apply {
-            putString(CardInfoFragment.KEY_TITLE, title)
-            putLong(CardInfoFragment.KEY_CARD_ID, cardId)
+            putString(CardInfoFragment.ARG_TITLE, title)
+            putLong(CardInfoFragment.ARG_CARD_ID, cardId)
         }
     return SingleFragmentActivity.getIntent(
         context,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/CardInfoFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/CardInfoFragment.kt
index 58cb6d70e61b..149558c54e69 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/CardInfoFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/CardInfoFragment.kt
@@ -9,7 +9,7 @@ import com.ichi2.anki.R
 
 class CardInfoFragment : PageFragment() {
     override val pagePath: String by lazy {
-        val cardId = requireArguments().getLong(KEY_CARD_ID)
+        val cardId = requireArguments().getLong(ARG_CARD_ID)
         "card-info/$cardId"
     }
 
@@ -18,14 +18,14 @@ class CardInfoFragment : PageFragment() {
         savedInstanceState: Bundle?,
     ) {
         super.onViewCreated(view, savedInstanceState)
-        val title = requireArguments().getString(KEY_TITLE)
+        val title = requireArguments().getString(ARG_TITLE)
         if (title != null) {
             view.findViewById<MaterialToolbar>(R.id.toolbar)?.setTitle(title)
         }
     }
 
     companion object {
-        const val KEY_CARD_ID = "cardId"
-        const val KEY_TITLE = "title"
+        const val ARG_CARD_ID = "cardId"
+        const val ARG_TITLE = "title"
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/CongratsPage.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/CongratsPage.kt
index 3231227bdd5e..110922dfa428 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/CongratsPage.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/CongratsPage.kt
@@ -7,7 +7,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.setFragmentResultListener
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
@@ -21,26 +20,22 @@ import com.google.android.material.appbar.MaterialToolbar
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.CommonString
-import com.ichi2.anki.DeckPicker
 import com.ichi2.anki.OnErrorListener
 import com.ichi2.anki.R
 import com.ichi2.anki.SingleFragmentActivity
 import com.ichi2.anki.common.destinations.DeckOptionsDestination
 import com.ichi2.anki.common.destinations.StudyOptionsDestination
 import com.ichi2.anki.common.destinations.navigate
-import com.ichi2.anki.common.preferences.sharedPrefs
-import com.ichi2.anki.common.time.SECONDS_PER_DAY
-import com.ichi2.anki.common.time.TIME_HOUR
-import com.ichi2.anki.common.time.TIME_MINUTE
-import com.ichi2.anki.common.utils.android.showThemedToast
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.CustomStudyAction
 import com.ichi2.anki.launchCatchingIO
 import com.ichi2.anki.launchCatchingTask
 import com.ichi2.anki.observability.ChangeManager
 import com.ichi2.anki.observability.undoableOp
-import com.ichi2.anki.snackbar.showSnackbar
+import com.ichi2.anki.study.StudyAvailability
+import com.ichi2.anki.study.currentDeckStudyState
 import com.ichi2.anki.ui.internationalization.sentenceCase
+import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.utils.listItems
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.show
@@ -49,7 +44,6 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import kotlin.math.round
 
 class CongratsPage :
     PageFragment(),
@@ -185,71 +179,12 @@ class CongratsPage :
     private fun onStudyMore() {
         launchCatchingTask {
             val customStudy = CustomStudyDialog.createInstance(deckId = withCol { decks.selected() })
-            customStudy.show(childFragmentManager, null)
+            requireActivity().showDialogFragment(customStudy)
         }
     }
 
     companion object {
         fun getIntent(context: Context): Intent = SingleFragmentActivity.getIntent(context, fragmentClass = CongratsPage::class)
-
-        private fun displayNewCongratsScreen(context: Context): Boolean = context.sharedPrefs().getBoolean("new_congrats_screen", false)
-
-        fun display(activity: FragmentActivity) {
-            if (displayNewCongratsScreen(activity)) {
-                activity.startActivity(getIntent(activity))
-            } else {
-                activity.launchCatchingTask {
-                    val message = getDeckFinishedMessage(activity)
-                    showThemedToast(activity, message, false)
-                }
-            }
-        }
-
-        fun onReviewsCompleted(
-            activity: FragmentActivity,
-            cardsInDeck: Boolean,
-        ) {
-            if (displayNewCongratsScreen(activity)) {
-                activity.startActivity(getIntent(activity))
-                return
-            }
-
-            // Show a message when reviewing has finished
-            if (cardsInDeck) {
-                activity.launchCatchingTask {
-                    val message = getDeckFinishedMessage(activity)
-                    activity.showSnackbar(message)
-                }
-            } else {
-                activity.showSnackbar(CommonString.studyoptions_no_cards_due)
-            }
-        }
-
-        // based in https://github.com/ankitects/anki/blob/9b4dd54312de8798a3f2bee07892bb3a488d1f9b/ts/routes/congrats/lib.ts#L8C17-L8C34
-        private suspend fun getDeckFinishedMessage(activity: FragmentActivity): String {
-            val info = withCol { sched.congratulationsInfo() }
-            val secsUntilNextLearn = info.secsUntilNextLearn
-            if (secsUntilNextLearn >= SECONDS_PER_DAY) {
-                return activity.getString(CommonString.studyoptions_congrats_finished)
-            }
-            // https://github.com/ankitects/anki/blob/9b4dd54312de8798a3f2bee07892bb3a488d1f9b/ts/lib/tslib/time.ts#L22
-            val (unit, amount) =
-                if (secsUntilNextLearn < TIME_MINUTE) {
-                    "seconds" to secsUntilNextLearn.toDouble()
-                } else if (secsUntilNextLearn < TIME_HOUR) {
-                    "minutes" to secsUntilNextLearn / TIME_MINUTE
-                } else {
-                    "hours" to secsUntilNextLearn / TIME_HOUR
-                }
-
-            val nextLearnDue = TR.schedulingNextLearnDue(unit, round(amount).toInt())
-            return activity.getString(CommonString.studyoptions_congrats_next_due_in, nextLearnDue)
-        }
-
-        fun DeckPicker.onDeckCompleted() {
-            Timber.i("Opening CongratsPage")
-            startActivity(getIntent(this))
-        }
     }
 }
 
@@ -310,8 +245,8 @@ class CongratsViewModel :
         }
     }
 
-    /** Called every time the screen becomes STARTED. [isDeckFinished] is cheap so it's always
-     * run, but the (latency-sensitive) reload/navigation only happens if something was actually
+    /** Called every time the screen becomes STARTED. [isDeckFinished] is always checked,
+     * but reload/navigation only happens if something was actually
      * missed while unwatched, or the deck no longer needs the congrats page. */
     suspend fun refreshIfNeeded() {
         // desktop's Overview re-checks sched._is_finished() on every refresh instead of
@@ -332,7 +267,7 @@ class CongratsViewModel :
         )
     }
 
-    private suspend fun isDeckFinished(): Boolean = withCol { sched.counts().count() == 0 }
+    private suspend fun isDeckFinished(): Boolean = withCol { currentDeckStudyState().availability == StudyAvailability.NoCardsAvailable }
 }
 
 sealed class UnburyState {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/CsvImporter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/CsvImporter.kt
index 0bdf0f94eb28..649aa083f921 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/CsvImporter.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/CsvImporter.kt
@@ -23,7 +23,7 @@ import com.ichi2.utils.WebViewVersion
  */
 class CsvImporter : PageFragment() {
     override val pagePath: String by lazy {
-        val filePath = requireArguments().getString(KEY_FILE_PATH)
+        val filePath = requireArguments().getString(ARG_FILE_PATH)
         "import-csv$filePath"
     }
 
@@ -90,7 +90,7 @@ class CsvImporter : PageFragment() {
     }
 
     companion object {
-        private const val KEY_FILE_PATH = "filePath"
+        private const val ARG_FILE_PATH = "filePath"
 
         /**
          * @param filePath path of the csv file that will be imported, which should be accessible by AnkiDroid
@@ -100,7 +100,7 @@ class CsvImporter : PageFragment() {
             context: Context,
             filePath: String,
         ): Intent {
-            val arguments = Bundle().apply { putString(KEY_FILE_PATH, filePath) }
+            val arguments = Bundle().apply { putString(ARG_FILE_PATH, filePath) }
             return SingleFragmentActivity.getIntent(context, fragmentClass = CsvImporter::class, arguments)
         }
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/DeckOptions.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/DeckOptions.kt
index 7bc8b3ae0623..af6ef7f961c2 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/DeckOptions.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/DeckOptions.kt
@@ -39,10 +39,10 @@ import java.util.concurrent.atomic.AtomicInteger
 @NeedsTest("15130: pressing back: icon + button should return to options if the manual is open")
 @NeedsTest("17905: pressing back before the webpage is ready closes the screen")
 class DeckOptions : PageFragment() {
-    private val deckId: DeckId by lazy { requireArguments().getLong(KEY_DECK_ID) }
+    private val deckId: DeckId by lazy { requireArguments().getLong(ARG_DECK_ID) }
 
     override val pagePath: String by lazy {
-        val deckId = requireArguments().getLong(KEY_DECK_ID)
+        val deckId = requireArguments().getLong(ARG_DECK_ID)
         "deck-options/$deckId"
     }
     private var webViewIsReady = false
@@ -433,7 +433,7 @@ class DeckOptions : PageFragment() {
     }
 
     companion object {
-        private const val KEY_DECK_ID = "deckId"
+        private const val ARG_DECK_ID = "deckId"
 
         fun getIntent(
             context: Context,
@@ -442,7 +442,7 @@ class DeckOptions : PageFragment() {
             SingleFragmentActivity.getIntent(
                 context,
                 fragmentClass = DeckOptions::class,
-                arguments = Bundle().apply { putLong(KEY_DECK_ID, deckId) },
+                arguments = Bundle().apply { putLong(ARG_DECK_ID, deckId) },
             )
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/pages/Statistics.kt b/AnkiDroid/src/main/java/com/ichi2/anki/pages/Statistics.kt
index 0ccdbc002a96..403face772c1 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/pages/Statistics.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/pages/Statistics.kt
@@ -7,6 +7,7 @@ import android.print.PrintAttributes
 import android.print.PrintJob
 import android.print.PrintManager
 import android.view.View
+import androidx.annotation.VisibleForTesting
 import androidx.core.content.ContextCompat.getSystemService
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.CollectionManager.withCol
@@ -20,6 +21,7 @@ import com.ichi2.anki.dialogs.startDeckSelection
 import com.ichi2.anki.launchCatchingTask
 import com.ichi2.anki.model.SelectableDeck
 import com.ichi2.anki.snackbar.showSnackbar
+import com.ichi2.anki.updateBottomNavOnScroll
 import com.ichi2.anki.withProgress
 import dev.androidbroadcast.vbpd.viewBinding
 import timber.log.Timber
@@ -60,12 +62,22 @@ class Statistics : PageFragment(R.layout.page_statistics) {
         requireActivity().launchCatchingTask {
             withProgress {
                 val deckName =
-                    savedInstanceState?.getString(KEY_DECK_NAME, null) ?: withCol { decks.current().name }
+                    savedInstanceState?.getString(STATE_DECK_NAME, null) ?: withCol { decks.current().name }
                 changeDeck(deckName)
             }
         }
     }
 
+    override fun onWebViewCreated() {
+        // Also called when the WebView is recreated after a renderer crash, so the listener is re-attached.
+        webViewLayout.setOnScrollChangeListener { webView, _, scrollY, _, oldScrollY ->
+            val dy = scrollY - oldScrollY
+            // Hiding the bar makes the page taller, which pulls a scroll at the bottom back up.
+            // That scroll comes from the resize, not the user: reacting to it would show the bar again.
+            if (!webView.scrolledUpToBottom(dy)) updateBottomNavOnScroll(dy)
+        }
+    }
+
     /** Prepares and initiates a printing task for the content(stats) displayed in the WebView.
      * It uses the Android PrintManager service to create a print job, based on the content of the WebView.
      * The resulting output is a PDF document. **/
@@ -100,7 +112,7 @@ class Statistics : PageFragment(R.layout.page_statistics) {
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putString(KEY_DECK_NAME, binding.deckName.text.toString())
+        outState.putString(STATE_DECK_NAME, binding.deckName.text.toString())
     }
 
     /**
@@ -124,9 +136,18 @@ class Statistics : PageFragment(R.layout.page_statistics) {
 
     companion object {
         const val ARG_HIDE_BACK_BUTTON = "hideBackButton"
-        private const val KEY_DECK_NAME = "key_deck_name"
+        private const val STATE_DECK_NAME = "key_deck_name"
     }
 }
 
 private val PrintJob.isActive: Boolean
     get() = !isCompleted && !isFailed && !isCancelled
+
+/**
+ * Whether scrolling up by [dy] left this view at the bottom of its scrollable content.
+ *
+ * Scrolling up moves away from the bottom, so this only happens when the view grew and scrolled
+ * itself back into range.
+ */
+@VisibleForTesting
+internal fun View.scrolledUpToBottom(dy: Int) = dy < 0 && canScrollVertically(-1) && !canScrollVertically(1)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AppearanceSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AppearanceSettingsFragment.kt
index b737c620a86a..eb7d278ad53e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AppearanceSettingsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AppearanceSettingsFragment.kt
@@ -31,6 +31,7 @@ import com.ichi2.utils.positiveButton
 import com.ichi2.utils.show
 import com.ichi2.utils.title
 import timber.log.Timber
+import com.ichi2.anki.common.android.R as CommonR
 
 class AppearanceSettingsFragment : SettingsFragment() {
     private var backgroundImage: Preference? = null
@@ -131,7 +132,7 @@ class AppearanceSettingsFragment : SettingsFragment() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
             // Drop "Follow system" option (the first one)
             appThemePref.entries = resources.getStringArray(R.array.app_theme_labels).drop(1).toTypedArray()
-            appThemePref.entryValues = resources.getStringArray(R.array.app_theme_values).drop(1).toTypedArray()
+            appThemePref.entryValues = resources.getStringArray(CommonR.array.app_theme_values).drop(1).toTypedArray()
             if (appTheme == AppTheme.FOLLOW_SYSTEM) {
                 appThemePref.value = getString(Themes.currentTheme.entryResId)
             }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/CustomSyncServerSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/CustomSyncServerSettingsFragment.kt
index 4c6c3da7cd1f..a335cfd07c27 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/CustomSyncServerSettingsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/CustomSyncServerSettingsFragment.kt
@@ -69,7 +69,7 @@ class CustomSyncServerSettingsFragment : SettingsFragment() {
                 key == SyncPreferences.CUSTOM_SYNC_ENABLED
             ) {
                 prefs.edit {
-                    remove(SyncPreferences.CURRENT_SYNC_URI)
+                    remove(SyncPreferences.PREF_CURRENT_SYNC_URI)
                 }
             }
         }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/DeveloperOptionsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/DeveloperOptionsFragment.kt
index c879fc2a4517..1f2111311d30 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/DeveloperOptionsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/DeveloperOptionsFragment.kt
@@ -10,6 +10,7 @@ import androidx.preference.SwitchPreferenceCompat
 import com.ichi2.anki.AnkiDroidApp
 import com.ichi2.anki.BuildConfig
 import com.ichi2.anki.CollectionManager.withCol
+import com.ichi2.anki.CommonPreferenceKey
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
 import com.ichi2.anki.analytics.AnkiDroidUsageAnalytics
@@ -173,7 +174,7 @@ class DeveloperOptionsFragment : SettingsFragment() {
          * with a "Review reminders" button, so we need to immediately reload the settings activity
          * to make this change show up.
          */
-        requirePreference<Preference>(R.string.pref_new_review_reminders).setOnPreferenceChangeListener { _, _ ->
+        requirePreference<Preference>(CommonPreferenceKey.pref_new_review_reminders).setOnPreferenceChangeListener { _, _ ->
             ActivityCompat.recreate(requireActivity())
             true
         }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/HeaderFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/HeaderFragment.kt
index 2863e31edd7f..2c0186e42cf3 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/HeaderFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/HeaderFragment.kt
@@ -240,7 +240,7 @@ class HeaderFragment : SettingsFragment() {
         fun getHeaderKeyForFragment(fragment: Fragment): Int? =
             when (fragment) {
                 is GeneralSettingsFragment -> R.string.pref_general_screen_key
-                is ReviewingSettingsFragment -> R.string.pref_reviewing_screen_key
+                is ReviewingSettingsFragment, is TimeboxSettingsFragment -> R.string.pref_reviewing_screen_key
                 is SyncSettingsFragment, is CustomSyncServerSettingsFragment -> R.string.pref_sync_screen_key
                 is NotificationsSettingsFragment -> R.string.pref_notifications_screen_key
                 is ScheduleRemindersFragment -> R.string.pref_review_reminders_screen_key
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/NotificationsSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/NotificationsSettingsFragment.kt
index 0fa56bebdcbe..e52c9eda0b02 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/NotificationsSettingsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/NotificationsSettingsFragment.kt
@@ -8,6 +8,7 @@ import android.content.Intent
 import androidx.core.app.PendingIntentCompat
 import androidx.preference.ListPreference
 import androidx.preference.SwitchPreferenceCompat
+import com.ichi2.anki.CommonPreferenceKey
 import com.ichi2.anki.R
 import com.ichi2.anki.common.android.AdaptionUtil
 import com.ichi2.anki.common.time.TimeManager
@@ -32,7 +33,7 @@ class NotificationsSettingsFragment : SettingsFragment() {
         }
         // Minimum cards due
         // The number of cards that should be due today in a deck to justify adding a notification.
-        requirePreference<ListPreference>(R.string.pref_notifications_minimum_cards_due_key).apply {
+        requirePreference<ListPreference>(CommonPreferenceKey.pref_notifications_minimum_cards_due_key).apply {
             updateNotificationPreference(this)
             setOnPreferenceChangeListener { preference, newValue ->
                 updateNotificationPreference(preference as ListPreference)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt
index 8fb8165f8656..a96bac253477 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/Preferences.kt
@@ -120,6 +120,12 @@ class PreferencesFragment :
             return
         }
 
+        if (result.key == getString(R.string.time_limit_preference)) {
+            Timber.i("Preferences:: Opening timebox settings from search result")
+            openPreferencesFragmentFromSearch(TimeboxSettingsFragment())
+            return
+        }
+
         val fragment = getFragmentFromXmlRes(result.resourceFile) ?: return
         openPreferencesFragmentFromSearch(fragment)
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ReviewingSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ReviewingSettingsFragment.kt
index 99d011d9333e..8ff4fcedc666 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ReviewingSettingsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ReviewingSettingsFragment.kt
@@ -6,6 +6,8 @@ import android.content.Context
 import androidx.annotation.VisibleForTesting
 import anki.config.copy
 import com.ichi2.anki.CollectionManager.withCol
+import com.ichi2.anki.CommonPlurals
+import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
 import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.common.time.TimeManager
@@ -41,14 +43,9 @@ class ReviewingSettingsFragment : SettingsFragment() {
         }
         // Timebox time limit
         // Represents in Android preferences the collections configuration "timeLim": i.e.
-        // the duration of a review timebox in minute. Each TIME_LIMIT minutes, a message appear suggesting to halt and giving the number of card reviewed
-        // Note that "timeLim" is in seconds while TIME_LIMIT is in minutes.
-        requirePreference<NumberRangePreferenceCompat>(R.string.time_limit_preference).apply {
-            launchCatchingTask { setValue(CollectionPreferences.getTimeboxTimeLimit().toInt(DurationUnit.MINUTES)) }
-            setOnPreferenceChangeListener { newValue ->
-                launchCatchingTask { CollectionPreferences.setTimeboxTimeLimit(newValue.toDuration(DurationUnit.MINUTES)) }
-            }
-        }
+        // the duration of a review timebox in minute. Each TIME_LIMIT minutes, a message appears suggesting to halt and giving the number of cards reviewed.
+        // Managed in TimeboxSettingsFragment.
+        updateTimeboxSummary()
         // Start of next day
         // Represents the collection pref "rollover"
         // in sched v2, and crt in sched v1. I.e. at which time of the day does the scheduler reset
@@ -59,6 +56,25 @@ class ReviewingSettingsFragment : SettingsFragment() {
             }
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+        updateTimeboxSummary()
+    }
+
+    private fun updateTimeboxSummary() {
+        launchCatchingTask {
+            val minutes = CollectionPreferences.getTimeboxTimeLimit().toInt(DurationUnit.MINUTES)
+            val pref =
+                findPreference<androidx.preference.Preference>(getString(R.string.time_limit_preference)) ?: return@launchCatchingTask
+            pref.summary =
+                if (minutes > 0) {
+                    resources.getQuantityString(CommonPlurals.pref_summ_minutes, minutes, minutes)
+                } else {
+                    getString(CommonString.disabled)
+                }
+        }
+    }
 }
 
 /** Sets the hour that the collection rolls over to the next day  */
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/SettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/SettingsFragment.kt
index e9da4fd0f242..c1e000437884 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/SettingsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/SettingsFragment.kt
@@ -125,7 +125,7 @@ abstract class SettingsFragment :
             (preference as? DialogFragmentProvider)?.makeDialogFragment()
                 ?: return super.onDisplayPreferenceDialog(preference)
         Timber.d("displaying custom preference: ${dialogFragment::class.simpleName}")
-        dialogFragment.arguments = Bundle().apply { putString(PREF_DIALOG_KEY, preference.key) }
+        dialogFragment.arguments = Bundle().apply { putString(ARG_PREFERENCE_KEY, preference.key) }
         dialogFragment.setTargetFragment(this, 0)
         dialogFragment.show(parentFragmentManager, "androidx.preference.PreferenceFragment.DIALOG")
     }
@@ -145,7 +145,7 @@ abstract class SettingsFragment :
     }
 
     companion object {
-        const val PREF_DIALOG_KEY = "key"
+        const val ARG_PREFERENCE_KEY = "key"
 
         /**
          * Converts a preference value to a numeric number that
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/TimeboxSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/TimeboxSettingsFragment.kt
new file mode 100644
index 000000000000..27433c83f901
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/TimeboxSettingsFragment.kt
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.preferences
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.ichi2.compose.theme.AnkiDroidTheme
+
+/**
+ * Screen allowing users to enable/disable and configure the review timebox time limit.
+ *
+ * Hosts the Compose [TimeboxSettingsScreen].
+ */
+class TimeboxSettingsFragment : Fragment() {
+    private val viewModel: TimeboxSettingsViewModel by viewModels()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View =
+        ComposeView(requireContext()).apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            setContent {
+                AnkiDroidTheme {
+                    val state by viewModel.uiState.collectAsStateWithLifecycle()
+                    TimeboxSettingsScreen(
+                        isLoading = state.isLoading,
+                        isEnabled = state.isEnabled,
+                        minutes = state.minutes,
+                        onToggleEnabled = viewModel::toggleEnabled,
+                        onIncrement = viewModel::increment,
+                        onDecrement = viewModel::decrement,
+                        onSetMinutes = viewModel::setMinutes,
+                        onNavigateUp = { requireActivity().onBackPressedDispatcher.onBackPressed() },
+                    )
+                }
+            }
+        }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/TimeboxSettingsScreen.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/TimeboxSettingsScreen.kt
new file mode 100644
index 000000000000..31a35d360ebf
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/TimeboxSettingsScreen.kt
@@ -0,0 +1,475 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.preferences
+
+import android.content.res.Configuration
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.consumeWindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.IconButtonDefaults
+import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedIconButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.ichi2.anki.CommonPlurals
+import com.ichi2.anki.CommonString
+import com.ichi2.anki.R
+import com.ichi2.compose.theme.AnkiDroidTheme
+import com.ichi2.compose.theme.widgetBorder
+import com.ichi2.compose.ui.preview.ThemePreviews
+import androidx.appcompat.R as AppCompatR
+import com.ichi2.anki.common.android.R as CommonR
+
+/**
+ * Screen allowing users to enable/disable and configure the review timebox time limit.
+ *
+ * Uses the modern Material 3 main switch card styling from Android Settings.
+ */
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun TimeboxSettingsScreen(
+    isLoading: Boolean,
+    isEnabled: Boolean,
+    minutes: Int,
+    onToggleEnabled: (Boolean) -> Unit,
+    onIncrement: () -> Unit,
+    onDecrement: () -> Unit,
+    onSetMinutes: (Int) -> Unit,
+    onNavigateUp: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val isLandscape = LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE
+    val verticalSpacing = if (isLandscape) 8.dp else 16.dp
+
+    Scaffold(
+        modifier = modifier,
+        topBar = {
+            TopAppBar(
+                title = { Text(stringResource(CommonString.timeboxing)) },
+                navigationIcon = {
+                    IconButton(onClick = onNavigateUp) {
+                        Icon(
+                            painter = painterResource(R.drawable.ic_baseline_arrow_back_24),
+                            contentDescription = stringResource(AppCompatR.string.abc_action_bar_up_description),
+                        )
+                    }
+                },
+            )
+        },
+    ) { contentPadding ->
+        if (isLoading) {
+            Box(
+                modifier =
+                    Modifier
+                        .fillMaxSize()
+                        .padding(contentPadding),
+                contentAlignment = Alignment.Center,
+            ) {
+                CircularProgressIndicator()
+            }
+        } else {
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxSize()
+                        .padding(contentPadding)
+                        .consumeWindowInsets(contentPadding)
+                        .navigationBarsPadding()
+                        .imePadding()
+                        .verticalScroll(rememberScrollState())
+                        .padding(horizontal = 16.dp, vertical = if (isLandscape) 4.dp else 8.dp)
+                        .padding(bottom = 32.dp),
+            ) {
+                TimeboxMainSwitch(
+                    isEnabled = isEnabled,
+                    onToggleEnabled = onToggleEnabled,
+                )
+
+                Spacer(modifier = Modifier.height(verticalSpacing))
+
+                AnimatedVisibility(
+                    visible = isEnabled,
+                    enter = fadeIn() + expandVertically(),
+                    exit = fadeOut() + shrinkVertically(),
+                ) {
+                    Column {
+                        TimeboxDurationCard(
+                            minutes = minutes,
+                            onSetMinutes = onSetMinutes,
+                        )
+                        Spacer(modifier = Modifier.height(verticalSpacing))
+                    }
+                }
+
+                TimeboxHelpSection()
+            }
+        }
+    }
+}
+
+/**
+ * Modern Material 3 main switch card matching Google Android Settings.
+ */
+@Composable
+private fun TimeboxMainSwitch(
+    isEnabled: Boolean,
+    onToggleEnabled: (Boolean) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val isLandscape = LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE
+    val containerColor = MaterialTheme.colorScheme.surfaceVariant
+    val contentColor = timeboxContentColor()
+
+    Surface(
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(28.dp))
+                .clickable { onToggleEnabled(!isEnabled) },
+        shape = RoundedCornerShape(28.dp),
+        color = containerColor,
+    ) {
+        val switchLabel = stringResource(CommonString.use_timebox)
+        Row(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 24.dp, vertical = if (isLandscape) 12.dp else 20.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.SpaceBetween,
+        ) {
+            Text(
+                text = switchLabel,
+                style = MaterialTheme.typography.titleMedium,
+                fontWeight = FontWeight.SemiBold,
+                color = contentColor,
+                modifier = Modifier.weight(1f),
+            )
+            Switch(
+                checked = isEnabled,
+                onCheckedChange = onToggleEnabled,
+                modifier =
+                    Modifier.semantics {
+                        contentDescription = switchLabel
+                    },
+            )
+        }
+    }
+}
+
+/**
+ * Stepper card allowing users to increment/decrement or directly edit the timebox duration inline.
+ */
+@Composable
+private fun TimeboxDurationCard(
+    minutes: Int,
+    onSetMinutes: (Int) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val isLandscape = LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE
+    var textValue by rememberSaveable { mutableStateOf(minutes.toString()) }
+    val focusManager = LocalFocusManager.current
+
+    LaunchedEffect(minutes) {
+        if (textValue.toIntOrNull() != minutes) {
+            textValue = minutes.toString()
+        }
+    }
+
+    val validRange = TimeboxSettingsViewModel.MIN_TIMEBOX_MINUTES..TimeboxSettingsViewModel.MAX_TIMEBOX_MINUTES
+    val count = textValue.toIntOrNull() ?: minutes
+    val safeCount = if (count in validRange) count else minutes
+    val unitSuffix = pluralStringResource(CommonPlurals.timebox_minutes_suffix, safeCount)
+
+    val parsed = textValue.toIntOrNull()
+    val isValid = parsed != null && parsed in validRange
+    val isError = textValue.isNotEmpty() && !isValid
+    val controlBorder = MaterialTheme.widgetBorder
+    val inputBorder =
+        controlBorder?.let {
+            if (isError) BorderStroke(it.width, MaterialTheme.colorScheme.error) else it
+        }
+    val inputContainerColor = if (controlBorder != null) MaterialTheme.colorScheme.surface else Color.Transparent
+    val buttonColors =
+        if (controlBorder != null) {
+            IconButtonDefaults.outlinedIconButtonColors(
+                containerColor = MaterialTheme.colorScheme.surface,
+                contentColor = MaterialTheme.colorScheme.onSurface,
+                disabledContainerColor = MaterialTheme.colorScheme.surface,
+            )
+        } else {
+            IconButtonDefaults.filledTonalIconButtonColors()
+        }
+
+    Surface(
+        modifier = modifier.fillMaxWidth(),
+        shape = RoundedCornerShape(16.dp),
+        color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.05f),
+    ) {
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 20.dp, vertical = if (isLandscape) 10.dp else 16.dp),
+            verticalArrangement = Arrangement.spacedBy(12.dp),
+        ) {
+            Text(
+                text = stringResource(CommonString.time_limit_label),
+                style = MaterialTheme.typography.titleSmall,
+                color = timeboxContentColor(),
+            )
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.SpaceBetween,
+            ) {
+                OutlinedIconButton(
+                    onClick = {
+                        val currentVal = textValue.toIntOrNull() ?: minutes
+                        val prevVal = (currentVal - 1).coerceIn(validRange)
+                        textValue = prevVal.toString()
+                        onSetMinutes(prevVal)
+                        focusManager.clearFocus()
+                    },
+                    modifier = Modifier.size(56.dp),
+                    shape = RoundedCornerShape(16.dp),
+                    colors = buttonColors,
+                    border = controlBorder,
+                    enabled = (textValue.toIntOrNull() ?: minutes) > TimeboxSettingsViewModel.MIN_TIMEBOX_MINUTES,
+                ) {
+                    Icon(
+                        painter = painterResource(R.drawable.ic_remove),
+                        contentDescription = stringResource(CommonString.minus_sign),
+                    )
+                }
+
+                OutlinedTextField(
+                    value = textValue,
+                    onValueChange = { input ->
+                        val digits = input.filter { it.isDigit() }
+                        val noLeadingZeros =
+                            if (digits.length > 1 && digits.startsWith("0")) {
+                                digits.trimStart('0').ifEmpty { "0" }
+                            } else {
+                                digits
+                            }
+                        val filtered = noLeadingZeros.take(3)
+                        textValue = filtered
+                        val p = filtered.toIntOrNull()
+                        if (p != null && p in validRange) {
+                            onSetMinutes(p)
+                        }
+                    },
+                    modifier =
+                        Modifier
+                            .width(136.dp)
+                            .then(
+                                if (inputBorder != null) {
+                                    Modifier.border(inputBorder, RoundedCornerShape(12.dp))
+                                } else {
+                                    Modifier
+                                },
+                            ).onFocusChanged { focusState ->
+                                if (!focusState.isFocused) {
+                                    val p = textValue.toIntOrNull()
+                                    if (p != null && p in validRange) {
+                                        onSetMinutes(p)
+                                    } else {
+                                        textValue = minutes.toString()
+                                    }
+                                }
+                            },
+                    suffix = {
+                        Text(
+                            text = unitSuffix,
+                            style = MaterialTheme.typography.bodyMedium,
+                            color = timeboxContentColor(),
+                        )
+                    },
+                    shape = RoundedCornerShape(12.dp),
+                    colors =
+                        OutlinedTextFieldDefaults.colors(
+                            focusedContainerColor = inputContainerColor,
+                            unfocusedContainerColor = inputContainerColor,
+                            errorContainerColor = inputContainerColor,
+                        ),
+                    textStyle =
+                        LocalTextStyle.current.copy(
+                            textAlign = TextAlign.Start,
+                            fontWeight = FontWeight.Bold,
+                            fontSize = 18.sp,
+                        ),
+                    singleLine = true,
+                    isError = isError,
+                    keyboardOptions =
+                        KeyboardOptions(
+                            keyboardType = KeyboardType.Number,
+                            imeAction = ImeAction.Done,
+                        ),
+                    keyboardActions =
+                        KeyboardActions(
+                            onDone = {
+                                val p = textValue.toIntOrNull()
+                                if (p != null && p in validRange) {
+                                    onSetMinutes(p)
+                                } else {
+                                    textValue = minutes.toString()
+                                }
+                                focusManager.clearFocus()
+                            },
+                        ),
+                )
+
+                OutlinedIconButton(
+                    onClick = {
+                        val currentVal = textValue.toIntOrNull() ?: minutes
+                        val nextVal = (currentVal + 1).coerceIn(validRange)
+                        textValue = nextVal.toString()
+                        onSetMinutes(nextVal)
+                        focusManager.clearFocus()
+                    },
+                    modifier = Modifier.size(56.dp),
+                    shape = RoundedCornerShape(16.dp),
+                    colors = buttonColors,
+                    border = controlBorder,
+                    enabled = (textValue.toIntOrNull() ?: minutes) < TimeboxSettingsViewModel.MAX_TIMEBOX_MINUTES,
+                ) {
+                    Icon(
+                        painter = painterResource(CommonR.drawable.ic_add),
+                        contentDescription = stringResource(CommonString.plus_sign),
+                    )
+                }
+            }
+        }
+    }
+}
+
+/**
+ * Explanatory help section citing the official Anki manual.
+ */
+@Composable
+private fun TimeboxHelpSection(modifier: Modifier = Modifier) {
+    Row(
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .padding(horizontal = 8.dp, vertical = 4.dp),
+        verticalAlignment = Alignment.Top,
+    ) {
+        Icon(
+            painter = painterResource(R.drawable.ic_outline_info_24),
+            contentDescription = null,
+            tint = timeboxContentColor(),
+            modifier =
+                Modifier
+                    .padding(top = 2.dp, end = 12.dp)
+                    .size(20.dp),
+        )
+        Text(
+            text = stringResource(CommonString.pref_timebox_help_summary),
+            style = MaterialTheme.typography.bodyMedium,
+            color = timeboxContentColor(),
+            lineHeight = 20.sp,
+        )
+    }
+}
+
+@Composable
+private fun timeboxContentColor(): Color =
+    if (MaterialTheme.widgetBorder != null) {
+        MaterialTheme.colorScheme.onSurface
+    } else {
+        MaterialTheme.colorScheme.onSurfaceVariant
+    }
+
+@ThemePreviews
+@Composable
+private fun TimeboxSettingsScreenEnabledPreview() {
+    AnkiDroidTheme {
+        TimeboxSettingsScreen(
+            isLoading = false,
+            isEnabled = true,
+            minutes = 20,
+            onToggleEnabled = {},
+            onIncrement = {},
+            onDecrement = {},
+            onSetMinutes = {},
+            onNavigateUp = {},
+        )
+    }
+}
+
+@ThemePreviews
+@Composable
+private fun TimeboxSettingsScreenDisabledPreview() {
+    AnkiDroidTheme {
+        TimeboxSettingsScreen(
+            isLoading = false,
+            isEnabled = false,
+            minutes = 20,
+            onToggleEnabled = {},
+            onIncrement = {},
+            onDecrement = {},
+            onSetMinutes = {},
+            onNavigateUp = {},
+        )
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/TimeboxSettingsViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/TimeboxSettingsViewModel.kt
new file mode 100644
index 000000000000..b2173ed0ee1a
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/TimeboxSettingsViewModel.kt
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.preferences
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.ichi2.anki.utils.CollectionPreferences
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
+
+data class TimeboxUiState(
+    val isLoading: Boolean = true,
+    val isEnabled: Boolean = false,
+    val minutes: Int = TimeboxSettingsViewModel.DEFAULT_TIMEBOX_MINUTES,
+)
+
+/**
+ * State holder for [TimeboxSettingsFragment] and [TimeboxSettingsScreen].
+ */
+class TimeboxSettingsViewModel : ViewModel() {
+    private val _uiState = MutableStateFlow(TimeboxUiState())
+    val uiState: StateFlow<TimeboxUiState> = _uiState.asStateFlow()
+
+    init {
+        loadSettings()
+    }
+
+    private fun loadSettings() {
+        viewModelScope.launch {
+            val limitMinutes = CollectionPreferences.getTimeboxTimeLimit().toInt(DurationUnit.MINUTES)
+            val isEnabled = limitMinutes > 0
+            val minutes = if (isEnabled) limitMinutes else DEFAULT_TIMEBOX_MINUTES
+            _uiState.value =
+                TimeboxUiState(
+                    isLoading = false,
+                    isEnabled = isEnabled,
+                    minutes = minutes,
+                )
+        }
+    }
+
+    fun toggleEnabled(enabled: Boolean) {
+        _uiState.update { it.copy(isEnabled = enabled) }
+        viewModelScope.launch {
+            // TODO: Follow-up issue: persist the old non-zero time limit in Android storage when disabled so the value is restored on re-enabling
+            val minutesToSave = if (enabled) _uiState.value.minutes else 0
+            CollectionPreferences.setTimeboxTimeLimit(minutesToSave.toDuration(DurationUnit.MINUTES))
+        }
+    }
+
+    fun setMinutes(newMinutes: Int) {
+        val clamped = newMinutes.coerceIn(MIN_TIMEBOX_MINUTES, MAX_TIMEBOX_MINUTES)
+        _uiState.update { it.copy(minutes = clamped) }
+        if (_uiState.value.isEnabled) {
+            viewModelScope.launch {
+                CollectionPreferences.setTimeboxTimeLimit(clamped.toDuration(DurationUnit.MINUTES))
+            }
+        }
+    }
+
+    fun increment() = setMinutes(_uiState.value.minutes + 1)
+
+    fun decrement() = setMinutes(_uiState.value.minutes - 1)
+
+    companion object {
+        const val DEFAULT_TIMEBOX_MINUTES = 20
+        const val MIN_TIMEBOX_MINUTES = 1
+        const val MAX_TIMEBOX_MINUTES = 999
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/AddProfileDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/ProfileNameDialog.kt
similarity index 52%
rename from AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/AddProfileDialog.kt
rename to AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/ProfileNameDialog.kt
index e1b2270088d1..366aa9e373d4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/AddProfileDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/ProfileNameDialog.kt
@@ -11,7 +11,7 @@ import com.ichi2.anki.multiprofile.ProfileName
 import com.ichi2.anki.multiprofile.ProfileName.ValidationResult
 import com.ichi2.compose.theme.AnkiDroidTheme
 import com.ichi2.compose.ui.dialogs.TextInputDialog
-import com.ichi2.compose.ui.preview.ThemePreviews
+import com.ichi2.compose.ui.preview.DialogPreviews
 
 /**
  * Dialog asking for the display name of a new profile.
@@ -21,25 +21,65 @@ import com.ichi2.compose.ui.preview.ThemePreviews
  */
 @Composable
 fun AddProfileDialog(
+    existingNames: List<String>,
+    onDismissRequest: () -> Unit,
+    onConfirm: (ProfileName) -> Unit,
+) {
+    ProfileNameDialog(
+        title = stringResource(CommonString.add_profile),
+        confirmText = stringResource(CommonString.dialog_add),
+        initialText = "",
+        existingNames = existingNames,
+        onDismissRequest = onDismissRequest,
+        onConfirm = onConfirm,
+    )
+}
+
+@Composable
+fun RenameProfileDialog(
+    currentName: String,
+    existingNames: List<String>,
+    onDismissRequest: () -> Unit,
+    onConfirm: (ProfileName) -> Unit,
+) {
+    ProfileNameDialog(
+        title = stringResource(CommonString.rename_profile),
+        confirmText = stringResource(CommonString.rename),
+        initialText = currentName,
+        existingNames = existingNames,
+        onDismissRequest = onDismissRequest,
+        onConfirm = onConfirm,
+    )
+}
+
+@Composable
+private fun ProfileNameDialog(
+    title: String,
+    confirmText: String,
+    initialText: String,
+    existingNames: List<String>,
     onDismissRequest: () -> Unit,
     onConfirm: (ProfileName) -> Unit,
 ) {
     val emptyError = stringResource(CommonString.profile_name_empty_error)
     val tooLongError = stringResource(CommonString.profile_name_too_long_error, ProfileName.MAX_LENGTH)
+    val nameExistsError = stringResource(CommonString.error_name_exists)
 
     TextInputDialog(
-        title = stringResource(CommonString.add_profile),
+        title = title,
         label = stringResource(CommonString.profile_name),
-        confirmText = stringResource(CommonString.dialog_add),
+        confirmText = confirmText,
         onConfirm = { text ->
             (ProfileName.validate(text) as? ValidationResult.Valid)?.let { onConfirm(it.name) }
         },
         onDismissRequest = onDismissRequest,
+        initialText = initialText,
         maxLengthCounter = ProfileName.MAX_LENGTH,
+        lengthOf = { it.trim().length },
         capitalization = KeyboardCapitalization.Words,
         errorMessageFor = { text ->
-            when (ProfileName.validate(text)) {
-                is ValidationResult.Valid -> null
+            when (val result = ProfileName.validate(text)) {
+                is ValidationResult.Valid -> nameExistsError.takeIf { result.name.existsIn(existingNames) }
                 is ValidationResult.Empty -> emptyError
                 is ValidationResult.TooLong -> tooLongError
             }
@@ -47,10 +87,18 @@ fun AddProfileDialog(
     )
 }
 
-@ThemePreviews
+@DialogPreviews
 @Composable
 private fun AddProfileDialogPreview() {
     AnkiDroidTheme {
-        AddProfileDialog(onDismissRequest = {}, onConfirm = {})
+        AddProfileDialog(existingNames = emptyList(), onDismissRequest = {}, onConfirm = {})
+    }
+}
+
+@DialogPreviews
+@Composable
+private fun RenameProfileDialogPreview() {
+    AnkiDroidTheme {
+        RenameProfileDialog(currentName = "Work", existingNames = emptyList(), onDismissRequest = {}, onConfirm = {})
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/SwitchProfilesFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/SwitchProfilesFragment.kt
index ece7653126f5..e84ccc100a90 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/SwitchProfilesFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/SwitchProfilesFragment.kt
@@ -49,14 +49,18 @@ class SwitchProfilesFragment : Fragment() {
                 AnkiDroidTheme {
                     val profiles by viewModel.profiles.collectAsStateWithLifecycle()
                     val isAddProfileDialogVisible by viewModel.isAddProfileDialogVisible.collectAsStateWithLifecycle()
+                    val profileBeingRenamed by viewModel.profileBeingRenamed.collectAsStateWithLifecycle()
                     SwitchProfilesScreen(
                         profiles = profiles,
                         isAddProfileDialogVisible = isAddProfileDialogVisible,
+                        profileBeingRenamed = profileBeingRenamed,
                         onNavigateUp = { requireActivity().onBackPressedDispatcher.onBackPressed() },
                         onAddProfileClick = viewModel::showAddProfileDialog,
                         onAddProfileConfirm = viewModel::addProfile,
                         onAddProfileDismiss = viewModel::dismissAddProfileDialog,
-                        onEditProfile = viewModel::editProfile,
+                        onEditProfile = viewModel::showRenameProfileDialog,
+                        onRenameProfileConfirm = viewModel::renameProfile,
+                        onRenameProfileDismiss = viewModel::dismissRenameProfileDialog,
                         onDeleteProfile = viewModel::deleteProfile,
                     )
                 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/SwitchProfilesScreen.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/SwitchProfilesScreen.kt
index 9df62ce27221..71d2425ddc07 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/SwitchProfilesScreen.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/SwitchProfilesScreen.kt
@@ -48,11 +48,14 @@ import androidx.appcompat.R as AppCompatR
 fun SwitchProfilesScreen(
     profiles: List<ProfileItem>,
     isAddProfileDialogVisible: Boolean,
+    profileBeingRenamed: ProfileItem?,
     onNavigateUp: () -> Unit,
     onAddProfileClick: () -> Unit,
     onAddProfileConfirm: (ProfileName) -> Unit,
     onAddProfileDismiss: () -> Unit,
     onEditProfile: (ProfileItem) -> Unit,
+    onRenameProfileConfirm: (ProfileName) -> Unit,
+    onRenameProfileDismiss: () -> Unit,
     onDeleteProfile: (ProfileItem) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -97,10 +100,20 @@ fun SwitchProfilesScreen(
 
     if (isAddProfileDialogVisible) {
         AddProfileDialog(
+            existingNames = profiles.map { it.name },
             onDismissRequest = onAddProfileDismiss,
             onConfirm = onAddProfileConfirm,
         )
     }
+
+    profileBeingRenamed?.let { profile ->
+        RenameProfileDialog(
+            currentName = profile.name,
+            existingNames = profiles.filter { it.id != profile.id }.map { it.name },
+            onDismissRequest = onRenameProfileDismiss,
+            onConfirm = onRenameProfileConfirm,
+        )
+    }
 }
 
 private val AvatarSize = 40.dp
@@ -176,11 +189,14 @@ private fun SwitchProfilesScreenPreview() {
                     ProfileItem(id = ProfileId("p_work"), name = "Work"),
                 ),
             isAddProfileDialogVisible = false,
+            profileBeingRenamed = null,
             onNavigateUp = {},
             onAddProfileClick = {},
             onAddProfileConfirm = {},
             onAddProfileDismiss = {},
             onEditProfile = {},
+            onRenameProfileConfirm = {},
+            onRenameProfileDismiss = {},
             onDeleteProfile = {},
         )
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/SwitchProfilesViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/SwitchProfilesViewModel.kt
index 681f1282de5a..6d961146d03e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/SwitchProfilesViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/profiles/SwitchProfilesViewModel.kt
@@ -27,6 +27,9 @@ class SwitchProfilesViewModel(
     val isAddProfileDialogVisible: StateFlow<Boolean>
         field = MutableStateFlow(false)
 
+    val profileBeingRenamed: StateFlow<ProfileItem?>
+        field = MutableStateFlow<ProfileItem?>(null)
+
     fun showAddProfileDialog() {
         isAddProfileDialogVisible.value = true
     }
@@ -39,12 +42,24 @@ class SwitchProfilesViewModel(
     fun addProfile(name: ProfileName) {
         isAddProfileDialogVisible.value = false
         Timber.i("Add profile confirmed (%d chars)", name.value.length)
-        // TODO: handle profile creation via ProfileManager.createNewProfile
+        profileManager.createNewProfile(name)
+        refresh()
+    }
+
+    fun showRenameProfileDialog(profile: ProfileItem) {
+        profileBeingRenamed.value = profile
+    }
+
+    fun dismissRenameProfileDialog() {
+        profileBeingRenamed.value = null
     }
 
-    fun editProfile(profile: ProfileItem) {
-        Timber.i("Edit profile requested: %s", profile.id)
-        // TODO: implement profile rename via ProfileManager
+    fun renameProfile(name: ProfileName) {
+        val profile = profileBeingRenamed.value ?: return
+        profileBeingRenamed.value = null
+        Timber.i("Rename profile confirmed: %s", profile.id)
+        profileManager.renameProfile(profile.id, name)
+        refresh()
     }
 
     fun deleteProfile(profile: ProfileItem) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
index d19849561f62..b0100fb67249 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/reviewer/ViewerAction.kt
@@ -16,9 +16,11 @@ import com.ichi2.anki.preferences.reviewer.MenuDisplayType.DISABLED
 import com.ichi2.anki.preferences.reviewer.MenuDisplayType.MENU_ONLY
 import com.ichi2.anki.reviewer.Binding
 import com.ichi2.anki.reviewer.Binding.AppDefinedModifierKeys
+import com.ichi2.anki.reviewer.Binding.KeyCode
 import com.ichi2.anki.reviewer.Binding.ModifierKeys
 import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.ctrl
 import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.shift
+import com.ichi2.anki.reviewer.BindingUnicodeCharacter
 import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.MappableAction
 import com.ichi2.anki.reviewer.ReviewerBinding
@@ -120,13 +122,13 @@ enum class ViewerAction(
         when (this) {
             UNDO -> listOf(keycode(KeyEvent.KEYCODE_Z, ctrl()))
             REDO -> listOf(keycode(KeyEvent.KEYCODE_Z, ModifierKeys(shift = true, ctrl = true)))
-            MARK -> listOf(unicode('*'))
+            MARK -> listOf(unicode(BindingUnicodeCharacter('*')))
             EDIT -> listOf(keycode(KeyEvent.KEYCODE_E))
             ADD_NOTE -> listOf(keycode(KeyEvent.KEYCODE_A))
-            BURY_NOTE -> listOf(unicode('='))
-            BURY_CARD -> listOf(unicode('-'))
-            SUSPEND_NOTE -> listOf(unicode('!'))
-            SUSPEND_CARD -> listOf(unicode('@'))
+            BURY_NOTE -> listOf(unicode(BindingUnicodeCharacter('=')))
+            BURY_CARD -> listOf(unicode(BindingUnicodeCharacter('-')))
+            SUSPEND_NOTE -> listOf(unicode(BindingUnicodeCharacter('!')))
+            SUSPEND_CARD -> listOf(unicode(BindingUnicodeCharacter('@')))
             TOGGLE_AUTO_ADVANCE -> listOf(keycode(KeyEvent.KEYCODE_A, shift()))
             SHOW_HINT -> listOf(keycode(KeyEvent.KEYCODE_H))
             SHOW_ALL_HINTS -> listOf(keycode(KeyEvent.KEYCODE_G))
@@ -316,12 +318,12 @@ enum class ViewerAction(
         keys: ModifierKeys = ModifierKeys.none(),
         side: CardSide = CardSide.BOTH,
     ): ReviewerBinding {
-        val binding = Binding.keyCode(keycode, keys)
+        val binding = KeyCode(keycode, keys)
         return ReviewerBinding(binding = binding, side = side)
     }
 
     private fun unicode(
-        unicodeChar: Char,
+        unicodeChar: BindingUnicodeCharacter,
         keys: ModifierKeys = AppDefinedModifierKeys.allowShift(),
         side: CardSide = CardSide.BOTH,
     ): ReviewerBinding {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/CardViewerFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/CardViewerFragment.kt
index b6b381339832..a5255a09f487 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/CardViewerFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/CardViewerFragment.kt
@@ -312,15 +312,22 @@ abstract class CardViewerFragment(
                         Timber.w("URL blocked")
                         return true
                     }
-                    if (!appPermission.checkCanLaunchExternalApps()) {
+                    val intent = appPermission.createUrlIntent(url)
+                    if (intent == null) {
                         Timber.w("URL blocked: canLaunchExternalApps")
                         return true
                     }
                     try {
-                        openUrl(url)
-                    } catch (_: Throwable) {
-                        Timber.w("Could not open url")
-                        return false
+                        if (intent.hasCategory(Intent.CATEGORY_BROWSABLE)) {
+                            startActivity(intent)
+                        } else {
+                            // Preserve the existing browser check for custom schemes.
+                            openUrl(url)
+                        }
+                    } catch (e: Exception) {
+                        Timber.w(e, "Could not open url")
+                        showSnackbar(CommonString.activity_start_failed)
+                        // Consume failed launches: external pages must not load inside the card.
                     }
                 }
             }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/CardViewerViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/CardViewerViewModel.kt
index 26af26daee03..4c86c9ab1a1d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/CardViewerViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/CardViewerViewModel.kt
@@ -43,7 +43,8 @@ abstract class CardViewerViewModel(
 
     val showingAnswer = savedStateHandle.getMutableStateFlow(KEY_SHOWING_ANSWER, false)
 
-    protected val cardMediaPlayer =
+    @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
+    val cardMediaPlayer =
         CardMediaPlayer(
             javascriptEvaluator = { launchCatchingIO { eval.emit(it) } },
             mediaErrorListener = mediaErrorHandler,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerAction.kt b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerAction.kt
index 01657da992fc..bcd599a90083 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerAction.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerAction.kt
@@ -4,9 +4,10 @@ package com.ichi2.anki.previewer
 
 import android.content.SharedPreferences
 import android.view.KeyEvent
-import com.ichi2.anki.reviewer.Binding.Companion.keyCode
 import com.ichi2.anki.reviewer.Binding.Companion.unicode
+import com.ichi2.anki.reviewer.Binding.KeyCode
 import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.ctrl
+import com.ichi2.anki.reviewer.BindingUnicodeCharacter
 import com.ichi2.anki.reviewer.MappableAction
 import com.ichi2.anki.reviewer.MappableBinding
 
@@ -39,19 +40,19 @@ enum class PreviewerAction : MappableAction<MappableBinding> {
     private val defaultBindings: List<MappableBinding> get() {
         val binding =
             when (this) {
-                BACK -> keyCode(KeyEvent.KEYCODE_DPAD_LEFT)
-                NEXT -> keyCode(KeyEvent.KEYCODE_DPAD_RIGHT)
-                MARK -> unicode('*')
-                REPLAY_AUDIO -> keyCode(KeyEvent.KEYCODE_R)
-                EDIT -> keyCode(KeyEvent.KEYCODE_E)
-                TOGGLE_BACKSIDE_ONLY -> keyCode(KeyEvent.KEYCODE_B)
-                TOGGLE_FLAG_RED -> keyCode(KeyEvent.KEYCODE_1, ctrl())
-                TOGGLE_FLAG_ORANGE -> keyCode(KeyEvent.KEYCODE_2, ctrl())
-                TOGGLE_FLAG_GREEN -> keyCode(KeyEvent.KEYCODE_3, ctrl())
-                TOGGLE_FLAG_BLUE -> keyCode(KeyEvent.KEYCODE_4, ctrl())
-                TOGGLE_FLAG_PINK -> keyCode(KeyEvent.KEYCODE_5, ctrl())
-                TOGGLE_FLAG_TURQUOISE -> keyCode(KeyEvent.KEYCODE_6, ctrl())
-                TOGGLE_FLAG_PURPLE -> keyCode(KeyEvent.KEYCODE_7, ctrl())
+                BACK -> KeyCode(KeyEvent.KEYCODE_DPAD_LEFT)
+                NEXT -> KeyCode(KeyEvent.KEYCODE_DPAD_RIGHT)
+                MARK -> unicode(BindingUnicodeCharacter('*'))
+                REPLAY_AUDIO -> KeyCode(KeyEvent.KEYCODE_R)
+                EDIT -> KeyCode(KeyEvent.KEYCODE_E)
+                TOGGLE_BACKSIDE_ONLY -> KeyCode(KeyEvent.KEYCODE_B)
+                TOGGLE_FLAG_RED -> KeyCode(KeyEvent.KEYCODE_1, ctrl())
+                TOGGLE_FLAG_ORANGE -> KeyCode(KeyEvent.KEYCODE_2, ctrl())
+                TOGGLE_FLAG_GREEN -> KeyCode(KeyEvent.KEYCODE_3, ctrl())
+                TOGGLE_FLAG_BLUE -> KeyCode(KeyEvent.KEYCODE_4, ctrl())
+                TOGGLE_FLAG_PINK -> KeyCode(KeyEvent.KEYCODE_5, ctrl())
+                TOGGLE_FLAG_TURQUOISE -> KeyCode(KeyEvent.KEYCODE_6, ctrl())
+                TOGGLE_FLAG_PURPLE -> KeyCode(KeyEvent.KEYCODE_7, ctrl())
                 UNSET_FLAG -> return emptyList()
             }
         return listOf(MappableBinding(binding))
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt
index 2b46b8fd5f6b..d5d3bdcb528d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerFragment.kt
@@ -29,7 +29,7 @@ import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.common.destinations.navigate
 import com.ichi2.anki.common.utils.android.showThemedToast
 import com.ichi2.anki.databinding.FragmentPreviewerBinding
-import com.ichi2.anki.previewer.PreviewerFragment.Companion.CARD_IDS_FILE_ARG
+import com.ichi2.anki.previewer.PreviewerFragment.Companion.ARG_CARD_IDS_FILE
 import com.ichi2.anki.reviewer.BindingMap
 import com.ichi2.anki.reviewer.BindingProcessor
 import com.ichi2.anki.reviewer.MappableBinding
@@ -62,12 +62,12 @@ class PreviewerFragment :
             // Read before constructing the ViewModel, which immediately loads the first card.
             val ids =
                 try {
-                    arguments.requireParcelable<IdsFile>(CARD_IDS_FILE_ARG).getIds()
+                    arguments.requireParcelable<IdsFile>(ARG_CARD_IDS_FILE).getIds()
                 } catch (e: IOException) {
                     throw UnavailableSelectionException(e)
                 }
             if (ids.isEmpty()) throw UnavailableSelectionException()
-            PreviewerViewModel(handle, ids, requireNotNull(arguments.getIntOrNull(CURRENT_INDEX_ARG)))
+            PreviewerViewModel(handle, ids, requireNotNull(arguments.getIntOrNull(ARG_CURRENT_INDEX)))
         }
     }
 
@@ -308,11 +308,11 @@ class PreviewerFragment :
     ) : Exception("Unable to load preview selection", cause)
 
     companion object {
-        /** Index of the card to be first displayed among the IDs provided by [CARD_IDS_FILE_ARG] */
-        const val CURRENT_INDEX_ARG = "currentIndex"
+        /** Index of the card to be first displayed among the IDs provided by [ARG_CARD_IDS_FILE] */
+        const val ARG_CURRENT_INDEX = "currentIndex"
 
         /** Argument key to a [IdsFile] with the IDs of the cards to be displayed */
-        const val CARD_IDS_FILE_ARG = "cardIdsFile"
+        const val ARG_CARD_IDS_FILE = "cardIdsFile"
 
         fun getIntent(
             context: Context,
@@ -321,8 +321,8 @@ class PreviewerFragment :
         ): Intent {
             val arguments =
                 Bundle().apply {
-                    putInt(CURRENT_INDEX_ARG, currentIndex)
-                    putParcelable(CARD_IDS_FILE_ARG, idsFile)
+                    putInt(ARG_CURRENT_INDEX, currentIndex)
+                    putParcelable(ARG_CARD_IDS_FILE, idsFile)
                 }
             return CardViewerActivity.getIntent(context, PreviewerFragment::class, arguments)
         }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerViewModel.kt
index 1665e4f862a3..cf4cf14737ab 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/PreviewerViewModel.kt
@@ -69,7 +69,6 @@ class PreviewerViewModel(
 
     /** Call this after the webView has finished loading the page */
     @NeedsTest("16302 - a sound-only card on the back/flipped with 'don't keep activities'")
-    @NeedsTest("16302 - on config changes, sound continues to play")
     override fun onPageFinished(isAfterRecreation: Boolean) {
         launchCatchingIO {
             if (isAfterRecreation) {
@@ -92,9 +91,11 @@ class PreviewerViewModel(
         launchCatchingIO {
             backSideOnly.emit(!backSideOnly.value)
             if (!backSideOnly.value && showingAnswer.value) {
+                cardMediaPlayer.stop()
                 showQuestion()
                 cardMediaPlayer.autoplayAllForSide(CardSide.QUESTION)
             } else if (backSideOnly.value && !showingAnswer.value) {
+                cardMediaPlayer.stop()
                 showAnswer()
                 cardMediaPlayer.autoplayAllForSide(CardSide.ANSWER)
             }
@@ -135,6 +136,7 @@ class PreviewerViewModel(
     fun onNextButtonClick() {
         launchCatchingIO {
             if (!showingAnswer.value && !backSideOnly.value) {
+                cardMediaPlayer.stop()
                 showAnswer()
                 cardMediaPlayer.autoplayAllForSide(CardSide.ANSWER)
             } else {
@@ -152,6 +154,7 @@ class PreviewerViewModel(
             if (currentIndex.value > 0) {
                 updateCurrentIndex { it - 1 }
             } else if (showingAnswer.value && !backSideOnly.value) {
+                cardMediaPlayer.stop()
                 showQuestion()
             }
         }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TypeAnswer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TypeAnswer.kt
index 86ea68b09870..e783909a25e4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TypeAnswer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/previewer/TypeAnswer.kt
@@ -5,7 +5,6 @@ package com.ichi2.anki.previewer
 import android.os.LocaleList
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.cardviewer.TypeAnswerModifiers
-import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.libanki.Card
 import com.ichi2.anki.libanki.Field
 import com.ichi2.anki.servicelayer.LanguageHintService
@@ -20,13 +19,11 @@ import org.jetbrains.annotations.VisibleForTesting
  * @see [imeHintLocales]
  * @see [noSuggest]
  * */
-@NeedsTest("combining and non combining answers are properly parsed")
-@NeedsTest("nosuggest modifier is parsed and composes with nc/cloze")
 class TypeAnswer private constructor(
     private val text: String,
     /** whether combining characters should be compared. Defined by the presence of the
      *   `nc:` specifier in the type answer tag */
-    private val combining: Boolean,
+    val combining: Boolean,
     /**
      * Whether keyboard suggestions, swiping and autocorrect should be disabled (#10352).
      *
@@ -88,7 +85,6 @@ class TypeAnswer private constructor(
          * @param isCloze whether the placeholder was a `cloze:` type filter
          * @param fieldName the name of the field in the card template
          */
-        @NeedsTest("cloze type-in-answer are properly parsed")
         private suspend fun getExpectedTypeInAnswer(
             card: Card,
             isCloze: Boolean,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/progress/ProgressObserver.kt b/AnkiDroid/src/main/java/com/ichi2/anki/progress/ProgressObserver.kt
index 3d20f930496b..0780405ac327 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/progress/ProgressObserver.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/progress/ProgressObserver.kt
@@ -6,16 +6,23 @@ package com.ichi2.anki.progress
 import android.content.Context
 import android.view.Window
 import android.view.WindowManager
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.addCallback
+import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.coroutineScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.ichi2.anki.AnkiActivity
 import com.ichi2.anki.dialogs.LoadingDialogFragment
-import com.ichi2.anki.dialogs.dismissLoadingDialog
 import com.ichi2.anki.dialogs.showLoadingDialog
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.util.WeakHashMap
@@ -23,7 +30,7 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 
 /**
- * Blocks touches and shows/dismisses a loading dialog driven by [viewModel]'s progress flow.
+ * Blocks touches and back, and shows/dismisses a loading dialog driven by [viewModel]'s progress flow.
  * [delayMillis] defers the initial show so quick operations don't flash a dialog.
  * [resolveMessage] maps the ViewModel's message to the text shown in the dialog.
  */
@@ -31,65 +38,142 @@ fun <M : Any> AnkiActivity.observeProgress(
     viewModel: HasProgress<M>,
     delayMillis: Duration = 600.milliseconds,
     resolveMessage: Context.(M) -> String,
+) = observeProgressFor(this, viewModel, delayMillis, resolveMessage)
+
+private fun <M : Any> AnkiActivity.observeProgressFor(
+    owner: LifecycleOwner,
+    viewModel: HasProgress<M>,
+    delayMillis: Duration,
+    resolveMessage: Context.(M) -> String,
 ) {
     val dialogTag = "${LoadingDialogFragment.TAG}:${viewModel.javaClass.name}"
-    var dialogVisible = supportFragmentManager.findFragmentByTag(dialogTag) != null
-    var blockingTouches = false
-
-    lifecycleScope.launch {
-        repeatOnLifecycle(Lifecycle.State.STARTED) {
-            // Pending "show after delay" job survives subsequent Active emissions so the
-            // anti-flash delay isn't restarted on every progress update. Kept inside the
-            // block: a job cancelled on stop must not linger into the next start.
-            var pendingShow: Job? = null
-            viewModel.progressManager.progress.collect { state ->
-                when (state) {
-                    is ViewModelProgress.Idle -> {
-                        pendingShow?.cancel()
-                        pendingShow = null
-                        dialogVisible = false
-                        dismissLoadingDialog(dialogTag)
-                        if (blockingTouches) {
-                            blockingTouches = false
-                            window.unblockTouches()
-                        }
-                    }
-                    is ViewModelProgress.Active -> {
-                        if (!blockingTouches) {
-                            blockingTouches = true
-                            window.blockTouches()
-                        }
-                        if (dialogVisible) {
+    var holdingDialog = false
+    var reshowDialog: (() -> Unit)? = null
+    val dialogHolder: () -> Unit = { reshowDialog?.invoke() }
+    val ownerLifecycle = owner.lifecycle
+    var backBlock: OnBackPressedCallback? = null
+
+    fun blockInput() {
+        if (backBlock != null) return
+        window.blockTouches()
+        backBlock = onBackPressedDispatcher.addCallback(this) { Timber.i("Ignoring back while an operation runs") }
+    }
+
+    fun unblockInput() {
+        val block = backBlock ?: return
+        backBlock = null
+        block.remove()
+        window.unblockTouches()
+    }
+
+    fun holdDialog() {
+        if (holdingDialog) return
+        holdingDialog = true
+        supportFragmentManager.addDialogHolder(dialogTag, dialogHolder)
+    }
+
+    fun releaseDialog() {
+        if (!holdingDialog) return
+        holdingDialog = false
+        supportFragmentManager.removeDialogHolder(dialogTag, dialogHolder)
+    }
+
+    val restoringDialog =
+        !lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED) &&
+            supportFragmentManager.findFragmentByTag(dialogTag) != null
+    if (restoringDialog) holdDialog()
+
+    val releaseIfOwnerStopped =
+        LifecycleEventObserver { _, event ->
+            if (event == Lifecycle.Event.ON_START && !ownerLifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) releaseDialog()
+        }
+    lifecycle.addObserver(releaseIfOwnerStopped)
+
+    ownerLifecycle.coroutineScope.launch {
+        try {
+            ownerLifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                // Pending "show after delay" job survives subsequent Active emissions so the
+                // anti-flash delay isn't restarted on every progress update. Kept inside the
+                // block: a job cancelled on stop must not linger into the next start.
+                var pendingShow: Job? = null
+
+                fun showDialogAfter(wait: Duration) =
+                    ownerLifecycle.coroutineScope.launch(Dispatchers.Main) {
+                        delay(wait)
+                        val latest = viewModel.progressManager.progress.value
+                        if (latest is ViewModelProgress.Active) {
+                            holdDialog()
                             showLoadingDialog(
-                                message = formatMessage(state, resolveMessage),
-                                cancellable = state.cancellable,
+                                message = formatMessage(latest, resolveMessage),
+                                cancellable = latest.cancellable,
                                 tag = dialogTag,
                             )
-                            if (state.cancellable) wireCancelListener(viewModel, dialogTag)
-                        } else if (pendingShow == null) {
-                            pendingShow =
-                                launch {
-                                    delay(delayMillis)
-                                    val latest = viewModel.progressManager.progress.value
-                                    if (latest is ViewModelProgress.Active) {
-                                        dialogVisible = true
-                                        showLoadingDialog(
-                                            message = formatMessage(latest, resolveMessage),
-                                            cancellable = latest.cancellable,
-                                            tag = dialogTag,
-                                        )
-                                        if (latest.cancellable) wireCancelListener(viewModel, dialogTag)
-                                    }
-                                    pendingShow = null
-                                }
+                            if (latest.cancellable) wireCancelListener(viewModel, dialogTag)
+                        }
+                        pendingShow = null
+                    }
+
+                reshowDialog = {
+                    pendingShow?.cancel()
+                    pendingShow = showDialogAfter(Duration.ZERO)
+                }
+                val progress =
+                    viewModel.progressManager.progress.onCompletion {
+                        reshowDialog = null
+                        pendingShow?.cancel()
+                        unblockInput()
+                        if (lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) releaseDialog()
+                    }
+                progress.collect { state ->
+                    when (state) {
+                        is ViewModelProgress.Idle -> {
+                            pendingShow?.cancel()
+                            pendingShow = null
+                            releaseDialog()
+                            unblockInput()
+                        }
+                        is ViewModelProgress.Active -> {
+                            blockInput()
+                            if (holdingDialog) {
+                                pendingShow?.cancel()
+                                pendingShow = showDialogAfter(Duration.ZERO)
+                            } else if (pendingShow == null) {
+                                pendingShow = showDialogAfter(delayMillis)
+                            }
                         }
                     }
                 }
             }
+        } finally {
+            lifecycle.removeObserver(releaseIfOwnerStopped)
+            releaseDialog()
         }
     }
 }
 
+private val dialogHolders = WeakHashMap<FragmentManager, MutableMap<String, MutableList<() -> Unit>>>()
+
+private fun FragmentManager.addDialogHolder(
+    tag: String,
+    reshow: () -> Unit,
+) {
+    dialogHolders.getOrPut(this) { mutableMapOf() }.getOrPut(tag) { mutableListOf() }.add(reshow)
+}
+
+private fun FragmentManager.removeDialogHolder(
+    tag: String,
+    reshow: () -> Unit,
+) {
+    val holders = dialogHolders[this]?.get(tag) ?: return
+    holders.remove(reshow)
+    if (holders.isNotEmpty()) {
+        holders.last().invoke()
+        return
+    }
+    dialogHolders[this]?.remove(tag)
+    (findFragmentByTag(tag) as? DialogFragment)?.dismissAllowingStateLoss()
+}
+
 private val touchBlockCounts = WeakHashMap<Window, Int>()
 
 internal fun Window.blockTouches() {
@@ -122,7 +206,7 @@ private fun AnkiActivity.wireCancelListener(
 }
 
 /**
- * Fragment wrapper that delegates to the host activity.
+ * Follows this fragment's lifecycle, showing the dialog and blocking touches and back on the host activity.
  *
  * If the host is not an [AnkiActivity], logs a warning and returns — no observer is set up.
  *
@@ -145,7 +229,7 @@ fun <M : Any> Fragment.observeProgress(
         )
         return
     }
-    activity.observeProgress(viewModel, delayMillis, resolveMessage)
+    activity.observeProgressFor(this, viewModel, delayMillis, resolveMessage)
 }
 
 private fun <M : Any> Context.formatMessage(
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/provider/CardContentProvider.kt b/AnkiDroid/src/main/java/com/ichi2/anki/provider/CardContentProvider.kt
index fccd2f992dbe..ff105be96b6c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/provider/CardContentProvider.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/provider/CardContentProvider.kt
@@ -180,11 +180,14 @@ class CardContentProvider : ContentProvider() {
             return sanitized.toTypedArray()
         }
 
+        private val AUTHORITY = FlashCardsContract.getAuthority(BuildConfig.APPLICATION_ID)
+        private val PERMISSION = FlashCardsContract.getPermission(BuildConfig.APPLICATION_ID)
+
         init {
             fun addUri(
                 path: String,
                 code: Int,
-            ) = uriMatcher.addURI(FlashCardsContract.AUTHORITY, path, code)
+            ) = uriMatcher.addURI(AUTHORITY, path, code)
             // Here you can see all the URIs at a glance
             addUri("notes", NOTES)
             addUri("notes_v2", NOTES_V2)
@@ -979,7 +982,7 @@ class CardContentProvider : ContentProvider() {
                     // Add to collection
                     col.addNote(newNote, newNote.notetype.did)
 
-                    Uri.withAppendedPath(FlashCardsContract.Note.CONTENT_URI, newNote.id.toString())
+                    Uri.withAppendedPath(uri, newNote.id.toString())
                 }
                 NOTES_ID -> throw IllegalArgumentException("Not possible to insert note with specific ID")
                 NOTES_ID_CARDS, NOTES_ID_CARDS_ORD -> throw IllegalArgumentException(
@@ -1050,7 +1053,7 @@ class CardContentProvider : ContentProvider() {
 
                         // Get the mid and return a URI
                         val noteTypeId = newNoteType.id.toString()
-                        Uri.withAppendedPath(FlashCardsContract.Model.CONTENT_URI, noteTypeId)
+                        Uri.withAppendedPath(uri, noteTypeId)
                     } catch (e: JSONException) {
                         Timber.e(e, "Could not set a field of new note type %s", noteTypeName)
                         null
@@ -1132,7 +1135,7 @@ class CardContentProvider : ContentProvider() {
                         deck.description = deckDesc
                         col.decks.save(deck)
                     }
-                    Uri.withAppendedPath(FlashCardsContract.Deck.CONTENT_ALL_URI, did.toString())
+                    Uri.withAppendedPath(uri, did.toString())
                 }
                 DECK_SELECTED -> throw IllegalArgumentException("Selected deck can only be queried and updated")
                 DECKS_ID -> throw IllegalArgumentException("Not possible to insert deck with specific ID")
@@ -1483,15 +1486,14 @@ class CardContentProvider : ContentProvider() {
 
     private fun hasReadWritePermission(): Boolean =
         if (BuildConfig.DEBUG) { // Allow self-calling of the provider only in debug builds (e.g. for unit tests)
-            context!!.checkCallingOrSelfPermission(FlashCardsContract.READ_WRITE_PERMISSION) == PackageManager.PERMISSION_GRANTED
+            context!!.checkCallingOrSelfPermission(PERMISSION) == PackageManager.PERMISSION_GRANTED
         } else {
-            context!!.checkCallingPermission(FlashCardsContract.READ_WRITE_PERMISSION) == PackageManager.PERMISSION_GRANTED
+            context!!.checkCallingPermission(PERMISSION) == PackageManager.PERMISSION_GRANTED
         }
 
     /** Returns true if the calling package is known to be "rogue" and should be blocked.
      * Calling package might be rogue if it has not declared #READ_WRITE_PERMISSION in its manifest */
-    private fun knownRogueClient(): Boolean =
-        !context!!.arePermissionsDefinedInManifest(callingPackage!!, FlashCardsContract.READ_WRITE_PERMISSION)
+    private fun knownRogueClient(): Boolean = !context!!.arePermissionsDefinedInManifest(callingPackage!!, PERMISSION)
 }
 
 /** replaces [anki:play...] with [sound:] */
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/receiver/SdCardReceiver.kt b/AnkiDroid/src/main/java/com/ichi2/anki/receiver/SdCardReceiver.kt
index b38ae52c60fd..29f13484f5af 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/receiver/SdCardReceiver.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/receiver/SdCardReceiver.kt
@@ -22,7 +22,7 @@ class SdCardReceiver : AnkiBroadcastReceiver() {
         if (intent.action == Intent.ACTION_MEDIA_EJECT) {
             Timber.i("media eject detected - closing collection and sending broadcast")
             val i = Intent()
-            i.action = MEDIA_EJECT
+            i.action = ACTION_MEDIA_EJECT
             context.sendBroadcast(i)
             try {
                 val col = CollectionManager.getColUnsafe()
@@ -33,13 +33,13 @@ class SdCardReceiver : AnkiBroadcastReceiver() {
         } else if (intent.action == Intent.ACTION_MEDIA_MOUNTED) {
             Timber.i("media mount detected - sending broadcast")
             val i = Intent()
-            i.action = MEDIA_MOUNT
+            i.action = ACTION_MEDIA_MOUNT
             context.sendBroadcast(i)
         }
     }
 
     companion object {
-        const val MEDIA_EJECT = "com.ichi2.anki.action.MEDIA_EJECT"
-        const val MEDIA_MOUNT = "com.ichi2.anki.action.MEDIA_MOUNT"
+        const val ACTION_MEDIA_EJECT = "com.ichi2.anki.action.MEDIA_EJECT"
+        const val ACTION_MEDIA_MOUNT = "com.ichi2.anki.action.MEDIA_MOUNT"
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/recorder/VoiceRecorder.kt b/AnkiDroid/src/main/java/com/ichi2/anki/recorder/VoiceRecorder.kt
index 62ec5c768230..3932c04a1537 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/recorder/VoiceRecorder.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/recorder/VoiceRecorder.kt
@@ -3,7 +3,9 @@
 
 package com.ichi2.anki.recorder
 
+import android.content.Context
 import androidx.annotation.MainThread
+import com.ichi2.anki.common.time.TimeManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -15,6 +17,7 @@ import java.io.Closeable
 import java.io.File
 import java.io.IOException
 import kotlin.time.Duration
+import kotlin.time.Duration.Companion.days
 import kotlin.time.TimeSource
 
 sealed interface RecorderState {
@@ -183,5 +186,23 @@ class VoiceRecorder(
         const val RECORDINGS_DIRECTORY = "recordings"
         private const val FILE_PREFIX = "ankidroid_audiorec"
         private const val FILE_SUFFIX = ".3gp"
+        private val RECORDING_RETENTION = 7.days
+
+        fun recordingsDirectory(context: Context): File = File(context.noBackupFilesDir, RECORDINGS_DIRECTORY)
+
+        fun removeExpiredRecordings(
+            directory: File,
+            now: Long = TimeManager.time.intTimeMS(),
+        ) {
+            val cutoff = now - RECORDING_RETENTION.inWholeMilliseconds
+            directory
+                .listFiles { _, name -> name.startsWith(FILE_PREFIX) && name.endsWith(FILE_SUFFIX) }
+                ?.forEach { file ->
+                    val modified = file.lastModified()
+                    if (file.isFile && modified > 0 && modified < cutoff && !file.delete()) {
+                        Timber.w("Could not delete %s", file)
+                    }
+                }
+        }
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/AnswerButtons.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/AnswerButtons.kt
index f6cb5787d22b..acaea2b5cc93 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/AnswerButtons.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/AnswerButtons.kt
@@ -4,11 +4,11 @@ package com.ichi2.anki.reviewer
 
 import android.content.Context
 import com.ichi2.anki.AnkiActivity
-import com.ichi2.anki.R
 import com.ichi2.anki.cardviewer.ViewerCommand
 import com.ichi2.anki.common.android.animationEnabled
 import com.ichi2.anki.common.utils.android.getColorsFromAttrs
 import com.ichi2.anki.common.utils.android.getResFromAttr
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Handles mapping from an answer button to its position.
@@ -72,17 +72,17 @@ enum class AnswerButtons {
             val backgroundIds: IntArray =
                 if (ctx.animationEnabled()) {
                     intArrayOf(
-                        R.attr.againButtonRippleRef,
-                        R.attr.hardButtonRippleRef,
-                        R.attr.goodButtonRippleRef,
-                        R.attr.easyButtonRippleRef,
+                        CommonR.attr.againButtonRippleRef,
+                        CommonR.attr.hardButtonRippleRef,
+                        CommonR.attr.goodButtonRippleRef,
+                        CommonR.attr.easyButtonRippleRef,
                     )
                 } else {
                     intArrayOf(
-                        R.attr.againButtonRef,
-                        R.attr.hardButtonRef,
-                        R.attr.goodButtonRef,
-                        R.attr.easyButtonRef,
+                        CommonR.attr.againButtonRef,
+                        CommonR.attr.hardButtonRef,
+                        CommonR.attr.goodButtonRef,
+                        CommonR.attr.easyButtonRef,
                     )
                 }
             return getResFromAttr(ctx, backgroundIds)
@@ -92,10 +92,10 @@ enum class AnswerButtons {
             getColorsFromAttrs(
                 ctx,
                 intArrayOf(
-                    R.attr.againButtonTextColor,
-                    R.attr.hardButtonTextColor,
-                    R.attr.goodButtonTextColor,
-                    R.attr.easyButtonTextColor,
+                    CommonR.attr.againButtonTextColor,
+                    CommonR.attr.hardButtonTextColor,
+                    CommonR.attr.goodButtonTextColor,
+                    CommonR.attr.easyButtonTextColor,
                 ),
             )
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/AnswerTimer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/AnswerTimer.kt
index a87570446eb9..c7b911f50018 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/AnswerTimer.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/AnswerTimer.kt
@@ -11,11 +11,11 @@ import androidx.annotation.VisibleForTesting
 import androidx.core.view.isInvisible
 import com.google.android.material.color.MaterialColors
 import com.ichi2.anki.CollectionManager.withCol
-import com.ichi2.anki.R
 import com.ichi2.anki.libanki.Card
 import com.ichi2.anki.libanki.Collection
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Responsible for pause/resume of the card timer and the UI element displaying the amount of time to answer a card
@@ -83,7 +83,7 @@ class AnswerTimer(
         cardTimer.setOnChronometerTickListener { chronometer: Chronometer ->
             val elapsed: Long = elapsedRealTime - chronometer.base
             if (elapsed >= limit) {
-                chronometer.setTextColor(MaterialColors.getColor(context, R.attr.maxTimerColor, 0))
+                chronometer.setTextColor(MaterialColors.getColor(context, CommonR.attr.maxTimerColor, 0))
                 chronometer.stop()
             }
         }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt
index d7cacd83ed28..1a6a913a3bba 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt
@@ -4,7 +4,6 @@ package com.ichi2.anki.reviewer
 
 import android.content.Context
 import android.view.KeyEvent
-import androidx.annotation.VisibleForTesting
 import com.ichi2.anki.cardviewer.Gesture
 import com.ichi2.anki.common.utils.StringUtils
 import com.ichi2.anki.common.utils.ext.ifNotZero
@@ -95,9 +94,14 @@ sealed interface Binding {
         override fun hashCode(): Int = Objects.hash(keycode)
     }
 
+    /**
+     * A keyboard shortcut matched by the character produced by a key press.
+     *
+     * [KeyCode] is insufficient: e.g. `@` doesn't have a consistent keypress across keyboards.
+     */
     @Suppress("EqualsOrHashCode")
     data class UnicodeCharacter(
-        val unicodeCharacter: Char,
+        val unicodeCharacter: BindingUnicodeCharacter,
         override val modifierKeys: ModifierKeys = AppDefinedModifierKeys.allowShift(),
     ) : KeyBinding {
         override fun toDisplayString(context: Context): String =
@@ -105,27 +109,18 @@ sealed interface Binding {
                 append(KEY_PREFIX)
                 append(' ')
                 append(modifierKeys.toString())
-                append(unicodeCharacter)
+                append(unicodeCharacter.value)
             }
 
         override fun toString(): String =
             buildString {
                 append(UNICODE_PREFIX)
                 append(modifierKeys.toString())
-                append(unicodeCharacter)
+                append(unicodeCharacter.value)
             }
 
         // don't include the modifierKeys
-        override fun hashCode(): Int = Objects.hash(unicodeCharacter)
-    }
-
-    data object UnknownBinding : Binding {
-        override fun toDisplayString(context: Context): String = ""
-
-        override fun toString(): String = ""
-
-        override val isValid: Boolean
-            get() = false
+        override fun hashCode(): Int = Objects.hash(unicodeCharacter.value)
     }
 
     fun toDisplayString(context: Context): String
@@ -190,7 +185,8 @@ sealed interface Binding {
              * @return The [ModifierKeys], and the remainder of the string
              */
             fun parse(s: String): Pair<ModifierKeys, String> {
-                val plusIndex = s.lastIndexOfOrNull('+') ?: return Pair(none(), s)
+                // A trailing '+' is the bound character, not a modifier separator.
+                val plusIndex = s.lastIndexOfOrNull('+', startIndex = s.lastIndex - 1) ?: return Pair(none(), s)
                 val modifiers = fromString(s.take(plusIndex + 1))
                 return Pair(modifiers, s.substring(plusIndex + 1))
             }
@@ -220,8 +216,6 @@ sealed interface Binding {
     }
 
     companion object {
-        const val FORBIDDEN_UNICODE_CHAR = MappableBinding.PREF_SEPARATOR
-
         /**
          * https://www.fileformat.info/info/unicode/char/2328/index.htm (Keyboard)
          */
@@ -249,45 +243,43 @@ sealed interface Binding {
         fun possibleKeyBindings(event: KeyEvent): List<KeyBinding> {
             val modifiers = ModifierKeys(event.isShiftPressed, event.isCtrlPressed, event.isAltPressed)
             val ret: MutableList<KeyBinding> = ArrayList()
-            event.keyCode.ifNotZero { keyCode -> ret.add(keyCode(keyCode, modifiers)) }
+            event.keyCode.ifNotZero { keyCode -> ret.add(KeyCode(keyCode, modifiers)) }
 
             // passing in metaState: 0 means that Ctrl+1 returns '1' instead of '\0'
             // NOTE: We do not differentiate on upper/lower case via KeyEvent.META_CAPS_LOCK_ON
             event
                 .getUnicodeChar(event.metaState and (KeyEvent.META_SHIFT_ON or KeyEvent.META_NUM_LOCK_ON))
                 .ifNotZero { unicodeChar ->
-                    try {
-                        ret.add(unicode(unicodeChar.toChar(), modifiers) as KeyBinding)
-                    } catch (e: Exception) {
-                        // very slight chance it returns unknown()
-                        Timber.w(e)
+                    BindingUnicodeCharacter.fromCharOrNull(unicodeChar.toChar())?.let { character ->
+                        ret.add(unicode(character, modifiers))
                     }
                 }
 
             return ret
         }
 
-        fun fromString(from: String): Binding {
-            if (from.isEmpty()) return UnknownBinding
+        fun fromString(from: String): Binding? {
+            if (from.isEmpty()) return null
             try {
                 return when (from[0]) {
                     JOYSTICK_CHAR_PREFIX -> AxisButtonBinding.from(from.substring(1))
                     GESTURE_PREFIX -> GestureInput(Gesture.valueOf(from.substring(1)))
                     UNICODE_PREFIX -> {
                         val (modifierKeys, char) = ModifierKeys.parse(from.substring(1))
-                        UnicodeCharacter(char[0], modifierKeys)
+                        val unicodeChar = BindingUnicodeCharacter.fromCharOrNull(char[0]) ?: return null
+                        UnicodeCharacter(unicodeChar, modifierKeys)
                     }
                     KEY_PREFIX -> {
                         val (modifierKeys, keyCodeAsString) = ModifierKeys.parse(from.substring(1))
                         val keyCode = keyCodeAsString.toInt()
                         KeyCode(keyCode, modifierKeys)
                     }
-                    else -> UnknownBinding
+                    else -> null
                 }
             } catch (ex: Exception) {
                 Timber.w(ex)
             }
-            return UnknownBinding
+            return null
         }
 
         /**
@@ -295,21 +287,10 @@ sealed interface Binding {
          * See [AppDefinedModifierKeys]
          */
         fun unicode(
-            unicodeChar: Char,
+            unicodeChar: BindingUnicodeCharacter,
             modifierKeys: ModifierKeys = AppDefinedModifierKeys.allowShift(),
-        ): Binding {
-            if (unicodeChar == FORBIDDEN_UNICODE_CHAR) return unknown()
-            return UnicodeCharacter(unicodeChar, modifierKeys)
-        }
-
-        fun keyCode(
-            keyCode: Int,
-            modifiers: ModifierKeys = ModifierKeys.none(),
-        ) = KeyCode(keyCode, modifiers)
+        ): KeyBinding = UnicodeCharacter(unicodeChar, modifierKeys)
 
         fun gesture(gesture: Gesture) = GestureInput(gesture)
-
-        @VisibleForTesting
-        fun unknown() = UnknownBinding
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/BindingMap.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/BindingMap.kt
index 8b4af224cf1e..157f81158052 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/BindingMap.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/BindingMap.kt
@@ -49,7 +49,6 @@ class BindingMap<B : MappableBinding, A : MappableAction<B>>(
                             gestureMap[binding.gesture] = mutableListOf(action to mappableBinding)
                         }
                     }
-                    else -> {}
                 }
             }
         }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/BindingUnicodeCharacter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/BindingUnicodeCharacter.kt
new file mode 100644
index 000000000000..b08e4e5dcfc2
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/BindingUnicodeCharacter.kt
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.reviewer
+
+/** @see Binding.UnicodeCharacter */
+@JvmInline
+value class BindingUnicodeCharacter(
+    val value: Char,
+) {
+    init {
+        require(value != FORBIDDEN_UNICODE_CHAR) { "The preference separator cannot be bound" }
+    }
+
+    companion object {
+        /** Separates bindings in preferences; using it as a key would split the binding during deserialization. */
+        private const val FORBIDDEN_UNICODE_CHAR = MappableBinding.PREF_SEPARATOR
+
+        /** Returns null for the preference separator, which cannot be stored as a binding. */
+        fun fromCharOrNull(value: Char): BindingUnicodeCharacter? =
+            if (value == FORBIDDEN_UNICODE_CHAR) null else BindingUnicodeCharacter(value)
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
index 239bc840d48f..6931186da6d5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/MappableBinding.kt
@@ -52,9 +52,10 @@ open class MappableBinding(
         @CheckResult
         fun fromPreferenceString(string: String?): List<MappableBinding> {
             if (string.isNullOrEmpty()) return emptyList()
-            return getPreferenceSubstrings(string).map {
-                val binding = Binding.fromString(it)
-                MappableBinding(binding)
+            return getPreferenceSubstrings(string).mapNotNull { substring ->
+                Binding.fromString(substring)?.let { binding ->
+                    MappableBinding(binding)
+                }
             }
         }
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerBinding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerBinding.kt
index 9baca34f25e9..4af2724df680 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerBinding.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerBinding.kt
@@ -69,7 +69,7 @@ class ReviewerBinding(
                     StringBuilder(string)
                         .substring(0, string.length - 1)
                         .removePrefix(PREFIX.toString())
-                val binding = Binding.fromString(bindingString)
+                val binding = Binding.fromString(bindingString) ?: return null
                 val side =
                     when (string.last()) {
                         QUESTION_SUFFIX -> CardSide.QUESTION
@@ -79,8 +79,7 @@ class ReviewerBinding(
                 return ReviewerBinding(binding, side)
             }
 
-            val strings = getPreferenceSubstrings(prefString)
-            return strings.mapNotNull { fromString(it) }
+            return getPreferenceSubstrings(prefString).mapNotNull { fromString(it) }
         }
 
         @CheckResult
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/AddEditReminderDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/AddEditReminderDialog.kt
index e5a5c558642a..9d3695fb9775 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/AddEditReminderDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/AddEditReminderDialog.kt
@@ -7,6 +7,7 @@ import android.app.Dialog
 import android.os.Bundle
 import android.os.Parcelable
 import android.text.format.DateFormat
+import androidx.annotation.AttrRes
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
@@ -15,6 +16,9 @@ import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.setFragmentResult
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.LiveData
+import com.google.android.material.chip.Chip
+import com.google.android.material.color.MaterialColors
 import com.google.android.material.timepicker.MaterialTimePicker
 import com.google.android.material.timepicker.TimeFormat
 import com.ichi2.anki.CollectionManager.TR
@@ -47,6 +51,7 @@ import com.ichi2.utils.neutralButton
 import com.ichi2.utils.positiveButton
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber
+import com.ichi2.anki.common.android.R as CommonR
 
 class AddEditReminderDialog : DialogFragment() {
     /**
@@ -123,6 +128,7 @@ class AddEditReminderDialog : DialogFragment() {
         setInitialDeckSelection()
         setUpAdvancedDropdown()
         setUpCardThresholdInput()
+        setUpCountChips()
         setUpOnlyNotifyIfNoReviewsCheckbox()
 
         setDialogKeyboardResize(dialog)
@@ -245,6 +251,55 @@ class AddEditReminderDialog : DialogFragment() {
         }
     }
 
+    /**
+     * Convenience data class for setting up the chips for whether to count new, learning, and review cards
+     * when considering the card trigger threshold.
+     * @see setUpCountChips
+     */
+    private data class CountViewsAndActions(
+        val chip: Chip,
+        val label: String,
+        @AttrRes val colorAttr: Int,
+        val actionOnClick: () -> Unit,
+        val state: LiveData<Boolean>,
+    )
+
+    private fun setUpCountChips() {
+        val countViewsAndActionsItems =
+            listOf(
+                CountViewsAndActions(
+                    chip = binding.addEditReminderCountNewChip,
+                    label = TR.actionsNew(),
+                    colorAttr = CommonR.attr.newCountColor,
+                    actionOnClick = viewModel::toggleCountNew,
+                    state = viewModel.countNew,
+                ),
+                CountViewsAndActions(
+                    chip = binding.addEditReminderCountLrnChip,
+                    label = TR.schedulingLearning(),
+                    colorAttr = CommonR.attr.learnCountColor,
+                    actionOnClick = viewModel::toggleCountLrn,
+                    state = viewModel.countLrn,
+                ),
+                CountViewsAndActions(
+                    chip = binding.addEditReminderCountRevChip,
+                    label = TR.studyingToReview(),
+                    colorAttr = CommonR.attr.reviewCountColor,
+                    actionOnClick = viewModel::toggleCountRev,
+                    state = viewModel.countRev,
+                ),
+            )
+
+        countViewsAndActionsItems.forEach { item ->
+            item.chip.text = item.label
+            item.chip.setTextColor(MaterialColors.getColor(requireContext(), item.colorAttr, 0))
+            item.chip.setOnClickListener { item.actionOnClick() }
+            item.state.observe(this) { value ->
+                item.chip.isChecked = value
+            }
+        }
+    }
+
     private fun setUpOnlyNotifyIfNoReviewsCheckbox() {
         binding.addEditReminderOnlyNotifyIfNoReviewsSection.setOnClickListener {
             viewModel.toggleOnlyNotifyIfNoReviews()
@@ -359,7 +414,7 @@ class AddEditReminderDialog : DialogFragment() {
         /**
          * Icon that shows next to the advanced settings section when the dropdown is closed.
          */
-        private val DROPDOWN_COLLAPSED_CHEVRON = R.drawable.ic_baseline_chevron_right_24
+        private val DROPDOWN_COLLAPSED_CHEVRON = CommonR.drawable.ic_baseline_chevron_right_24
 
         /**
          * Arguments key for the dialog mode to open this dialog in.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/AddEditReminderDialogViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/AddEditReminderDialogViewModel.kt
index 6f627f1344c0..089a5c3542bc 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/AddEditReminderDialogViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/AddEditReminderDialogViewModel.kt
@@ -29,22 +29,25 @@ class AddEditReminderDialogViewModel(
             savedStateHandle.get<AddEditReminderDialog.DialogMode>(AddEditReminderDialog.ARG_DIALOG_MODE),
         ) { "dialogMode is required" }
 
-    private val _time =
+    val time: LiveData<ReviewReminderTime>
+        field =
         MutableLiveData(
             when (dialogMode) {
                 is AddEditReminderDialog.DialogMode.Add -> ReviewReminderTime.getCurrentTime()
                 is AddEditReminderDialog.DialogMode.Edit -> dialogMode.reminderToBeEdited.time
             },
         )
-    val time: LiveData<ReviewReminderTime> = _time
 
     /**
      * Here, we set an immediate default value for the deck selected based on the dialog mode.
      * However, it is possible that the deck with this deck ID does not currently exist in the collection
      * (ex. due to a deleted deck, changed collection folder, etc.). Since checking for this case requires
      * accessing the collection, we handle it in [AddEditReminderDialog.setInitialDeckSelection].
+     *
+     * [ALL_DECKS_ID] is used to represent All Decks (i.e. [ReviewReminderScope.Global]) being selected.
      */
-    private val _deckSelected =
+    val deckSelected: LiveData<DeckId>
+        field =
         MutableLiveData(
             when (dialogMode) {
                 is AddEditReminderDialog.DialogMode.Add -> {
@@ -62,55 +65,92 @@ class AddEditReminderDialogViewModel(
             },
         )
 
-    /**
-     * [ALL_DECKS_ID] is used to represent All Decks (i.e. [ReviewReminderScope.Global]) being selected.
-     */
-    val deckSelected: LiveData<DeckId> = _deckSelected
-
-    private val _cardTriggerThreshold =
+    val cardTriggerThreshold: LiveData<Int>
+        field =
         MutableLiveData(
             when (dialogMode) {
                 is AddEditReminderDialog.DialogMode.Add -> INITIAL_CARD_THRESHOLD
                 is AddEditReminderDialog.DialogMode.Edit -> dialogMode.reminderToBeEdited.cardTriggerThreshold.threshold
             },
         )
-    val cardTriggerThreshold: LiveData<Int> = _cardTriggerThreshold
 
-    private val _onlyNotifyIfNoReviews =
+    val countNew: LiveData<Boolean>
+        field =
+        MutableLiveData(
+            when (dialogMode) {
+                is AddEditReminderDialog.DialogMode.Add -> INITIAL_COUNT_NEW
+                is AddEditReminderDialog.DialogMode.Edit -> dialogMode.reminderToBeEdited.thresholdFilter.countNew
+            },
+        )
+
+    val countLrn: LiveData<Boolean>
+        field =
+        MutableLiveData(
+            when (dialogMode) {
+                is AddEditReminderDialog.DialogMode.Add -> INITIAL_COUNT_LRN
+                is AddEditReminderDialog.DialogMode.Edit -> dialogMode.reminderToBeEdited.thresholdFilter.countLrn
+            },
+        )
+
+    val countRev: LiveData<Boolean>
+        field =
+        MutableLiveData(
+            when (dialogMode) {
+                is AddEditReminderDialog.DialogMode.Add -> INITIAL_COUNT_REV
+                is AddEditReminderDialog.DialogMode.Edit -> dialogMode.reminderToBeEdited.thresholdFilter.countRev
+            },
+        )
+
+    val onlyNotifyIfNoReviews: LiveData<Boolean>
+        field =
         MutableLiveData(
             when (dialogMode) {
                 is AddEditReminderDialog.DialogMode.Add -> INITIAL_ONLY_NOTIFY_IF_NO_REVIEWS
                 is AddEditReminderDialog.DialogMode.Edit -> dialogMode.reminderToBeEdited.onlyNotifyIfNoReviews
             },
         )
-    val onlyNotifyIfNoReviews: LiveData<Boolean> = _onlyNotifyIfNoReviews
 
-    private val _advancedSettingsOpen = MutableLiveData(INITIAL_ADVANCED_SETTINGS_OPEN)
-    val advancedSettingsOpen: LiveData<Boolean> = _advancedSettingsOpen
+    val advancedSettingsOpen: LiveData<Boolean>
+        field = MutableLiveData(INITIAL_ADVANCED_SETTINGS_OPEN)
 
-    fun setTime(time: ReviewReminderTime) {
-        Timber.i("Updated time to %s", time)
-        _time.value = time
+    fun setTime(newTime: ReviewReminderTime) {
+        Timber.i("Updated time to %s", newTime)
+        time.value = newTime
     }
 
     fun setDeckSelected(deckId: DeckId) {
         Timber.i("Updated deck selected to %s", deckId)
-        _deckSelected.value = deckId
+        deckSelected.value = deckId
     }
 
     fun setCardTriggerThreshold(threshold: Int) {
         Timber.i("Updated card trigger threshold to %s", threshold)
-        _cardTriggerThreshold.value = threshold
+        cardTriggerThreshold.value = threshold
+    }
+
+    fun toggleCountNew() {
+        Timber.i("Toggled count new from %s", countNew.value)
+        countNew.value = !(countNew.value ?: false)
+    }
+
+    fun toggleCountLrn() {
+        Timber.i("Toggled count lrn from %s", countLrn.value)
+        countLrn.value = !(countLrn.value ?: false)
+    }
+
+    fun toggleCountRev() {
+        Timber.i("Toggled count rev from %s", countRev.value)
+        countRev.value = !(countRev.value ?: false)
     }
 
     fun toggleOnlyNotifyIfNoReviews() {
-        Timber.i("Toggled onlyNotifyIfNoReviews from %s", _onlyNotifyIfNoReviews.value)
-        _onlyNotifyIfNoReviews.value = !(_onlyNotifyIfNoReviews.value ?: false)
+        Timber.i("Toggled onlyNotifyIfNoReviews from %s", onlyNotifyIfNoReviews.value)
+        onlyNotifyIfNoReviews.value = !(onlyNotifyIfNoReviews.value ?: false)
     }
 
     fun toggleAdvancedSettingsOpen() {
-        Timber.i("Toggled advanced settings open from %s", _advancedSettingsOpen.value)
-        _advancedSettingsOpen.value = !(_advancedSettingsOpen.value ?: false)
+        Timber.i("Toggled advanced settings open from %s", advancedSettingsOpen.value)
+        advancedSettingsOpen.value = !(advancedSettingsOpen.value ?: false)
     }
 
     /**
@@ -138,6 +178,12 @@ class AddEditReminderDialogViewModel(
                     is AddEditReminderDialog.DialogMode.Edit -> dialogMode.reminderToBeEdited.enabled
                 },
             onlyNotifyIfNoReviews = onlyNotifyIfNoReviews.value ?: INITIAL_ONLY_NOTIFY_IF_NO_REVIEWS,
+            thresholdFilter =
+                ReviewReminderThresholdFilter(
+                    countNew = countNew.value ?: INITIAL_COUNT_NEW,
+                    countLrn = countLrn.value ?: INITIAL_COUNT_LRN,
+                    countRev = countRev.value ?: INITIAL_COUNT_REV,
+                ),
         )
 
     companion object {
@@ -150,6 +196,26 @@ class AddEditReminderDialogViewModel(
          */
         private const val INITIAL_CARD_THRESHOLD: Int = 1
 
+        /**
+         * The default setting for whether new cards are counted when checking the card trigger threshold.
+         * This value, and the other default settings for whether certain kinds of cards are counted
+         * when checking the card trigger threshold, are all set to true, as removing some card types
+         * from card trigger threshold consideration is a form of advanced review reminder customization.
+         */
+        private const val INITIAL_COUNT_NEW = true
+
+        /**
+         * The default setting for whether cards in learning are counted when checking the card trigger threshold.
+         * @see INITIAL_COUNT_NEW
+         */
+        private const val INITIAL_COUNT_LRN = true
+
+        /**
+         * The default setting for whether cards in review are counted when checking the card trigger threshold.
+         * @see INITIAL_COUNT_NEW
+         */
+        private const val INITIAL_COUNT_REV = true
+
         /**
          * The default value for whether a notification should only be fired if no reviews have been done today
          * for the corresponding deck / all decks. Since this is set to false, the default behaviour is that
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ReminderTroubleshootingFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ReminderTroubleshootingFragment.kt
index 3db774bd2118..34167d3a946e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ReminderTroubleshootingFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ReminderTroubleshootingFragment.kt
@@ -36,6 +36,7 @@ import com.ichi2.anki.CommonString
 import com.ichi2.anki.NotificationChannel
 import com.ichi2.anki.R
 import com.ichi2.anki.common.utils.android.getColorFromAttr
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.FragmentReminderTroubleshootingBinding
 import com.ichi2.anki.databinding.ItemTroubleshootingCheckBinding
 import com.ichi2.anki.requireAnkiActivity
@@ -49,10 +50,10 @@ import com.ichi2.utils.Permissions.attemptToEnableNotifications
 import com.ichi2.utils.Permissions.openAppNotificationsSettingsScreen
 import com.ichi2.utils.TruncatedString
 import com.ichi2.utils.copyToClipboard
-import com.ichi2.utils.dp
 import dev.androidbroadcast.vbpd.viewBinding
 import kotlinx.coroutines.launch
 import timber.log.Timber
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * An action which a user can take to resolve a [check][TroubleshootingCheck].
@@ -170,14 +171,14 @@ class ReminderTroubleshootingFragment : Fragment(R.layout.fragment_reminder_trou
                     SummaryStatus.Warning ->
                         Triple(
                             R.drawable.ic_warning_24,
-                            getColorFromAttr(context, R.attr.reminderTroubleshootingWarning),
+                            getColorFromAttr(context, CommonR.attr.reminderTroubleshootingWarning),
                             context.getString(CommonString.reminder_troubleshooting_summary_warning),
                         )
 
                     SummaryStatus.Ok ->
                         Triple(
                             R.drawable.ic_check_circle_24,
-                            getColorFromAttr(context, R.attr.reminderTroubleshootingOk),
+                            getColorFromAttr(context, CommonR.attr.reminderTroubleshootingOk),
                             context.getString(CommonString.reminder_troubleshooting_summary_ok),
                         )
                 }
@@ -430,8 +431,8 @@ private fun CheckResult.iconRes(): Int =
 
 private fun CheckResult.tintColor(context: Context): Int =
     when (this) {
-        is CheckResult.Passed -> getColorFromAttr(context, R.attr.reminderTroubleshootingOk)
-        is CheckResult.Warning -> getColorFromAttr(context, R.attr.reminderTroubleshootingWarning)
+        is CheckResult.Passed -> getColorFromAttr(context, CommonR.attr.reminderTroubleshootingOk)
+        is CheckResult.Warning -> getColorFromAttr(context, CommonR.attr.reminderTroubleshootingWarning)
         is CheckResult.Failed -> context.getColor(android.R.color.holo_red_dark)
         is CheckResult.Loading -> context.getColor(android.R.color.darker_gray)
         is CheckResult.Unavailable -> context.getColor(android.R.color.darker_gray)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ReviewReminder.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ReviewReminder.kt
index 233fffd2fac7..d00f648a2912 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ReviewReminder.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ReviewReminder.kt
@@ -10,10 +10,12 @@ import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.common.time.TimeManager
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.libanki.EpochMilliseconds
+import com.ichi2.anki.libanki.sched.Counts
 import com.ichi2.anki.settings.Prefs
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 import timber.log.Timber
 import java.util.Calendar
 import kotlin.time.Duration.Companion.hours
@@ -96,6 +98,31 @@ value class ReviewReminderCardTriggerThreshold(
     }
 }
 
+/**
+ * A filter specifying which types of cards to count towards the [ReviewReminderCardTriggerThreshold].
+ *
+ * @param countNew Whether new cards are counted when checking the threshold.
+ * @param countLrn Whether learning cards are counted when checking the threshold.
+ * @param countRev Whether review cards are counted when checking the threshold.
+ */
+@Serializable
+@Parcelize
+data class ReviewReminderThresholdFilter(
+    val countNew: Boolean = true,
+    val countLrn: Boolean = true,
+    val countRev: Boolean = true,
+) : Parcelable {
+    /**
+     * Filters the given [inputCounts] according to this filter's settings and returns the resulting [Counts].
+     */
+    fun filterCounts(inputCounts: Counts): Counts =
+        Counts(
+            new = if (countNew) inputCounts.new else 0,
+            lrn = if (countLrn) inputCounts.lrn else 0,
+            rev = if (countRev) inputCounts.rev else 0,
+        )
+}
+
 /**
  * An indicator of whether a review reminders feature is associated with every deck in the user's
  * collection or if it is associated with a single deck. For example, the [ScheduleRemindersFragment] fragment
@@ -122,6 +149,7 @@ sealed class ReviewReminderScope : Parcelable {
         val did: DeckId,
     ) : ReviewReminderScope() {
         @IgnoredOnParcel
+        @Transient
         private var cachedDeckName: String? = null
 
         /**
@@ -193,6 +221,7 @@ data class ReviewReminder private constructor(
     var latestNotifTime: EpochMilliseconds,
     val profileID: String,
     val onlyNotifyIfNoReviews: Boolean,
+    val thresholdFilter: ReviewReminderThresholdFilter,
 ) : Parcelable,
     ReviewReminderSchema {
     companion object {
@@ -208,6 +237,7 @@ data class ReviewReminder private constructor(
             enabled: Boolean = true,
             profileID: String = "",
             onlyNotifyIfNoReviews: Boolean = false,
+            thresholdFilter: ReviewReminderThresholdFilter = ReviewReminderThresholdFilter(),
         ) = ReviewReminder(
             id = ReviewReminderId.getAndIncrementNextFreeReminderId(),
             time,
@@ -217,7 +247,30 @@ data class ReviewReminder private constructor(
             latestNotifTime = TimeManager.time.calendar().timeInMillis,
             profileID,
             onlyNotifyIfNoReviews,
+            thresholdFilter,
         )
+
+        /**
+         * Creates a review reminder from the latest outdated schema. Should only be used for migration.
+         * Must be changed when the schema is updated.
+         *
+         * This method is necessary for schema migration because migrated review reminders should retain
+         * their original ID. Otherwise, review reminder alarms associated with the old ID will remain active
+         * and become orphaned. Note that this method must be located here because the constructor of [ReviewReminder]
+         * (and hence access to the [id] field) is private.
+         */
+        fun createViaMigration(latestOutdatedSchema: ReviewReminderSchemaV4) =
+            ReviewReminder(
+                id = latestOutdatedSchema.id,
+                time = latestOutdatedSchema.time,
+                cardTriggerThreshold = latestOutdatedSchema.cardTriggerThreshold,
+                scope = latestOutdatedSchema.scope,
+                enabled = latestOutdatedSchema.enabled,
+                latestNotifTime = latestOutdatedSchema.latestNotifTime,
+                profileID = latestOutdatedSchema.profileID,
+                onlyNotifyIfNoReviews = latestOutdatedSchema.onlyNotifyIfNoReviews,
+                thresholdFilter = ReviewReminderThresholdFilter(),
+            )
     }
 
     /**
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ReviewReminderSchema.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ReviewReminderSchema.kt
index ae1cb3874ccd..f1e0c8b790d4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ReviewReminderSchema.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ReviewReminderSchema.kt
@@ -3,8 +3,11 @@
 
 package com.ichi2.anki.reviewreminders
 
+import com.ichi2.anki.common.time.TimeManager
 import com.ichi2.anki.libanki.DeckId
+import com.ichi2.anki.libanki.EpochMilliseconds
 import com.ichi2.anki.reviewreminders.ReviewRemindersDatabase.StoredReviewReminderGroup
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 /**
@@ -28,7 +31,7 @@ value class ReviewReminderSchemaVersion(
  * has the same fields as the old version of [ReviewReminder], then implement the [migrate] method which
  * transforms old [ReviewReminder]s to new [ReviewReminder]s. Also ensure that the previous [ReviewReminderSchema]
  * in the migration version chain ([ReviewRemindersDatabase.oldReviewReminderSchemasForMigration]) has its [migrate] method
- * edited to return instances of the newly-created [ReviewReminderSchema]. Then, increment [ReviewRemindersDatabase.schemaVersion].
+ * edited to return instances of the newly-created schema. Then, increment [ReviewRemindersDatabase.schemaVersion].
  *
  * Data classes implementing this interface should be marked as @Serializable. Any new types defined for ReviewReminderSchemas
  * should also be marked as @Serializable.
@@ -45,11 +48,46 @@ sealed interface ReviewReminderSchema {
     val id: ReviewReminderId
 
     /**
-     * Transforms this [ReviewReminderSchema] to the next version of the [ReviewReminderSchema].
+     * Transforms this [ReviewReminderSchema] to the next version of the [ReviewReminderSchema]. For example, if an old schema used `did`
+     * to define its scope, but the new schema uses a scope data class, the field might have an override like the following:
+     *
+     * ```kotlin
+     * scope = if (this.did == -1L) ReviewReminderScope.Global else ReviewReminderScope.DeckSpecific(this.did)
+     * ```
      */
     fun migrate(): ReviewReminderSchema
 }
 
+/**
+ * The Version 3 -> Version 4 migration fixed a bug where the cachedDeckName field of [ReviewReminderScope.DeckSpecific]
+ * was being serialized and persisted to SharedPreferences. However, since this involves a change to an existing data class,
+ * we must still maintain a namespaced version of the old data class so that the serializer can distinguish between the old and new data classes.
+ * To ensure these classes interact with serialization like they did in old versions, the up-to-date SerialName is specified.
+ */
+object ReviewReminderPreV4Classes {
+    @Serializable
+    sealed class ReviewReminderScope {
+        @Serializable
+        @SerialName("com.ichi2.anki.reviewreminders.ReviewReminderScope.Global")
+        data object Global : ReviewReminderScope()
+
+        /**
+         * This class will be serialized into "DeckSpecific(did=#, cachedDeckName=#)", and is nested because it will otherwise conflict
+         * with the updated definition of [ReviewReminderScope.DeckSpecific], which is serialized as "DeckSpecific(did=#)".
+         * When we read the outdated schema from the disk, we need to tell the deserializer that it is reading a
+         * ReviewReminderPreV4Classes.DeckSpecific rather than a [ReviewReminderScope.DeckSpecific], even though the class names are the same.
+         */
+        @Serializable
+        @SerialName("com.ichi2.anki.reviewreminders.ReviewReminderScope.DeckSpecific")
+        data class DeckSpecific(
+            val did: DeckId,
+        ) : ReviewReminderScope() {
+            @Suppress("unused") // Only used for migration serialization.
+            private var cachedDeckName: String? = null
+        }
+    }
+}
+
 /**
  * Version 1 of [ReviewReminderSchema]. Updated to Version 2 by adding [ReviewReminder.onlyNotifyIfNoReviews].
  */
@@ -58,12 +96,12 @@ data class ReviewReminderSchemaV1(
     override val id: ReviewReminderId,
     val time: ReviewReminderTime,
     val cardTriggerThreshold: ReviewReminderCardTriggerThreshold,
-    val scope: ReviewReminderScope,
+    val scope: ReviewReminderPreV4Classes.ReviewReminderScope,
     var enabled: Boolean,
     val profileID: String,
     val onlyNotifyIfNoReviews: Boolean = false,
 ) : ReviewReminderSchema {
-    override fun migrate(): ReviewReminderSchema =
+    override fun migrate(): ReviewReminderSchemaV2 =
         ReviewReminderSchemaV2(
             id = id,
             time = time,
@@ -83,92 +121,69 @@ data class ReviewReminderSchemaV2(
     override val id: ReviewReminderId,
     val time: ReviewReminderTime,
     val cardTriggerThreshold: ReviewReminderCardTriggerThreshold,
-    val scope: ReviewReminderScope,
+    val scope: ReviewReminderPreV4Classes.ReviewReminderScope,
     var enabled: Boolean,
     val profileID: String,
     val onlyNotifyIfNoReviews: Boolean,
 ) : ReviewReminderSchema {
-    override fun migrate(): ReviewReminderSchema =
-        ReviewReminder.createReviewReminder(
+    override fun migrate(): ReviewReminderSchemaV3 =
+        ReviewReminderSchemaV3(
+            id = id,
             time = time,
             cardTriggerThreshold = cardTriggerThreshold,
             scope = scope,
             enabled = enabled,
+            latestNotifTime = TimeManager.time.calendar().timeInMillis,
             profileID = profileID,
             onlyNotifyIfNoReviews = onlyNotifyIfNoReviews,
         )
 }
 
 /**
- * Schema migration settings for testing purposes.
- * Consult this as an example of how to save old schemas and define their [ReviewReminderSchema.migrate] methods.
- * Also see the unit tests for [ReviewRemindersDatabase], where these classes are exercised.
- * These classes cannot be moved directly to the test file because [ReviewReminderSchema] is a sealed interface,
- * meaning all implementations of it must be within the same module.
+ * Version 3 of [ReviewReminderSchema]. Updated to Version 4 by fixing a bug where the [ReviewReminderScope.DeckSpecific.cachedDeckName]
+ * field was persisted to SharedPreferences, which is not necessary and can cause issues if the deck name changes.
  */
-object TestingReviewReminderMigrationSettings {
-    /**
-     * A sample old review reminder schema. Perhaps this was how the [ReviewReminder] data class was originally implemented.
-     * We would like to test the code that checks if review reminders stored on the device adhere to an old, outdated schema.
-     * In particular, does the code correctly migrate the serialized data class strings to the updated, current version of [ReviewReminder]?
-     */
-    @Serializable
-    data class ReviewReminderTestSchemaVersionOne(
-        override val id: ReviewReminderId,
-        val hour: Int,
-        val minute: Int,
-        val cardTriggerThreshold: Int,
-        val did: DeckId,
-        val enabled: Boolean = true,
-    ) : ReviewReminderSchema {
-        override fun migrate(): ReviewReminderSchema =
-            ReviewReminderTestSchemaVersionTwo(
-                id = this.id,
-                time = VersionTwoDataClasses.ReviewReminderTime(hour, minute),
-                snoozeAmount = 1,
-                cardTriggerThreshold = this.cardTriggerThreshold,
-                did = this.did,
-                enabled = enabled,
-            )
-    }
-
-    /**
-     * Here's an example of how you can handle renamed fields in a data class stored as part of a [ReviewReminder].
-     * Otherwise, there's a namespace collision with [ReviewReminderTime].
-     *
-     * This class will be serialized into "ReviewReminderTime(timeHour=#, timeMinute=#)", which otherwise might conflict
-     * with the updated definition of [ReviewReminderTime], which is serialized as "ReviewReminderTime(hour=#, minute=#)".
-     * When we read the outdated schema from the disk, we need to tell the deserializer that it is reading a
-     * [VersionTwoDataClasses.ReviewReminderTime] rather than a [ReviewReminderTime], even though the names are the same.
-     *
-     * @see ReviewReminderTestSchemaVersionTwo
-     */
-    object VersionTwoDataClasses {
-        @Serializable
-        data class ReviewReminderTime(
-            val timeHour: Int,
-            val timeMinute: Int,
+@Serializable
+data class ReviewReminderSchemaV3(
+    override val id: ReviewReminderId,
+    val time: ReviewReminderTime,
+    val cardTriggerThreshold: ReviewReminderCardTriggerThreshold,
+    val scope: ReviewReminderPreV4Classes.ReviewReminderScope,
+    var enabled: Boolean,
+    var latestNotifTime: EpochMilliseconds,
+    val profileID: String,
+    val onlyNotifyIfNoReviews: Boolean,
+) : ReviewReminderSchema {
+    override fun migrate(): ReviewReminderSchemaV4 =
+        ReviewReminderSchemaV4(
+            id = id,
+            time = time,
+            cardTriggerThreshold = cardTriggerThreshold,
+            scope =
+                when (scope) {
+                    is ReviewReminderPreV4Classes.ReviewReminderScope.Global -> ReviewReminderScope.Global
+                    is ReviewReminderPreV4Classes.ReviewReminderScope.DeckSpecific -> ReviewReminderScope.DeckSpecific(scope.did)
+                },
+            enabled = enabled,
+            latestNotifTime = latestNotifTime,
+            profileID = profileID,
+            onlyNotifyIfNoReviews = onlyNotifyIfNoReviews,
         )
-    }
+}
 
-    /**
-     * Another example of an old review reminder schema. See [ReviewReminderTestSchemaVersionOne] for more details.
-     */
-    @Serializable
-    data class ReviewReminderTestSchemaVersionTwo(
-        override val id: ReviewReminderId,
-        val time: VersionTwoDataClasses.ReviewReminderTime,
-        val snoozeAmount: Int,
-        val cardTriggerThreshold: Int,
-        val did: DeckId,
-        val enabled: Boolean = true,
-    ) : ReviewReminderSchema {
-        override fun migrate(): ReviewReminder =
-            ReviewReminder.createReviewReminder(
-                time = ReviewReminderTime(this.time.timeHour, this.time.timeMinute),
-                cardTriggerThreshold = ReviewReminderCardTriggerThreshold(this.cardTriggerThreshold),
-                scope = if (this.did == -1L) ReviewReminderScope.Global else ReviewReminderScope.DeckSpecific(this.did),
-                enabled = enabled,
-            )
-    }
+/**
+ * Version 4 of [ReviewReminderSchema]. Updated to Version 5 by adding [ReviewReminder.thresholdFilter].
+ */
+@Serializable
+data class ReviewReminderSchemaV4(
+    override val id: ReviewReminderId,
+    val time: ReviewReminderTime,
+    val cardTriggerThreshold: ReviewReminderCardTriggerThreshold,
+    val scope: ReviewReminderScope,
+    var enabled: Boolean,
+    var latestNotifTime: EpochMilliseconds,
+    val profileID: String,
+    val onlyNotifyIfNoReviews: Boolean,
+) : ReviewReminderSchema {
+    override fun migrate(): ReviewReminder = ReviewReminder.createViaMigration(this)
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ReviewRemindersDatabase.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ReviewRemindersDatabase.kt
index a2b2ff7909f6..791a599d1dfe 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ReviewRemindersDatabase.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ReviewRemindersDatabase.kt
@@ -64,14 +64,14 @@ object ReviewRemindersDatabase {
      * Its value is a [ReviewReminderGroup] serialized as a JSON String.
      */
     @VisibleForTesting
-    const val DECK_SPECIFIC_KEY = "deck_"
+    const val PREF_DECK_SPECIFIC_REMINDERS = "deck_"
 
     /**
      * Key in SharedPreferences for retrieving app-wide reminders.
      * Its value is a [ReviewReminderGroup] serialized as a JSON String.
      */
     @VisibleForTesting
-    const val APP_WIDE_KEY = "app_wide"
+    const val PREF_APP_WIDE_REMINDERS = "app_wide"
 
     /**
      * The form in which [ReviewReminderGroup] are actually written to SharedPreferences.
@@ -98,13 +98,15 @@ object ReviewRemindersDatabase {
      *
      * - Version 1: [ReviewReminderSchemaV1]: 3 August 2025 -  Initial version
      * - Version 2: [ReviewReminderSchemaV2]: 25 January 2026 - Added [ReviewReminder.onlyNotifyIfNoReviews]
-     * - Version 3: [ReviewReminder]: 8 February 2026 - Added [ReviewReminder.latestNotifTime]
+     * - Version 3: [ReviewReminderSchemaV3]: 8 February 2026 - Added [ReviewReminder.latestNotifTime]
+     * - Version 4: [ReviewReminderSchemaV4]: 4 October 2026 - Fixed having [ReviewReminderScope.DeckSpecific.cachedDeckName] serialized
+     * - Version 5: [ReviewReminder]: 4 October 2026 - Added [ReviewReminder.thresholdFilter]
      *
      * @see [oldReviewReminderSchemasForMigration]
      * @see [ReviewReminder]
      */
     @VisibleForTesting
-    var schemaVersion = ReviewReminderSchemaVersion(3)
+    var schemaVersion = ReviewReminderSchemaVersion(5)
 
     /**
      * A map of all old [ReviewReminderSchema]s that [ReviewRemindersDatabase.performSchemaMigration] will attempt to migrate old
@@ -123,7 +125,9 @@ object ReviewRemindersDatabase {
         mapOf(
             ReviewReminderSchemaVersion(1) to ReviewReminderSchemaV1::class,
             ReviewReminderSchemaVersion(2) to ReviewReminderSchemaV2::class,
-            ReviewReminderSchemaVersion(3) to ReviewReminder::class, // Most up to date version
+            ReviewReminderSchemaVersion(3) to ReviewReminderSchemaV3::class,
+            ReviewReminderSchemaVersion(4) to ReviewReminderSchemaV4::class,
+            ReviewReminderSchemaVersion(5) to ReviewReminder::class, // Most up-to-date version
         )
 
     /**
@@ -279,8 +283,8 @@ object ReviewRemindersDatabase {
     suspend fun getRemindersForScope(scope: ReviewReminderScope): ReviewReminderGroup =
         mutex.withLock {
             when (scope) {
-                is ReviewReminderScope.DeckSpecific -> getRemindersForKey(DECK_SPECIFIC_KEY + scope.did)
-                is ReviewReminderScope.Global -> getRemindersForKey(APP_WIDE_KEY)
+                is ReviewReminderScope.DeckSpecific -> getRemindersForKey(PREF_DECK_SPECIFIC_REMINDERS + scope.did)
+                is ReviewReminderScope.Global -> getRemindersForKey(PREF_APP_WIDE_REMINDERS)
             }
         }
 
@@ -340,8 +344,8 @@ object ReviewRemindersDatabase {
         editor: ReviewReminderGroupEditor,
     ) {
         when (scope) {
-            is ReviewReminderScope.DeckSpecific -> editRemindersForKey(DECK_SPECIFIC_KEY + scope.did, editor)
-            is ReviewReminderScope.Global -> editRemindersForKey(APP_WIDE_KEY, editor)
+            is ReviewReminderScope.DeckSpecific -> editRemindersForKey(PREF_DECK_SPECIFIC_REMINDERS + scope.did, editor)
+            is ReviewReminderScope.Global -> editRemindersForKey(PREF_APP_WIDE_REMINDERS, editor)
         }
     }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ScheduleRemindersFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ScheduleRemindersFragment.kt
index 7f6e8223263a..f17d555a0a64 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ScheduleRemindersFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ScheduleRemindersFragment.kt
@@ -27,6 +27,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.commit
 import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.snackbar.Snackbar
@@ -36,17 +37,17 @@ import com.ichi2.anki.R
 import com.ichi2.anki.canUserAccessDeck
 import com.ichi2.anki.databinding.FragmentScheduleRemindersBinding
 import com.ichi2.anki.launchCatchingTask
+import com.ichi2.anki.launchCatchingViewTask
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.requireAnkiActivity
 import com.ichi2.anki.reviewreminders.AddEditReminderDialog.Companion.registerAddEditReminderHandler
-import com.ichi2.anki.runCatching
 import com.ichi2.anki.snackbar.BaseSnackbarBuilderProvider
 import com.ichi2.anki.snackbar.SnackbarBuilder
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.anki.utils.ConfigAwareSingleFragmentActivity
 import com.ichi2.anki.utils.doOnApplyWindowInsets
 import com.ichi2.anki.utils.ext.getParcelableCompat
-import com.ichi2.anki.utils.ext.launchCollectionInLifecycleScope
+import com.ichi2.anki.utils.ext.launchCollectionInViewLifecycleScope
 import com.ichi2.anki.utils.showDialogFragment
 import com.ichi2.anki.withProgress
 import com.ichi2.utils.Permissions.openAppNotificationsSettingsScreen
@@ -56,7 +57,6 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber
 
@@ -188,7 +188,7 @@ class ScheduleRemindersFragment :
     private val flowOfShowTroubleshooting: StateFlow<Boolean> by lazy {
         combine(troubleshootingViewModel.state, flowOfHasReminders) { state, hasReminders ->
             hasReminders && state.summaryStatus == SummaryStatus.Error
-        }.stateIn(lifecycleScope, SharingStarted.Eagerly, initialValue = false)
+        }.flowWithLifecycle(lifecycle).stateIn(lifecycleScope, SharingStarted.Eagerly, initialValue = false)
     }
 
     override val baseSnackbarBuilder: SnackbarBuilder = {
@@ -235,7 +235,7 @@ class ScheduleRemindersFragment :
         setContentInsets()
 
         binding.floatingActionButtonAdd.setOnClickListener { addReminder() }
-        flowOfShowTroubleshooting.launchCollectionInLifecycleScope(::renderTroubleshootingSnackbar)
+        flowOfShowTroubleshooting.launchCollectionInViewLifecycleScope(::renderTroubleshootingSnackbar)
 
         // Set up recycler view
         binding.recyclerView.layoutManager = LinearLayoutManager(requireContext())
@@ -249,7 +249,7 @@ class ScheduleRemindersFragment :
         binding.recyclerView.adapter = adapter
 
         // Retrieve reminders based on the editing scope
-        launchCatchingTask { loadDatabaseRemindersIntoUI() }
+        launchCatchingViewTask { loadDatabaseRemindersIntoUI() }
 
         // If the user creates or edits a review reminder, the dialog for doing so opens
         // Once their changes are complete, the dialog closes and this fragment is reloaded
@@ -396,15 +396,13 @@ class ScheduleRemindersFragment :
     }
 
     private fun retrieveSubtitle(setSubtitle: (String?) -> Unit) {
-        viewLifecycleOwner.lifecycleScope.launch {
-            requireActivity().runCatching {
-                val subtitle =
-                    when (val scope = scheduleRemindersScope) {
-                        is ReviewReminderScope.Global -> null
-                        is ReviewReminderScope.DeckSpecific -> scope.getDeckName()
-                    }
-                setSubtitle(subtitle)
-            }
+        launchCatchingViewTask {
+            val subtitle =
+                when (val scope = scheduleRemindersScope) {
+                    is ReviewReminderScope.Global -> null
+                    is ReviewReminderScope.DeckSpecific -> scope.getDeckName()
+                }
+            setSubtitle(subtitle)
         }
     }
 
@@ -553,7 +551,7 @@ class ScheduleRemindersFragment :
         did: DeckId,
         callback: (deckName: String) -> Unit,
     ) {
-        launchCatchingTask {
+        launchCatchingViewTask {
             val deckName = cachedDeckNames.getOrPut(did) { withCol { decks.name(did) } }
             callback(deckName)
         }
@@ -568,7 +566,7 @@ class ScheduleRemindersFragment :
         did: DeckId,
         callback: (isDeckAccessible: Boolean) -> Unit,
     ) {
-        launchCatchingTask {
+        launchCatchingViewTask {
             val isDeckAccessible = canUserAccessDeck(did)
             Timber.d("Checked for whether deck with id %s can be accessed: %s", did, isDeckAccessible)
             callback(isDeckAccessible)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/ForgetCardsDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/ForgetCardsDialog.kt
index 4817c673c5d3..24ce4aee31a8 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/ForgetCardsDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/ForgetCardsDialog.kt
@@ -74,13 +74,13 @@ class ForgetCardsDialog : AnalyticsDialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val sharedPrefs = requireContext().sharedPrefs()
         if (savedInstanceState != null) {
-            restoreOriginalPositionIfPossible = savedInstanceState.getBoolean(ARG_RESTORE_ORIGINAL, true)
-            resetRepetitionAndLapseCounts = savedInstanceState.getBoolean(ARG_RESET_REPETITION, false)
+            restoreOriginalPositionIfPossible = savedInstanceState.getBoolean(STATE_RESTORE_ORIGINAL, true)
+            resetRepetitionAndLapseCounts = savedInstanceState.getBoolean(STATE_RESET_REPETITION, false)
         } else {
             // If no saved instance state, load the last saved preferences for restore position and reset counts.
             with(sharedPrefs) {
-                restoreOriginalPositionIfPossible = getBoolean(ARG_RESTORE_ORIGINAL, true)
-                resetRepetitionAndLapseCounts = getBoolean(ARG_RESET_REPETITION, false)
+                restoreOriginalPositionIfPossible = getBoolean(PREF_RESTORE_ORIGINAL, true)
+                resetRepetitionAndLapseCounts = getBoolean(PREF_RESET_REPETITION, false)
             }
         }
         val binding = DialogForgetCardsBinding.inflate(layoutInflater)
@@ -108,14 +108,14 @@ class ForgetCardsDialog : AnalyticsDialogFragment() {
             }
             positiveButton(CommonString.reset) {
                 sharedPrefs.edit {
-                    putBoolean(ARG_RESTORE_ORIGINAL, restoreOriginalPositionIfPossible)
-                    putBoolean(ARG_RESET_REPETITION, resetRepetitionAndLapseCounts)
+                    putBoolean(PREF_RESTORE_ORIGINAL, restoreOriginalPositionIfPossible)
+                    putBoolean(PREF_RESET_REPETITION, resetRepetitionAndLapseCounts)
                 }
                 parentFragmentManager.setFragmentResult(
                     REQUEST_KEY_FORGET,
                     Bundle().apply {
-                        putBoolean(ARG_RESTORE_ORIGINAL, restoreOriginalPositionIfPossible)
-                        putBoolean(ARG_RESET_REPETITION, resetRepetitionAndLapseCounts)
+                        putBoolean(RESULT_RESTORE_ORIGINAL, restoreOriginalPositionIfPossible)
+                        putBoolean(RESULT_RESET_REPETITION, resetRepetitionAndLapseCounts)
                     },
                 )
             }
@@ -126,14 +126,19 @@ class ForgetCardsDialog : AnalyticsDialogFragment() {
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putBoolean(ARG_RESTORE_ORIGINAL, restoreOriginalPositionIfPossible)
-        outState.putBoolean(ARG_RESET_REPETITION, resetRepetitionAndLapseCounts)
+        outState.putBoolean(STATE_RESTORE_ORIGINAL, restoreOriginalPositionIfPossible)
+        outState.putBoolean(STATE_RESET_REPETITION, resetRepetitionAndLapseCounts)
     }
 
     companion object {
         const val REQUEST_KEY_FORGET = "request_key_forget_cards"
-        const val ARG_RESTORE_ORIGINAL = "key_restore_original"
-        const val ARG_RESET_REPETITION = "key_reset_repetition"
+        const val RESULT_RESTORE_ORIGINAL = "key_restore_original"
+        const val RESULT_RESET_REPETITION = "key_reset_repetition"
+
+        private const val STATE_RESTORE_ORIGINAL = "key_restore_original"
+        private const val STATE_RESET_REPETITION = "key_reset_repetition"
+        private const val PREF_RESTORE_ORIGINAL = "key_restore_original"
+        private const val PREF_RESET_REPETITION = "key_reset_repetition"
     }
 }
 
@@ -147,8 +152,8 @@ internal fun FragmentActivity.registerOnForgetHandler(cardsIdsProducer: suspend
     setFragmentResultListener(ForgetCardsDialog.REQUEST_KEY_FORGET) { _, bundle ->
         forgetCards(
             cardsIdsProducer = cardsIdsProducer,
-            restoreOriginalPositionIfPossible = bundle.getBoolean(ForgetCardsDialog.ARG_RESTORE_ORIGINAL),
-            resetRepetitionAndLapseCounts = bundle.getBoolean(ForgetCardsDialog.ARG_RESET_REPETITION),
+            restoreOriginalPositionIfPossible = bundle.getBoolean(ForgetCardsDialog.RESULT_RESTORE_ORIGINAL),
+            resetRepetitionAndLapseCounts = bundle.getBoolean(ForgetCardsDialog.RESULT_RESET_REPETITION),
         )
     }
 }
@@ -163,8 +168,8 @@ internal fun Fragment.registerOnForgetHandler(cardsIdsProducer: suspend () -> Li
     setFragmentResultListener(ForgetCardsDialog.REQUEST_KEY_FORGET) { _, bundle ->
         activity?.forgetCards(
             cardsIdsProducer = cardsIdsProducer,
-            restoreOriginalPositionIfPossible = bundle.getBoolean(ForgetCardsDialog.ARG_RESTORE_ORIGINAL),
-            resetRepetitionAndLapseCounts = bundle.getBoolean(ForgetCardsDialog.ARG_RESET_REPETITION),
+            restoreOriginalPositionIfPossible = bundle.getBoolean(ForgetCardsDialog.RESULT_RESTORE_ORIGINAL),
+            resetRepetitionAndLapseCounts = bundle.getBoolean(ForgetCardsDialog.RESULT_RESET_REPETITION),
         )
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/SetDueDateDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/SetDueDateDialog.kt
index 4298b0897805..a8c71d294dc2 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/SetDueDateDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/scheduling/SetDueDateDialog.kt
@@ -40,6 +40,7 @@ import com.ichi2.anki.asyncCatching
 import com.ichi2.anki.browser.IdsFile
 import com.ichi2.anki.browser.removeSafely
 import com.ichi2.anki.common.utils.android.showThemedToast
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.DialogSetDueDateBinding
 import com.ichi2.anki.databinding.FragmentSetDueDateRangeBinding
 import com.ichi2.anki.databinding.FragmentSetDueDateSingleBinding
@@ -58,7 +59,6 @@ import com.ichi2.anki.utils.openUrl
 import com.ichi2.anki.withProgress
 import com.ichi2.utils.AndroidUiUtils
 import com.ichi2.utils.create
-import com.ichi2.utils.dp
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.positiveButton
 import com.ichi2.utils.title
@@ -113,8 +113,8 @@ class SetDueDateDialog : AnalyticsDialogFragment() {
         Timber.d("Set due date dialog: %d card(s)", cardIds.size)
         this.initialRotation = getScreenRotation()
 
-        childFragmentManager.setFragmentResultListener(RESULT_SUBMIT_DUE_DATE, this) { _, _ ->
-            Timber.i(RESULT_SUBMIT_DUE_DATE)
+        childFragmentManager.setFragmentResultListener(REQUEST_SUBMIT_DUE_DATE, this) { _, _ ->
+            Timber.i(REQUEST_SUBMIT_DUE_DATE)
             requireActivity().launchCatchingTask {
                 if (launchUpdateDueDate(showError = false).await() == null) {
                     Timber.w("unsuccessful updating dates; not dismissing dialog")
@@ -266,7 +266,7 @@ class SetDueDateDialog : AnalyticsDialogFragment() {
         const val ARG_IDS_FILE = "ARGS_IDS_FILE"
         const val MAX_WIDTH_DP = 450f
 
-        private const val RESULT_SUBMIT_DUE_DATE = "SubmitDueDate"
+        private const val REQUEST_SUBMIT_DUE_DATE = "SubmitDueDate"
 
         /** Keeps the existing dialog and its input when another request arrives. */
         @MainThread
@@ -348,7 +348,7 @@ class SetDueDateDialog : AnalyticsDialogFragment() {
                             event?.keyCode == KeyEvent.KEYCODE_ENTER
                         ) {
                             parentFragmentManager.setFragmentResult(
-                                RESULT_SUBMIT_DUE_DATE,
+                                REQUEST_SUBMIT_DUE_DATE,
                                 Bundle(),
                             )
                             true
@@ -423,7 +423,7 @@ class SetDueDateDialog : AnalyticsDialogFragment() {
                             event?.keyCode == KeyEvent.KEYCODE_ENTER
                         ) {
                             parentFragmentManager.setFragmentResult(
-                                RESULT_SUBMIT_DUE_DATE,
+                                REQUEST_SUBMIT_DUE_DATE,
                                 Bundle(),
                             )
                             true
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/security/AppPermissions.kt b/AnkiDroid/src/main/java/com/ichi2/anki/security/AppPermissions.kt
index 2d44b55f6866..aa865a99ac75 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/security/AppPermissions.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/security/AppPermissions.kt
@@ -3,6 +3,8 @@
 package com.ichi2.anki.security
 
 import android.content.Context
+import android.content.Intent
+import android.net.Uri
 import androidx.annotation.VisibleForTesting
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
@@ -34,6 +36,20 @@ class AppPermissions(
     private val context: Context,
     private val showSnackbar: (String) -> Unit = {},
 ) {
+    /**
+     * Creates a new URL navigation intent, or `null` when permission is denied.
+     *
+     * HTTP(S) links do not require external app launches to be enabled and are returned with
+     * `CATEGORY_BROWSABLE`.
+     *
+     * Other URL schemes require [external app launches][checkCanLaunchExternalApps] to be enabled.
+     */
+    fun createUrlIntent(url: Uri): Intent? =
+        when (url.scheme) {
+            "http", "https" -> Intent(Intent.ACTION_VIEW, url).addCategory(Intent.CATEGORY_BROWSABLE)
+            else -> if (checkCanLaunchExternalApps()) Intent(Intent.ACTION_VIEW, url) else null
+        }
+
     /**
      * Returns true if cards may launch external apps;
      * shows a rate-limited snackbar on denial.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/DebugInfoService.kt b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/DebugInfoService.kt
index 3cfaae2301aa..5ef11217fc58 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/DebugInfoService.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/DebugInfoService.kt
@@ -8,7 +8,9 @@ import com.ichi2.anki.BuildConfig
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.common.crashreporting.CrashReportService
 import com.ichi2.anki.common.utils.ext.fsrsEnabled
+import com.ichi2.utils.LanguageUtil
 import com.ichi2.utils.VersionUtils.pkgVersionName
+import com.ichi2.utils.getLanguageDebugInfo
 import com.ichi2.utils.getWebViewInfo
 import org.acra.util.Installation
 import timber.log.Timber
@@ -24,6 +26,13 @@ object DebugInfoService {
         val webviewInfo = getWebViewInfo(info)
         // isFSRSEnabled is null on startup
         val isFSRSEnabled = getFSRSStatus()
+        val languageInfo = getLanguageDebugInfo(info)
+        val appLocale =
+            when (languageInfo.appLocale) {
+                LanguageUtil.SYSTEM_LANGUAGE_TAG -> "System language"
+                null -> "Error"
+                else -> languageInfo.appLocale
+            }
         return """
             AnkiDroid Version = $pkgVersionName (${BuildConfig.GIT_COMMIT_HASH})
             Backend Version = ${BuildConfig.BACKEND_VERSION} (${BackendBuildConfig.ANKI_DESKTOP_VERSION} ${BackendBuildConfig.ANKI_COMMIT_HASH})
@@ -34,6 +43,7 @@ object DebugInfoService {
             ACRA UUID = ${Installation.id(info)}
             FSRS = ${BackendBuildConfig.FSRS_VERSION} (Enabled: $isFSRSEnabled)
             Crash Reports Enabled = ${isSendingCrashReports(info)}
+            Language = System: ${languageInfo.systemLocale} | App: $appLocale | Backend: ${languageInfo.backendLocales?.joinToString()}
             """.trimIndent()
             // A Markdown newline is two spaces followed by '\n', this avoids the need for
             // code fences
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
index 69ae4e8a66a1..0ed4f4ad688c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
@@ -27,7 +27,6 @@ import com.ichi2.anki.browser.CardBrowserColumn.REVIEWS
 import com.ichi2.anki.browser.CardBrowserColumn.SFLD
 import com.ichi2.anki.browser.CardBrowserColumn.TAGS
 import com.ichi2.anki.cardviewer.Gesture
-import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.common.utils.HashUtil.hashSetInit
 import com.ichi2.anki.libanki.Consts
@@ -36,7 +35,7 @@ import com.ichi2.anki.model.CardsOrNotes
 import com.ichi2.anki.noteeditor.CustomToolbarButton
 import com.ichi2.anki.preferences.reviewer.ViewerAction
 import com.ichi2.anki.reviewer.Binding
-import com.ichi2.anki.reviewer.Binding.Companion.keyCode
+import com.ichi2.anki.reviewer.Binding.KeyCode
 import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.FullScreenMode
 import com.ichi2.anki.reviewer.MappableBinding
@@ -95,7 +94,7 @@ object PreferenceUpgradeService {
         companion object {
             /** A version code where the value doesn't matter as we're not using the result */
             private const val IGNORED_LEGACY_VERSION_CODE = 0L
-            const val UPGRADE_VERSION_PREF_KEY = "preferenceUpgradeVersion"
+            const val PREF_PREFERENCE_UPGRADE_VERSION = "preferenceUpgradeVersion"
 
             /** Returns all instances of preference upgrade classes */
             private fun getAllInstances(legacyPreviousVersionCode: LegacyVersionIdentifier) =
@@ -146,14 +145,14 @@ object PreferenceUpgradeService {
                 setPreferenceVersion(preferences, versionWhichRequiresNoUpgrades)
             }
 
-            internal fun getPreferenceVersion(preferences: SharedPreferences) = preferences.getInt(UPGRADE_VERSION_PREF_KEY, 0)
+            internal fun getPreferenceVersion(preferences: SharedPreferences) = preferences.getInt(PREF_PREFERENCE_UPGRADE_VERSION, 0)
 
             internal fun setPreferenceVersion(
                 preferences: SharedPreferences,
                 versionIdentifier: VersionIdentifier,
             ) {
                 Timber.i("upgrading preference version to '$versionIdentifier'")
-                preferences.edit { putInt(UPGRADE_VERSION_PREF_KEY, versionIdentifier) }
+                preferences.edit { putInt(PREF_PREFERENCE_UPGRADE_VERSION, versionIdentifier) }
             }
 
             /** Returns the collection of all preference version numbers */
@@ -364,7 +363,7 @@ object PreferenceUpgradeService {
                 oldGesturePreferenceKey: String,
                 volumeKeyCode: Int,
             ) {
-                upgradeBinding(preferences, oldGesturePreferenceKey, keyCode(volumeKeyCode))
+                upgradeBinding(preferences, oldGesturePreferenceKey, KeyCode(volumeKeyCode))
             }
 
             private fun upgradeGestureToBinding(
@@ -454,10 +453,10 @@ object PreferenceUpgradeService {
 
         internal class UpgradeFetchMedia : PreferenceUpgrade(9) {
             override fun upgrade(preferences: SharedPreferences) {
-                val fetchMediaSwitch = preferences.getBoolean(RemovedPreferences.SYNC_FETCHES_MEDIA, true)
+                val fetchMediaSwitch = preferences.getBoolean(RemovedPreferences.PREF_SYNC_FETCHES_MEDIA, true)
                 val status = if (fetchMediaSwitch) "always" else "never"
                 preferences.edit {
-                    remove(RemovedPreferences.SYNC_FETCHES_MEDIA)
+                    remove(RemovedPreferences.PREF_SYNC_FETCHES_MEDIA)
                     putString("syncFetchMedia", status)
                 }
             }
@@ -617,13 +616,13 @@ object PreferenceUpgradeService {
                 fun clearLegacyKeys() {
                     Timber.d("removing legacy keys")
                     preferences.edit {
-                        remove(DISPLAY_COLUMN_1_KEY)
-                        remove(DISPLAY_COLUMN_2_KEY)
+                        remove(PREF_DISPLAY_COLUMN_1)
+                        remove(PREF_DISPLAY_COLUMN_2)
                     }
                 }
 
-                val currentColumn1Index = preferences.getInt(DISPLAY_COLUMN_1_KEY, -1)
-                val currentColumn2Index = preferences.getInt(DISPLAY_COLUMN_2_KEY, -1)
+                val currentColumn1Index = preferences.getInt(PREF_DISPLAY_COLUMN_1, -1)
+                val currentColumn2Index = preferences.getInt(PREF_DISPLAY_COLUMN_2, -1)
 
                 if (currentColumn1Index == -1 || currentColumn2Index == -1) {
                     Timber.d("no update needed")
@@ -654,8 +653,8 @@ object PreferenceUpgradeService {
             }
 
             companion object {
-                private const val DISPLAY_COLUMN_1_KEY = "cardBrowserColumn1"
-                private const val DISPLAY_COLUMN_2_KEY = "cardBrowserColumn2"
+                private const val PREF_DISPLAY_COLUMN_1 = "cardBrowserColumn1"
+                private const val PREF_DISPLAY_COLUMN_2 = "cardBrowserColumn2"
 
                 @VisibleForTesting
                 internal val LEGACY_COLUMN1_KEYS = arrayOf(QUESTION, SFLD)
@@ -675,7 +674,6 @@ object PreferenceUpgradeService {
             }
         }
 
-        @NeedsTest("long touch gesture is removed from preferences")
         internal class RemoveLongTouchGesture : PreferenceUpgrade(21) {
             private val keys =
                 listOf(
@@ -734,15 +732,20 @@ object PreferenceUpgradeService {
             override fun upgrade(preferences: SharedPreferences) {
                 for (key in keys) {
                     val value = preferences.getString(key, null) ?: continue
-                    val bindings = fromPreferenceString(value)
-                    val unknown = bindings.filter { it.binding is Binding.UnknownBinding }
-                    if (unknown.isEmpty()) continue
-                    val newBindings = bindings - unknown
+                    val (newBindings, error) = parseBindingsAndError(value)
+                    if (!error) continue
                     preferences.edit {
                         putString(key, newBindings.toPreferenceString())
                     }
                 }
             }
+
+            /** The list of bindings, and whether there are bindings that could not be interpreted. */
+            private fun parseBindingsAndError(prefString: String): Pair<List<ReviewerBinding>, Boolean> {
+                val substringCount = MappableBinding.getPreferenceSubstrings(prefString).size
+                val bindings = ReviewerBinding.fromPreferenceString(prefString)
+                return bindings to (substringCount != bindings.size)
+            }
         }
 
         internal class UpgradeDoubleTapTimeout : PreferenceUpgrade(22) {
@@ -797,9 +800,9 @@ object PreferenceUpgradeService {
 
         internal class UpgradeThemes : PreferenceUpgrade(26) {
             companion object {
-                const val KEY_APP_THEME = "appTheme"
-                const val KEY_DAY_THEME = "dayTheme"
-                const val KEY_NIGHT_THEME = "nightTheme"
+                const val PREF_APP_THEME = "appTheme"
+                const val PREF_DAY_THEME = "dayTheme"
+                const val PREF_NIGHT_THEME = "nightTheme"
 
                 const val THEME_FOLLOW_SYSTEM = "0"
                 const val THEME_LIGHT = "1"
@@ -813,20 +816,20 @@ object PreferenceUpgradeService {
 
             @Suppress("MoveVariableDeclarationIntoWhen")
             override fun upgrade(preferences: SharedPreferences) {
-                val appTheme = preferences.getString(KEY_APP_THEME, THEME_FOLLOW_SYSTEM)
+                val appTheme = preferences.getString(PREF_APP_THEME, THEME_FOLLOW_SYSTEM)
 
                 when (appTheme) {
                     THEME_FOLLOW_SYSTEM -> return
                     THEME_LIGHT, THEME_PLAIN -> {
                         preferences.edit {
-                            putString(KEY_APP_THEME, THEME_DAY)
-                            putString(KEY_DAY_THEME, appTheme)
+                            putString(PREF_APP_THEME, THEME_DAY)
+                            putString(PREF_DAY_THEME, appTheme)
                         }
                     }
                     THEME_BLACK, THEME_DARK -> {
                         preferences.edit {
-                            putString(KEY_APP_THEME, THEME_NIGHT)
-                            putString(KEY_NIGHT_THEME, appTheme)
+                            putString(PREF_APP_THEME, THEME_NIGHT)
+                            putString(PREF_NIGHT_THEME, appTheme)
                         }
                     }
                 }
@@ -898,7 +901,7 @@ object PreferenceUpgradeService {
         /**
          * Removes the legacy "analytics_opt_in" key so all users are re-prompted
          * to opt in under the new GA4-backed analytics implementation, which
-         * stores the opt-in under [AnkiDroidUsageAnalytics.ANALYTICS_OPTIN_KEY].
+         * stores the opt-in under [AnkiDroidUsageAnalytics.PREF_ANALYTICS_OPTIN].
          */
         internal class ResetAnalyticsOptIn2 : PreferenceUpgrade(29) {
             override fun upgrade(preferences: SharedPreferences) = preferences.edit { remove("analytics_opt_in") }
@@ -907,7 +910,7 @@ object PreferenceUpgradeService {
 }
 
 object RemovedPreferences {
-    const val SYNC_FETCHES_MEDIA = "syncFetchesMedia"
+    const val PREF_SYNC_FETCHES_MEDIA = "syncFetchesMedia"
 }
 
 fun bindingFromPreference(
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/ThrowableFilterService.kt b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/ThrowableFilterService.kt
index 8b479484308b..84c7a6532518 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/ThrowableFilterService.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/ThrowableFilterService.kt
@@ -5,12 +5,17 @@
 package com.ichi2.anki.servicelayer
 
 import androidx.annotation.VisibleForTesting
+import com.ichi2.anki.exception.SanitizedThrowable
 import com.ichi2.anki.exception.StorageAccessException
+import com.ichi2.utils.ExceptionUtil.causeChain
+import com.ichi2.utils.ExceptionUtil.causesAndSuppressed
 import net.ankiweb.rsdroid.BackendException.BackendSchedulerUpgradeRequiredException
 import net.ankiweb.rsdroid.exceptions.BackendNetworkException
 import net.ankiweb.rsdroid.exceptions.BackendSyncException
 import net.ankiweb.rsdroid.exceptions.BackendSyncException.BackendSyncServerMessageException
 import timber.log.Timber
+import java.util.Collections
+import java.util.IdentityHashMap
 
 object ThrowableFilterService {
     @FunctionalInterface
@@ -25,11 +30,15 @@ object ThrowableFilterService {
                 Timber.w("unexpected: thread was null")
                 return@FilteringExceptionHandler
             }
-            if (shouldDiscardThrowable(throwable)) {
-                Timber.i("discarding throwable")
-                return@FilteringExceptionHandler
-            }
-            originalUncaughtExceptionHandler?.uncaughtException(thread, throwable)
+            val reportable =
+                if (shouldDiscardThrowable(throwable)) {
+                    // Retain diagnostic class names and frames without exposing private messages.
+                    Timber.i("sanitizing uncaught throwable")
+                    SanitizedThrowable.from(throwable)
+                } else {
+                    throwable
+                }
+            originalUncaughtExceptionHandler?.uncaughtException(thread, reportable)
         }
 
     fun initialize() {
@@ -38,7 +47,7 @@ object ThrowableFilterService {
     }
 
     /**
-     * We want to filter any exceptions with PII, then chain to other handlers
+     * Sanitize filtered uncaught exceptions before delegating to the reporting handlers.
      */
     @Synchronized
     @VisibleForTesting
@@ -69,14 +78,18 @@ object ThrowableFilterService {
         initialize()
     }
 
+    /**
+     * Whether a handled report should be discarded. Uncaught errors are sanitized instead, so they
+     * can still reach the reporting handlers.
+     */
     fun shouldDiscardThrowable(t: Throwable): Boolean {
-        // Note that an exception may have a nested BackendSyncException,
-        // so we check if it is safe from PII despite also filtering by type
-        return exceptionIsUnwanted(t) || !t.safeFromPII()
+        // PII-bearing exceptions may be nested or suppressed. ACRA's stack-trace hashing also
+        // assumes the main cause chain is acyclic, so circular causes cannot be reported as-is.
+        return exceptionIsUnwanted(t) || !t.safeFromPII() || t.hasCyclicCause()
     }
 
-    // There are few exception types that are common, but are unwanted in
-    // our analytics or crash report service because they are not actionable
+    // These common types are noise in handled reports. Uncaught instances still indicate crashes
+    // and must reach reporting after sanitization.
     fun exceptionIsUnwanted(t: Throwable): Boolean {
         Timber.v("exceptionIsUnwanted - examining %s", t.javaClass.simpleName)
         when (t) {
@@ -90,12 +103,14 @@ object ThrowableFilterService {
     }
 
     /**
-     * Checks if the [Throwable] is safe from Personally Identifiable Information (PII)
+     * Checks this throwable, its causes and suppressed exceptions for known PII-bearing types.
      * @return `false` if the [Throwable] contains PII, otherwise `true`
      */
-    fun Throwable.safeFromPII(): Boolean {
-        if (this.containsPIINonRecursive()) return false
-        return this.cause?.safeFromPII() != false
+    fun Throwable.safeFromPII(): Boolean = causesAndSuppressed().none { it.containsPIINonRecursive() }
+
+    private fun Throwable.hasCyclicCause(): Boolean {
+        val seen = Collections.newSetFromMap(IdentityHashMap<Throwable, Boolean>())
+        return causeChain.any { !seen.add(it) }
     }
 
     private fun Throwable.containsPIINonRecursive(): Boolean {
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/services/BootService.kt b/AnkiDroid/src/main/java/com/ichi2/anki/services/BootService.kt
index 9e31c80617a8..626772b0caf4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/services/BootService.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/services/BootService.kt
@@ -9,13 +9,13 @@ import android.content.Context
 import android.content.Intent
 import androidx.core.app.PendingIntentCompat
 import com.ichi2.anki.CollectionManager
+import com.ichi2.anki.CommonPreferenceKey
 import com.ichi2.anki.CommonString
-import com.ichi2.anki.IntentHandler.Companion.grantedStoragePermissions
-import com.ichi2.anki.R
 import com.ichi2.anki.common.android.AnkiBroadcastReceiver
 import com.ichi2.anki.common.annotations.LegacyNotifications
 import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.anki.common.storage.grantedStoragePermissions
 import com.ichi2.anki.common.time.Time
 import com.ichi2.anki.common.time.TimeManager
 import com.ichi2.anki.common.utils.android.showThemedToast
@@ -149,7 +149,7 @@ class BootService : AnkiBroadcastReceiver() {
             // Don't schedule a notification if the due reminders setting is not enabled
             if (sp
                     .getString(
-                        context.getString(R.string.pref_notifications_minimum_cards_due_key),
+                        context.getString(CommonPreferenceKey.pref_notifications_minimum_cards_due_key),
                         PENDING_NOTIFICATIONS_ONLY.toString(),
                     )!!
                     .toInt() >= PENDING_NOTIFICATIONS_ONLY
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/services/NotificationService.kt b/AnkiDroid/src/main/java/com/ichi2/anki/services/NotificationService.kt
index ff5683440a44..4aa9b47f14cf 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/services/NotificationService.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/services/NotificationService.kt
@@ -13,6 +13,7 @@ import androidx.core.app.PendingIntentCompat
 import androidx.core.content.getSystemService
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.CommonPlurals
+import com.ichi2.anki.CommonPreferenceKey
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.DeckPicker
 import com.ichi2.anki.IntentHandler
@@ -205,10 +206,13 @@ class NotificationService : AnkiBroadcastReceiver() {
                     }
                 }
             val dueCardsTotal = dueCardsCount.count()
-            if (dueCardsTotal < reviewReminder.cardTriggerThreshold.threshold) {
+            val consideredCardsCount = reviewReminder.thresholdFilter.filterCounts(dueCardsCount)
+            val consideredCardsTotal = consideredCardsCount.count()
+
+            if (consideredCardsTotal < reviewReminder.cardTriggerThreshold.threshold) {
                 Timber.i(
                     "${reminderLogPrefix(reviewReminder.id)} skip: Aborting notification due to cardTriggerThreshold " +
-                        "(due: $dueCardsTotal, threshold: ${reviewReminder.cardTriggerThreshold.threshold})",
+                        "(due: $dueCardsCount, considered: $consideredCardsCount, threshold: ${reviewReminder.cardTriggerThreshold.threshold})",
                 )
                 return
             }
@@ -362,7 +366,7 @@ class NotificationService : AnkiBroadcastReceiver() {
             val minCardsDue =
                 preferences
                     .getString(
-                        context.getString(R.string.pref_notifications_minimum_cards_due_key),
+                        context.getString(CommonPreferenceKey.pref_notifications_minimum_cards_due_key),
                         PENDING_NOTIFICATIONS_ONLY.toString(),
                     )!!
                     .toInt()
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/settings/Prefs.kt b/AnkiDroid/src/main/java/com/ichi2/anki/settings/Prefs.kt
index 3b2a89ebf967..1be09801f0ba 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/settings/Prefs.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/settings/Prefs.kt
@@ -10,11 +10,14 @@ import androidx.annotation.VisibleForTesting
 import androidx.core.content.edit
 import com.ichi2.anki.AnkiDroidApp
 import com.ichi2.anki.BuildConfig
+import com.ichi2.anki.CommonPreferenceKey
 import com.ichi2.anki.R
 import com.ichi2.anki.cardviewer.TapGestureMode
 import com.ichi2.anki.common.preferences.AnimationPreferences
+import com.ichi2.anki.common.preferences.NotificationPreferences
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.common.utils.isRunningAsUnitTest
+import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.preferences.SharedPreferencesProvider
 import com.ichi2.anki.settings.enums.AppTheme
 import com.ichi2.anki.settings.enums.DayTheme
@@ -36,7 +39,8 @@ object Prefs : PrefsRepository(AnkiDroidApp.sharedPreferencesProvider, AnkiDroid
 open class PrefsRepository protected constructor(
     private val preferences: SharedPreferencesProvider,
     private val resources: Resources,
-) : AnimationPreferences {
+) : AnimationPreferences,
+    NotificationPreferences {
     constructor(sharedPrefs: SharedPreferences, resources: Resources) : this(SharedPreferencesProvider { sharedPrefs }, resources)
 
     constructor(context: Context) : this(context.sharedPrefs(), context.resources)
@@ -236,6 +240,14 @@ open class PrefsRepository protected constructor(
 
     val exitViaDoubleTapBack by booleanPref(R.string.exit_via_double_tap_back_key, false)
 
+    // ****************************************** Editing ****************************************** //
+
+    /**
+     * Last deck successfully used when saving note data from a 'share' intent,
+     * or zero if no destination has been saved.
+     */
+    var lastSharedDeckId: DeckId by longPref(R.string.last_shared_deck_id_key, defaultValue = 0L)
+
     // ****************************************** Sync ****************************************** //
 
     val isAutoSyncEnabled by booleanPref(R.string.automatic_sync_choice_key, false)
@@ -246,6 +258,13 @@ open class PrefsRepository protected constructor(
     var hkey by stringPref(R.string.hkey_key)
     var currentSyncUri by stringPref(R.string.current_sync_uri_key)
 
+    /**
+     * End time of the last manual or automatic sync attempt, in epoch milliseconds.
+     * Rate-limits foreground auto-sync and sync intents, including failed, canceled and no-change attempts.
+     *
+     * If a request is blocked before starting (rate limit; metered connection etc...) do not update it,
+     * so it can try again once the block is lifted.
+     */
     var lastSyncTime by longPref(R.string.last_sync_time_key, defaultValue = 0L)
 
     val shouldFetchMedia: ShouldFetchMedia
@@ -276,7 +295,12 @@ open class PrefsRepository protected constructor(
     /**
      * Whether to enable the new review reminders notification system.
      */
-    var newReviewRemindersEnabled by booleanPref(R.string.pref_new_review_reminders, false)
+    override var newReviewRemindersEnabled by booleanPref(CommonPreferenceKey.pref_new_review_reminders, defaultValue = false)
+
+    private val minimumCardsDueForNotification by stringPref(CommonPreferenceKey.pref_notifications_minimum_cards_due_key, "1000000")
+
+    override val legacyNotificationsEnabled: Boolean
+        get() = minimumCardsDueForNotification!!.toInt() < 1000000
 
     /**
      * Review reminder IDs are unique, starting at 0 and climbing upwards by one each time a new one is created.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/shareddeck/SharedDecksActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/shareddeck/SharedDecksActivity.kt
index 7f084abab01a..6bfa07aacda4 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/shareddeck/SharedDecksActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/shareddeck/SharedDecksActivity.kt
@@ -11,6 +11,7 @@ import android.view.MenuItem
 import android.view.ViewGroup.MarginLayoutParams
 import android.webkit.CookieManager
 import android.webkit.URLUtil
+import android.webkit.WebBackForwardList
 import android.webkit.WebResourceError
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
@@ -20,25 +21,32 @@ import androidx.activity.OnBackPressedCallback
 import androidx.activity.SystemBarStyle
 import androidx.activity.enableEdgeToEdge
 import androidx.annotation.VisibleForTesting
+import androidx.appcompat.app.AlertDialog
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.fragment.app.commit
-import com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_INDEFINITE
 import com.ichi2.anki.AnkiActivity
+import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
 import com.ichi2.anki.common.utils.ext.requireSystemService
 import com.ichi2.anki.databinding.ActivitySharedDecksBinding
-import com.ichi2.anki.isLoggedIn
-import com.ichi2.anki.snackbar.showSnackbar
+import com.ichi2.anki.ui.internationalization.sentenceCase
 import com.ichi2.anki.workarounds.SafeWebViewLayout
 import com.ichi2.utils.FileNameAndExtension
+import com.ichi2.utils.message
+import com.ichi2.utils.negativeButton
+import com.ichi2.utils.neutralButton
+import com.ichi2.utils.positiveButton
+import com.ichi2.utils.show
+import com.ichi2.utils.title
 import dev.androidbroadcast.vbpd.viewBinding
 import timber.log.Timber
 import java.io.Serializable
 import kotlin.random.Random
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Browse AnkiWeb shared decks with the functionality to download and import them.
@@ -51,11 +59,22 @@ class SharedDecksActivity : AnkiActivity(R.layout.activity_shared_decks) {
 
     private var shouldHistoryBeCleared = false
 
+    private var isReturningAfterLogin = false
+
+    private val pagesBeforeLogin = mutableListOf<String>()
+
+    private var loginRequiredDialog: AlertDialog? = null
+
     private val allowedHosts = listOf(Regex("""^(?:.*\.)?ankiweb\.net$"""), Regex("""^ankiuser\.net$"""), Regex("""^ankisrs\.net$"""))
     private val onBackPressedCallback =
         object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
-                if (binding.webView.canGoBack()) binding.webView.goBack()
+                if (isReturningAfterLogin) return
+                if (binding.webView.canGoBack()) {
+                    binding.webView.goBack()
+                } else {
+                    pagesBeforeLogin.removeLastOrNull()?.let { returnTo(it) }
+                }
             }
         }
 
@@ -68,15 +87,20 @@ class SharedDecksActivity : AnkiActivity(R.layout.activity_shared_decks) {
      */
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
     internal inner class SharedDeckWebViewClient : WebViewClient() {
-        private var redirectTimes = 0
-
         override fun doUpdateVisitedHistory(
             view: WebView?,
             url: String?,
             isReload: Boolean,
         ) {
             super.doUpdateVisitedHistory(view, url, isReload)
-            onBackPressedCallback.isEnabled = binding.webView.canGoBack()
+            if (isReturningAfterLogin && url?.startsWith(SHARED_PAGES_PREFIX) == true) {
+                binding.webView.clearHistory()
+                isReturningAfterLogin = false
+            }
+            updateBackPressedCallback()
+            if (url?.startsWith(AFTER_LOGIN_URL) == true && isLoggedInToAnkiWeb()) {
+                returnToSharedDecks()
+            }
         }
 
         override fun onPageFinished(
@@ -87,6 +111,7 @@ class SharedDecksActivity : AnkiActivity(R.layout.activity_shared_decks) {
             if (shouldHistoryBeCleared) {
                 binding.webView.clearHistory()
                 shouldHistoryBeCleared = false
+                updateBackPressedCallback()
             }
             super.onPageFinished(view, url)
         }
@@ -113,10 +138,6 @@ class SharedDecksActivity : AnkiActivity(R.layout.activity_shared_decks) {
             return true
         }
 
-        @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-        internal val isLoggedInToAnkiWeb: Boolean
-            get() = isLoggedInToAnkiWeb()
-
         override fun onReceivedHttpError(
             view: WebView?,
             request: WebResourceRequest?,
@@ -128,12 +149,12 @@ class SharedDecksActivity : AnkiActivity(R.layout.activity_shared_decks) {
 
             // If a user is logged in, they see: "Daily limit exceeded; please try again tomorrow."
             // We have nothing we can do here
-            if (isLoggedInToAnkiWeb) return
+            if (isLoggedInToAnkiWeb()) return
 
             // The following cases are handled below:
             // "Please log in to download more decks." - on clicking "Download"
             // "Please log in to perform more searches" - on searching
-            redirectUserToSignUpOrLogin()
+            showLoginRequiredDialog()
         }
 
         override fun onReceivedError(
@@ -145,59 +166,67 @@ class SharedDecksActivity : AnkiActivity(R.layout.activity_shared_decks) {
             shouldHistoryBeCleared = false
             super.onReceivedError(view, request, error)
         }
-
-        /**
-         * Redirects the user to a login page
-         *
-         * The redirect is not performed if [redirectTimes] is 3 or more
-         */
-        private fun redirectUserToSignUpOrLogin() {
-            showLoginRequiredSnackbar()
-
-            // redirect user to /account/login
-            // TODO: the result of login is typically redirecting the user to their decks
-            // this should be improved
-
-            if (redirectTimes++ < 3) {
-                redirectToLogin()
-            } else {
-                // Ensure that we do not have an infinite redirect
-                Timber.w("HTTP 429 redirect limit exceeded, only displaying message")
-            }
-        }
     }
 
-    /**
-     * Tells the user they need to log in to download more decks, with a sign-up action for
-     * users without an AnkiDroid login.
-     */
-    internal fun showLoginRequiredSnackbar() {
-        showSnackbar(CommonString.shared_decks_login_required, LENGTH_INDEFINITE) {
-            if (isLoggedIn()) return@showSnackbar
-
-            // If a user is not logged in inside AnkiDroid, assume they have no AnkiWeb account
-            // and give them the option to sign up
-            setAction(CommonString.sign_up) {
-                binding.webView.loadUrl(getString(R.string.shared_decks_sign_up_url))
+    internal fun showLoginRequiredDialog() {
+        if (loginRequiredDialog?.isShowing == true) return
+        Timber.i("HTTP 429, asking the user to log in")
+        loginRequiredDialog =
+            AlertDialog.Builder(this).show {
+                title(CommonString.not_logged_in_title)
+                message(CommonString.shared_decks_ankiweb_login_limit)
+                positiveButton(text = TR.sentenceCase.logIn) { redirectToLogin() }
+                neutralButton(CommonString.sign_up) { redirectToSignUp() }
+                negativeButton(CommonString.dialog_cancel)
             }
-        }
     }
 
     /** Loads the AnkiWeb login page in the WebView, where the user can log in. */
-    internal fun redirectToLogin() {
+    private fun redirectToLogin() {
         val url = getString(R.string.shared_decks_login_url)
         Timber.i("HTTP 429, redirecting to login: '$url'")
         binding.webView.loadUrl(url)
     }
 
+    private fun redirectToSignUp() {
+        val url = getString(R.string.shared_decks_sign_up_url)
+        Timber.i("HTTP 429, redirecting to sign up: '$url'")
+        binding.webView.loadUrl(url)
+    }
+
+    private fun returnToSharedDecks() {
+        if (isReturningAfterLogin) return
+        val history = binding.webView.copyBackForwardList()
+        val sharedPages =
+            history.urlsBeforeCurrent
+                .filter { it.startsWith(SHARED_PAGES_PREFIX) }
+                .toList()
+        val url = sharedPages.lastOrNull() ?: return
+        Timber.d("Logged in to AnkiWeb, returning to '$url'")
+        pagesBeforeLogin += sharedPages.dropLast(1)
+        returnTo(url)
+    }
+
+    private fun returnTo(url: String) {
+        isReturningAfterLogin = true
+        binding.webView.loadUrl(url)
+    }
+
+    private fun updateBackPressedCallback() {
+        onBackPressedCallback.isEnabled = binding.webView.canGoBack() || pagesBeforeLogin.isNotEmpty()
+    }
+
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
     internal val webViewClient = SharedDeckWebViewClient()
 
     companion object {
         const val SHARED_DECKS_DOWNLOAD_FRAGMENT = "SharedDecksDownloadFragment"
-        const val DOWNLOAD_FILE = "DownloadFile"
+        const val ARG_DOWNLOAD_FILE = "DownloadFile"
 
         const val HTTP_STATUS_TOO_MANY_REQUESTS = 429
+
+        private const val AFTER_LOGIN_URL = "https://ankiweb.net/account/login?afterAuth=1"
+        private const val SHARED_PAGES_PREFIX = "https://ankiweb.net/shared/"
     }
 
     // Show WebView with AnkiWeb shared decks with the functionality to capture downloads and import decks.
@@ -216,7 +245,7 @@ class SharedDecksActivity : AnkiActivity(R.layout.activity_shared_decks) {
         setTitle(CommonString.download_deck)
         setupEdgeToEdge()
 
-        binding.webviewToolbar.setTitleTextColor(getColor(R.color.white))
+        binding.webviewToolbar.setTitleTextColor(getColor(CommonR.color.white))
         setSupportActionBar(binding.webviewToolbar)
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
@@ -239,7 +268,7 @@ class SharedDecksActivity : AnkiActivity(R.layout.activity_shared_decks) {
                 val sharedDecksDownloadFragment = SharedDecksDownloadFragment()
                 sharedDecksDownloadFragment.arguments =
                     Bundle().apply {
-                        putSerializable(DOWNLOAD_FILE, DownloadFile(url, userAgent, contentDisposition, mimetype))
+                        putSerializable(ARG_DOWNLOAD_FILE, DownloadFile(url, userAgent, contentDisposition, mimetype))
                     }
                 supportFragmentManager.commit {
                     add(
@@ -292,6 +321,7 @@ class SharedDecksActivity : AnkiActivity(R.layout.activity_shared_decks) {
         if (item.itemId == R.id.home) {
             // R.id.home refers to a custom 'home' menu item defined in your app resources (res/menu/...).
             shouldHistoryBeCleared = true
+            pagesBeforeLogin.clear()
             binding.webView.loadUrl(resources.getString(R.string.shared_decks_url))
         } else if (item.itemId == android.R.id.home) {
             // android.R.id.home refers to the system-provided "up" button in the app toolbar
@@ -301,6 +331,7 @@ class SharedDecksActivity : AnkiActivity(R.layout.activity_shared_decks) {
     }
 
     override fun onDestroy() {
+        loginRequiredDialog?.dismiss()
         SafeWebViewLayout.destroyWebView(binding.webView)
         super.onDestroy()
     }
@@ -352,3 +383,6 @@ internal fun isLoggedInToAnkiWeb(): Boolean =
         Timber.w(e, "Could not determine login status")
         false
     }
+
+private val WebBackForwardList.urlsBeforeCurrent: Sequence<String>
+    get() = (0 until currentIndex).asSequence().map { getItemAtIndex(it).url }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/shareddeck/SharedDecksDownloadFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/shareddeck/SharedDecksDownloadFragment.kt
index 085fbbb6d228..caa7e26be636 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/shareddeck/SharedDecksDownloadFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/shareddeck/SharedDecksDownloadFragment.kt
@@ -6,10 +6,12 @@ package com.ichi2.anki.shareddeck
 import android.app.DownloadManager
 import android.content.ActivityNotFoundException
 import android.content.BroadcastReceiver
+import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.database.Cursor
+import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -42,7 +44,7 @@ import com.ichi2.anki.common.time.TimeManager
 import com.ichi2.anki.common.utils.android.showThemedToast
 import com.ichi2.anki.compat.CompatHelper.Companion.getSerializableCompat
 import com.ichi2.anki.compat.CompatHelper.Companion.registerReceiverCompat
-import com.ichi2.anki.shareddeck.SharedDecksActivity.Companion.DOWNLOAD_FILE
+import com.ichi2.anki.shareddeck.SharedDecksActivity.Companion.ARG_DOWNLOAD_FILE
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.anki.utils.ext.launchCollectionInLifecycleScope
 import com.ichi2.anki.utils.openUrl
@@ -64,13 +66,13 @@ import com.ichi2.anki.common.android.R as CommonR
 class SharedDecksDownloadFragment : Fragment() {
     private val viewModel: SharedDecksDownloadViewModel by viewModels()
 
-    private val fileToBeDownloaded by lazy { arguments?.getSerializableCompat<DownloadFile>(DOWNLOAD_FILE)!! }
+    private val fileToBeDownloaded by lazy { arguments?.getSerializableCompat<DownloadFile>(ARG_DOWNLOAD_FILE)!! }
 
     private var downloadId: Long = 0
 
     private var fileName: String? = null
 
-    private var completedFile: File? = null
+    private var completedDeck: Uri? = null
 
     private var handler: Handler = Handler(Looper.getMainLooper())
     private var isProgressCheckerRunning = false
@@ -160,7 +162,7 @@ class SharedDecksDownloadFragment : Fragment() {
                         },
                         onImportClick = {
                             Timber.i("Import deck button clicked")
-                            completedFile?.let { openDownloadedDeck(requireContext(), it) }
+                            completedDeck?.let { openDownloadedDeck(requireContext(), it) }
                         },
                         onTryAgainClick = ::retryDownload,
                         onOpenInBrowserClick = ::openInBrowser,
@@ -182,8 +184,7 @@ class SharedDecksDownloadFragment : Fragment() {
 
     /**
      * Handles the [DownloadPhase.LoginRequired] phase: shows the login prompt and returns to
-     * the shared decks WebView, opened on its login page, so the prompt is actionable even
-     * without a sign-up action.
+     * the shared decks WebView.
      *
      * Handled in this collector rather than in the broadcast receiver which records the
      * state: the receiver can fire while the activity is backgrounded, where
@@ -193,9 +194,7 @@ class SharedDecksDownloadFragment : Fragment() {
         viewModel.uiState.launchCollectionInLifecycleScope { state ->
             if (state.phase == DownloadPhase.LoginRequired) {
                 Timber.i("Download requires login, returning to shared decks")
-                val sharedDecksActivity = activity as SharedDecksActivity
-                sharedDecksActivity.showLoginRequiredSnackbar()
-                sharedDecksActivity.redirectToLogin()
+                (activity as SharedDecksActivity).showLoginRequiredDialog()
                 parentFragmentManager.popBackStack()
             }
         }
@@ -257,11 +256,17 @@ class SharedDecksDownloadFragment : Fragment() {
         }
         val currentFileName = fileToBeDownloaded.toFileName(extension = "apkg")
 
-        val downloadRequest = generateDeckDownloadRequest(fileToBeDownloaded, currentFileName)
-
-        completedFile = null
+        completedDeck = null
         // Store unique download ID to be used when onReceiveBroadcast() of AnkiBroadcastReceiver gets executed.
-        downloadId = downloadManager.enqueue(downloadRequest)
+        downloadId =
+            try {
+                enqueueDownload(fileToBeDownloaded, currentFileName)
+            } catch (e: SecurityException) {
+                CrashReportService.sendExceptionReport(e, "SharedDecksDownloadFragment::downloadFile")
+                viewModel.onDownloadStarted(currentFileName)
+                onDownloadFinished(DownloadOutcome.Failed)
+                return
+            }
         fileName = currentFileName
         isDownloadInProgress = true
         onBackPressedCallback.isEnabled = isDownloadInProgress
@@ -271,6 +276,24 @@ class SharedDecksDownloadFragment : Fragment() {
         startDownloadProgressChecker()
     }
 
+    private fun enqueueDownload(
+        fileToBeDownloaded: DownloadFile,
+        currentFileName: String,
+    ): Long {
+        val request =
+            generateDeckDownloadRequest(fileToBeDownloaded, currentFileName).setDestinationInExternalFilesDir(
+                context,
+                null,
+                "$SHARED_DECKS_DOWNLOAD_FOLDER/$currentFileName",
+            )
+        return try {
+            downloadManager.enqueue(request)
+        } catch (_: SecurityException) {
+            Timber.w("DownloadManager rejected the app folder, downloading into its own storage")
+            downloadManager.enqueue(generateDeckDownloadRequest(fileToBeDownloaded, currentFileName))
+        }
+    }
+
     private fun generateDeckDownloadRequest(
         fileToBeDownloaded: DownloadFile,
         currentFileName: String,
@@ -286,11 +309,6 @@ class SharedDecksDownloadFragment : Fragment() {
         request.setTitle(currentFileName)
 
         request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-        request.setDestinationInExternalFilesDir(
-            context,
-            null,
-            "$SHARED_DECKS_DOWNLOAD_FOLDER/$currentFileName",
-        )
 
         return request
     }
@@ -309,9 +327,9 @@ class SharedDecksDownloadFragment : Fragment() {
                 Timber.i("Download might be complete now, verify and continue with import")
 
                 /**
-                 * @return The completed download's file, or null if it cannot be imported.
+                 * @return The completed download's location, or null if it cannot be imported.
                  */
-                fun getImportableDeck(): File? {
+                fun getImportableDeck(): Uri? {
                     if (fileName == null) {
                         // Send ACRA report
                         CrashReportService.sendExceptionReport(
@@ -376,11 +394,11 @@ class SharedDecksDownloadFragment : Fragment() {
                             onDownloadFinished(DownloadOutcome.Failed)
                             return null
                         }
-                        return localUri.toUri().toFile()
+                        return localUri.toUri()
                     }
                 }
 
-                val downloadedFile =
+                val downloadedDeck =
                     try {
                         getImportableDeck()
                     } catch (exception: Exception) {
@@ -389,20 +407,20 @@ class SharedDecksDownloadFragment : Fragment() {
                         return
                     }
 
-                if (downloadedFile == null) {
+                if (downloadedDeck == null) {
                     // Could be a retryable fault (we received notification of another file)
                     // Otherwise, onDownloadFinished should have been called
                     // to update the UI
                     return
                 }
 
-                completedFile = downloadedFile
+                completedDeck = downloadedDeck
 
                 // the progress checker can stop before it sees 100%, so complete it here
                 viewModel.onDownloadComplete()
 
                 Timber.i("Opening downloaded deck for import")
-                openDownloadedDeck(context, downloadedFile)
+                openDownloadedDeck(context, downloadedDeck)
 
                 Timber.d("Download finished")
                 onDownloadFinished(DownloadOutcome.Success)
@@ -515,25 +533,30 @@ class SharedDecksDownloadFragment : Fragment() {
      */
     private fun openDownloadedDeck(
         context: Context,
-        downloadedFile: File,
+        downloadedDeck: Uri,
     ) {
-        // A successful DownloadManager entry can outlive its file, e.g. after another import.
-        if (!downloadedFile.isFile) {
-            Timber.w("Downloaded shared deck no longer exists")
-            onDownloadFinished(DownloadOutcome.Failed)
-            return
-        }
+        val fileUri =
+            if (downloadedDeck.scheme == ContentResolver.SCHEME_FILE) {
+                val downloadedFile = downloadedDeck.toFile()
+                // A successful DownloadManager entry can outlive its file, e.g. after another import.
+                if (!downloadedFile.isFile) {
+                    Timber.w("Downloaded shared deck no longer exists")
+                    onDownloadFinished(DownloadOutcome.Failed)
+                    return
+                }
+                FileProvider.getUriForFile(
+                    context,
+                    context.packageName + ".apkgfileprovider",
+                    downloadedFile,
+                )
+            } else {
+                downloadedDeck
+            }
 
-        val mimeType = URLConnection.guessContentTypeFromName(downloadedFile.name)
+        val mimeType = URLConnection.guessContentTypeFromName(fileName)
         val fileIntent = Intent(context, IntentHandler::class.java)
         fileIntent.action = Intent.ACTION_VIEW
 
-        val fileUri =
-            FileProvider.getUriForFile(
-                context,
-                context.packageName + ".apkgfileprovider",
-                downloadedFile,
-            )
         Timber.d("File URI -> $fileUri")
         fileIntent.setDataAndType(fileUri, mimeType)
         fileIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/shareddeck/SharedDecksDownloadScreen.kt b/AnkiDroid/src/main/java/com/ichi2/anki/shareddeck/SharedDecksDownloadScreen.kt
index e95bf48da145..f3e9dfba3b59 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/shareddeck/SharedDecksDownloadScreen.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/shareddeck/SharedDecksDownloadScreen.kt
@@ -45,6 +45,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -63,6 +65,7 @@ import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
 import com.ichi2.compose.theme.AnkiDroidTheme
 import com.ichi2.compose.theme.dimensions
+import com.ichi2.compose.theme.widgetBorder
 import com.ichi2.compose.ui.preview.ThemePreviews
 
 private val MaxContentWidth = 600.dp
@@ -137,20 +140,36 @@ private fun ProgressRing(
     state: SharedDecksDownloadUiState,
     modifier: Modifier = Modifier,
 ) {
+    val border = MaterialTheme.widgetBorder
+    val colors = MaterialTheme.colorScheme
+    val trackColor = if (border != null) colors.surface else colors.surfaceVariant
+    val sizeTextColor = if (border != null) colors.onSurface else colors.onSurfaceVariant
+    val indicatorModifier =
+        Modifier.size(ProgressRingSize).drawWithContent {
+            drawContent()
+            if (border != null) {
+                // The thin outline distinguishes the track from the thicker progress arc.
+                drawCircle(
+                    brush = border.brush,
+                    radius = (size.minDimension - ProgressRingStroke.toPx()) / 2,
+                    style = Stroke(width = border.width.toPx()),
+                )
+            }
+        }
     Box(modifier = modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
         val percent = state.percent
         if (percent == null) {
             CircularProgressIndicator(
-                modifier = Modifier.size(ProgressRingSize),
+                modifier = indicatorModifier,
                 strokeWidth = ProgressRingStroke,
-                trackColor = MaterialTheme.colorScheme.surfaceVariant,
+                trackColor = trackColor,
             )
         } else {
             CircularProgressIndicator(
                 progress = { (percent / 100f).coerceIn(0f, 1f) },
-                modifier = Modifier.size(ProgressRingSize),
+                modifier = indicatorModifier,
                 strokeWidth = ProgressRingStroke,
-                trackColor = MaterialTheme.colorScheme.surfaceVariant,
+                trackColor = trackColor,
             )
         }
         Column(horizontalAlignment = Alignment.CenterHorizontally) {
@@ -163,7 +182,7 @@ private fun ProgressRing(
                         Text(
                             text = it,
                             style = MaterialTheme.typography.bodyMedium,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant,
+                            color = sizeTextColor,
                             modifier = Modifier.padding(top = MaterialTheme.dimensions.space50),
                         )
                     }
@@ -329,12 +348,29 @@ private fun TonalCard(
     modifier: Modifier = Modifier,
     content: @Composable ColumnScope.() -> Unit,
 ) {
-    Card(
-        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
-        elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
-        modifier = modifier,
-        content = content,
-    )
+    val border = MaterialTheme.widgetBorder
+    val colors = MaterialTheme.colorScheme
+    // Outlined e-ink cards use white surfaces and black content without changing the app palette.
+    val cardColors =
+        if (border != null) {
+            colors.copy(
+                surfaceVariant = colors.surface,
+                onSurfaceVariant = colors.onSurface,
+                tertiary = colors.onSurface,
+                onTertiary = colors.surface,
+            )
+        } else {
+            colors
+        }
+    MaterialTheme(colorScheme = cardColors) {
+        Card(
+            colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
+            elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
+            border = border,
+            modifier = modifier,
+            content = content,
+        )
+    }
 }
 
 /** Warning shown while the download waits for a network connection. */
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/startup/SetupStorage.kt b/AnkiDroid/src/main/java/com/ichi2/anki/startup/SetupStorage.kt
index efc8bd50a647..9526acf561b5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/startup/SetupStorage.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/startup/SetupStorage.kt
@@ -29,12 +29,11 @@ import java.io.File
  * in [CollectionHelper.systemStorageFailure] so reads report it rather than
  * [StorageNotConfiguredException]
  */
-fun ensureCollectionPathSet(context: Context) {
+fun maybeSetDefaultCollectionPath(context: Context) {
     val preferences = context.sharedPrefs()
     if (preferences.contains(CollectionHelper.PREF_COLLECTION_PATH)) return
     val folder = selectStoragePermissions(context).folderToPersist(context)
     if (folder == null) {
-        // unreachable until 13574 is fixed.
         Timber.i("deferring the storage decision to the user")
         return
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/startup/StoragePolicy.kt b/AnkiDroid/src/main/java/com/ichi2/anki/startup/StoragePolicy.kt
index c7146be65925..cefe625a9c5c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/startup/StoragePolicy.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/startup/StoragePolicy.kt
@@ -10,7 +10,7 @@ import com.ichi2.anki.common.storage.StorageDecision
  * Who chooses the [AnkiDroidFolder] on a fresh install.
  *
  * Declared per [StoragePermissionSet] ([StoragePermissionSet.storagePolicy]) and applied by
- * [ensureCollectionPathSet].
+ * [maybeSetDefaultCollectionPath].
  */
 sealed interface StoragePolicy {
     /** Only one folder is possible, so it is persisted on startup. */
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/study/DeckStudyState.kt b/AnkiDroid/src/main/java/com/ichi2/anki/study/DeckStudyState.kt
new file mode 100644
index 000000000000..ae27cedbc06d
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/study/DeckStudyState.kt
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.study
+
+import anki.scheduler.CongratsInfoResponse
+import com.ichi2.anki.common.time.SECONDS_PER_DAY
+import com.ichi2.anki.libanki.Collection
+import com.ichi2.anki.libanki.DeckId
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * Collection facts about the selected deck, independent of the screen displaying them.
+ *
+ * Contents and availability are separate: cards can be buried, limited, scheduled for later,
+ * or temporarily borrowed by a filtered deck. Completion details retain those distinctions.
+ */
+data class DeckStudyState(
+    val deckId: DeckId,
+    val kind: DeckKind,
+    /** Includes subdecks and cards temporarily borrowed by filtered decks. */
+    val cardCount: Int,
+    val newCardsAvailable: Int,
+    val learningCardsAvailable: Int,
+    val reviewCardsAvailable: Int,
+    val congratulations: CongratsInfoResponse,
+) {
+    val availability: StudyAvailability
+        get() =
+            if (newCardsAvailable + learningCardsAvailable + reviewCardsAvailable > 0) {
+                StudyAvailability.CardsAvailable
+            } else {
+                StudyAvailability.NoCardsAvailable
+            }
+
+    val isEmptyRegularDeck: Boolean get() = kind == DeckKind.Regular && cardCount == 0
+
+    /** Time until learning becomes available, accounting for the learn-ahead limit. */
+    val nextLearningIn: Duration?
+        get() = congratulations.secsUntilNextLearn.takeIf { it < SECONDS_PER_DAY }?.seconds
+}
+
+enum class DeckKind {
+    Regular,
+    Filtered,
+}
+
+enum class StudyAvailability {
+    CardsAvailable,
+    NoCardsAvailable,
+}
+
+/** Read under the collection lock so identity, contents and scheduling refer to the same deck. */
+fun Collection.currentDeckStudyState(): DeckStudyState {
+    val deck = decks.current()
+    val counts = sched.counts()
+    return DeckStudyState(
+        deckId = deck.id,
+        kind = if (deck.isFiltered) DeckKind.Filtered else DeckKind.Regular,
+        cardCount = decks.cardCount(deck.id, includeSubdecks = true),
+        newCardsAvailable = counts.new,
+        learningCardsAvailable = counts.lrn,
+        reviewCardsAvailable = counts.rev,
+        congratulations = sched.congratulationsInfo(),
+    )
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/study/StudyCompletionUi.kt b/AnkiDroid/src/main/java/com/ichi2/anki/study/StudyCompletionUi.kt
new file mode 100644
index 000000000000..1dc4c5fdd303
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/study/StudyCompletionUi.kt
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.study
+
+import android.content.Context
+import androidx.fragment.app.FragmentActivity
+import com.ichi2.anki.CollectionManager.TR
+import com.ichi2.anki.CollectionManager.withCol
+import com.ichi2.anki.CommonString
+import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.anki.common.time.TIME_HOUR
+import com.ichi2.anki.common.time.TIME_MINUTE
+import com.ichi2.anki.common.utils.android.showThemedToast
+import com.ichi2.anki.launchCatchingTask
+import com.ichi2.anki.pages.CongratsPage
+import com.ichi2.anki.snackbar.showSnackbar
+import kotlin.math.round
+
+/** Presents the end of a review session in the activity that owns its result. */
+object StudyCompletionUi {
+    fun openCongratsPage(activity: FragmentActivity) {
+        activity.startActivity(CongratsPage.getIntent(activity))
+    }
+
+    fun displayFromShortcut(activity: FragmentActivity) {
+        if (displayNewCongratsScreen(activity)) {
+            openCongratsPage(activity)
+        } else {
+            activity.launchCatchingTask {
+                val state = withCol { currentDeckStudyState() }
+                showThemedToast(activity, finishedMessage(activity, state), false)
+            }
+        }
+    }
+
+    fun onReviewsCompleted(
+        activity: FragmentActivity,
+        state: DeckStudyState,
+    ) {
+        if (displayNewCongratsScreen(activity)) {
+            openCongratsPage(activity)
+            return
+        }
+        when (state.availability) {
+            StudyAvailability.NoCardsAvailable -> activity.showSnackbar(finishedMessage(activity, state))
+            StudyAvailability.CardsAvailable -> activity.showSnackbar(CommonString.studyoptions_no_cards_due)
+        }
+    }
+
+    private fun displayNewCongratsScreen(context: Context) = context.sharedPrefs().getBoolean("new_congrats_screen", false)
+
+    private fun finishedMessage(
+        context: Context,
+        state: DeckStudyState,
+    ): String {
+        val seconds = state.nextLearningIn?.inWholeSeconds ?: return context.getString(CommonString.studyoptions_congrats_finished)
+        val (unit, amount) =
+            if (seconds < TIME_MINUTE) {
+                "seconds" to seconds.toDouble()
+            } else if (seconds < TIME_HOUR) {
+                "minutes" to seconds / TIME_MINUTE
+            } else {
+                "hours" to seconds / TIME_HOUR
+            }
+        val nextLearnDue = TR.schedulingNextLearnDue(unit, round(amount).toInt())
+        return context.getString(CommonString.studyoptions_congrats_next_due_in, nextLearnDue)
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/tags/ManageTagsViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/tags/ManageTagsViewModel.kt
index 31d528a4b9a4..79a513faf39c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/tags/ManageTagsViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/tags/ManageTagsViewModel.kt
@@ -10,6 +10,7 @@ import com.ichi2.anki.libanki.Tags
 import com.ichi2.anki.observability.undoableOp
 import com.ichi2.anki.tags.ManageTagsState.Error
 import com.ichi2.anki.tags.UserMessage.ClearedUnusedTags
+import com.ichi2.anki.tags.UserMessage.TagMoved
 import com.ichi2.anki.tags.UserMessage.TagRemoved
 import com.ichi2.anki.tags.UserMessage.TagRenamed
 import com.ichi2.anki.utils.MessageQueue
@@ -83,6 +84,9 @@ class ManageTagsViewModel : ViewModel() {
     /** Acknowledges that the UI has finished displaying a message. */
     fun messageShown(id: MessageId) = messageQueue.acknowledge(id)
 
+    /** Checks the complete tag tree, including tags hidden by search or collapsed ancestors. */
+    fun tagExists(tag: TagName): Boolean = tagList.any { it.fullTag == tag }
+
     /** Returns the visible node for [tag], or null with a warning if not found or not loaded */
     private fun findVisibleNode(tag: TagName): TagListItemState? {
         val loaded = state.value as? ManageTagsState.Content
@@ -113,7 +117,7 @@ class ManageTagsViewModel : ViewModel() {
                     return@launchTagOperation
                 }
             val newCollapsed = !node.collapsed
-            withCol { tags.setCollapsed(tag, newCollapsed) }
+            withCol { tags.setCollapsed(node.fullTag, newCollapsed) }
             // Update the in-memory list with the new collapsed state
             tagList =
                 tagList.map {
@@ -133,14 +137,14 @@ class ManageTagsViewModel : ViewModel() {
         }
 
     /**
-     * Renames [oldName] to [newName], updating all notes and child tags.
+     * Renames [oldName] to [newName] on notes, including matching child tags.
      * @see Tags.rename
      */
     fun renameTag(
         oldName: TagName,
         newName: TagName,
     ) = launchTagOpAndRefresh {
-        val result = undoableOp { tags.rename(oldName, newName) }
+        val result = undoableOp { renameTagTree(oldName, newName) }
         messageQueue.enqueue(TagRenamed(result.count))
     }
 
@@ -155,12 +159,27 @@ class ManageTagsViewModel : ViewModel() {
             messageQueue.enqueue(ClearedUnusedTags(result.count))
         }
 
+    /**
+     * Reparents [tag] and its descendants on notes under [newParent]. An empty [newParent] moves
+     * [tag] to the top level.
+     * @see moveTagTree
+     */
+    fun moveTag(
+        tag: TagName,
+        newParent: TagName?,
+    ) = launchTagOpAndRefresh {
+        Timber.i("Moving tag")
+        val result = undoableOp { moveTagTree(tag, newParent) }
+        messageQueue.enqueue(TagMoved(result.count))
+    }
+
     private suspend fun loadTags() {
         Timber.i("Loading tags from collection")
         tagList = flattenTree(withCol { tags.tree() })
         state.value =
             ManageTagsState.Content(
                 visibleNodes = computeVisibleNodes(searchQuery.value),
+                totalTagCount = tagList.size,
             )
     }
 
@@ -349,12 +368,16 @@ data class TagListItemState(
 sealed class ManageTagsState {
     data object Loading : ManageTagsState()
 
+    /**
+     * @param totalTagCount every tag in the collection, unaffected by search/collapse
+     */
     data class Content(
         val visibleNodes: List<TagListItemState>,
         /** `true` while a tag operation runs, allowing the UI to show progress without hiding the list. */
         val isWorking: Boolean = false,
         /** Most recent operation failure, cleared when the next operation starts. */
         val error: Throwable? = null,
+        val totalTagCount: Int = 0,
     ) : ManageTagsState()
 
     data class Error(
@@ -373,6 +396,11 @@ sealed interface UserMessage {
         val notesAffected: Int,
     ) : UserMessage
 
+    /** @param notesAffected number of notes whose tags were reparented */
+    data class TagMoved(
+        val notesAffected: Int,
+    ) : UserMessage
+
     /** @param count number of unused tags removed from the collection */
     data class ClearedUnusedTags(
         val count: Int,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/tags/TagName.kt b/AnkiDroid/src/main/java/com/ichi2/anki/tags/TagName.kt
index b4962bb3674f..49c72c78bc03 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/tags/TagName.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/tags/TagName.kt
@@ -2,20 +2,31 @@
 
 package com.ichi2.anki.tags
 
+import android.icu.lang.UCharacter
 import anki.collection.OpChanges
 import anki.collection.OpChangesWithCount
 import com.ichi2.anki.libanki.Tags
+import com.ichi2.anki.libanki.utils.RustCompat
 import timber.log.Timber
+import java.text.Normalizer
 
 /**
  * A tag name, e.g. "science::biology".
  *
+ * Equality, hashing and hierarchy checks mirror backend tag identity, including normalization
+ * and the case-folding bug in Anki's pinned unicase version. [value] retains the name's spelling
+ * for display and case-only renames; compare it explicitly when checking whether the spelling changed.
+ *
  * Tag names should not be logged using `Timber.i` or above to avoid leaking PII to crash reports.
  */
-@JvmInline
-value class TagName private constructor(
+class TagName private constructor(
     val value: String,
 ) {
+    private val identity = foldCase(normalize(value))
+
+    /** Includes [root] itself; `a::b` is a descendant of `a`, but `ab` is not. */
+    fun isSameOrDescendantOf(root: TagName): Boolean = identity == root.identity || identity.startsWith("${root.identity}::")
+
     /** Ancestor tags, e.g. `TagName.build("a::b::c").ancestors` returns `["a", "a::b"]` */
     val ancestors: List<String>
         get() {
@@ -32,6 +43,10 @@ value class TagName private constructor(
             }
         }
 
+    override fun equals(other: Any?): Boolean = other is TagName && identity == other.identity
+
+    override fun hashCode(): Int = identity.hashCode()
+
     override fun toString(): String = value
 
     companion object {
@@ -41,6 +56,44 @@ value class TagName private constructor(
             // But "_" is converted to " " in some visual displays
             return TagName(tagName.replace(" ", "_"))
         }
+
+        /**
+         * Match the backend's three-character case-folding bug in unicase 2.6.0.
+         *
+         * Anki pins this version because collation changes can invalidate SQLite indexes.
+         * The bug is fixed in unicase 2.10.0 by
+         * [afc3c16219c9](https://github.com/seanmonstar/unicase/commit/afc3c16219c9720839f2f4c16a3ede52274df7d7).
+         * Remove the rotation when the backend adopts that fix.
+         */
+        private fun foldCase(spelling: String): String =
+            buildString {
+                var offset = 0
+                while (offset < spelling.length) {
+                    val codePoint = spelling.codePointAt(offset)
+                    val folded = UCharacter.foldCase(String(Character.toChars(codePoint)), true)
+                    // Reproduce unicase 2.6.0's bug per input character: "ffi" folds to "iff",
+                    // while the three literal characters in "ffi" keep their order.
+                    if (folded.codePointCount(0, folded.length) == 3) {
+                        val last = folded.offsetByCodePoints(0, 2)
+                        append(folded, last, folded.length)
+                        append(folded, 0, last)
+                    } else {
+                        append(folded)
+                    }
+                    offset += Character.charCount(codePoint)
+                }
+            }
+
+        // Mirror tags/register.rs for identity only. Preserve the supplied spelling
+        // and leave mutation validation (e.g. forbidden separators) to the backend.
+        private fun normalize(spelling: String): String =
+            spelling.split("::").joinToString("::") { component ->
+                Normalizer
+                    .normalize(component, Normalizer.Form.NFC)
+                    .filterNot { it <= '\u001f' || it == '\u007f' || it == '\u3000' }
+                    .trim(RustCompat::isWhitespace)
+                    .ifEmpty { "blank" }
+            }
     }
 }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/tags/TagTreeOperations.kt b/AnkiDroid/src/main/java/com/ichi2/anki/tags/TagTreeOperations.kt
new file mode 100644
index 000000000000..51158409f324
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/tags/TagTreeOperations.kt
@@ -0,0 +1,61 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.tags
+
+import anki.collection.OpChangesWithCount
+import anki.collection.copy
+import anki.collection.opChangesWithCount
+import com.ichi2.anki.libanki.Collection
+
+/**
+ * Renames tags on notes, repairing duplicates when subtrees merge.
+ *
+ * Works around [Anki issue 5857](https://github.com/ankitects/anki/issues/5857).
+ *
+ * Follows Anki's backend behavior: an entirely unused subtree is left unchanged. When
+ * renaming a subtree used by notes, unused cached descendants are removed, not renamed.
+ * See https://github.com/ankitects/anki/blob/main/rslib/src/tags/rename.rs.
+ */
+internal fun Collection.renameTagTree(
+    oldName: TagName,
+    newName: TagName,
+): OpChangesWithCount {
+    val affectedNotes = findNotes(oldName.literalSubtreeSearch())
+    val result = tags.rename(oldName, newName)
+    if (result.count == 0) return result
+
+    // Renaming into an existing tag can leave duplicate tags on a note. Use the backend's
+    // tag identity to deduplicate: its pinned unicase 2.6.0 has a folding bug that equates
+    // "ffi" with "iff", but keeps "ffi" distinct. Standard Unicode folding disagrees, so
+    // client-side cleanup can remove valid tags or miss duplicates.
+    // The rename already marked these notes modified; no card generation is needed.
+    val undoStep = undoStatus().lastStep
+    afterNoteUpdates(affectedNotes, markModified = false, generateCards = false)
+    return result.copy { changes = mergeUndoEntries(undoStep) }
+}
+
+/** Move tags on notes, merging overlapping subtrees with the same semantics as [renameTagTree]. */
+internal fun Collection.moveTagTree(
+    tag: TagName,
+    newParent: TagName?,
+): OpChangesWithCount {
+    require(newParent == null || !newParent.isSameOrDescendantOf(tag)) { "A tag cannot be moved under itself" }
+    val leaf = tag.value.substringAfterLast("::")
+    val destination = TagName.build(newParent?.let { "${it.value}::$leaf" } ?: leaf)!!
+    if (destination == tag) return opChangesWithCount { }
+    // Moving one subtree is a prefix rename. The backend reparent operation also rejects
+    // valid sibling prefixes (e.g. parent::a beneath parent::ab).
+    return renameTagTree(tag, destination)
+}
+
+/** A literal regex avoids tag-search wildcards and reserved names such as "none". */
+private fun TagName.literalSubtreeSearch(): String {
+    val escaped =
+        buildString {
+            for (char in value) {
+                if (char in "\\.^$|?*+()[]{}") append('\\')
+                append(char)
+            }
+        }.replace("\"", "\\\"")
+    return "\"tag:re:^$escaped(?:::|$)\""
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/RecyclerFastScroller.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/RecyclerFastScroller.kt
index 6837ad870d09..d13a45d5b31f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/RecyclerFastScroller.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/RecyclerFastScroller.kt
@@ -62,9 +62,9 @@ import androidx.interpolator.view.animation.LinearOutSlowInInterpolator
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.color.MaterialColors
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.utils.ext.wholeAndFraction
 import com.ichi2.anki.utils.postDelayed
-import com.ichi2.utils.dp
 import com.ichi2.utils.isRtl
 import timber.log.Timber
 import kotlin.time.Duration
@@ -396,11 +396,12 @@ class RecyclerFastScroller
                     true
                 }
                 MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
-                    handle.isSelected = false
+                    handle.isPressed = false
                     if (recyclerView != null) {
                         recyclerView?.let { removeCallbacks(scrollTask) }
                         scrollTask.run()
                     }
+                    postAutoHide()
                     false
                 }
                 else -> super.onTouchEvent(event)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/ResizablePaneLayout.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/ResizablePaneLayout.kt
new file mode 100644
index 000000000000..6793ea3c293a
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/ResizablePaneLayout.kt
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.ui
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewConfiguration
+import android.widget.LinearLayout
+import androidx.core.view.children
+import androidx.core.view.isVisible
+import kotlin.math.abs
+
+class ResizablePaneLayout
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+    ) : LinearLayout(context, attrs) {
+        private val grabDistance = 24 * resources.displayMetrics.density
+        private val touchSlop = ViewConfiguration.get(context).scaledTouchSlop
+        private var downX = 0f
+        private var downY = 0f
+        private var nearDivider = false
+        private var dragging = false
+
+        private val divider: View?
+            get() = children.firstOrNull { it is ResizingDivider && it.isVisible }
+
+        override fun onInterceptTouchEvent(ev: MotionEvent): Boolean = startsDrag(ev)
+
+        override fun onTouchEvent(event: MotionEvent): Boolean {
+            if (dragging) {
+                divider?.dispatchTouchEvent(event)
+                if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) {
+                    dragging = false
+                }
+                return true
+            }
+            return startsDrag(event) || nearDivider || super.onTouchEvent(event)
+        }
+
+        private fun startsDrag(event: MotionEvent): Boolean {
+            val divider = divider ?: return false
+            when (event.actionMasked) {
+                MotionEvent.ACTION_DOWN -> {
+                    downX = event.x
+                    downY = event.y
+                    nearDivider = abs(event.x - (divider.left + divider.right) / 2f) <= grabDistance
+                    if (nearDivider) parent?.requestDisallowInterceptTouchEvent(true)
+                }
+                MotionEvent.ACTION_MOVE -> {
+                    val dx = abs(event.x - downX)
+                    if (nearDivider && dx > touchSlop && dx > abs(event.y - downY)) {
+                        nearDivider = false
+                        dragging = true
+                        val down = MotionEvent.obtain(event).apply { action = MotionEvent.ACTION_DOWN }
+                        divider.dispatchTouchEvent(down)
+                        down.recycle()
+                        return true
+                    }
+                }
+                MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> nearDivider = false
+            }
+            return false
+        }
+    }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/ResizablePaneManager.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/ResizablePaneManager.kt
index cabe100ae948..5d20e9d4bcc3 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/ResizablePaneManager.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/ResizablePaneManager.kt
@@ -9,7 +9,9 @@ import android.view.PointerIcon
 import android.view.View
 import android.widget.LinearLayout
 import androidx.core.content.edit
+import androidx.core.view.doOnPreDraw
 import com.ichi2.anki.R
+import com.ichi2.anki.common.utils.dp
 import timber.log.Timber
 
 /**
@@ -24,7 +26,6 @@ class ResizablePaneManager(
     private val sharedPrefs: SharedPreferences,
     private val startPaneWeightKey: String,
     private val endPaneWeightKey: String,
-    private val minWeight: Float = 0.5f, // Minimum weight for each pane
     private val dragColor: Int = divider.context.getColor(R.color.drag_divider_color),
     private val idleColor: Int = divider.context.getColor(R.color.idle_divider_color),
     private val onResizingChanged: (Boolean) -> Unit = {},
@@ -36,6 +37,10 @@ class ResizablePaneManager(
     private fun setupResizableDivider() {
         // Load saved weights if available
         loadSavedWeights()
+        parentLayout.doOnPreDraw { clampWeights() }
+        parentLayout.addOnLayoutChangeListener { _, left, _, right, _, oldLeft, _, oldRight, _ ->
+            if (right - left != oldRight - oldLeft) parentLayout.doOnPreDraw { clampWeights() }
+        }
 
         var initialTouchX = 0f
         var initialStartWeight = 0f
@@ -97,6 +102,7 @@ class ResizablePaneManager(
 
                         // Clamp the new weight for the start pane
                         // Ensures it's not too small and not too large (leaving space for the other pane's minWeight)
+                        val minWeight = minWeight(sumOfInitialWeights)
                         newStartWeight = newStartWeight.coerceIn(minWeight, sumOfInitialWeights - minWeight)
 
                         val newEndWeight = sumOfInitialWeights - newStartWeight
@@ -151,6 +157,33 @@ class ResizablePaneManager(
             Timber.w(e, "Failed to load saved pane weights")
         }
     }
+
+    /** The weight that keeps a pane [MIN_PANE_WIDTH] wide, or half of [totalWeight] if two of those don't fit */
+    private fun minWeight(totalWeight: Float): Float {
+        val paneSpace = parentLayout.width - divider.width
+        if (paneSpace <= 0) return 0f
+        val minPaneWidth = MIN_PANE_WIDTH.toPx(parentLayout.context) * parentLayout.resources.configuration.fontScale
+        return (totalWeight * minPaneWidth / paneSpace).coerceAtMost(totalWeight / 2)
+    }
+
+    /** Moves the divider back within the limits when a saved split or a narrower screen leaves a pane too small */
+    private fun clampWeights() {
+        val startParams = startPane.layoutParams as LinearLayout.LayoutParams
+        val endParams = endPane.layoutParams as LinearLayout.LayoutParams
+        val totalWeight = startParams.weight + endParams.weight
+        val minWeight = minWeight(totalWeight)
+        val clampedStartWeight = startParams.weight.coerceIn(minWeight, totalWeight - minWeight)
+        if (clampedStartWeight == startParams.weight) return
+        startParams.weight = clampedStartWeight
+        endParams.weight = totalWeight - clampedStartWeight
+        startPane.layoutParams = startParams
+        endPane.layoutParams = endParams
+    }
+
+    companion object {
+        /** Narrowest a pane can be, times the font scale: the panes hold text, which needs more room at a larger font size */
+        private val MIN_PANE_WIDTH = 240.dp
+    }
 }
 
 private fun Float.invertIfRtl(view: View): Float = if (view.layoutDirection == View.LAYOUT_DIRECTION_RTL) -this else this
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/animations/ViewAnimations.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/animations/ViewAnimations.kt
index 55108002276b..0414c48f8be2 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/animations/ViewAnimations.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/animations/ViewAnimations.kt
@@ -4,7 +4,7 @@ package com.ichi2.anki.ui.animations
 
 import android.view.View
 import android.view.ViewPropertyAnimator
-import com.ichi2.utils.dp
+import com.ichi2.anki.common.utils.dp
 
 fun View.fadeIn(
     duration: Int,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/managespace/ManageSpaceFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/managespace/ManageSpaceFragment.kt
index f9eeaebcb09c..9e3e8cca2648 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/managespace/ManageSpaceFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/managespace/ManageSpaceFragment.kt
@@ -12,7 +12,6 @@ import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat.getSystemService
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewModelScope
 import androidx.preference.Preference
 import com.ichi2.anki.BackupManager
@@ -32,6 +31,7 @@ import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.anki.ui.dialogs.tools.AsyncDialogBuilder.CheckedItems
 import com.ichi2.anki.ui.dialogs.tools.DialogResult
 import com.ichi2.anki.ui.dialogs.tools.awaitDialog
+import com.ichi2.anki.utils.ext.launchCollectionInViewLifecycleScope
 import com.ichi2.anki.utils.getUserFriendlyErrorText
 import com.ichi2.preferences.TextWidgetPreference
 import kotlinx.coroutines.CoroutineScope
@@ -233,15 +233,6 @@ class ManageSpaceFragment : SettingsFragment() {
 
         adjustDeleteEverythingStringsDependingOnCollectionLocation(deleteEverythingPreference)
 
-        listOf(
-            viewModel.flowOfDeleteUnusedMediaSize to deleteUnusedMediaPreference,
-            viewModel.flowOfDeleteCollectionSize to deleteCollectionPreference,
-            viewModel.flowOfDeleteEverythingSize to deleteEverythingPreference,
-            viewModel.flowOfDeleteBackupsSize to deleteBackupsPreference,
-        ).forEach { (flowOfSize, preference) ->
-            lifecycleScope.launch { flowOfSize.collect { size -> preference.setWidgetTextBy(size) } }
-        }
-
         observeProgress(viewModel) { progress -> getString(progress.messageRes) }
     }
 
@@ -253,6 +244,16 @@ class ManageSpaceFragment : SettingsFragment() {
         binding.toolbar.apply {
             title = getString(CommonString.pref__manage_space__screen_title)
         }
+
+        listOf(
+            viewModel.flowOfDeleteUnusedMediaSize to R.string.pref_delete_media_key,
+            viewModel.flowOfDeleteCollectionSize to R.string.pref_delete_collection_key,
+            viewModel.flowOfDeleteEverythingSize to R.string.pref_delete_everything_key,
+            viewModel.flowOfDeleteBackupsSize to R.string.pref_delete_backups_key,
+        ).forEach { (flowOfSize, key) ->
+            val preference = requirePreference<TextWidgetPreference>(key)
+            flowOfSize.launchCollectionInViewLifecycleScope { size -> preference.setWidgetTextBy(size) }
+        }
     }
 
     /************************************ Delete unused media *************************************/
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/LegacyNotificationsPermissionFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/LegacyNotificationsPermissionFragment.kt
index b036fa9f1a4c..4cd2d9c86e4c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/LegacyNotificationsPermissionFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/LegacyNotificationsPermissionFragment.kt
@@ -35,7 +35,7 @@ class LegacyNotificationsPermissionFragment : PermissionsFragment(R.layout.fragm
         // onResume is called after returning from the OS settings
         if (canPostNotifications(requireContext())) {
             // Post a fragment result to indicate that the bottom sheet can be dismissed
-            setFragmentResult(PermissionsBottomSheet.RESULT_DISMISS, Bundle())
+            setFragmentResult(PermissionsBottomSheet.REQUEST_DISMISS_PERMISSIONS_SHEET, Bundle())
         }
     }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/NotificationsPermissionFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/NotificationsPermissionFragment.kt
index b92018e72a56..de783617e6de 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/NotificationsPermissionFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/NotificationsPermissionFragment.kt
@@ -45,7 +45,7 @@ class NotificationsPermissionFragment : PermissionsFragment(R.layout.fragment_no
         // onResume is called after returning from both the OS settings and the OS permission request dialog
         if (canPostNotifications(requireContext())) {
             // Post a fragment result to indicate that the bottom sheet can be dismissed
-            setFragmentResult(PermissionsBottomSheet.RESULT_DISMISS, Bundle())
+            setFragmentResult(PermissionsBottomSheet.REQUEST_DISMISS_PERMISSIONS_SHEET, Bundle())
         }
     }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsActivity.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsActivity.kt
index af0be0f60549..bfe0ca4a58cd 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsActivity.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsActivity.kt
@@ -17,8 +17,8 @@ import com.ichi2.anki.StoragePermissionSet
 import com.ichi2.anki.common.utils.android.showThemedToast
 import com.ichi2.anki.common.utils.ext.getParcelableExtraCompat
 import com.ichi2.anki.databinding.ActivityPermissionsBinding
-import com.ichi2.anki.ui.windows.permissions.PermissionsFragment.Companion.HAS_ALL_PERMISSIONS_KEY
-import com.ichi2.anki.ui.windows.permissions.PermissionsFragment.Companion.PERMISSIONS_FRAGMENT_RESULT_KEY
+import com.ichi2.anki.ui.windows.permissions.PermissionsFragment.Companion.REQUEST_PERMISSIONS
+import com.ichi2.anki.ui.windows.permissions.PermissionsFragment.Companion.RESULT_HAS_ALL_PERMISSIONS
 import com.ichi2.anki.utils.ext.setFragmentResultListener
 import dev.androidbroadcast.vbpd.viewBinding
 import timber.log.Timber
@@ -37,7 +37,7 @@ import timber.log.Timber
  * To request optional permissions from the user, prefer [PermissionsBottomSheet].
  */
 class PermissionsActivity : AnkiActivity(R.layout.activity_permissions) {
-    private val binding by viewBinding(ActivityPermissionsBinding::bind)
+    internal val binding by viewBinding(ActivityPermissionsBinding::bind)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         if (showedActivityFailedScreen(savedInstanceState)) {
@@ -58,21 +58,29 @@ class PermissionsActivity : AnkiActivity(R.layout.activity_permissions) {
             finish()
             return
         }
-        val permissionsFragment = permissionSet.permissionsFragment.getDeclaredConstructor().newInstance()
-        setFragmentResultListener(PERMISSIONS_FRAGMENT_RESULT_KEY) { _, bundle ->
-            val hasAllPermissions = bundle.getBoolean(HAS_ALL_PERMISSIONS_KEY)
+        configurePermissions(permissionSet)
+        // only close the activity by tapping the continue button
+        onBackPressedDispatcher.addCallback {}
+    }
+
+    private fun configurePermissions(permissionSet: StoragePermissionSet) {
+        setFragmentResultListener(REQUEST_PERMISSIONS) { _, bundle ->
+            val hasAllPermissions = bundle.getBoolean(RESULT_HAS_ALL_PERMISSIONS)
             setContinueButtonEnabled(hasAllPermissions)
         }
-        setFragmentResultListener(RESULT_COMPLETE) { _, _ -> decideStorageAndFinish() }
+        setFragmentResultListener(REQUEST_PERMISSIONS_GRANTED) { _, _ -> decideStorageAndFinish() }
 
+        showPermissionsFragment(permissionSet)
+    }
+
+    private fun showPermissionsFragment(permissionSet: StoragePermissionSet) {
+        val permissionsFragment = permissionSet.permissionsFragment.getDeclaredConstructor().newInstance()
         supportFragmentManager.commit {
             replace(R.id.fragment_container, permissionsFragment)
         }
-        // only close the activity by tapping the continue button
-        onBackPressedDispatcher.addCallback {}
     }
 
-    fun setContinueButtonEnabled(isEnabled: Boolean) {
+    private fun setContinueButtonEnabled(isEnabled: Boolean) {
         binding.continueButton.isEnabled = isEnabled
     }
 
@@ -80,7 +88,7 @@ class PermissionsActivity : AnkiActivity(R.layout.activity_permissions) {
      * Records the storage decision and closes the screen: the granted permissions
      * determine the default collection path.
      *
-     * Called on 'Continue', or when the fragment reports [RESULT_COMPLETE].
+     * Called on 'Continue', or when the fragment reports [REQUEST_PERMISSIONS_GRANTED].
      * Preserves an existing collection path.
      *
      * @see InitialActivity.decideStorageIfUndecided
@@ -99,7 +107,7 @@ class PermissionsActivity : AnkiActivity(R.layout.activity_permissions) {
          * Signals the activity to persist the
          * [storage decision][com.ichi2.anki.common.storage.StorageDecision], and then close.
          */
-        const val RESULT_COMPLETE = "result_complete"
+        const val REQUEST_PERMISSIONS_GRANTED = "result_complete"
 
         fun getIntent(
             context: Context,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsBottomSheet.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsBottomSheet.kt
index cdeb5a437f67..0c281fd7e468 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsBottomSheet.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsBottomSheet.kt
@@ -47,7 +47,7 @@ class PermissionsBottomSheet : BottomSheetDialogFragment() {
         }
 
         binding.closeButton.setOnClickListener { dismiss() }
-        childFragmentManager.setFragmentResultListener(RESULT_DISMISS, this) { _, _ ->
+        childFragmentManager.setFragmentResultListener(REQUEST_DISMISS_PERMISSIONS_SHEET, this) { _, _ ->
             dismiss()
         }
 
@@ -75,7 +75,7 @@ class PermissionsBottomSheet : BottomSheetDialogFragment() {
          * Fragment result request key for dismissing this BottomSheet.
          * Public so that child fragments can set it.
          */
-        const val RESULT_DISMISS = "result_dismiss"
+        const val REQUEST_DISMISS_PERMISSIONS_SHEET = "result_dismiss"
 
         /**
          * Starts this BottomSheet with the provided [OptionalPermissionSet].
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsFragment.kt
index bb3cade2921f..899b59d38a33 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsFragment.kt
@@ -61,8 +61,8 @@ abstract class PermissionsFragment(
         super.onResume()
         permissionsItems.forEach { it.updateSwitchCheckedStatus() }
         setFragmentResult(
-            PERMISSIONS_FRAGMENT_RESULT_KEY,
-            Bundle().apply { putBoolean(HAS_ALL_PERMISSIONS_KEY, hasAllPermissions()) },
+            REQUEST_PERMISSIONS,
+            Bundle().apply { putBoolean(RESULT_HAS_ALL_PERMISSIONS, hasAllPermissions()) },
         )
     }
 
@@ -135,7 +135,7 @@ abstract class PermissionsFragment(
     }
 
     companion object {
-        const val PERMISSIONS_FRAGMENT_RESULT_KEY = "PERMISSION_FRAGMENT_RESULT"
-        const val HAS_ALL_PERMISSIONS_KEY = "HAS_ALL_PERMISSIONS"
+        const val REQUEST_PERMISSIONS = "PERMISSION_FRAGMENT_RESULT"
+        const val RESULT_HAS_ALL_PERMISSIONS = "HAS_ALL_PERMISSIONS"
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsStartingAt30Fragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsStartingAt30Fragment.kt
index 53b1c927c064..8b8700b373f3 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsStartingAt30Fragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsStartingAt30Fragment.kt
@@ -31,7 +31,7 @@ class PermissionsStartingAt30Fragment : PermissionsFragment(R.layout.fragment_pe
         ) {
             if (hasAllPermissions()) {
                 // the activity records the storage decision and finishes
-                setFragmentResult(PermissionsActivity.RESULT_COMPLETE, Bundle())
+                setFragmentResult(PermissionsActivity.REQUEST_PERMISSIONS_GRANTED, Bundle())
             }
         }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/AnswerFeedbackView.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/AnswerFeedbackView.kt
index f1c2ff0b0267..8001e6120e0e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/AnswerFeedbackView.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/AnswerFeedbackView.kt
@@ -79,6 +79,8 @@ class AnswerFeedbackView : AppCompatImageView {
                 override fun onAnimationRepeat(animation: Animation) {}
             },
         )
+        // The animation may be delayed if the row is not expanded before the first frame.
+        visibility = VISIBLE
         startAnimation(fadeIn)
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/AnswerTimerView.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/AnswerTimerView.kt
index fcdcafd94021..c3448d054162 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/AnswerTimerView.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/AnswerTimerView.kt
@@ -8,7 +8,7 @@ import android.util.AttributeSet
 import android.widget.Chronometer
 import androidx.appcompat.widget.ThemeUtils
 import androidx.core.view.isVisible
-import com.ichi2.anki.R
+import com.ichi2.anki.common.android.R as CommonR
 
 class AnswerTimerView(
     context: Context,
@@ -81,7 +81,7 @@ class AnswerTimerView(
     }
 
     private fun updateTextColor(isOverLimit: Boolean) {
-        val colorAttr = if (isOverLimit) R.attr.maxTimerColor else android.R.attr.textColor
+        val colorAttr = if (isOverLimit) CommonR.attr.maxTimerColor else android.R.attr.textColor
         setTextColor(ThemeUtils.getThemeAttrColor(context, colorAttr))
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
index 690fd7f110a5..76712b6c4823 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt
@@ -47,6 +47,7 @@ import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.common.destinations.DeckOptionsDestination
 import com.ichi2.anki.common.destinations.navigate
 import com.ichi2.anki.common.utils.android.isRobolectric
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.FragmentReviewerBinding
 import com.ichi2.anki.dialogs.showDeckOptionsSelectionDialog
 import com.ichi2.anki.dialogs.tags.TagsDialogFactory
@@ -83,7 +84,6 @@ import com.ichi2.anki.workarounds.SafeWebViewLayout
 import com.ichi2.themes.Themes
 import com.ichi2.ui.TypeAnswerEditText
 import com.ichi2.utils.ViewGroupUtils.setRenderWorkaround
-import com.ichi2.utils.dp
 import com.ichi2.utils.show
 import com.squareup.seismic.ShakeDetector
 import dev.androidbroadcast.vbpd.viewBinding
@@ -133,7 +133,7 @@ class ReviewerFragment :
     override fun onLoadInitialHtml(): String =
         stdHtml(
             context = requireContext(),
-            extraJsAssets = listOf("scripts/ankidroid-reviewer.js"),
+            extraJsAssets = listOf("scripts/ankidroid-reviewer.js", "scripts/type-answer.js"),
             nightMode = Themes.isNightTheme,
         )
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
index 3329fd0eda9f..49f2295a632c 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModel.kt
@@ -15,6 +15,7 @@ import com.ichi2.anki.Flag
 import com.ichi2.anki.Reviewer
 import com.ichi2.anki.asyncIO
 import com.ichi2.anki.cardviewer.SingleCardSide
+import com.ichi2.anki.cardviewer.appendNoSuggestAttributes
 import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.common.destinations.BrowserDestination
 import com.ichi2.anki.common.destinations.CardInfoDestination
@@ -631,12 +632,18 @@ class ReviewerViewModel(
         text: String,
         typeAnswer: TypeAnswer,
     ): String {
+        val keyboardAttributes =
+            buildString {
+                if (typeAnswer.noSuggest) appendNoSuggestAttributes()
+            }
+
         @Suppress("XmlDeprecatedElement") // upstream uses `<center>`
         @Language("HTML")
         val repl =
             """
             <center>
             <input type="text" id="typeans" onkeydown="ankidroid.onTypeAnswerKeyDown(event);" 
+               $keyboardAttributes
                style="font-family: '${typeAnswer.font}'; font-size: ${typeAnswer.fontSize}px;">
             </center>
             """.trimIndent()
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/StudyScreenRepository.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/StudyScreenRepository.kt
index 89bfe645627b..d7be2134994b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/StudyScreenRepository.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/StudyScreenRepository.kt
@@ -21,8 +21,8 @@ class StudyScreenRepository(
 ) {
     val isMarkShownInToolbar: Boolean
     val isFlagShownInToolbar: Boolean
-    var isWhiteboardEnabled by prefs.booleanPref(KEY_WHITEBOARD_ENABLED, false)
-    var isRecordVoiceEnabled by prefs.booleanPref(KEY_RECORD_VOICE_ENABLED, false)
+    var isWhiteboardEnabled by prefs.booleanPref(PREF_WHITEBOARD_ENABLED, false)
+    var isRecordVoiceEnabled by prefs.booleanPref(PREF_RECORD_VOICE_ENABLED, false)
     val isHtmlTypeAnswerEnabled get() = prefs.isHtmlTypeAnswerEnabled
 
     init {
@@ -61,7 +61,7 @@ class StudyScreenRepository(
     suspend fun getShouldShowNextTimes(): Boolean = CollectionPreferences.getShowIntervalOnButtons()
 
     companion object {
-        private const val KEY_WHITEBOARD_ENABLED = "whiteboardEnabled"
-        private const val KEY_RECORD_VOICE_ENABLED = "recordVoiceEnabled"
+        private const val PREF_WHITEBOARD_ENABLED = "whiteboardEnabled"
+        private const val PREF_RECORD_VOICE_ENABLED = "recordVoiceEnabled"
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/audiorecord/AudioRecordView.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/audiorecord/AudioRecordView.kt
index 079a3c127654..0d84ae95d516 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/audiorecord/AudioRecordView.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/audiorecord/AudioRecordView.kt
@@ -67,7 +67,7 @@ class AudioRecordView : ConstraintLayout {
     private var stopTrackingAction = false
     private var chronometerBase: Long = 0
     private val recordEnabledColor = context.getColor(CommonR.color.material_red_600)
-    private val recordDisabledColor = ThemeUtils.getThemeAttrColor(context, R.attr.editTextDisabled)
+    private val recordDisabledColor = ThemeUtils.getThemeAttrColor(context, CommonR.attr.editTextDisabled)
 
     private var firstX = 0f
     private var firstY = 0f
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/audiorecord/CheckPronunciationViewModel.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/audiorecord/CheckPronunciationViewModel.kt
index 7e839ba4ac3c..2c3c22724bf3 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/audiorecord/CheckPronunciationViewModel.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/audiorecord/CheckPronunciationViewModel.kt
@@ -23,7 +23,7 @@ import kotlin.time.Duration
 class CheckPronunciationViewModel(
     audioRecorder: AudioRecorder = AudioRecorder(appContext),
     createPlayer: () -> Player = { VoicePlayer.createExoPlayer(appContext) },
-    recordingsDirectory: File = File(appContext.cacheDir, VoiceRecorder.RECORDINGS_DIRECTORY),
+    recordingsDirectory: File = VoiceRecorder.recordingsDirectory(appContext),
 ) : ViewModel() {
     private val recorder = VoiceRecorder(audioRecorder, recordingsDirectory, viewModelScope)
     private val player = VoicePlayer(viewModelScope, createPlayer)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/whiteboard/ColorPickerDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/whiteboard/ColorPickerDialog.kt
index 57d69c09bd2b..08180b8c1aee 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/whiteboard/ColorPickerDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/whiteboard/ColorPickerDialog.kt
@@ -13,8 +13,8 @@ import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
-import com.ichi2.utils.Dp
-import com.ichi2.utils.dp
+import com.ichi2.anki.common.utils.Dp
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.show
 import com.skydoves.colorpickerview.AlphaTileView
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/whiteboard/WhiteboardFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/whiteboard/WhiteboardFragment.kt
index 7cfd081c45b8..e3c92571b416 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/whiteboard/WhiteboardFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/whiteboard/WhiteboardFragment.kt
@@ -33,6 +33,7 @@ import com.ichi2.anki.R
 import com.ichi2.anki.android.back.doubleBackPressCallback
 import com.ichi2.anki.cardviewer.Gesture
 import com.ichi2.anki.common.utils.android.systemIsInNightMode
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.compat.CompatHelper.Companion.compat
 import com.ichi2.anki.databinding.FragmentWhiteboardBinding
 import com.ichi2.anki.databinding.PopupBrushOptionsBinding
@@ -42,7 +43,6 @@ import com.ichi2.anki.reviewer.BindingMap
 import com.ichi2.anki.reviewer.ReviewerBinding
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.anki.utils.ext.sharedPrefs
-import com.ichi2.utils.dp
 import com.ichi2.utils.increaseHorizontalPaddingOfMenuIcons
 import com.ichi2.utils.toRGBAHex
 import dev.androidbroadcast.vbpd.viewBinding
@@ -52,6 +52,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import kotlin.math.roundToInt
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Fragment that displays a whiteboard and its controls.
@@ -353,7 +354,7 @@ class WhiteboardFragment :
             PopupWindow(popupBrushBinding.root, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, true)
 
         val typedValue = TypedValue()
-        val hasAttr = requireContext().theme.resolveAttribute(R.attr.studyScreenElevation, typedValue, true)
+        val hasAttr = requireContext().theme.resolveAttribute(CommonR.attr.studyScreenElevation, typedValue, true)
         brushConfigPopup?.elevation =
             if (hasAttr && typedValue.type == TypedValue.TYPE_DIMENSION) {
                 typedValue.getDimension(resources.displayMetrics)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/whiteboard/WhiteboardRepository.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/whiteboard/WhiteboardRepository.kt
index d809a06c41fb..7611d29e8c78 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/whiteboard/WhiteboardRepository.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/whiteboard/WhiteboardRepository.kt
@@ -17,12 +17,12 @@ class WhiteboardRepository(
         brushes: List<WhiteboardTool.Brush>,
         isDarkMode: Boolean,
     ) {
-        val key = if (isDarkMode) KEY_BRUSHES_DARK else KEY_BRUSHES_LIGHT
+        val key = if (isDarkMode) PREF_BRUSHES_DARK else PREF_BRUSHES_LIGHT
         sharedPreferences.edit { putString(key, brushes.toPreferenceString()) }
     }
 
     fun loadBrushes(isDarkMode: Boolean): List<WhiteboardTool.Brush> {
-        val key = if (isDarkMode) KEY_BRUSHES_DARK else KEY_BRUSHES_LIGHT
+        val key = if (isDarkMode) PREF_BRUSHES_DARK else PREF_BRUSHES_LIGHT
         val saved = sharedPreferences.getString(key, null)
         return if (saved.isNullOrEmpty()) {
             getDefaultBrushes(isDarkMode)
@@ -35,44 +35,44 @@ class WhiteboardRepository(
         index: Int,
         isDarkMode: Boolean,
     ) {
-        val key = if (isDarkMode) KEY_LAST_ACTIVE_BRUSH_INDEX_DARK else KEY_LAST_ACTIVE_BRUSH_INDEX_LIGHT
+        val key = if (isDarkMode) PREF_LAST_ACTIVE_BRUSH_INDEX_DARK else PREF_LAST_ACTIVE_BRUSH_INDEX_LIGHT
         sharedPreferences.edit { putInt(key, index) }
     }
 
     fun loadLastActiveBrushIndex(isDarkMode: Boolean): Int {
-        val key = if (isDarkMode) KEY_LAST_ACTIVE_BRUSH_INDEX_DARK else KEY_LAST_ACTIVE_BRUSH_INDEX_LIGHT
+        val key = if (isDarkMode) PREF_LAST_ACTIVE_BRUSH_INDEX_DARK else PREF_LAST_ACTIVE_BRUSH_INDEX_LIGHT
         return sharedPreferences.getInt(key, 0)
     }
 
     var inkEraserWidth: Float
-        get() = sharedPreferences.getFloat(KEY_INK_ERASER_WIDTH, DEFAULT_ERASER_WIDTH)
-        set(value) = sharedPreferences.edit { putFloat(KEY_INK_ERASER_WIDTH, value) }
+        get() = sharedPreferences.getFloat(PREF_INK_ERASER_WIDTH, DEFAULT_ERASER_WIDTH)
+        set(value) = sharedPreferences.edit { putFloat(PREF_INK_ERASER_WIDTH, value) }
 
     var strokeEraserWidth: Float
-        get() = sharedPreferences.getFloat(KEY_STROKE_ERASER_WIDTH, DEFAULT_ERASER_WIDTH)
-        set(value) = sharedPreferences.edit { putFloat(KEY_STROKE_ERASER_WIDTH, value) }
+        get() = sharedPreferences.getFloat(PREF_STROKE_ERASER_WIDTH, DEFAULT_ERASER_WIDTH)
+        set(value) = sharedPreferences.edit { putFloat(PREF_STROKE_ERASER_WIDTH, value) }
 
     var eraserMode: EraserMode
         get() {
-            val value = sharedPreferences.getString(KEY_ERASER_MODE, EraserMode.INK.name) ?: EraserMode.INK.name
+            val value = sharedPreferences.getString(PREF_ERASER_MODE, EraserMode.INK.name) ?: EraserMode.INK.name
             return EraserMode.entries.firstOrNull { it.name == value } ?: EraserMode.INK
         }
-        set(value) = sharedPreferences.edit { putString(KEY_ERASER_MODE, value.name) }
+        set(value) = sharedPreferences.edit { putString(PREF_ERASER_MODE, value.name) }
 
     var stylusOnlyMode: Boolean
-        get() = sharedPreferences.getBoolean(KEY_STYLUS_ONLY_MODE, false)
-        set(value) = sharedPreferences.edit { putBoolean(KEY_STYLUS_ONLY_MODE, value) }
+        get() = sharedPreferences.getBoolean(PREF_STYLUS_ONLY_MODE, false)
+        set(value) = sharedPreferences.edit { putBoolean(PREF_STYLUS_ONLY_MODE, value) }
 
     var toolbarAlignment: ToolbarAlignment
         get() {
-            val value = sharedPreferences.getString(KEY_TOOLBAR_ALIGNMENT, ToolbarAlignment.BOTTOM.name) ?: ToolbarAlignment.BOTTOM.name
+            val value = sharedPreferences.getString(PREF_TOOLBAR_ALIGNMENT, ToolbarAlignment.BOTTOM.name) ?: ToolbarAlignment.BOTTOM.name
             return ToolbarAlignment.entries.firstOrNull { it.name == value } ?: ToolbarAlignment.BOTTOM
         }
-        set(value) = sharedPreferences.edit { putString(KEY_TOOLBAR_ALIGNMENT, value.name) }
+        set(value) = sharedPreferences.edit { putString(PREF_TOOLBAR_ALIGNMENT, value.name) }
 
     var isToolbarShown: Boolean
-        get() = sharedPreferences.getBoolean(KEY_IS_TOOLBAR_SHOWN, true)
-        set(value) = sharedPreferences.edit { putBoolean(KEY_IS_TOOLBAR_SHOWN, value) }
+        get() = sharedPreferences.getBoolean(PREF_IS_TOOLBAR_SHOWN, true)
+        set(value) = sharedPreferences.edit { putBoolean(PREF_IS_TOOLBAR_SHOWN, value) }
 
     private fun List<WhiteboardTool.Brush>.toPreferenceString(): String = this.joinToString(",") { "${it.color}|${it.width}" }
 
@@ -91,16 +91,16 @@ class WhiteboardRepository(
         }
 
     companion object {
-        private const val KEY_BRUSHES_LIGHT = "brushes_light"
-        private const val KEY_LAST_ACTIVE_BRUSH_INDEX_LIGHT = "last_active_brush_index_light"
-        private const val KEY_BRUSHES_DARK = "brushes_dark"
-        private const val KEY_LAST_ACTIVE_BRUSH_INDEX_DARK = "last_active_brush_index_dark"
-        private const val KEY_INK_ERASER_WIDTH = "ink_eraser_width"
-        private const val KEY_STROKE_ERASER_WIDTH = "stroke_eraser_width"
-        private const val KEY_ERASER_MODE = "eraser_mode"
-        private const val KEY_STYLUS_ONLY_MODE = "stylus_only_mode"
-        private const val KEY_TOOLBAR_ALIGNMENT = "toolbar_alignment"
-        private const val KEY_IS_TOOLBAR_SHOWN = "is_toolbar_shown"
+        private const val PREF_BRUSHES_LIGHT = "brushes_light"
+        private const val PREF_LAST_ACTIVE_BRUSH_INDEX_LIGHT = "last_active_brush_index_light"
+        private const val PREF_BRUSHES_DARK = "brushes_dark"
+        private const val PREF_LAST_ACTIVE_BRUSH_INDEX_DARK = "last_active_brush_index_dark"
+        private const val PREF_INK_ERASER_WIDTH = "ink_eraser_width"
+        private const val PREF_STROKE_ERASER_WIDTH = "stroke_eraser_width"
+        private const val PREF_ERASER_MODE = "eraser_mode"
+        private const val PREF_STYLUS_ONLY_MODE = "stylus_only_mode"
+        private const val PREF_TOOLBAR_ALIGNMENT = "toolbar_alignment"
+        private const val PREF_IS_TOOLBAR_SHOWN = "is_toolbar_shown"
         const val DEFAULT_STROKE_WIDTH = 10f
         const val DEFAULT_ERASER_WIDTH = 30f
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/whiteboard/WhiteboardToolbar.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/whiteboard/WhiteboardToolbar.kt
index 042d2d7eaf16..5869bf8a20bf 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/whiteboard/WhiteboardToolbar.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/whiteboard/WhiteboardToolbar.kt
@@ -16,9 +16,9 @@ import androidx.core.view.marginLeft
 import androidx.core.view.marginRight
 import androidx.core.view.updateLayoutParams
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.ViewWhiteboardToolbarBinding
 import com.ichi2.anki.utils.ext.setDuration
-import com.ichi2.utils.dp
 import kotlin.math.abs
 import kotlin.time.Duration.Companion.milliseconds
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/utils/ErrorMessage.kt b/AnkiDroid/src/main/java/com/ichi2/anki/utils/ErrorMessage.kt
new file mode 100644
index 000000000000..64e0fb1c9bf9
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/utils/ErrorMessage.kt
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.utils
+
+import android.content.Context
+import android.text.Spanned
+import android.text.style.TypefaceSpan
+import androidx.core.text.buildSpannedString
+import androidx.core.text.inSpans
+import androidx.core.text.toSpanned
+import com.ichi2.anki.showError
+
+/** Search errors have a formatting contract that does not apply to arbitrary exceptions. */
+internal fun Context.showSearchError(message: String) = showError(formatSearchError(message), crashReportData = null)
+
+/**
+ * Formats the backend's search errors: single-backtick code spans, or an entire regex diagnostic
+ * wrapped in `<pre>`. Unsupported code delimiters leave the entire message literal.
+ *
+ * Desktop converts search-syntax errors with Python-Markdown, whose code spans trim edge whitespace:
+ * https://github.com/Python-Markdown/markdown/blob/3.10.3/markdown/inlinepatterns.py#L394-L413
+ * Regex diagnostics contain raw user input, so remove only the outer wrapper, without parsing HTML:
+ * https://github.com/ankitects/anki/blob/fe4f9e039a4e283b71e611fc1ffb87029b1cdc05/rslib/src/error/mod.rs#L161
+ */
+internal fun formatSearchError(message: String): Spanned {
+    if (message.startsWith("<pre>") && message.endsWith("</pre>")) {
+        return buildSpannedString {
+            inSpans(TypefaceSpan("monospace")) {
+                append(message.removeSurrounding("<pre>", "</pre>"))
+            }
+        }
+    }
+
+    val parts = message.split('`')
+    if (!supportsInlineCode(message, parts)) return message.toSpanned()
+
+    return buildSpannedString {
+        parts.forEachIndexed { index, part ->
+            if (index % 2 == 1) {
+                inSpans(TypefaceSpan("monospace")) { append(part.trim()) }
+            } else {
+                append(part)
+            }
+        }
+    }
+}
+
+private fun supportsInlineCode(
+    message: String,
+    parts: List<String>,
+): Boolean {
+    if (parts.size % 2 == 0 || "``" in message) return false
+
+    // Splitting on backticks alternates prose and code, starting and ending with prose.
+    for (codeIndex in 1 until parts.size step 2) {
+        val code = parts[codeIndex]
+        if (code.isBlank() || '\n' in code || '\r' in code) return false
+
+        val precedingText = parts[codeIndex - 1]
+        if (precedingText.endsWith('\\')) return false
+    }
+    return true
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/Flow.kt b/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/Flow.kt
index 5dcd982c60a8..33b471acaf44 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/Flow.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/Flow.kt
@@ -49,6 +49,20 @@ fun <T> Flow<T>.launchCollectionInLifecycleScope(block: suspend (T) -> Unit) {
     }
 }
 
+/**
+ * Collects while the fragment's current view is started. Call from [Fragment.onViewCreated].
+ */
+context(fragment: Fragment)
+fun <T> Flow<T>.launchCollectionInViewLifecycleScope(block: suspend (T) -> Unit): Job {
+    // Capture the owner before launching: the view may be destroyed or recreated before the job starts.
+    val owner = fragment.viewLifecycleOwner
+    return owner.lifecycleScope.launch {
+        owner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+            this@launchCollectionInViewLifecycleScope.collect(block)
+        }
+    }
+}
+
 // Workaround a bug in overload resolution. Replace with the following when the compiler is fixed:
 //  state: Lifecycle.State = Lifecycle.State.STARTED
 context(activity: AnkiActivity)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/widgets/DeckAdapter.kt b/AnkiDroid/src/main/java/com/ichi2/anki/widgets/DeckAdapter.kt
index 146cfa5f5e20..5c892e650e13 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/widgets/DeckAdapter.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/widgets/DeckAdapter.kt
@@ -19,10 +19,10 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.ItemDeckBinding
 import com.ichi2.anki.deckpicker.DisplayDeckNode
 import com.ichi2.anki.libanki.DeckId
-import com.ichi2.utils.dp
 import kotlinx.coroutines.runBlocking
 import net.ankiweb.rsdroid.RustCleanup
 import com.ichi2.anki.common.android.R as CommonR
@@ -233,23 +233,23 @@ class DeckAdapter(
         // Get the colors from the theme attributes
         val attrs =
             intArrayOf(
-                R.attr.zeroCountColor,
-                R.attr.newCountColor,
-                R.attr.learnCountColor,
-                R.attr.reviewCountColor,
-                R.attr.currentDeckBackground,
+                CommonR.attr.zeroCountColor,
+                CommonR.attr.newCountColor,
+                CommonR.attr.learnCountColor,
+                CommonR.attr.reviewCountColor,
+                CommonR.attr.currentDeckBackground,
                 android.R.attr.textColor,
-                R.attr.dynDeckColor,
-                R.attr.expandRef,
-                R.attr.collapseRef,
+                CommonR.attr.dynDeckColor,
+                CommonR.attr.expandRef,
+                CommonR.attr.collapseRef,
             )
         val ta = context.obtainStyledAttributes(attrs)
-        zeroCountColor = ta.getColor(0, context.getColor(R.color.black))
-        newCountColor = ta.getColor(1, context.getColor(R.color.black))
-        learnCountColor = ta.getColor(2, context.getColor(R.color.black))
-        reviewCountColor = ta.getColor(3, context.getColor(R.color.black))
+        zeroCountColor = ta.getColor(0, context.getColor(CommonR.color.black))
+        newCountColor = ta.getColor(1, context.getColor(CommonR.color.black))
+        learnCountColor = ta.getColor(2, context.getColor(CommonR.color.black))
+        reviewCountColor = ta.getColor(3, context.getColor(CommonR.color.black))
         rowCurrentDrawable = ta.getResourceId(4, 0)
-        deckNameDefaultColor = ta.getColor(5, context.getColor(R.color.black))
+        deckNameDefaultColor = ta.getColor(5, context.getColor(CommonR.color.black))
         deckNameDynColor = ta.getColor(6, context.getColor(CommonR.color.material_blue_A700))
         expandImage = ta.getDrawableOrThrow(7)
         expandImage.isAutoMirrored = true
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/widgets/DeckHierarchyLinesDecoration.kt b/AnkiDroid/src/main/java/com/ichi2/anki/widgets/DeckHierarchyLinesDecoration.kt
index 3e94f7da4668..83edd9f2c23b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/widgets/DeckHierarchyLinesDecoration.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/widgets/DeckHierarchyLinesDecoration.kt
@@ -12,7 +12,7 @@ import androidx.core.view.children
 import androidx.recyclerview.widget.RecyclerView
 import com.ichi2.anki.R
 import com.ichi2.anki.common.utils.android.systemIsInNightMode
-import com.ichi2.utils.dp
+import com.ichi2.anki.common.utils.dp
 
 @JvmInline
 private value class DepthBitSet(
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/workarounds/SafeWebViewLayout.kt b/AnkiDroid/src/main/java/com/ichi2/anki/workarounds/SafeWebViewLayout.kt
index 60b839172e5f..3729772b0033 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/workarounds/SafeWebViewLayout.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/workarounds/SafeWebViewLayout.kt
@@ -128,6 +128,12 @@ open class SafeWebViewLayout :
         webView.goBack()
     }
 
+    @MainThread
+    fun canGoBack(): Boolean {
+        if (warnIfNotActive("canGoBack")) return false
+        return webView.canGoBack()
+    }
+
     @MainThread
     fun pageUp(): Boolean {
         if (warnIfNotActive("pageUp")) return false
@@ -205,29 +211,64 @@ open class SafeWebViewLayout :
         removeView(webView)
         webView.destroy()
 
-        val fragment =
-            try {
-                findFragment<Fragment>()
-            } catch (e: IllegalStateException) {
-                Timber.w(e, "skipping WebView recreation; layout is not attached to a Fragment")
-                webViewState = WebViewState.DESTROYED_RECOVERABLE
-                return
-            }
-        if (fragment.view == null) {
-            Timber.w("skipping WebView recreation; fragment view is gone")
+        if (!isAttachedToWindow) {
+            Timber.w("skipping WebView recreation; layout is not attached to a window")
             webViewState = WebViewState.DESTROYED_RECOVERABLE
             return
         }
-        if (!isAttachedToWindow) {
-            Timber.w("skipping WebView recreation; layout is not attached to a window")
+
+        val listener = findListener()
+        if (listener == null) {
+            Timber.w("skipping WebView recreation; no OnWebViewRecreatedListener found")
             webViewState = WebViewState.DESTROYED_RECOVERABLE
             return
         }
 
-        recreateInnerWebView(fragment)
+        recreateInnerWebView(listener)
     }
 
-    private fun recreateInnerWebView(fragment: Fragment) {
+    /** Finds the [OnWebViewRecreatedListener] from the host Fragment, falling back to the host Activity. */
+    private fun findListener(): OnWebViewRecreatedListener? {
+        val fragment =
+            try {
+                findFragment<Fragment>()
+            } catch (e: IllegalStateException) {
+                null
+            }
+
+        if (fragment != null) {
+            if (fragment.view == null) {
+                Timber.w("skipping WebView recreation; fragment view is gone")
+                return null
+            }
+            return (fragment as? OnWebViewRecreatedListener).also {
+                if (it == null) {
+                    if (BuildConfig.DEBUG && !isInEditMode) {
+                        throw IllegalStateException(
+                            "Fragment '${fragment::class.simpleName}' must implement OnWebViewRecreatedListener",
+                        )
+                    } else {
+                        Timber.w("Fragment does not implement OnWebViewRecreatedListener. WebView recreation may not be handled")
+                    }
+                }
+            }
+        }
+
+        return (context as? OnWebViewRecreatedListener).also {
+            if (it == null) {
+                val hostName = context.javaClass.simpleName
+                if (BuildConfig.DEBUG && !isInEditMode) {
+                    throw IllegalStateException(
+                        "'$hostName' must implement OnWebViewRecreatedListener",
+                    )
+                } else {
+                    Timber.w("'$hostName' does not implement OnWebViewRecreatedListener. WebView recreation may not be handled")
+                }
+            }
+        }
+    }
+
+    private fun recreateInnerWebView(listener: OnWebViewRecreatedListener) {
         val previousWebView = this.webView
         if (previousWebView.parent == this) {
             removeView(previousWebView)
@@ -235,17 +276,26 @@ open class SafeWebViewLayout :
         this.webView = createWebView()
         webViewState = WebViewState.ACTIVE
         addView(this.webView, webViewLayoutParams)
-        (fragment as? OnWebViewRecreatedListener)?.onWebViewRecreated(this.webView)
+        listener.onWebViewRecreated(this.webView)
     }
 
-    private fun tryRecoverDestroyedWebViewIfNeeded(fragment: Fragment) {
+    private fun tryRecoverDestroyedWebViewIfNeeded(listener: OnWebViewRecreatedListener) {
         if (webViewState != WebViewState.DESTROYED_RECOVERABLE) return
-        val fragmentView = fragment.view ?: return
-        if (this === fragmentView || ancestors.any { it === fragmentView }) {
-            recreateInnerWebView(fragment)
-        } else {
-            Timber.w("skipping WebView recovery; layout is not in the fragment's current view hierarchy")
+        // For Fragment hosts, ensure the layout is still in the fragment's current view hierarchy.
+        val fragment =
+            try {
+                findFragment<Fragment>()
+            } catch (e: IllegalStateException) {
+                null
+            }
+        if (fragment != null) {
+            val fragmentView = fragment.view ?: return
+            if (this !== fragmentView && ancestors.none { it === fragmentView }) {
+                Timber.w("skipping WebView recovery; layout is not in the fragment's current view hierarchy")
+                return
+            }
         }
+        recreateInnerWebView(listener)
     }
 
     private fun warnIfNotActive(methodName: String): Boolean {
@@ -258,41 +308,8 @@ open class SafeWebViewLayout :
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-
-        val fragment =
-            try {
-                findFragment<Fragment>()
-            } catch (e: IllegalStateException) {
-                // findFragment throws if the View is not attached to a Fragment.
-                // This can happen in scenarios like Android Studio previews
-                // or if the view is added directly to an Activity.
-                if (webViewState == WebViewState.DESTROYED_RECOVERABLE) {
-                    Timber.w(e, "SafeWebViewLayout not attached to a Fragment; skipping WebView recovery")
-                    return
-                }
-                if (BuildConfig.DEBUG && !isInEditMode) {
-                    throw IllegalStateException(
-                        "SafeWebViewLayout must be used within a Fragment",
-                        e,
-                    )
-                } else {
-                    Timber.w(e, "SafeWebViewLayout not attached to a Fragment")
-                }
-                return
-            }
-
-        if (fragment !is OnWebViewRecreatedListener) {
-            if (BuildConfig.DEBUG && !isInEditMode) {
-                throw IllegalStateException(
-                    "Fragment '${fragment::class.simpleName}' must implement OnWebViewRecreatedListener",
-                )
-            } else {
-                Timber.w("Fragment does not implement OnWebViewRecreatedListener. WebView recreation may not be handled")
-            }
-            return
-        }
-
-        tryRecoverDestroyedWebViewIfNeeded(fragment)
+        val listener = findListener() ?: return
+        tryRecoverDestroyedWebViewIfNeeded(listener)
     }
 
     /**
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncWorker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncWorker.kt
index 2247b215e391..31d638e8508b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncWorker.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/worker/SyncWorker.kt
@@ -19,6 +19,7 @@ import androidx.work.WorkManager
 import androidx.work.WorkerParameters
 import anki.collection.Progress
 import anki.sync.SyncCollectionResponse
+import com.ichi2.anki.BackupManager
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CollectionManager.withCol
@@ -27,11 +28,15 @@ import com.ichi2.anki.NotificationChannel
 import com.ichi2.anki.R
 import com.ichi2.anki.cancelSync
 import com.ichi2.anki.common.permissions.canPostNotifications
+import com.ichi2.anki.libanki.Collection
 import com.ichi2.anki.notifications.NotificationId
+import com.ichi2.anki.reopen
 import com.ichi2.anki.setLastSyncTimeToNow
 import com.ichi2.anki.settings.Prefs
+import com.ichi2.anki.sync.MediaSync
 import com.ichi2.anki.sync.MeteredSyncPolicy
 import com.ichi2.anki.sync.SyncAuth
+import com.ichi2.anki.sync.fullUploadOrDownload
 import com.ichi2.anki.sync.syncCollection
 import com.ichi2.anki.utils.ext.trySetForeground
 import kotlinx.coroutines.Dispatchers
@@ -56,7 +61,8 @@ val syncLock = Mutex()
  *
  * Media is synced by enqueueing a [SyncMediaWorker] work, which doesn't block the collection.
  *
- * Note that one-way syncs will be ignored, since they require user input.
+ * Full uploads and downloads run when the server specifies the direction.
+ * Conflicts requiring the user to choose a direction are ignored.
  *
  * That is useful when the user isn't interacting with
  * the app, like when doing an automatic sync after leaving the app.
@@ -102,12 +108,13 @@ class SyncWorker(
             }
             Timber.d("SyncWorker: showing failure notification")
             return Result.failure()
+        } finally {
+            setLastSyncTimeToNow()
         }
         Timber.d("SyncWorker: cancelling progress notification (sync completed)")
         notificationManager?.cancel(NotificationId.SYNC)
 
         Timber.d("SyncWorker: success")
-        setLastSyncTimeToNow()
         return Result.success()
     }
 
@@ -116,7 +123,7 @@ class SyncWorker(
         syncMedia: Boolean,
     ) {
         Timber.v("SyncWorker::syncCollection")
-        val response =
+        val syncAuth =
             coroutineScope {
                 val monitor =
                     launch(Dispatchers.IO) {
@@ -134,41 +141,64 @@ class SyncWorker(
                     }
                 try {
                     withCol {
-                        syncCollection(auth, syncMedia = false)
+                        val response = syncCollection(auth, syncMedia = false)
+                        val syncAuth =
+                            if (response.hasNewEndpoint() && response.newEndpoint.isNotEmpty()) {
+                                Prefs.currentSyncUri = response.newEndpoint
+                                auth.withEndpoint(response.newEndpoint)
+                            } else {
+                                auth
+                            }
+                        Timber.i("Sync required: %s", response.required)
+                        // Keep the direction decision and transfer on the queue so the collection
+                        // cannot change between checking whether it is empty and replacing it.
+                        when (response.required) {
+                            SyncCollectionResponse.ChangesRequired.NO_CHANGES -> _loadScheduler()
+                            SyncCollectionResponse.ChangesRequired.FULL_DOWNLOAD -> fullSync(syncAuth, upload = false)
+                            SyncCollectionResponse.ChangesRequired.FULL_UPLOAD -> fullSync(syncAuth, upload = true)
+                            SyncCollectionResponse.ChangesRequired.FULL_SYNC -> {
+                                Timber.d("Sync direction required: Skipping background sync")
+                                return@withCol null
+                            }
+                            SyncCollectionResponse.ChangesRequired.UNRECOGNIZED,
+                            SyncCollectionResponse.ChangesRequired.NORMAL_SYNC,
+                            null,
+                            -> TODO("should never happen")
+                        }
+                        syncAuth
                     }
                 } finally {
                     Timber.d("Collection sync completed. Cancelling monitor...")
                     // this doesn't wait for completion; the outer `coroutineScope` does.
                     monitor.cancel()
                 }
+            } ?: return
+        if (syncMedia) syncMedia(syncAuth)
+    }
+
+    private fun Collection.fullSync(
+        auth: SyncAuth,
+        upload: Boolean,
+    ) {
+        val title = if (upload) TR.syncUploadingToAnkiweb() else TR.syncDownloadingFromAnkiweb()
+        notify(getProgressNotification(title))
+        if (!upload) {
+            val created =
+                createBackup(
+                    BackupManager.getBackupDirectoryFromCollection(colDb),
+                    force = true,
+                    waitForCompletion = true,
+                )
+            if (!created) {
+                Timber.i("SyncWorker: Backup skipped before full download: collection unchanged")
             }
-        Timber.i("Sync required: %s", response.required)
-        when (response.required) {
-            // a successful sync returns this value
-            SyncCollectionResponse.ChangesRequired.NO_CHANGES -> {
-                withCol { _loadScheduler() } // scheduler version may have changed
-                if (!syncMedia) return
-                val syncAuth =
-                    if (response.hasNewEndpoint() && response.newEndpoint.isNotEmpty()) {
-                        Prefs.currentSyncUri = response.newEndpoint
-                        auth.withEndpoint(response.newEndpoint)
-                    } else {
-                        auth
-                    }
-                syncMedia(syncAuth)
-            }
-            SyncCollectionResponse.ChangesRequired.FULL_SYNC,
-            SyncCollectionResponse.ChangesRequired.FULL_DOWNLOAD,
-            SyncCollectionResponse.ChangesRequired.FULL_UPLOAD,
-            -> {
-                Timber.d("One-way sync required: Skipping background sync")
-            }
-            SyncCollectionResponse.ChangesRequired.UNRECOGNIZED,
-            SyncCollectionResponse.ChangesRequired.NORMAL_SYNC,
-            null,
-            -> {
-                TODO("should never happen")
-            }
+        }
+        close(downgrade = false, forFullSync = true)
+        try {
+            // Media starts separately so WorkManager can enforce its network constraints.
+            fullUploadOrDownload(auth, upload = upload, mediaSync = MediaSync.Skip)
+        } finally {
+            reopen(afterFullSync = true)
         }
     }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/compose/theme/Borders.kt b/AnkiDroid/src/main/java/com/ichi2/compose/theme/Borders.kt
new file mode 100644
index 000000000000..766f8faeb6f7
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/compose/theme/Borders.kt
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.compose.theme
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.dp
+import androidx.core.content.withStyledAttributes
+import com.ichi2.anki.common.android.R as CommonR
+
+/** The XML theme's widget outline; e-ink uses it to distinguish white surfaces. */
+val MaterialTheme.widgetBorder: BorderStroke?
+    @Composable
+    get() {
+        val context = LocalContext.current
+        val density = LocalDensity.current
+        return remember(context, density) {
+            var border: BorderStroke? = null
+            context.withStyledAttributes(attrs = intArrayOf(CommonR.attr.widgetStrokeWidth, CommonR.attr.widgetStrokeColor)) {
+                val width = with(density) { getDimension(0, 0f).toDp() }
+                if (width > 0.dp) {
+                    border = BorderStroke(width, Color(getColor(1, android.graphics.Color.TRANSPARENT)))
+                }
+            }
+            border
+        }
+    }
diff --git a/AnkiDroid/src/main/java/com/ichi2/compose/ui/components/HeroToolbarActionButton.kt b/AnkiDroid/src/main/java/com/ichi2/compose/ui/components/HeroToolbarActionButton.kt
index b690b9ed2c1b..7b66b4bac909 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compose/ui/components/HeroToolbarActionButton.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compose/ui/components/HeroToolbarActionButton.kt
@@ -20,10 +20,11 @@ import com.ichi2.compose.ui.preview.ThemePreviews
 fun HeroToolbarActionButton(
     modifier: Modifier = Modifier,
     label: String = stringResource(CommonString.multimedia_editor_field_editing_done),
+    enabled: Boolean = true,
     onClick: () -> Unit = {},
 ) {
     Box(modifier.padding(horizontal = 8.dp)) {
-        Button(onClick = onClick, modifier = Modifier.heightIn(min = 48.dp)) {
+        Button(onClick = onClick, modifier = Modifier.heightIn(min = 48.dp), enabled = enabled) {
             Text(text = label)
         }
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/compose/ui/dialogs/TextInputDialog.kt b/AnkiDroid/src/main/java/com/ichi2/compose/ui/dialogs/TextInputDialog.kt
index 640337092f62..66ad37575c75 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compose/ui/dialogs/TextInputDialog.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compose/ui/dialogs/TextInputDialog.kt
@@ -13,8 +13,6 @@ import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.AlertDialogDefaults
-import androidx.compose.material3.BasicAlertDialog
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Surface
@@ -31,26 +29,21 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
 import com.ichi2.anki.CommonString
-import com.ichi2.compose.theme.AnkiDroidTheme
-import com.ichi2.compose.ui.preview.ThemePreviews
+import com.ichi2.compose.ui.preview.AnkiDroidPreview
+import com.ichi2.compose.ui.preview.DialogPreviews
 
 /**
  * Dialog asking the user for a single line of text. Compose counterpart of
  * the View based `AlertDialog.input(...)` helper.
  *
- * In previews the card renders inline, because dialog windows don't show up
- * in the static preview pane.
- *
  * @param onConfirm called with the text, but only while it is valid
  * @param errorMessageFor error to show for the current input, null when valid
  */
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun TextInputDialog(
     title: String,
@@ -61,10 +54,11 @@ fun TextInputDialog(
     dismissText: String = stringResource(CommonString.dialog_cancel),
     initialText: String = "",
     maxLengthCounter: Int? = null,
+    lengthOf: (String) -> Int = { it.length },
     capitalization: KeyboardCapitalization = KeyboardCapitalization.Sentences,
     errorMessageFor: (String) -> String? = { null },
 ) {
-    if (LocalInspectionMode.current) {
+    AnkiDroidDialog(onDismissRequest = onDismissRequest) {
         TextInputDialogCard(
             title = title,
             label = label,
@@ -74,24 +68,10 @@ fun TextInputDialog(
             dismissText = dismissText,
             initialText = initialText,
             maxLengthCounter = maxLengthCounter,
+            lengthOf = lengthOf,
             capitalization = capitalization,
             errorMessageFor = errorMessageFor,
         )
-    } else {
-        BasicAlertDialog(onDismissRequest = onDismissRequest) {
-            TextInputDialogCard(
-                title = title,
-                label = label,
-                confirmText = confirmText,
-                onConfirm = onConfirm,
-                onDismissRequest = onDismissRequest,
-                dismissText = dismissText,
-                initialText = initialText,
-                maxLengthCounter = maxLengthCounter,
-                capitalization = capitalization,
-                errorMessageFor = errorMessageFor,
-            )
-        }
     }
 }
 
@@ -106,6 +86,7 @@ private fun TextInputDialogCard(
     dismissText: String,
     initialText: String,
     maxLengthCounter: Int?,
+    lengthOf: (String) -> Int,
     capitalization: KeyboardCapitalization,
     errorMessageFor: (String) -> String?,
 ) {
@@ -157,7 +138,7 @@ private fun TextInputDialogCard(
                                     Spacer(modifier = Modifier.weight(1f))
                                 }
                                 if (maxLengthCounter != null) {
-                                    Text("${text.length}/$maxLengthCounter")
+                                    Text("${lengthOf(text)}/$maxLengthCounter")
                                 }
                             }
                         }
@@ -192,10 +173,10 @@ private fun TextInputDialogCard(
     }
 }
 
-@ThemePreviews
+@DialogPreviews
 @Composable
 private fun TextInputDialogPreview() {
-    AnkiDroidTheme {
+    AnkiDroidPreview {
         TextInputDialog(
             title = "Rename deck",
             label = "Deck name",
diff --git a/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/AnkiDroidPreview.kt b/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/AnkiDroidPreview.kt
index 55dd0abba7c5..581ec6247f3a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/AnkiDroidPreview.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/AnkiDroidPreview.kt
@@ -8,20 +8,24 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
-import com.ichi2.anki.R
+import com.ichi2.anki.settings.enums.DayTheme
+import com.ichi2.anki.settings.enums.NightTheme
+import com.ichi2.anki.settings.enums.Theme
 import com.ichi2.compose.theme.AnkiDroidTheme
 
 /**
- * Applies the AnkiDroid theme matching the preview's light or dark UI mode.
+ * Applies [theme] to preview content, defaulting to the preview's light or dark UI mode.
  *
- * Use this wrapper with [ThemePreviews].
+ * Use [AnkiDroidThemeProvider] to preview every app theme, or [ThemePreviews] for light and dark.
  */
 @Composable
-fun AnkiDroidPreview(content: @Composable () -> Unit) {
+fun AnkiDroidPreview(
+    theme: Theme = if (isSystemInDarkTheme()) NightTheme.DARK else DayTheme.LIGHT,
+    content: @Composable () -> Unit,
+) {
     // AnkiDroidTheme reads XML attributes, so changing only the preview's UI mode is insufficient.
     val context = LocalContext.current
-    val theme = if (isSystemInDarkTheme()) R.style.Theme_Dark else R.style.Theme_Light
-    val themedContext = remember(context, theme) { ContextThemeWrapper(context, theme) }
+    val themedContext = remember(context, theme) { ContextThemeWrapper(context, theme.styleResId) }
     CompositionLocalProvider(LocalContext provides themedContext) {
         AnkiDroidTheme(content = content)
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/AnkiDroidThemeProvider.kt b/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/AnkiDroidThemeProvider.kt
new file mode 100644
index 000000000000..b90acf3c0a41
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/AnkiDroidThemeProvider.kt
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.compose.ui.preview
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import com.ichi2.anki.settings.enums.DayTheme
+import com.ichi2.anki.settings.enums.NightTheme
+import com.ichi2.anki.settings.enums.Theme
+
+/** Supplies every app theme to a preview wrapped in [AnkiDroidPreview]. */
+class AnkiDroidThemeProvider : PreviewParameterProvider<Theme> {
+    override val values: Sequence<Theme> = DayTheme.entries.asSequence() + NightTheme.entries.asSequence()
+
+    override fun getDisplayName(index: Int): String =
+        when (val theme = values.elementAt(index)) {
+            DayTheme.EINK -> "E-ink"
+            else -> theme.toString().lowercase().replaceFirstChar(Char::titlecase)
+        }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/DialogPreviews.kt b/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/DialogPreviews.kt
new file mode 100644
index 000000000000..cb3bb3627a95
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/DialogPreviews.kt
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.compose.ui.preview
+
+import android.content.res.Configuration
+import androidx.compose.ui.tooling.preview.Preview
+
+/** Light and dark dialog previews with a transparent canvas around the dialog's outline. */
+@Preview(
+    name = "Light",
+    group = "dialog",
+    showBackground = false,
+    uiMode = Configuration.UI_MODE_NIGHT_NO,
+)
+@Preview(
+    name = "Dark",
+    group = "dialog",
+    showBackground = false,
+    uiMode = Configuration.UI_MODE_NIGHT_YES,
+)
+annotation class DialogPreviews
diff --git a/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/ThemePreviews.kt b/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/ThemePreviews.kt
index c93f2c14f0c6..86148330a60d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/ThemePreviews.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/compose/ui/preview/ThemePreviews.kt
@@ -14,17 +14,16 @@ import androidx.compose.ui.tooling.preview.Preview
  *
  * Apply to any private `*Preview` function in a composable file so the IDE
  * shows both variants side-by-side without duplicating @Preview blocks.
+ * Use [DialogPreviews] for dialogs that need a transparent preview background.
  */
 @Preview(
     name = "Light",
     group = "theme",
     uiMode = Configuration.UI_MODE_NIGHT_NO,
-    showBackground = true,
 )
 @Preview(
     name = "Dark",
     group = "theme",
     uiMode = Configuration.UI_MODE_NIGHT_YES,
-    showBackground = true,
 )
 annotation class ThemePreviews
diff --git a/AnkiDroid/src/main/java/com/ichi2/imagecropper/ImageCropper.kt b/AnkiDroid/src/main/java/com/ichi2/imagecropper/ImageCropper.kt
index cf8e5e2ced30..7a4c78027a43 100644
--- a/AnkiDroid/src/main/java/com/ichi2/imagecropper/ImageCropper.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/imagecropper/ImageCropper.kt
@@ -68,7 +68,7 @@ class ImageCropper :
             cropRect = Rect(100, 300, 500, 1200)
         }
         val originalImageUri =
-            BundleCompat.getParcelable(requireArguments(), CROP_IMAGE_URI, Uri::class.java)
+            BundleCompat.getParcelable(requireArguments(), ARG_IMAGE_URI, Uri::class.java)
                 ?: error("No image identifier was provided for cropping")
         viewLifecycleOwner.lifecycleScope.launch {
             withProgress {
@@ -194,7 +194,7 @@ class ImageCropper :
         if (result.error == null) {
             val resultIntent = Intent()
             resultIntent.putExtra(
-                CROP_IMAGE_RESULT,
+                EXTRA_CROP_IMAGE_RESULT,
                 CropResultData(
                     uriContent = result.uriContent,
                     uriPath = context?.let { result.getUriFilePath(it) },
@@ -220,12 +220,12 @@ class ImageCropper :
         /**
          * The key for the original image URI passed as an argument.
          */
-        const val CROP_IMAGE_URI = "image_uri"
+        const val ARG_IMAGE_URI = "image_uri"
 
         /**
          * The key for the cropped image path sent back in the result Intent.
          */
-        const val CROP_IMAGE_RESULT = "crop_image_result"
+        const val EXTRA_CROP_IMAGE_RESULT = "crop_image_result"
     }
 
     @Parcelize
diff --git a/AnkiDroid/src/main/java/com/ichi2/imagecropper/ImageCropperLauncher.kt b/AnkiDroid/src/main/java/com/ichi2/imagecropper/ImageCropperLauncher.kt
index 1a0165fd1b86..f0079869ea3f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/imagecropper/ImageCropperLauncher.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/imagecropper/ImageCropperLauncher.kt
@@ -36,7 +36,7 @@ sealed interface ImageCropperLauncher {
     ) : ImageCropperLauncher {
         override fun toBundle(): Bundle =
             Bundle().apply {
-                putParcelable(ImageCropper.CROP_IMAGE_URI, imageUri)
+                putParcelable(ImageCropper.ARG_IMAGE_URI, imageUri)
             }
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt b/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
index 8c33d7626ca8..d6ca3ab24b0d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/preferences/ControlPreference.kt
@@ -14,6 +14,7 @@ import androidx.preference.DialogPreference
 import androidx.preference.PreferenceFragmentCompat
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.DialogControlPreferenceBinding
 import com.ichi2.anki.dialogs.GestureSelectionDialogUtils
 import com.ichi2.anki.dialogs.GestureSelectionDialogUtils.onGestureChanged
@@ -31,7 +32,6 @@ import com.ichi2.ui.GesturePicker
 import com.ichi2.ui.KeyPicker
 import com.ichi2.utils.create
 import com.ichi2.utils.customView
-import com.ichi2.utils.dp
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.positiveButton
 import com.ichi2.utils.show
@@ -71,17 +71,11 @@ open class ControlPreference :
 
     protected open fun onGestureSelected(binding: Binding) = Unit
 
-    /** @return whether the binding is used in another action */
-    open fun warnIfUsed(
-        binding: Binding,
-        warningDisplay: WarningDisplay,
-    ): Boolean {
-        val bindingPreference = getPreferenceAssignedTo(binding) ?: return false
-        if (bindingPreference == this) return false
-        val actionTitle = bindingPreference.title ?: ""
-        val warning = context.getString(CommonString.bindings_already_bound, actionTitle)
-        warningDisplay.setWarning(warning)
-        return true
+    /** @return the title of the other action using [binding], or null if there is no conflict */
+    open fun otherActionTitleForBinding(binding: Binding): CharSequence? {
+        val bindingPreference = getPreferenceAssignedTo(binding) ?: return null
+        if (bindingPreference == this) return null
+        return bindingPreference.title ?: ""
     }
 
     var value: String?
@@ -172,7 +166,11 @@ open class ControlPreference :
         binding: Binding,
         warningDisplay: WarningDisplay,
     ) {
-        if (!warnIfUsed(binding, warningDisplay)) {
+        val otherActionTitle = otherActionTitleForBinding(binding)
+        if (otherActionTitle != null) {
+            val warning = context.getString(CommonString.bindings_already_bound, otherActionTitle)
+            warningDisplay.setWarning(warning)
+        } else {
             warningDisplay.clearWarning()
         }
     }
@@ -221,7 +219,7 @@ open class ControlPreferenceDialogFragment : DialogFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val key = requireArguments().requireString(SettingsFragment.PREF_DIALOG_KEY)
+        val key = requireArguments().requireString(SettingsFragment.ARG_PREFERENCE_KEY)
         preference = (targetFragment as PreferenceFragmentCompat).requirePreference(key)
     }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/preferences/ExternalDirectorySelectionPreference.kt b/AnkiDroid/src/main/java/com/ichi2/preferences/ExternalDirectorySelectionPreference.kt
index 2b004719075c..7fa190d219ed 100644
--- a/AnkiDroid/src/main/java/com/ichi2/preferences/ExternalDirectorySelectionPreference.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/preferences/ExternalDirectorySelectionPreference.kt
@@ -16,7 +16,6 @@ import androidx.fragment.app.DialogFragment
 import androidx.preference.ListPreference
 import androidx.preference.ListPreferenceDialogFragmentCompat
 import com.ichi2.anki.CommonString
-import com.ichi2.anki.R
 import com.ichi2.anki.common.crashreporting.runCatchingWithLog
 import com.ichi2.anki.common.utils.android.showThemedToast
 import com.ichi2.anki.startup.getDefaultAnkiDroidDirectory
@@ -29,6 +28,7 @@ import timber.log.Timber
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Paths
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Lets the user pick the AnkiDroid directory from a list of detected storage
@@ -148,7 +148,7 @@ class FullWidthListPreferenceDialogFragment : ListPreferenceDialogFragmentCompat
             .Builder(context)
             .show {
                 setTitle(CommonString.pref_enter_custom_path)
-                setView(R.layout.dialog_generic_text_input)
+                setView(CommonR.layout.dialog_generic_text_input)
                 positiveButton(android.R.string.ok)
                 negativeButton(android.R.string.cancel)
             }.input(
diff --git a/AnkiDroid/src/main/java/com/ichi2/preferences/HeaderPreference.kt b/AnkiDroid/src/main/java/com/ichi2/preferences/HeaderPreference.kt
index 1b1e0c75abf9..668e53f0b051 100644
--- a/AnkiDroid/src/main/java/com/ichi2/preferences/HeaderPreference.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/preferences/HeaderPreference.kt
@@ -10,6 +10,7 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
 import com.ichi2.anki.LanguageUtils
 import com.ichi2.anki.R
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Preference used on the headers of [com.ichi2.anki.preferences.HeaderFragment]
@@ -41,7 +42,7 @@ class HeaderPreference : Preference {
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
         super.onBindViewHolder(holder)
         if (isHighlighted) {
-            val color = ThemeUtils.getThemeAttrColor(context, R.attr.currentDeckBackgroundColor)
+            val color = ThemeUtils.getThemeAttrColor(context, CommonR.attr.currentDeckBackgroundColor)
             holder.itemView.setBackgroundColor(color)
         }
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/preferences/ListPreferenceTrait.kt b/AnkiDroid/src/main/java/com/ichi2/preferences/ListPreferenceTrait.kt
index 73c38d4e162c..7f9a0fcdf75a 100644
--- a/AnkiDroid/src/main/java/com/ichi2/preferences/ListPreferenceTrait.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/preferences/ListPreferenceTrait.kt
@@ -95,17 +95,17 @@ class ListPreferenceDialogFragment : PreferenceDialogFragmentCompat() {
             entries = preference.entryKeys.toTypedArray()
             entryValues = preference.entryValues.toTypedArray()
         } else {
-            clickedDialogEntryIndex = savedInstanceState.getInt(SAVE_STATE_INDEX, 0)
-            entries = savedInstanceState.getCharSequenceArray(SAVE_STATE_ENTRIES)!!
-            entryValues = savedInstanceState.getCharSequenceArray(SAVE_STATE_ENTRY_VALUES)!!
+            clickedDialogEntryIndex = savedInstanceState.getInt(STATE_INDEX, 0)
+            entries = savedInstanceState.getCharSequenceArray(STATE_ENTRIES)!!
+            entryValues = savedInstanceState.getCharSequenceArray(STATE_ENTRY_VALUES)!!
         }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putInt(SAVE_STATE_INDEX, clickedDialogEntryIndex)
-        outState.putCharSequenceArray(SAVE_STATE_ENTRIES, entries)
-        outState.putCharSequenceArray(SAVE_STATE_ENTRY_VALUES, entryValues)
+        outState.putInt(STATE_INDEX, clickedDialogEntryIndex)
+        outState.putCharSequenceArray(STATE_ENTRIES, entries)
+        outState.putCharSequenceArray(STATE_ENTRY_VALUES, entryValues)
     }
 
     private val listPreference get() = preference as ListPreferenceTrait
@@ -142,9 +142,9 @@ class ListPreferenceDialogFragment : PreferenceDialogFragmentCompat() {
     }
 
     companion object {
-        private const val SAVE_STATE_INDEX = "ListPreferenceDialogFragment.index"
-        private const val SAVE_STATE_ENTRIES = "ListPreferenceDialogFragment.entries"
-        private const val SAVE_STATE_ENTRY_VALUES = "ListPreferenceDialogFragment.entryValues"
+        private const val STATE_INDEX = "ListPreferenceDialogFragment.index"
+        private const val STATE_ENTRIES = "ListPreferenceDialogFragment.entries"
+        private const val STATE_ENTRY_VALUES = "ListPreferenceDialogFragment.entryValues"
 
         fun newInstance(key: String?): ListPreferenceDialogFragment =
             ListPreferenceDialogFragment().apply {
diff --git a/AnkiDroid/src/main/java/com/ichi2/preferences/NumberRangePreferenceCompat.kt b/AnkiDroid/src/main/java/com/ichi2/preferences/NumberRangePreferenceCompat.kt
index 0c09037c08e6..ea172d1a4753 100644
--- a/AnkiDroid/src/main/java/com/ichi2/preferences/NumberRangePreferenceCompat.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/preferences/NumberRangePreferenceCompat.kt
@@ -16,8 +16,8 @@ import androidx.preference.EditTextPreference
 import androidx.preference.EditTextPreferenceDialogFragmentCompat
 import com.google.android.material.textview.MaterialTextView
 import com.ichi2.anki.R
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.utils.getFormattedStringOrPlurals
-import com.ichi2.utils.dp
 import com.ichi2.utils.setPaddingRelative
 import timber.log.Timber
 import com.google.android.material.R as MaterialR
diff --git a/AnkiDroid/src/main/java/com/ichi2/ui/AxisValueDisplay.kt b/AnkiDroid/src/main/java/com/ichi2/ui/AxisValueDisplay.kt
index 75c22c0ee4dd..c477755b776e 100644
--- a/AnkiDroid/src/main/java/com/ichi2/ui/AxisValueDisplay.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/ui/AxisValueDisplay.kt
@@ -10,7 +10,7 @@ import android.graphics.Rect
 import android.util.AttributeSet
 import android.view.View
 import com.google.android.material.color.MaterialColors
-import com.ichi2.utils.dp
+import com.ichi2.anki.common.utils.dp
 import java.util.Locale
 import kotlin.math.abs
 import kotlin.math.max
diff --git a/AnkiDroid/src/main/java/com/ichi2/ui/FixedEditText.kt b/AnkiDroid/src/main/java/com/ichi2/ui/FixedEditText.kt
index 3a26b6754bbe..85121ea1eaef 100644
--- a/AnkiDroid/src/main/java/com/ichi2/ui/FixedEditText.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/ui/FixedEditText.kt
@@ -45,9 +45,9 @@ import android.view.inputmethod.InputMethodManager
 import androidx.appcompat.widget.AppCompatEditText
 import androidx.core.graphics.toColorInt
 import com.google.android.material.color.MaterialColors
-import com.ichi2.anki.R
 import com.ichi2.utils.AndroidUiUtils.setFocusAndOpenKeyboard
 import timber.log.Timber
+import com.ichi2.anki.common.android.R as CommonR
 
 open class FixedEditText : AppCompatEditText {
     constructor(context: Context) : super(context)
@@ -71,7 +71,7 @@ open class FixedEditText : AppCompatEditText {
         val highlightColor =
             MaterialColors.getColor(
                 context,
-                R.attr.editTextHighlightColor,
+                CommonR.attr.editTextHighlightColor,
                 "#99CCFF".toColorInt(), // light blue color for fallback just-in-case
             )
         setHighlightColor(highlightColor)
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/AndroidUiUtils.kt b/AnkiDroid/src/main/java/com/ichi2/utils/AndroidUiUtils.kt
index 90d92c57f103..9cffc158de47 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/AndroidUiUtils.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/AndroidUiUtils.kt
@@ -5,8 +5,6 @@ package com.ichi2.utils
 import android.app.Activity
 import android.content.Context
 import android.view.View
-import android.view.Window
-import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
 import com.ichi2.anki.compat.showSoftInput
 
@@ -22,20 +20,6 @@ object AndroidUiUtils {
         currentFocus.showSoftInput()
     }
 
-    /**
-     * This method is used for setting the focus on an EditText which is used in a dialog
-     * and for opening the keyboard.
-     * @param view The EditText which requires the focus to be set.
-     * @param window The window where the view is present.
-     */
-    fun setFocusAndOpenKeyboard(
-        view: View,
-        window: Window,
-    ) {
-        view.requestFocus()
-        window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
-    }
-
     /**
      * Focuses on View and opens the soft keyboard.
      * @param view The View which requires the focus to be set (typically an EditText).
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/ExceptionUtil.kt b/AnkiDroid/src/main/java/com/ichi2/utils/ExceptionUtil.kt
index f62214ff7a5a..524043f48838 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/ExceptionUtil.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/ExceptionUtil.kt
@@ -9,8 +9,33 @@ import com.ichi2.anki.common.crashreporting.CrashReportService
 import com.ichi2.anki.common.utils.android.showThemedToast
 import java.io.PrintWriter
 import java.io.StringWriter
+import java.util.Collections
+import java.util.IdentityHashMap
 
 object ExceptionUtil {
+    /** This throwable followed lazily by its causes. Cyclic chains repeat instances indefinitely. */
+    internal val Throwable.causeChain: Sequence<Throwable>
+        get() = generateSequence(this) { it.cause }
+
+    /**
+     * Produces a sequence of this throwable and all throwables reachable through
+     * [Throwable.cause] or [Throwable.getSuppressed].
+     */
+    internal fun Throwable.causesAndSuppressed(): Sequence<Throwable> =
+        sequence {
+            val seen = Collections.newSetFromMap(IdentityHashMap<Throwable, Boolean>())
+            val pending = ArrayDeque<Throwable>()
+            pending.add(this@causesAndSuppressed)
+            while (pending.isNotEmpty()) {
+                val throwable = pending.removeLast()
+                if (!seen.add(throwable)) continue
+                yield(throwable)
+                // Visit causes first so shared suppressed references cannot truncate the cause chain.
+                pending.addAll(throwable.suppressed)
+                throwable.cause?.let { pending.add(it) }
+            }
+        }
+
     @CheckResult
     fun getExceptionMessage(e: Throwable?): String = getExceptionMessage(e, "\n")
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/ImportUtils.kt b/AnkiDroid/src/main/java/com/ichi2/utils/ImportUtils.kt
index b5443720bb4c..3ebe6750d569 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/ImportUtils.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/ImportUtils.kt
@@ -20,16 +20,14 @@ import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
 import com.ichi2.anki.common.android.appContext
-import com.ichi2.anki.common.annotations.NeedsTest
 import com.ichi2.anki.common.coroutines.applicationScope
 import com.ichi2.anki.common.crashreporting.CrashReportService
 import com.ichi2.anki.common.exception.ManuallyReportedException
 import com.ichi2.anki.common.time.TimeManager
 import com.ichi2.anki.compat.CompatHelper
-import com.ichi2.anki.dialogs.DialogHandler
 import com.ichi2.anki.dialogs.DialogHandlerMessage
 import com.ichi2.anki.dialogs.ImportDialog
-import com.ichi2.anki.onSelectedCsvForImport
+import com.ichi2.anki.openImport
 import com.ichi2.anki.servicelayer.DebugInfoService
 import com.ichi2.anki.showImportDialog
 import com.ichi2.anki.ui.internationalization.sentenceCase
@@ -49,6 +47,20 @@ object ImportUtils {
     // A filename should be shortened if over this threshold
     private const val FILE_NAME_SHORTENING_THRESHOLD = 100
 
+    /**
+     * Resolve and cache the source, then start the text importer or store a package confirmation.
+     *
+     * Text importer launch happens before this method returns. Package confirmations must be
+     * dispatched by the caller or by DeckPicker when it resumes.
+     *
+     * @return The resolved source metadata and cached path, or details of a preparation or launch
+     * failure. Success does not mean that the file's contents have been imported.
+     */
+    fun handleFileImport(
+        activity: Activity,
+        intent: Intent,
+    ): ImportResult = FileImporter().handleFileImport(activity, intent)
+
     /** Resolve the source and select its importer without copying files or starting UI. */
     fun resolveImport(
         context: Context,
@@ -56,16 +68,15 @@ object ImportUtils {
     ): ImportResolution = FileImporter().resolveImport(context, intent)
 
     /**
-     * This code is used in multiple places to handle package imports
+     * Resolve the source and copy it to the cache synchronously on the calling thread.
+     * Does not launch UI or store a package confirmation.
      *
-     * @param context for use in resource resolution and path finding
-     * @param intent contains the file to import
-     * @return null if successful, otherwise error message
+     * @return The resolved source metadata and cached path, or details of a preparation failure.
      */
-    fun handleFileImport(
+    fun prepareImport(
         context: Context,
         intent: Intent,
-    ): ImportResult = FileImporter().handleFileImport(context, intent)
+    ): ImportResult = FileImporter().prepareImport(context, intent)
 
     /**
      * Makes a cached copy of the file selected on [intent] and returns its path
@@ -115,6 +126,62 @@ object ImportUtils {
 
     @SuppressWarnings("WeakerAccess")
     open class FileImporter {
+        /** See [ImportUtils.handleFileImport] for the UI and error handling contract. */
+        fun handleFileImport(
+            activity: Activity,
+            intent: Intent,
+        ): ImportResult {
+            Timber.i("IntentHandler/ User requested to view a file")
+            val extras = if (intent.extras == null) "none" else intent.extras!!.keySet().joinToString(", ")
+            Timber.i("Intent: %s. Data: %s", intent, extras)
+            return try {
+                val uri = getDataUri(intent)
+                if (uri == null) {
+                    ImportResult.Failure(activity.getString(CommonString.import_error_handle_exception))
+                } else {
+                    handleContentProviderFile(activity, uri, intent)
+                }
+            } catch (e: Exception) {
+                CrashReportService.sendExceptionReport(e, "handleFileImport")
+                Timber.e(e, "failed to handle import intent")
+                ImportResult.Failure(
+                    humanReadableMessage = activity.getString(CommonString.import_error_handle_exception, e.localizedMessage),
+                    exception = e,
+                )
+            }
+        }
+
+        /**
+         * Prepare the source, then start the text importer or store a package confirmation.
+         * Uses [intent] when supplied, otherwise creates an intent from [importPathUri].
+         *
+         * Preparation failures are returned. Exceptions from starting the importer or storing a
+         * confirmation propagate to the caller; [handleFileImport] converts them into [ImportResult.Failure].
+         */
+        fun handleContentProviderFile(
+            activity: Activity,
+            importPathUri: Uri,
+            intent: Intent? = null,
+        ): ImportResult =
+            prepareImport(activity, intent ?: Intent().setData(importPathUri)).also { result ->
+                if (result is ImportResult.Success) {
+                    activity.openImport(result)
+                }
+            }
+
+        fun isValidImportType(
+            context: Context,
+            importPathUri: Uri,
+        ): Boolean {
+            val fileName = getFileNameFromContentProvider(context, importPathUri)
+            return when {
+                isDeckPackage(fileName) -> true
+                isCollectionPackage(fileName) -> true
+                isValidTextOrDataFile(context, importPathUri) -> true
+                else -> false
+            }
+        }
+
         fun resolveImport(
             context: Context,
             intent: Intent,
@@ -165,45 +232,23 @@ object ImportUtils {
             }
         }
 
-        /**
-         * This code is used in multiple places to handle package imports
-         *
-         * @param context for use in resource resolution and path finding
-         * @param intent contains the file to import
-         * @return null if successful, otherwise error message
-         */
-        fun handleFileImport(
+        /** See [ImportUtils.prepareImport] for the preparation and result contract. */
+        fun prepareImport(
             context: Context,
             intent: Intent,
-        ): ImportResult {
-            // This intent is used for opening apkg package files
-            // We want to go immediately to DeckPicker, clearing any history in the process
-            Timber.i("IntentHandler/ User requested to view a file")
-            val extras = if (intent.extras == null) "none" else intent.extras!!.keySet().joinToString(", ")
-            Timber.i("Intent: %s. Data: %s", intent, extras)
-            return try {
-                handleFileImportInternal(context, intent)
+        ): ImportResult =
+            try {
+                when (val resolution = resolveImport(context, intent)) {
+                    is ImportResolution.Failure -> resolution.error
+                    is ImportResolution.ResolvedFile -> cacheImport(context, resolution)
+                }
             } catch (e: Exception) {
-                CrashReportService.sendExceptionReport(e, "handleFileImport")
-                Timber.e(e, "failed to handle import intent")
+                CrashReportService.sendExceptionReport(e, "prepareImport")
                 ImportResult.Failure(
                     humanReadableMessage = context.getString(CommonString.import_error_handle_exception, e.localizedMessage),
                     exception = e,
                 )
             }
-        }
-
-        private fun handleFileImportInternal(
-            context: Context,
-            intent: Intent,
-        ): ImportResult {
-            val importPathUri = getDataUri(intent)
-            return if (importPathUri != null) {
-                handleContentProviderFile(context, importPathUri, intent)
-            } else {
-                ImportResult.Failure(context.getString(CommonString.import_error_handle_exception))
-            }
-        }
 
         fun getFileCachedCopy(
             context: Context,
@@ -239,35 +284,29 @@ object ImportUtils {
             return getFileCachedCopy(context, uri)
         }
 
-        fun handleContentProviderFile(
+        private fun cacheImport(
             context: Context,
-            importPathUri: Uri,
-            intent: Intent? = null,
+            file: ImportResolution.ResolvedFile,
         ): ImportResult {
-            val file =
-                when (val resolution = resolveImport(context, intent ?: Intent().setData(importPathUri))) {
-                    is ImportResolution.Failure -> return resolution.error
-                    is ImportResolution.ResolvedFile -> resolution
-                }
-            if (file is ImportResolution.Text) {
-                (context as Activity).onSelectedCsvForImport(intent ?: Intent().setData(importPathUri))
-                return ImportResult.Success
-            }
-
             // Copy to temporary file
             val checkFile =
                 try {
                     context.cacheDir.withFileNameSafe(file.source.fileName)
                 } catch (_: SecurityException) {
                     // Do not log the exception: it may interpolate attacker-controlled paths (PII).
-                    Timber.e("Path traversal detected in handleContentProviderFile")
+                    Timber.e("Path traversal detected in cacheImport")
                     return ImportResult.Failure(context.getString(CommonString.import_error_handle_exception, "Invalid path"))
                 } catch (_: IllegalArgumentException) {
                     // Do not log the exception: it may interpolate attacker-controlled paths (PII).
-                    Timber.e("Path traversal detected in handleContentProviderFile")
+                    Timber.e("Path traversal detected in cacheImport")
                     return ImportResult.Failure(context.getString(CommonString.import_error_handle_exception, "Invalid path"))
                 }
-            val tempOutDir: String = Uri.fromFile(checkFile).encodedPath!!
+            // The package WebView/backend route expects encoded filenames on disk; CSV uses a raw path.
+            val tempOutDir =
+                when (file) {
+                    is ImportResolution.Text -> checkFile.absolutePath
+                    is ImportResolution.DeckPackage, is ImportResolution.CollectionPackage -> Uri.fromFile(checkFile).encodedPath!!
+                }
 
             copyFileToCache(context, file.source.uri, tempOutDir).asErrorDetails()?.let { details ->
                 details.exceptionForReport?.let { CrashReportService.sendExceptionReport(it, "ImportUtils") }
@@ -277,21 +316,7 @@ object ImportUtils {
                     exception = details.userFacingException,
                 )
             }
-            sendShowImportFileDialogMsg(tempOutDir)
-            return ImportResult.Success
-        }
-
-        fun isValidImportType(
-            context: Context,
-            importPathUri: Uri,
-        ): Boolean {
-            val fileName = getFileNameFromContentProvider(context, importPathUri)
-            return when {
-                isDeckPackage(fileName) -> true
-                isCollectionPackage(fileName) -> true
-                isValidTextOrDataFile(context, importPathUri) -> true
-                else -> false
-            }
+            return ImportResult.Success(file, tempOutDir)
         }
 
         private fun isAnkiDatabase(filename: String?): Boolean = filename != null && hasExtension(filename, "anki2")
@@ -311,7 +336,6 @@ object ImportUtils {
             }
         }
 
-        @NeedsTest("Add test for the fallback, ensure the fallback filename \"file_<timestamp>.<ext>\" is produced when decoding fails")
         private fun validateFileName(fileName: String): String {
             // #6137 - filenames can be too long when URLEncoded
             val sanitized = sanitizeFileName(fileName)
@@ -432,6 +456,14 @@ object ImportUtils {
                 // The selected file may have been deleted since the provider returned its URI.
                 Timber.w(e, "Import source file is unavailable")
                 CacheFileResult.SourceFileUnavailable(e)
+            } catch (e: IllegalStateException) {
+                if (e.message?.contains("pending/trashed") == true) {
+                    Timber.w(e, "Import source file is pending or trashed")
+                    CacheFileResult.SourceFileUnavailable(e)
+                } else {
+                    Timber.w("Could not open import source")
+                    CacheFileResult.Error(e)
+                }
             } catch (e: Exception) {
                 Timber.w("Could not open import source")
                 CacheFileResult.Error(e)
@@ -462,7 +494,7 @@ object ImportUtils {
             ) : CacheFileResult()
 
             data class SourceFileUnavailable(
-                val exception: FileNotFoundException,
+                val exception: Exception,
             ) : CacheFileResult()
 
             data object ContentProviderCrashed : CacheFileResult()
@@ -539,24 +571,6 @@ object ImportUtils {
                 }
             }
 
-            /**
-             * Send a Message to AnkiDroidApp so that the DialogMessageHandler shows the Import apkg dialog.
-             * @param importPath path of to apkg file which will be imported
-             */
-            private fun sendShowImportFileDialogMsg(importPath: String) {
-                // Get the filename from the path
-                val filename = File(importPath).name
-
-                val dialogMessage =
-                    if (isCollectionPackage(filename)) {
-                        CollectionImportReplace(importPath)
-                    } else {
-                        CollectionImportAdd(importPath)
-                    }
-                // Store the message in AnkiDroidApp message holder, which is loaded later in AnkiActivity.onResume
-                DialogHandler.storeMessage(dialogMessage.toMessage())
-            }
-
             @SuppressLint("LocaleRootUsage")
             internal fun isDeckPackage(filename: String?): Boolean =
                 filename != null && filename.lowercase(Locale.ROOT).endsWith(".apkg") && "collection.apkg" != filename
@@ -626,7 +640,10 @@ object ImportUtils {
 }
 
 sealed class ImportResult {
-    data object Success : ImportResult()
+    data class Success(
+        val file: ImportResolution.ResolvedFile,
+        val path: String,
+    ) : ImportResult()
 
     data class Failure(
         val humanReadableMessage: String,
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/LanguageUtil.kt b/AnkiDroid/src/main/java/com/ichi2/utils/LanguageUtil.kt
index 591755dcc02a..b86a2a39a7fc 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/LanguageUtil.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/LanguageUtil.kt
@@ -8,8 +8,10 @@ import android.content.res.Resources
 import androidx.annotation.StringRes
 import androidx.core.os.ConfigurationCompat
 import androidx.fragment.app.Fragment
+import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.backend.AnkiBackendLanguage
+import com.ichi2.anki.backend.getLocales
 import com.ichi2.anki.common.android.appContext
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.compat.CompatHelper
@@ -369,3 +371,16 @@ object LanguageUtil {
      */
     fun withUnicodeIsolation(s: String): String = "\u2068$s\u2069"
 }
+
+data class LanguageDebugInfo(
+    val systemLocale: String?,
+    val appLocale: String?,
+    val backendLocales: List<String>?,
+)
+
+fun getLanguageDebugInfo(context: Context): LanguageDebugInfo =
+    LanguageDebugInfo(
+        systemLocale = runCatching { LanguageUtil.getSystemLocale().toLanguageTag() }.getOrNull(),
+        appLocale = runCatching { context.sharedPrefs().getString("language", LanguageUtil.SYSTEM_LANGUAGE_TAG) }.getOrNull(),
+        backendLocales = runCatching { CollectionManager.getBackend().getLocales().all }.getOrNull(),
+    )
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/MenuUtils.kt b/AnkiDroid/src/main/java/com/ichi2/utils/MenuUtils.kt
index 191e9e47b1b3..0343de74cf64 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/MenuUtils.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/MenuUtils.kt
@@ -11,7 +11,8 @@ import androidx.appcompat.view.menu.MenuBuilder
 import androidx.appcompat.view.menu.MenuItemImpl
 import androidx.core.view.forEach
 import com.google.android.material.color.MaterialColors
-import com.ichi2.anki.R
+import com.ichi2.anki.common.utils.dp
+import com.ichi2.anki.common.android.R as CommonR
 
 private const val DEFAULT_HORIZONTAL_PADDING = 4F
 
@@ -90,14 +91,14 @@ fun Context.increaseHorizontalPaddingOfMenuIcons(
 
 /**
  * Recursively mutates and tints the icons of the items of the given overflow or popup menu
- * with the color [R.attr.overflowAndPopupMenuIconColor] that is specified in the theme.
+ * with the color [CommonR.attr.overflowAndPopupMenuIconColor] that is specified in the theme.
  * Has no effect for items that have no icon.
  */
 fun Context.tintOverflowMenuIcons(
     menu: Menu,
     skipIf: ((MenuItem) -> Boolean)? = null,
 ) {
-    val iconColor = MaterialColors.getColor(this, R.attr.overflowAndPopupMenuIconColor, 0)
+    val iconColor = MaterialColors.getColor(this, CommonR.attr.overflowAndPopupMenuIconColor, 0)
 
     menu.overflowItemsRecursive().forEach { item ->
         if (skipIf == null || !skipIf(item)) {
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/ViewUtils.kt b/AnkiDroid/src/main/java/com/ichi2/utils/ViewUtils.kt
index 52e139852c22..6c88483685f9 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/ViewUtils.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/utils/ViewUtils.kt
@@ -3,37 +3,17 @@
 package com.ichi2.utils
 
 import android.app.Activity
-import android.content.Context
 import android.content.res.Resources
-import android.graphics.Rect
-import android.view.MotionEvent
 import android.view.View
 import androidx.core.view.OnReceiveContentListener
 import androidx.draganddrop.DropHelper
+import com.ichi2.anki.common.utils.Dp
 
 /** @see View.performClick */
 fun View.performClickIfEnabled() {
     if (isEnabled) performClick()
 }
 
-/**
- * Performs a hit test using the raw coordinates of the provided [MotionEvent]
- */
-fun View.rawHitTest(event: MotionEvent): Boolean {
-    val location = IntArray(2)
-    getLocationOnScreen(location)
-
-    val rect = Rect()
-    getHitRect(rect)
-
-    rect.left += location[0]
-    rect.top += location[1]
-    rect.right += location[0]
-    rect.bottom += location[1]
-
-    return rect.contains(event.rawX.toInt(), event.rawY.toInt())
-}
-
 /**
  * If possible, configures a [View] for drag and drop operations, including highlighting that
  * indicates the view is a drop target. Sets a listener that enables the view to handle dropped data.
@@ -113,33 +93,6 @@ fun View.updatePaddingRelative(
     )
 }
 
-/** Returns a [Dp] instance equal to this [Int] number of display pixels. */
-val Int.dp
-    get() = Dp(dp = this.toFloat())
-
-val Float.dp
-    get() = Dp(dp = this)
-
-val Double.dp
-    get() = Dp(dp = this.toFloat())
-
-/**
- * Helper for 'display pixels' to 'pixels' conversions
- */
-@JvmInline
-value class Dp(
-    val dp: Float,
-) : Comparable<Dp> {
-    // TODO: improve once we have context parameters
-    fun toPx(context: Context) = dp.dpToPx(context)
-
-    operator fun plus(other: Dp) = Dp(dp = dp + other.dp)
-
-    override fun compareTo(other: Dp) = dp.compareTo(other.dp)
-}
-
-private fun Float.dpToPx(context: Context): Int = (this * context.resources.displayMetrics.density + 0.5f).toInt()
-
 fun View.isRtl() = isRtl(resources)
 
 fun isRtl(res: Resources): Boolean = res.configuration.layoutDirection == View.LAYOUT_DIRECTION_RTL
diff --git a/AnkiDroid/src/main/java/com/ichi2/widget/WidgetConfigDestination.kt b/AnkiDroid/src/main/java/com/ichi2/widget/WidgetConfigDestination.kt
new file mode 100644
index 000000000000..deb5cfb1d287
--- /dev/null
+++ b/AnkiDroid/src/main/java/com/ichi2/widget/WidgetConfigDestination.kt
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.widget
+
+import android.appwidget.AppWidgetManager
+import android.content.Context
+import android.content.Intent
+import com.ichi2.anki.common.destinations.WidgetConfigDestination
+import com.ichi2.widget.cardanalysis.CardAnalysisWidgetConfig
+import com.ichi2.widget.deckpicker.DeckPickerWidgetConfig
+
+fun WidgetConfigDestination.toIntent(context: Context): Intent {
+    val activity =
+        when (this) {
+            is WidgetConfigDestination.CardAnalysis -> CardAnalysisWidgetConfig::class.java
+            is WidgetConfigDestination.DeckPicker -> DeckPickerWidgetConfig::class.java
+        }
+    return Intent(context, activity).apply {
+        putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
+        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/widget/cardanalysis/CardAnalysisWidgetConfig.kt b/AnkiDroid/src/main/java/com/ichi2/widget/cardanalysis/CardAnalysisWidgetConfig.kt
index 735464be36df..5e8320f7c2df 100644
--- a/AnkiDroid/src/main/java/com/ichi2/widget/cardanalysis/CardAnalysisWidgetConfig.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/widget/cardanalysis/CardAnalysisWidgetConfig.kt
@@ -90,7 +90,7 @@ class CardAnalysisWidgetConfig : AnkiActivity(R.layout.activity_card_analysis_wi
             deck =
                 BundleCompat.getParcelable(
                     savedInstanceState,
-                    KEY_DECK,
+                    STATE_DECK,
                     SelectableDeck.Deck::class.java,
                 )
             binding.deckName.text = deck?.name
@@ -109,7 +109,7 @@ class CardAnalysisWidgetConfig : AnkiActivity(R.layout.activity_card_analysis_wi
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putParcelable(KEY_DECK, deck)
+        outState.putParcelable(STATE_DECK, deck)
     }
 
     override fun onDestroy() {
@@ -209,6 +209,6 @@ class CardAnalysisWidgetConfig : AnkiActivity(R.layout.activity_card_analysis_wi
         }
 
     companion object {
-        private const val KEY_DECK = "key_deck"
+        private const val STATE_DECK = "key_deck"
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/widget/deckpicker/DeckPickerWidgetConfig.kt b/AnkiDroid/src/main/java/com/ichi2/widget/deckpicker/DeckPickerWidgetConfig.kt
index f12999bf1f4f..fe7ea0706244 100644
--- a/AnkiDroid/src/main/java/com/ichi2/widget/deckpicker/DeckPickerWidgetConfig.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/widget/deckpicker/DeckPickerWidgetConfig.kt
@@ -31,6 +31,7 @@ import com.ichi2.anki.CommonPlurals
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.common.android.AnkiBroadcastReceiver
 import com.ichi2.anki.common.utils.android.showThemedToast
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.common.utils.ext.unregisterReceiverSilently
 import com.ichi2.anki.dialogs.DeckSelectionDialog
 import com.ichi2.anki.dialogs.DiscardChangesDialog
@@ -45,7 +46,6 @@ import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.anki.startup.ensureStorageIsReady
 import com.ichi2.anki.widgets.R
 import com.ichi2.anki.widgets.databinding.WidgetDeckPickerConfigBinding
-import com.ichi2.utils.dp
 import com.ichi2.widget.AppWidgetId.Companion.INVALID_APPWIDGET_ID
 import com.ichi2.widget.AppWidgetId.Companion.getAppWidgetId
 import com.ichi2.widget.AppWidgetId.Companion.updateWidget
diff --git a/AnkiDroid/src/main/res/color/chip_stroke_color_checked_primary.xml b/AnkiDroid/src/main/res/color/chip_stroke_color_checked_primary.xml
new file mode 100644
index 000000000000..e231dc0c67ae
--- /dev/null
+++ b/AnkiDroid/src/main/res/color/chip_stroke_color_checked_primary.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?attr/colorPrimary" />
+    <item android:color="?attr/colorOutline" />
+</selector>
diff --git a/AnkiDroid/src/main/res/drawable-ldrtl/shadow_left.xml b/AnkiDroid/src/main/res/drawable-ldrtl/shadow_left.xml
new file mode 100644
index 000000000000..e98211140362
--- /dev/null
+++ b/AnkiDroid/src/main/res/drawable-ldrtl/shadow_left.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="180"
+        android:gradientRadius="0dp"
+        android:startColor="#10000000"
+        android:endColor="?android:attr/colorBackground"/>
+</shape>
diff --git a/AnkiDroid/src/main/res/drawable/calendar_date_range.xml b/AnkiDroid/src/main/res/drawable/calendar_date_range.xml
index d8f2936ada7d..01c8b32d04aa 100644
--- a/AnkiDroid/src/main/res/drawable/calendar_date_range.xml
+++ b/AnkiDroid/src/main/res/drawable/calendar_date_range.xml
@@ -1,4 +1,9 @@
 <!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled (modified calendar_today icon).
+  Base source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/action/calendar_today/materialicons/black/res/drawable/baseline_calendar_today_24.xml
+
   ~ Copyright 2xxx, Google Material Design Icons
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/AnkiDroid/src/main/res/drawable/calendar_single_day.xml b/AnkiDroid/src/main/res/drawable/calendar_single_day.xml
index ec085551b7a2..81dacce869dc 100644
--- a/AnkiDroid/src/main/res/drawable/calendar_single_day.xml
+++ b/AnkiDroid/src/main/res/drawable/calendar_single_day.xml
@@ -1,4 +1,9 @@
 <!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled (modified calendar_today icon).
+  Base source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/action/calendar_today/materialicons/black/res/drawable/baseline_calendar_today_24.xml
+
   ~ Copyright 2xxx, Google Material Design Icons
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/AnkiDroid/src/main/res/drawable/close_icon.xml b/AnkiDroid/src/main/res/drawable/close_icon.xml
index 96a3d6abcf91..cc525f367ca1 100644
--- a/AnkiDroid/src/main/res/drawable/close_icon.xml
+++ b/AnkiDroid/src/main/res/drawable/close_icon.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/navigation/close/materialicons/black/res/drawable/baseline_close_24.xml
+-->
 <vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/AnkiDroid/src/main/res/drawable/ic_add_bell.xml b/AnkiDroid/src/main/res/drawable/ic_add_bell.xml
index cc0d8aa062bd..d28167651a4d 100644
--- a/AnkiDroid/src/main/res/drawable/ic_add_bell.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_add_bell.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/notification_add/materialsymbolsoutlined/notification_add_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:tint="?attr/colorControlNormal"
     android:width="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_audio_wave.xml b/AnkiDroid/src/main/res/drawable/ic_audio_wave.xml
index c5f28bbcd1cb..d3b983f85400 100644
--- a/AnkiDroid/src/main/res/drawable/ic_audio_wave.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_audio_wave.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Rounded
+  SPDX-FileComment: Material Symbols; FILL=0, wght=500, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/graphic_eq/materialsymbolsrounded/graphic_eq_wght500_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_bar_chart_black.xml b/AnkiDroid/src/main/res/drawable/ic_bar_chart_black.xml
index 91ccf053d3c0..08c8429f9d32 100644
--- a/AnkiDroid/src/main/res/drawable/ic_bar_chart_black.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_bar_chart_black.xml
@@ -1,23 +1,11 @@
 <!--
-  ~ Copyright 2xxx, Google Material Design Icons
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ Modifications (David Allison, 2021):
-  ~  fill color set to black
-  ~  tint removed
-  ~  flip left/right to better match the equalizer icon we previously used
-  -->
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  SPDX-FileComment: Derived from bar_chart.
+  SPDX-FileComment: Modified (David Allison, 2021): left bar top moved from 9.2 to 13.2; right bar top moved from 13 to 9.
+  Source: https://fonts.gstatic.com/s/i/materialicons/bar_chart/v1/24px.xml
+-->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_baseline_email_24.xml b/AnkiDroid/src/main/res/drawable/ic_baseline_email_24.xml
index e322abe74bab..b35c48ab8dca 100644
--- a/AnkiDroid/src/main/res/drawable/ic_baseline_email_24.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_baseline_email_24.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/communication/email/materialicons/black/res/drawable/baseline_email_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_baseline_lock_24.xml b/AnkiDroid/src/main/res/drawable/ic_baseline_lock_24.xml
index 38bbd0e0ebe6..8ac1123cb02b 100644
--- a/AnkiDroid/src/main/res/drawable/ic_baseline_lock_24.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_baseline_lock_24.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/action/lock/materialicons/black/res/drawable/baseline_lock_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_camera.xml b/AnkiDroid/src/main/res/drawable/ic_camera.xml
index 25a2011c88b1..79aa5b1b5ee3 100644
--- a/AnkiDroid/src/main/res/drawable/ic_camera.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_camera.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Rounded
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/photo_camera/materialsymbolsrounded/photo_camera_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_camera_filled.xml b/AnkiDroid/src/main/res/drawable/ic_camera_filled.xml
index 2b484fcd7467..1f2ab4d5e16f 100644
--- a/AnkiDroid/src/main/res/drawable/ic_camera_filled.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_camera_filled.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=1, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/photo_camera/materialsymbolsoutlined/photo_camera_fill1_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_cancel_24.xml b/AnkiDroid/src/main/res/drawable/ic_cancel_24.xml
index b51c3d93dd58..1d9f7842fd8d 100644
--- a/AnkiDroid/src/main/res/drawable/ic_cancel_24.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_cancel_24.xml
@@ -1,3 +1,12 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  SPDX-FileComment: Derived from highlight_off; circle outline uses radio_button_unchecked geometry.
+  SPDX-FileComment: Modified: separated circle and X paths; removed theme tint.
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/action/highlight_off/materialicons/black/res/drawable/baseline_highlight_off_24.xml
+  Circle source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/toggle/radio_button_unchecked/materialicons/black/res/drawable/baseline_radio_button_unchecked_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_card_state_buried.xml b/AnkiDroid/src/main/res/drawable/ic_card_state.xml
similarity index 75%
rename from AnkiDroid/src/main/res/drawable/ic_card_state_buried.xml
rename to AnkiDroid/src/main/res/drawable/ic_card_state.xml
index f0164c0333b4..13df71f57488 100644
--- a/AnkiDroid/src/main/res/drawable/ic_card_state_buried.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_card_state.xml
@@ -4,7 +4,7 @@
   SPDX-FileComment: Style: Filled
   Source: https://fonts.gstatic.com/s/i/materialicons/circle/v11/24px.xml
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?attr/buriedColor" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
 
     <path android:fillColor="@android:color/white" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2z"/>
 
diff --git a/AnkiDroid/src/main/res/drawable/ic_card_state_learning.xml b/AnkiDroid/src/main/res/drawable/ic_card_state_learning.xml
deleted file mode 100644
index 175cb40916ca..000000000000
--- a/AnkiDroid/src/main/res/drawable/ic_card_state_learning.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  SPDX-FileCopyrightText: Google LLC
-  SPDX-FileComment: Style: Filled
-  Source: https://fonts.gstatic.com/s/i/materialicons/circle/v11/24px.xml
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?attr/learnCountColor" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-
-    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2z"/>
-
-</vector>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/drawable/ic_card_state_new.xml b/AnkiDroid/src/main/res/drawable/ic_card_state_new.xml
deleted file mode 100644
index 419a80c930b4..000000000000
--- a/AnkiDroid/src/main/res/drawable/ic_card_state_new.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  SPDX-FileCopyrightText: Google LLC
-  SPDX-FileComment: Style: Filled
-  Source: https://fonts.gstatic.com/s/i/materialicons/circle/v11/24px.xml
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?attr/newCountColor" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-
-    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2z"/>
-
-</vector>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/drawable/ic_card_state_review.xml b/AnkiDroid/src/main/res/drawable/ic_card_state_review.xml
deleted file mode 100644
index 0a48a8c49228..000000000000
--- a/AnkiDroid/src/main/res/drawable/ic_card_state_review.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  SPDX-FileCopyrightText: Google LLC
-  SPDX-FileComment: Style: Filled
-  Source: https://fonts.gstatic.com/s/i/materialicons/circle/v11/24px.xml
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?attr/reviewCountColor" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-
-    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2z"/>
-
-</vector>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/drawable/ic_card_state_suspended.xml b/AnkiDroid/src/main/res/drawable/ic_card_state_suspended.xml
deleted file mode 100644
index 7179f5c0f8f7..000000000000
--- a/AnkiDroid/src/main/res/drawable/ic_card_state_suspended.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--
-  SPDX-License-Identifier: Apache-2.0
-  SPDX-FileCopyrightText: Google LLC
-  SPDX-FileComment: Style: Filled
-  Source: https://fonts.gstatic.com/s/i/materialicons/circle/v11/24px.xml
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?attr/suspendedColor" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-
-    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2z"/>
-
-</vector>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/drawable/ic_cards_star.xml b/AnkiDroid/src/main/res/drawable/ic_cards_star.xml
index 664ce357feca..58007b06a263 100644
--- a/AnkiDroid/src/main/res/drawable/ic_cards_star.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_cards_star.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/cards_star/materialsymbolsoutlined/cards_star_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_change_deck.xml b/AnkiDroid/src/main/res/drawable/ic_change_deck.xml
index 9750efd7fe19..bbc0121a8f02 100644
--- a/AnkiDroid/src/main/res/drawable/ic_change_deck.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_change_deck.xml
@@ -1,8 +1,11 @@
 <!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ SPDX-FileCopyrightText: Copyright (C) 2026 The Android Open Source Project
-  -->
-
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileCopyrightText: Copyright (C) 2026 The Android Open Source Project
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/input/materialsymbolsoutlined/input_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_check_circle_24.xml b/AnkiDroid/src/main/res/drawable/ic_check_circle_24.xml
index 96f4c50f9fdd..a687290d9343 100644
--- a/AnkiDroid/src/main/res/drawable/ic_check_circle_24.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_check_circle_24.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  SPDX-FileComment: Derived from radio_button_unchecked; added a custom inset, thicker checkmark.
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/toggle/radio_button_unchecked/materialicons/black/res/drawable/baseline_radio_button_unchecked_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_clear_white.xml b/AnkiDroid/src/main/res/drawable/ic_clear_white.xml
index 0137cac7f444..de86ce63bb1d 100644
--- a/AnkiDroid/src/main/res/drawable/ic_clear_white.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_clear_white.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/content/clear/materialicons/black/res/drawable/baseline_clear_24.xml
+-->
 <vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/AnkiDroid/src/main/res/drawable/ic_color_lens_white_24dp.xml b/AnkiDroid/src/main/res/drawable/ic_color_lens_white_24dp.xml
index 2829565abd19..47b7b4283e59 100644
--- a/AnkiDroid/src/main/res/drawable/ic_color_lens_white_24dp.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_color_lens_white_24dp.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://fonts.gstatic.com/s/i/materialicons/color_lens/v16/24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_deselect_white.xml b/AnkiDroid/src/main/res/drawable/ic_deselect_white.xml
index 122323a288e7..abdb7c48fc04 100644
--- a/AnkiDroid/src/main/res/drawable/ic_deselect_white.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_deselect_white.xml
@@ -1,18 +1,11 @@
 <!--
-  ~ Copyright 2025, Google Material Design Icons
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileCopyrightText: Copyright 2025, Google Material Design Icons
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/deselect/materialsymbolsoutlined/deselect_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?attr/colorControlNormal" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
       
     <path android:fillColor="@android:color/white" android:pathData="M791,904L567,680L280,680L280,393L56,169L112,112L848,848L791,904ZM360,600L487,600L360,473L360,600ZM680,567L600,487L600,360L473,360L393,280L680,280L680,567ZM200,760L200,840Q167,840 143.5,816.5Q120,793 120,760L200,760ZM120,680L120,600L200,600L200,680L120,680ZM120,520L120,440L200,440L200,520L120,520ZM120,360L120,280L200,280L200,360L120,360ZM280,840L280,760L360,760L360,840L280,840ZM280,200L280,120L360,120L360,200L280,200ZM440,840L440,760L520,760L520,840L440,840ZM440,200L440,120L520,120L520,200L440,200ZM600,840L600,760L680,760L680,840L600,840ZM600,200L600,120L680,120L680,200L600,200ZM760,680L760,600L840,600L840,680L760,680ZM760,520L760,440L840,440L840,520L760,520ZM760,360L760,280L840,280L840,360L760,360ZM760,200L760,120Q793,120 816.5,143.5Q840,167 840,200L760,200Z"/>
diff --git a/AnkiDroid/src/main/res/drawable/ic_draw_filled.xml b/AnkiDroid/src/main/res/drawable/ic_draw_filled.xml
index c4265b0174d2..dc6a209aa0e8 100644
--- a/AnkiDroid/src/main/res/drawable/ic_draw_filled.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_draw_filled.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=1, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/draw/materialsymbolsoutlined/draw_fill1_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_ease_again.xml b/AnkiDroid/src/main/res/drawable/ic_ease_again.xml
index b759db03f13c..6c9efffdcc04 100644
--- a/AnkiDroid/src/main/res/drawable/ic_ease_again.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_ease_again.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Round
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/content/clear/materialiconsround/black/res/drawable/round_clear_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?againIconColor" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
     <path android:fillColor="@android:color/white" android:pathData="M18.3,5.71c-0.39,-0.39 -1.02,-0.39 -1.41,0L12,10.59 7.11,5.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41L10.59,12 5.7,16.89c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L12,13.41l4.89,4.89c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L13.41,12l4.89,-4.89c0.38,-0.38 0.38,-1.02 0,-1.4z"/>
 </vector>
diff --git a/AnkiDroid/src/main/res/drawable/ic_edit_off.xml b/AnkiDroid/src/main/res/drawable/ic_edit_off.xml
index 1ea20ab1b7dd..c4f6ce0097d2 100644
--- a/AnkiDroid/src/main/res/drawable/ic_edit_off.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_edit_off.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/edit_off/materialsymbolsoutlined/edit_off_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_email_black_24dp.xml b/AnkiDroid/src/main/res/drawable/ic_email_black_24dp.xml
index 6943b4cedf27..7cbf7b12af86 100644
--- a/AnkiDroid/src/main/res/drawable/ic_email_black_24dp.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_email_black_24dp.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/communication/email/materialicons/black/res/drawable/baseline_email_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_enable_whiteboard.xml b/AnkiDroid/src/main/res/drawable/ic_enable_whiteboard.xml
index 6cf9de014418..cdd3c4cfe93f 100644
--- a/AnkiDroid/src/main/res/drawable/ic_enable_whiteboard.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_enable_whiteboard.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/draw/materialsymbolsoutlined/draw_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_error_outline.xml b/AnkiDroid/src/main/res/drawable/ic_error_outline.xml
index af9ef1830128..ee1eede0f56e 100644
--- a/AnkiDroid/src/main/res/drawable/ic_error_outline.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_error_outline.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/error/materialsymbolsoutlined/error_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?attr/colorControlNormal" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
       
     <path android:fillColor="@android:color/white" android:pathData="M508.5,668.5Q520,657 520,640Q520,623 508.5,611.5Q497,600 480,600Q463,600 451.5,611.5Q440,623 440,640Q440,657 451.5,668.5Q463,680 480,680Q497,680 508.5,668.5ZM440,520L520,520L520,280L440,280L440,520ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
diff --git a/AnkiDroid/src/main/res/drawable/ic_export_notes.xml b/AnkiDroid/src/main/res/drawable/ic_export_notes.xml
index 0e01a1ff3eb0..d64a4d12b1c1 100644
--- a/AnkiDroid/src/main/res/drawable/ic_export_notes.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_export_notes.xml
@@ -1,8 +1,11 @@
 <!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ SPDX-FileCopyrightText: Copyright (C) 2026 The Android Open Source Project
-  -->
-
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileCopyrightText: Copyright (C) 2026 The Android Open Source Project
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/export_notes/materialsymbolsoutlined/export_notes_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_fast_forward_outlined.xml b/AnkiDroid/src/main/res/drawable/ic_fast_forward_outlined.xml
index 34e4e663e8a1..ea35f9a19ab5 100644
--- a/AnkiDroid/src/main/res/drawable/ic_fast_forward_outlined.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_fast_forward_outlined.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Rounded
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/fast_forward/materialsymbolsrounded/fast_forward_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_file_download_white.xml b/AnkiDroid/src/main/res/drawable/ic_file_download_white.xml
index 3e991ef3ade8..a4da652e02d4 100644
--- a/AnkiDroid/src/main/res/drawable/ic_file_download_white.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_file_download_white.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/file/file_download/materialicons/black/res/drawable/baseline_file_download_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_find_replace.xml b/AnkiDroid/src/main/res/drawable/ic_find_replace.xml
index 4c084e419320..797462c36ec0 100644
--- a/AnkiDroid/src/main/res/drawable/ic_find_replace.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_find_replace.xml
@@ -1,8 +1,11 @@
 <!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ SPDX-FileCopyrightText: Copyright (C) 2026 The Android Open Source Project
-  -->
-
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileCopyrightText: Copyright (C) 2026 The Android Open Source Project
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/find_replace/materialsymbolsoutlined/find_replace_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_flag_blue.xml b/AnkiDroid/src/main/res/drawable/ic_flag_blue.xml
index f230ad6f6f1e..b9f514f7bf28 100644
--- a/AnkiDroid/src/main/res/drawable/ic_flag_blue.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_flag_blue.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/content/flag/materialicons/black/res/drawable/baseline_flag_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_flag_green.xml b/AnkiDroid/src/main/res/drawable/ic_flag_green.xml
index 84e23ac7f2d6..852f727a334b 100644
--- a/AnkiDroid/src/main/res/drawable/ic_flag_green.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_flag_green.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/content/flag/materialicons/black/res/drawable/baseline_flag_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_flag_lightgrey.xml b/AnkiDroid/src/main/res/drawable/ic_flag_lightgrey.xml
index ab604038209d..87f4d3358ffb 100644
--- a/AnkiDroid/src/main/res/drawable/ic_flag_lightgrey.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_flag_lightgrey.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  SPDX-FileComment: Modified: transparent fill with a white stroke.
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/content/flag/materialicons/black/res/drawable/baseline_flag_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_flag_orange.xml b/AnkiDroid/src/main/res/drawable/ic_flag_orange.xml
index d64c721ca3a2..7f6f34be3a20 100644
--- a/AnkiDroid/src/main/res/drawable/ic_flag_orange.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_flag_orange.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/content/flag/materialicons/black/res/drawable/baseline_flag_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_flag_pink.xml b/AnkiDroid/src/main/res/drawable/ic_flag_pink.xml
index 238ed1d7da24..243cb2e89a5e 100644
--- a/AnkiDroid/src/main/res/drawable/ic_flag_pink.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_flag_pink.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/content/flag/materialicons/black/res/drawable/baseline_flag_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_flag_purple.xml b/AnkiDroid/src/main/res/drawable/ic_flag_purple.xml
index d11bd6a0b31f..e7138481628d 100644
--- a/AnkiDroid/src/main/res/drawable/ic_flag_purple.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_flag_purple.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/content/flag/materialicons/black/res/drawable/baseline_flag_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_flag_red.xml b/AnkiDroid/src/main/res/drawable/ic_flag_red.xml
index 5e2da784a371..68c595121cd3 100644
--- a/AnkiDroid/src/main/res/drawable/ic_flag_red.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_flag_red.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/content/flag/materialicons/black/res/drawable/baseline_flag_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_flag_turquoise.xml b/AnkiDroid/src/main/res/drawable/ic_flag_turquoise.xml
index 4f3ae21e34e0..6bbd01ef84e2 100644
--- a/AnkiDroid/src/main/res/drawable/ic_flag_turquoise.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_flag_turquoise.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/content/flag/materialicons/black/res/drawable/baseline_flag_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_flashcard_black.xml b/AnkiDroid/src/main/res/drawable/ic_flashcard_black.xml
index 76c51ac02eb5..75cd94bca1c4 100644
--- a/AnkiDroid/src/main/res/drawable/ic_flashcard_black.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_flashcard_black.xml
@@ -1,23 +1,11 @@
 <!--
-  ~ Copyright 2xxx, Google Material Design Icons
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ Modifications (GitHub: joshakaw, 2021):
-  ~  Base icon: payments - outline from Google Material Icons
-  ~  Removed the circle from the middle of the rounded rectangle
-  ~  Added some rounded corners to the background card outline
-  -->
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Derived from payments.
+  SPDX-FileComment: Modified (joshakaw, 2021): removed the central money circle and rounded the rear card corners.
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/navigation/payments/materialiconsoutlined/black/res/drawable/outline_payments_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:viewportWidth="24"
     android:viewportHeight="24"
@@ -27,4 +15,4 @@
     <path
         android:pathData="M19 14V6C19 4.9 18.1 4 17 4H3C1.9 4 1 4.9 1 6v8c0 1.1 0.9 2 2 2h14c1.1 0 2 -0.9 2 -2zm-2 0H3V6H17ZM23 8.9846154V18c0 1.1 -0.9 2 -2 2H5.9846154A1.9846154 1.9846154 45 0 1 4 18.015385V18H21V7h0.01538A1.9846154 1.9846154 45 0 1 23 8.9846154Z"
         android:fillColor="#FFFFFF" />
-</vector>
\ No newline at end of file
+</vector>
diff --git a/AnkiDroid/src/main/res/drawable/ic_forum_black_24dp.xml b/AnkiDroid/src/main/res/drawable/ic_forum_black_24dp.xml
index 4bc25443127f..5f96d1dc52d1 100644
--- a/AnkiDroid/src/main/res/drawable/ic_forum_black_24dp.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_forum_black_24dp.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/communication/forum/materialicons/black/res/drawable/baseline_forum_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_grading.xml b/AnkiDroid/src/main/res/drawable/ic_grading.xml
index 7ea2f6376c1e..faf211c02635 100644
--- a/AnkiDroid/src/main/res/drawable/ic_grading.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_grading.xml
@@ -1,8 +1,11 @@
 <!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ SPDX-FileCopyrightText: Copyright (C) 2026 The Android Open Source Project
-  -->
-
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileCopyrightText: Copyright (C) 2026 The Android Open Source Project
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/rule/materialsymbolsoutlined/rule_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_hide.xml b/AnkiDroid/src/main/res/drawable/ic_hide.xml
index 7032fde9338e..7c8a96d07870 100644
--- a/AnkiDroid/src/main/res/drawable/ic_hide.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_hide.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/visibility_off/materialsymbolsoutlined/visibility_off_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" android:tint="?attr/colorControlNormal">
     <path android:fillColor="@android:color/white" android:pathData="M644,532L586,474Q595,427 559,386Q523,345 466,354L408,296Q425,288 442.5,284Q460,280 480,280Q555,280 607.5,332.5Q660,385 660,460Q660,480 656,497.5Q652,515 644,532ZM772,658L714,602Q752,573 781.5,538.5Q811,504 832,460Q782,359 688.5,299.5Q595,240 480,240Q451,240 423,244Q395,248 368,256L306,194Q347,177 390,168.5Q433,160 480,160Q631,160 749,243.5Q867,327 920,460Q897,519 859.5,569.5Q822,620 772,658ZM792,904L624,738Q589,749 553.5,754.5Q518,760 480,760Q329,760 211,676.5Q93,593 40,460Q61,407 93,361.5Q125,316 166,280L56,168L112,112L848,848L792,904ZM222,336Q193,362 169,393Q145,424 128,460Q178,561 271.5,620.5Q365,680 480,680Q500,680 519,677.5Q538,675 558,672L522,634Q511,637 501,638.5Q491,640 480,640Q405,640 352.5,587.5Q300,535 300,460Q300,449 301.5,439Q303,429 306,418L222,336ZM541,429L541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429ZM390,504Q390,504 390,504Q390,504 390,504L390,504Q390,504 390,504Q390,504 390,504Q390,504 390,504Q390,504 390,504Z"/>
 </vector>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/drawable/ic_horizontal_rule_black_24dp.xml b/AnkiDroid/src/main/res/drawable/ic_horizontal_rule_black_24dp.xml
deleted file mode 100644
index 6d9458dd36a3..000000000000
--- a/AnkiDroid/src/main/res/drawable/ic_horizontal_rule_black_24dp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M19,13H2v-2h20v2z"/>
-</vector>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/drawable/ic_image.xml b/AnkiDroid/src/main/res/drawable/ic_image.xml
index 3a70e029d65c..8e6ff22dd45e 100644
--- a/AnkiDroid/src/main/res/drawable/ic_image.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_image.xml
@@ -1,8 +1,10 @@
 <!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ SPDX-FileCopyrightText: Copyright (c) Google LLC
-  ~ Material Symbols: image (outlined, 24px)
-  -->
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Copyright (c) Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/image/materialsymbolsoutlined/image_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_link.xml b/AnkiDroid/src/main/res/drawable/ic_link.xml
index b14a5532788f..6943855c8b8c 100644
--- a/AnkiDroid/src/main/res/drawable/ic_link.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_link.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/content/link/materialicons/black/res/drawable/baseline_link_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_lock_open.xml b/AnkiDroid/src/main/res/drawable/ic_lock_open.xml
index 63193717f1b7..3b9219b2bbd7 100644
--- a/AnkiDroid/src/main/res/drawable/ic_lock_open.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_lock_open.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/lock_open/materialsymbolsoutlined/lock_open_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_mark.xml b/AnkiDroid/src/main/res/drawable/ic_mark.xml
index 5b81cae229ef..d2b04976d5ba 100644
--- a/AnkiDroid/src/main/res/drawable/ic_mark.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_mark.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  SPDX-FileComment: Modified: white fill with a black stroke.
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/toggle/star/materialicons/black/res/drawable/baseline_star_24.xml
+-->
 <vector android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/AnkiDroid/src/main/res/drawable/ic_menu_24.xml b/AnkiDroid/src/main/res/drawable/ic_menu_24.xml
index 7a5ff605a821..071de95668f4 100644
--- a/AnkiDroid/src/main/res/drawable/ic_menu_24.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_menu_24.xml
@@ -1,10 +1,10 @@
 <!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ SPDX-FileCopyrightText: Google LLC
-  ~
-  ~ Source: https://github.com/google/material-design-icons/blob/master/symbols/web/menu/materialsymbolsoutlined/menu_24px.svg
-  -->
-
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/menu/materialsymbolsoutlined/menu_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?attr/colorControlNormal" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
       
     <path android:fillColor="@android:color/white" android:pathData="M120,720L120,640L840,640L840,720L120,720ZM120,520L120,440L840,440L840,520L120,520ZM120,320L120,240L840,240L840,320L120,320Z"/>
diff --git a/AnkiDroid/src/main/res/drawable/ic_mic_outlined.xml b/AnkiDroid/src/main/res/drawable/ic_mic_outlined.xml
index 38c78a5c9b37..0920d45b9954 100644
--- a/AnkiDroid/src/main/res/drawable/ic_mic_outlined.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_mic_outlined.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/mic/materialsymbolsoutlined/mic_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_mode_edit_white.xml b/AnkiDroid/src/main/res/drawable/ic_mode_edit_white.xml
index 12738698a5eb..663c4500c33f 100644
--- a/AnkiDroid/src/main/res/drawable/ic_mode_edit_white.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_mode_edit_white.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/image/edit/materialicons/black/res/drawable/baseline_edit_24.xml
+-->
 <vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/AnkiDroid/src/main/res/drawable/ic_notes.xml b/AnkiDroid/src/main/res/drawable/ic_notes.xml
index f43b9066b7ca..81f7e9ce5e4b 100644
--- a/AnkiDroid/src/main/res/drawable/ic_notes.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_notes.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Rounded
+  SPDX-FileComment: Material Symbols; FILL=0, wght=500, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/notes/materialsymbolsrounded/notes_wght500_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_numbers.xml b/AnkiDroid/src/main/res/drawable/ic_numbers.xml
index ab04cfea7225..92296f8e2056 100644
--- a/AnkiDroid/src/main/res/drawable/ic_numbers.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_numbers.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/numbers/materialsymbolsoutlined/numbers_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_outline_troubleshoot.xml b/AnkiDroid/src/main/res/drawable/ic_outline_troubleshoot.xml
index 82c5d27ea706..e848233c54ca 100644
--- a/AnkiDroid/src/main/res/drawable/ic_outline_troubleshoot.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_outline_troubleshoot.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/troubleshoot/materialsymbolsoutlined/troubleshoot_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?attr/colorControlNormal" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
       
     <path android:fillColor="@android:color/white" android:pathData="M824,840L636,652Q595,684 545.5,702Q496,720 440,720Q350,720 277.5,676Q205,632 163,560L261,560Q295,597 340.5,618.5Q386,640 440,640Q540,640 610,570Q680,500 680,400Q680,300 610,230Q540,160 440,160Q346,160 277.5,223.5Q209,287 201,380L121,380Q129,253 220.5,166.5Q312,80 440,80Q574,80 667,173Q760,266 760,400Q760,456 742,505.5Q724,555 692,596L880,784L824,840ZM397,560L334,352L282,500L80,500L80,440L240,440L306,250L366,250L427,454L470,320L530,320L590,440L620,440L620,500L553,500L506,406L456,560L397,560Z"/>
diff --git a/AnkiDroid/src/main/res/drawable/ic_paste.xml b/AnkiDroid/src/main/res/drawable/ic_paste.xml
index ccfa8e28f8af..dbb9105e030d 100644
--- a/AnkiDroid/src/main/res/drawable/ic_paste.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_paste.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/content_paste/materialsymbolsoutlined/content_paste_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_people_black_24dp.xml b/AnkiDroid/src/main/res/drawable/ic_people_black_24dp.xml
index 2989eb66c36c..9000e5edb389 100644
--- a/AnkiDroid/src/main/res/drawable/ic_people_black_24dp.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_people_black_24dp.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/social/people/materialicons/black/res/drawable/baseline_people_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_photo_library.xml b/AnkiDroid/src/main/res/drawable/ic_photo_library.xml
index 53d1bc54ad26..632742a53036 100644
--- a/AnkiDroid/src/main/res/drawable/ic_photo_library.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_photo_library.xml
@@ -1,8 +1,10 @@
 <!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ SPDX-FileCopyrightText: Copyright (c) Google LLC
-  ~ Material Symbols: photo_library (outlined, 24px)
-  -->
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Copyright (c) Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/photo_library/materialsymbolsoutlined/photo_library_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_popup_menu_item_editor.xml b/AnkiDroid/src/main/res/drawable/ic_popup_menu_item_editor.xml
index 2844bafebe8a..47d72c19b464 100644
--- a/AnkiDroid/src/main/res/drawable/ic_popup_menu_item_editor.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_popup_menu_item_editor.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/content/create/materialicons/black/res/drawable/baseline_create_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_popup_menu_item_image.xml b/AnkiDroid/src/main/res/drawable/ic_popup_menu_item_image.xml
index 8232c4de2dee..6de0cb63b182 100644
--- a/AnkiDroid/src/main/res/drawable/ic_popup_menu_item_image.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_popup_menu_item_image.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/image/image/materialicons/black/res/drawable/baseline_image_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_redo_2.xml b/AnkiDroid/src/main/res/drawable/ic_redo_2.xml
index d47efe35e8e2..632b5c645b9c 100644
--- a/AnkiDroid/src/main/res/drawable/ic_redo_2.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_redo_2.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/redo/materialsymbolsoutlined/redo_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_remove_done.xml b/AnkiDroid/src/main/res/drawable/ic_remove_done.xml
index a2bac909b921..72e9ee073a03 100644
--- a/AnkiDroid/src/main/res/drawable/ic_remove_done.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_remove_done.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/remove_done/materialsymbolsoutlined/remove_done_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_remove_red_eye_white.xml b/AnkiDroid/src/main/res/drawable/ic_remove_red_eye_white.xml
index 407d06fa27ef..8cb8ab8e039d 100644
--- a/AnkiDroid/src/main/res/drawable/ic_remove_red_eye_white.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_remove_red_eye_white.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/action/visibility/materialicons/black/res/drawable/baseline_visibility_24.xml
+-->
 <vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/AnkiDroid/src/main/res/drawable/ic_replace_audio.xml b/AnkiDroid/src/main/res/drawable/ic_replace_audio.xml
index 6238f4e702f9..44e9f113525e 100644
--- a/AnkiDroid/src/main/res/drawable/ic_replace_audio.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_replace_audio.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Rounded
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/replace_audio/materialsymbolsrounded/replace_audio_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_replace_video.xml b/AnkiDroid/src/main/res/drawable/ic_replace_video.xml
index b8be57ebcc6a..533a7de10de1 100644
--- a/AnkiDroid/src/main/res/drawable/ic_replace_video.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_replace_video.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Rounded
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/replace_video/materialsymbolsrounded/replace_video_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_reposition.xml b/AnkiDroid/src/main/res/drawable/ic_reposition.xml
index 98e68a757a60..84ce230347ec 100644
--- a/AnkiDroid/src/main/res/drawable/ic_reposition.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_reposition.xml
@@ -1,8 +1,11 @@
 <!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ SPDX-FileCopyrightText: Copyright (C) 2026 The Android Open Source Project
-  -->
-
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileCopyrightText: Copyright (C) 2026 The Android Open Source Project
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/low_priority/materialsymbolsoutlined/low_priority_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_reschedule.xml b/AnkiDroid/src/main/res/drawable/ic_reschedule.xml
index b1fead6e2c33..3bb4ff143330 100644
--- a/AnkiDroid/src/main/res/drawable/ic_reschedule.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_reschedule.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/action/restore/materialicons/black/res/drawable/baseline_restore_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_restore_variant.xml b/AnkiDroid/src/main/res/drawable/ic_restore_variant.xml
index f7827c49e855..767d77b4dfc0 100644
--- a/AnkiDroid/src/main/res/drawable/ic_restore_variant.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_restore_variant.xml
@@ -1,2 +1,8 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled; Pictogrammers Material Design Icons (restore).
+  Source: https://raw.githubusercontent.com/Templarian/MaterialDesign/2424e748e0cc63ab7b9c095a099b9fe239b737c0/svg/restore.svg
+-->
 <!-- drawable/restore.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:tint="?attr/colorControlNormal" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M13,3A9,9 0 0,0 4,12H1L4.89,15.89L4.96,16.03L9,12H6A7,7 0 0,1 13,5A7,7 0 0,1 20,12A7,7 0 0,1 13,19C11.07,19 9.32,18.21 8.06,16.94L6.64,18.36C8.27,20 10.5,21 13,21A9,9 0 0,0 22,12A9,9 0 0,0 13,3Z" /></vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:tint="?attr/colorControlNormal" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M13,3A9,9 0 0,0 4,12H1L4.89,15.89L4.96,16.03L9,12H6A7,7 0 0,1 13,5A7,7 0 0,1 20,12A7,7 0 0,1 13,19C11.07,19 9.32,18.21 8.06,16.94L6.64,18.36C8.27,20 10.5,21 13,21A9,9 0 0,0 22,12A9,9 0 0,0 13,3Z" /></vector>
diff --git a/AnkiDroid/src/main/res/drawable/ic_round_favorite_outline.xml b/AnkiDroid/src/main/res/drawable/ic_round_favorite_outline.xml
index 4f11b15563f3..4b901be70faa 100644
--- a/AnkiDroid/src/main/res/drawable/ic_round_favorite_outline.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_round_favorite_outline.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Rounded
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/favorite/materialsymbolsrounded/favorite_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?attr/colorControlNormal" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
       
     <path android:fillColor="@android:color/white" android:pathData="M451.5,808Q437,803 426,792L357,729Q251,632 165.5,536.5Q80,441 80,326Q80,232 143,169Q206,106 300,106Q353,106 400,128.5Q447,151 480,190Q513,151 560,128.5Q607,106 660,106Q754,106 817,169Q880,232 880,326Q880,441 795,537Q710,633 602,730L534,792Q523,803 508.5,808Q494,813 480,813Q466,813 451.5,808ZM442,270Q413,229 380,207.5Q347,186 300,186Q240,186 200,226Q160,266 160,326Q160,378 197,436.5Q234,495 285.5,550Q337,605 391.5,653Q446,701 480,732Q480,732 480,732Q480,732 480,732Q514,701 568.5,653Q623,605 674.5,550Q726,495 763,436.5Q800,378 800,326Q800,266 760,226Q720,186 660,186Q613,186 580,207.5Q547,229 518,270Q511,280 501,285Q491,290 480,290Q469,290 459,285Q449,280 442,270ZM480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Z"/>
diff --git a/AnkiDroid/src/main/res/drawable/ic_running_clock.xml b/AnkiDroid/src/main/res/drawable/ic_running_clock.xml
index a6091c1551e6..6f4cf3fa1fa4 100644
--- a/AnkiDroid/src/main/res/drawable/ic_running_clock.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_running_clock.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/acute/materialsymbolsoutlined/acute_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_shelf_auto_hide.xml b/AnkiDroid/src/main/res/drawable/ic_shelf_auto_hide.xml
index 6589a8ede378..b00c97142a09 100644
--- a/AnkiDroid/src/main/res/drawable/ic_shelf_auto_hide.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_shelf_auto_hide.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/shelf_auto_hide/materialsymbolsoutlined/shelf_auto_hide_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_sort.xml b/AnkiDroid/src/main/res/drawable/ic_sort.xml
index 1f06ff754e07..c19fe4f6fce2 100644
--- a/AnkiDroid/src/main/res/drawable/ic_sort.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_sort.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/sort/materialsymbolsoutlined/sort_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_sort_pill_arrow_down_label.xml b/AnkiDroid/src/main/res/drawable/ic_sort_pill_arrow_down_label.xml
index d41e8ca54d8a..b38d7f5265a2 100644
--- a/AnkiDroid/src/main/res/drawable/ic_sort_pill_arrow_down_label.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_sort_pill_arrow_down_label.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: Apache-2.0 AND GPL-3.0-or-later
+    SPDX-FileCopyrightText: Google LLC
+    SPDX-FileComment: Style: Outlined
+    SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+    SPDX-FileComment: Derived from arrow_downward_alt (Apache-2.0); modification licensed under GPL-3.0-or-later.
+    SPDX-FileComment: Modified: shifted all Y coordinates down by 70 viewport units (1.75dp at 24dp); X coordinates unchanged.
+    Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/arrow_downward_alt/materialsymbolsoutlined/arrow_downward_alt_24px.xml
+
     SortPill-only variant of @drawable/outline_arrow_downward_alt_24 with the path shifted
     down so the arrow's visual center sits below  the icon's geometric center.
 -->
diff --git a/AnkiDroid/src/main/res/drawable/ic_star.xml b/AnkiDroid/src/main/res/drawable/ic_star.xml
index 8ecb6a11546a..48da9b6eea92 100644
--- a/AnkiDroid/src/main/res/drawable/ic_star.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_star.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/toggle/star/materialicons/black/res/drawable/baseline_star_24.xml
+-->
 <vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/AnkiDroid/src/main/res/drawable/ic_star_black_24.xml b/AnkiDroid/src/main/res/drawable/ic_star_black_24.xml
index 33832947ef11..64943827ea0b 100644
--- a/AnkiDroid/src/main/res/drawable/ic_star_black_24.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_star_black_24.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/toggle/star/materialicons/black/res/drawable/baseline_star_24.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_star_border_white.xml b/AnkiDroid/src/main/res/drawable/ic_star_border_white.xml
index a9c8a005275b..e01443b88788 100644
--- a/AnkiDroid/src/main/res/drawable/ic_star_border_white.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_star_border_white.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/toggle/star_border/materialicons/black/res/drawable/baseline_star_border_24.xml
+-->
 <!-- TODO this icon's content isn't properly placed an requires extra padding to align it -->
 <vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
diff --git a/AnkiDroid/src/main/res/drawable/ic_star_white.xml b/AnkiDroid/src/main/res/drawable/ic_star_white.xml
index 85c045c0dc09..12432f4ffe33 100644
--- a/AnkiDroid/src/main/res/drawable/ic_star_white.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_star_white.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/toggle/star/materialicons/black/res/drawable/baseline_star_24.xml
+-->
 <vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/AnkiDroid/src/main/res/drawable/ic_star_white_bordered_24dp.xml b/AnkiDroid/src/main/res/drawable/ic_star_white_bordered_24dp.xml
index ef9ba6654ce9..877aadc85792 100644
--- a/AnkiDroid/src/main/res/drawable/ic_star_white_bordered_24dp.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_star_white_bordered_24dp.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  SPDX-FileComment: Modified: white fill with a black stroke.
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/toggle/star/materialicons/black/res/drawable/baseline_star_24.xml
+-->
 <vector android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/AnkiDroid/src/main/res/drawable/ic_switch_profile.xml b/AnkiDroid/src/main/res/drawable/ic_switch_profile.xml
index 345bff7b737d..c106f665e258 100644
--- a/AnkiDroid/src/main/res/drawable/ic_switch_profile.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_switch_profile.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/group_add/materialsymbolsoutlined/group_add_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_toolbar.xml b/AnkiDroid/src/main/res/drawable/ic_toolbar.xml
index d62042045c20..65c80ec75b3c 100644
--- a/AnkiDroid/src/main/res/drawable/ic_toolbar.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_toolbar.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/toolbar/materialsymbolsoutlined/toolbar_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_undo_2.xml b/AnkiDroid/src/main/res/drawable/ic_undo_2.xml
index a3f745b76796..501f6fdd2dbf 100644
--- a/AnkiDroid/src/main/res/drawable/ic_undo_2.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_undo_2.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/undo/materialsymbolsoutlined/undo_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_view_list_white_24dp.xml b/AnkiDroid/src/main/res/drawable/ic_view_list_white_24dp.xml
index 1c830e31db5e..1e97fc208a70 100644
--- a/AnkiDroid/src/main/res/drawable/ic_view_list_white_24dp.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_view_list_white_24dp.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  SPDX-FileComment: Historical Material Icons view_list geometry, before the left margin changed.
+  Source: https://raw.githubusercontent.com/google/material-design-icons/3.0.1/action/svg/production/ic_view_list_24px.svg
+-->
 <vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/AnkiDroid/src/main/res/drawable/ic_warning_24.xml b/AnkiDroid/src/main/res/drawable/ic_warning_24.xml
index 74fcc6f74720..f5eab40d8822 100644
--- a/AnkiDroid/src/main/res/drawable/ic_warning_24.xml
+++ b/AnkiDroid/src/main/res/drawable/ic_warning_24.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://fonts.gstatic.com/s/i/materialicons/warning/v17/24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/note_types_selection_background.xml b/AnkiDroid/src/main/res/drawable/note_types_selection_background.xml
index dde937930c75..dce7a1bbb6ac 100644
--- a/AnkiDroid/src/main/res/drawable/note_types_selection_background.xml
+++ b/AnkiDroid/src/main/res/drawable/note_types_selection_background.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="?attr/appBarColor" />
+    <stroke android:width="?attr/widgetStrokeWidth" android:color="?attr/widgetStrokeColor" />
     <corners android:radius="32dp" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/AnkiDroid/src/main/res/drawable/outline_arrow_downward_alt_24.xml b/AnkiDroid/src/main/res/drawable/outline_arrow_downward_alt_24.xml
index 64f4d2adf853..19a7cfb80591 100644
--- a/AnkiDroid/src/main/res/drawable/outline_arrow_downward_alt_24.xml
+++ b/AnkiDroid/src/main/res/drawable/outline_arrow_downward_alt_24.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/arrow_downward_alt/materialsymbolsoutlined/arrow_downward_alt_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?attr/colorControlNormal" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
       
     <path android:fillColor="@android:color/white" android:pathData="M480,720L240,480L296,424L440,568L440,200L520,200L520,568L664,424L720,480L480,720Z"/>
diff --git a/AnkiDroid/src/main/res/drawable/outline_arrow_insert_24.xml b/AnkiDroid/src/main/res/drawable/outline_arrow_insert_24.xml
index cc4e2d51d8f1..be7976d4e6ba 100644
--- a/AnkiDroid/src/main/res/drawable/outline_arrow_insert_24.xml
+++ b/AnkiDroid/src/main/res/drawable/outline_arrow_insert_24.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/arrow_insert/materialsymbolsoutlined/arrow_insert_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?colorControlNormal" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
       
     <path android:fillColor="@android:color/white" android:pathData="M704,720L320,336L320,680L240,680L240,200L720,200L720,280L376,280L760,664L704,720Z"/>
diff --git a/AnkiDroid/src/main/res/drawable/outline_arrow_upward_alt_24.xml b/AnkiDroid/src/main/res/drawable/outline_arrow_upward_alt_24.xml
index 7e05aa4a2f58..7d28264bfbb4 100644
--- a/AnkiDroid/src/main/res/drawable/outline_arrow_upward_alt_24.xml
+++ b/AnkiDroid/src/main/res/drawable/outline_arrow_upward_alt_24.xml
@@ -1,3 +1,10 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Outlined
+  SPDX-FileComment: Material Symbols; FILL=0, wght=400, GRAD=0, opsz=24
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/symbols/android/arrow_upward_alt/materialsymbolsoutlined/arrow_upward_alt_24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?attr/colorControlNormal" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
       
     <path android:fillColor="@android:color/white" android:pathData="M440,720L440,352L296,496L240,440L480,200L720,440L664,496L520,352L520,720L440,720Z"/>
diff --git a/AnkiDroid/src/main/res/drawable/wallpaper_icon.xml b/AnkiDroid/src/main/res/drawable/wallpaper_icon.xml
index 08cbe44dcb4f..0dd1a539c14f 100644
--- a/AnkiDroid/src/main/res/drawable/wallpaper_icon.xml
+++ b/AnkiDroid/src/main/res/drawable/wallpaper_icon.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/image/image/materialicons/black/res/drawable/baseline_image_24.xml
+-->
 <vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/AnkiDroid/src/main/res/layout-sw600dp/activity_card_browser.xml b/AnkiDroid/src/main/res/layout-sw600dp/activity_card_browser.xml
index 4a4525f0f83e..8a1260c612b3 100644
--- a/AnkiDroid/src/main/res/layout-sw600dp/activity_card_browser.xml
+++ b/AnkiDroid/src/main/res/layout-sw600dp/activity_card_browser.xml
@@ -7,7 +7,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
         <include layout="@layout/include_browser_toolbar" />
-        <LinearLayout
+        <com.ichi2.anki.ui.ResizablePaneLayout
             android:id="@+id/card_browser_xl_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -28,6 +28,6 @@
                 android:layout_weight="2"
                 android:layout_width="1dip"
                 android:layout_height="match_parent"/>
-        </LinearLayout>
+        </com.ichi2.anki.ui.ResizablePaneLayout>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/layout-sw600dp/activity_card_template_editor.xml b/AnkiDroid/src/main/res/layout-sw600dp/activity_card_template_editor.xml
index 5685a364eec2..a2470e175671 100644
--- a/AnkiDroid/src/main/res/layout-sw600dp/activity_card_template_editor.xml
+++ b/AnkiDroid/src/main/res/layout-sw600dp/activity_card_template_editor.xml
@@ -14,7 +14,7 @@
         <include layout="@layout/include_card_template_editor_top"
             android:id="@+id/template_editor_top" />
 
-        <LinearLayout
+        <com.ichi2.anki.ui.ResizablePaneLayout
             android:id="@+id/card_template_editor_xl_view"
             android:layout_width="match_parent"
             android:layout_height="0dp"
@@ -38,6 +38,6 @@
                 android:layout_width="1dp"
                 android:layout_weight="2"
                 android:layout_height="match_parent" />
-        </LinearLayout>
+        </com.ichi2.anki.ui.ResizablePaneLayout>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/AnkiDroid/src/main/res/layout-sw600dp/activity_homescreen.xml b/AnkiDroid/src/main/res/layout-sw600dp/activity_homescreen.xml
index 7e9aea8235ae..0aeb98ef0e13 100644
--- a/AnkiDroid/src/main/res/layout-sw600dp/activity_homescreen.xml
+++ b/AnkiDroid/src/main/res/layout-sw600dp/activity_homescreen.xml
@@ -17,7 +17,7 @@
             <include layout="@layout/include_toolbar" />
         </FrameLayout>
 
-        <LinearLayout
+        <com.ichi2.anki.ui.ResizablePaneLayout
             android:id="@+id/deckpicker_xl_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -39,6 +39,6 @@
                 android:layout_weight="2"
                 android:layout_width="1dip"
                 android:layout_height="match_parent"/>
-        </LinearLayout>
+        </com.ichi2.anki.ui.ResizablePaneLayout>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/AnkiDroid/src/main/res/layout-sw600dp/activity_note_editor.xml b/AnkiDroid/src/main/res/layout-sw600dp/activity_note_editor.xml
index 621224425abf..d238deb02a54 100644
--- a/AnkiDroid/src/main/res/layout-sw600dp/activity_note_editor.xml
+++ b/AnkiDroid/src/main/res/layout-sw600dp/activity_note_editor.xml
@@ -15,7 +15,7 @@
 
             <include layout="@layout/include_toolbar" />
         </FrameLayout>
-        <LinearLayout
+        <com.ichi2.anki.ui.ResizablePaneLayout
             android:id="@+id/note_editor_xl_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -49,6 +49,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"/>
             </LinearLayout>
-        </LinearLayout>
+        </com.ichi2.anki.ui.ResizablePaneLayout>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/layout/activity_homescreen.xml b/AnkiDroid/src/main/res/layout/activity_homescreen.xml
index 3fba44ff39fb..fce38a179925 100644
--- a/AnkiDroid/src/main/res/layout/activity_homescreen.xml
+++ b/AnkiDroid/src/main/res/layout/activity_homescreen.xml
@@ -38,6 +38,7 @@
         android:layout_gravity="bottom"
         android:background="?attr/colorSurface"
         android:visibility="gone"
+        app:layout_behavior="com.google.android.material.behavior.HideViewOnScrollBehavior"
         app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_nav_menu" />
 
diff --git a/AnkiDroid/src/main/res/layout/activity_info.xml b/AnkiDroid/src/main/res/layout/activity_info.xml
index 782ff94bb64a..c6112a89e608 100644
--- a/AnkiDroid/src/main/res/layout/activity_info.xml
+++ b/AnkiDroid/src/main/res/layout/activity_info.xml
@@ -40,11 +40,10 @@
                 android:layout_weight="1"
                 android:fadingEdge="vertical"
                 android:gravity="center">
-                <WebView
+                <com.ichi2.anki.workarounds.SafeWebViewLayout
                     android:id="@+id/web_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical" />
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
                 <!-- progress bar -->
                 <LinearLayout
                     android:id="@+id/progress_bar_layout"
diff --git a/AnkiDroid/src/main/res/layout/activity_manage_note_types.xml b/AnkiDroid/src/main/res/layout/activity_manage_note_types.xml
index 1af245186d7a..99639653d12e 100644
--- a/AnkiDroid/src/main/res/layout/activity_manage_note_types.xml
+++ b/AnkiDroid/src/main/res/layout/activity_manage_note_types.xml
@@ -49,7 +49,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:textColor="?attr/colorOnPrimary"
+            android:textColor="?attr/actionBarTextColor"
             android:textAppearance="?textAppearanceBodyMediumEmphasized"
             tools:text="5 note types selected" />
 
@@ -59,7 +59,7 @@
             android:layout_height="wrap_content"
             app:icon="@drawable/ic_delete"
             style="@style/Widget.Material3.Button.IconButton"
-            app:iconTint="@color/white"/>
+            app:iconTint="?attr/actionBarTextColor"/>
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_clear_selection"
@@ -67,7 +67,7 @@
             android:layout_height="wrap_content"
             app:icon="@drawable/ic_clear_white"
             style="@style/Widget.Material3.Button.IconButton"
-            app:iconTint="@color/white"/>
+            app:iconTint="?attr/actionBarTextColor"/>
     </LinearLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -80,7 +80,6 @@
         app:fabSize="normal"
         app:srcCompat="@drawable/ic_add"
         android:contentDescription="@string/cd_manage_notetypes_add"
-        app:backgroundTint="?attr/fab_normal"
-        app:layout_behavior="com.google.android.material.behavior.HideViewOnScrollBehavior" />
+        app:backgroundTint="?attr/fab_normal"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/layout/dialog_add_edit_reminder.xml b/AnkiDroid/src/main/res/layout/dialog_add_edit_reminder.xml
index c2f9e0fddb11..e6dee7822987 100644
--- a/AnkiDroid/src/main/res/layout/dialog_add_edit_reminder.xml
+++ b/AnkiDroid/src/main/res/layout/dialog_add_edit_reminder.xml
@@ -137,8 +137,7 @@
                             android:id="@+id/add_edit_reminder_card_threshold_section"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            tools:ignore="UselessParent">
+                            android:orientation="horizontal">
 
                             <LinearLayout
                                 android:id="@+id/add_edit_reminder_card_threshold_label_container"
@@ -150,6 +149,7 @@
 
                                 <com.google.android.material.textview.MaterialTextView
                                     android:id="@+id/add_edit_reminder_card_threshold_label"
+                                    android:labelFor="@id/add_edit_reminder_card_threshold_input"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="center_vertical"
@@ -183,6 +183,47 @@
 
                         </LinearLayout>
 
+                        <com.google.android.material.textview.MaterialTextView
+                            android:id="@+id/add_edit_reminder_count_toward_threshold_heading"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingTop="8dp"
+                            android:textSize="16sp"
+                            android:text="@string/add_edit_reminder_count_toward_threshold_heading" />
+
+                        <com.google.android.material.chip.ChipGroup
+                            android:id="@+id/add_edit_reminder_count_chip_group"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            app:chipSpacingHorizontal="16dp"
+                            app:chipSpacingVertical="0dp">
+
+                            <com.google.android.material.chip.Chip
+                                android:id="@+id/add_edit_reminder_count_new_chip"
+                                style="@style/Widget.Material3.Chip.Filter"
+                                app:chipStrokeColor="@color/chip_stroke_color_checked_primary"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                tools:text="New" />
+
+                            <com.google.android.material.chip.Chip
+                                android:id="@+id/add_edit_reminder_count_lrn_chip"
+                                style="@style/Widget.Material3.Chip.Filter"
+                                app:chipStrokeColor="@color/chip_stroke_color_checked_primary"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                tools:text="Learning" />
+
+                            <com.google.android.material.chip.Chip
+                                android:id="@+id/add_edit_reminder_count_rev_chip"
+                                style="@style/Widget.Material3.Chip.Filter"
+                                app:chipStrokeColor="@color/chip_stroke_color_checked_primary"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                tools:text="To Review" />
+
+                        </com.google.android.material.chip.ChipGroup>
+
                         <LinearLayout
                             android:id="@+id/add_edit_reminder_only_notify_if_no_reviews_section"
                             android:layout_width="match_parent"
@@ -196,6 +237,7 @@
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/add_edit_reminder_only_notify_if_no_reviews_label"
+                                android:labelFor="@id/add_edit_reminder_only_notify_if_no_reviews_checkbox"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
diff --git a/AnkiDroid/src/main/res/layout/dialog_custom_study_menu.xml b/AnkiDroid/src/main/res/layout/dialog_custom_study_menu.xml
new file mode 100644
index 000000000000..f414a0a9d490
--- /dev/null
+++ b/AnkiDroid/src/main/res/layout/dialog_custom_study_menu.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="9dp">
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal" />
+
+        <LinearLayout
+            android:id="@+id/menu_items"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="gone" />
+    </LinearLayout>
+</ScrollView>
diff --git a/AnkiDroid/src/main/res/layout/fragment_custom_study.xml b/AnkiDroid/src/main/res/layout/fragment_custom_study.xml
index f6a647f921cb..cd8d4eefc014 100644
--- a/AnkiDroid/src/main/res/layout/fragment_custom_study.xml
+++ b/AnkiDroid/src/main/res/layout/fragment_custom_study.xml
@@ -39,21 +39,83 @@
         android:text=""
         android:textSize="16sp" />
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/details_edit_text_2_layout"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:errorEnabled="true"
-        app:suffixTextAppearance="@style/TextAppearance.MaterialComponents.Body1">
+        android:orientation="horizontal">
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/details_edit_text_2"
-            android:layout_width="match_parent"
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/details_decrement_button"
+            style="@style/Widget.Material3.Button.ElevatedButton.Icon"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="12dp"
+            android:contentDescription="@string/minus_sign"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:padding="0dp"
+            android:visibility="gone"
+            app:backgroundTint="?attr/incrementerButtonBackground"
+            app:icon="@drawable/ic_remove"
+            app:iconGravity="textStart"
+            app:iconPadding="0dp"
+            app:iconSize="24dp"
+            app:iconTint="@color/white"
+            app:shapeAppearanceOverlay="@style/ShapeAppearance.Material3.Corner.Full"
+            tools:visibility="visible" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/details_edit_text_2_layout"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:inputType="number|numberSigned"
-            tools:text="1"
-            />
-    </com.google.android.material.textfield.TextInputLayout>
+            android:layout_weight="1"
+            app:errorEnabled="true"
+            app:suffixTextAppearance="@style/TextAppearance.MaterialComponents.Body1">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/details_edit_text_2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="number|numberSigned"
+                tools:text="1"
+                />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/details_increment_button"
+            style="@style/Widget.Material3.Button.ElevatedButton.Icon"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginStart="12dp"
+            android:contentDescription="@string/plus_sign"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:padding="0dp"
+            android:visibility="gone"
+            app:backgroundTint="?attr/incrementerButtonBackground"
+            app:icon="@drawable/ic_add"
+            app:iconGravity="textStart"
+            app:iconPadding="0dp"
+            app:iconSize="24dp"
+            app:iconTint="@color/white"
+            app:shapeAppearanceOverlay="@style/ShapeAppearance.Material3.Corner.Full"
+            tools:visibility="visible" />
+    </LinearLayout>
+
+    <com.ichi2.ui.FixedTextView
+        android:id="@+id/details_available_cards"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start"
+        android:layout_marginStart="4dip"
+        android:layout_marginEnd="4dip"
+        android:gravity="start"
+        android:textSize="16sp"
+        android:visibility="gone"
+        tools:text="Available new cards: 20"
+        tools:visibility="visible" />
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/cards_state_selector_layout"
diff --git a/AnkiDroid/src/main/res/layout/fragment_media_check.xml b/AnkiDroid/src/main/res/layout/fragment_media_check.xml
index 81612f3c0697..20d3a28bf029 100644
--- a/AnkiDroid/src/main/res/layout/fragment_media_check.xml
+++ b/AnkiDroid/src/main/res/layout/fragment_media_check.xml
@@ -18,7 +18,7 @@
         app:navigationContentDescription="@string/abc_action_bar_up_description"
         app:navigationIcon="?attr/homeAsUpIndicator" />
 
-    <WebView
+    <com.ichi2.anki.workarounds.SafeWebViewLayout
         android:id="@+id/web_view"
         android:layout_height="0dp"
         android:layout_weight="1"
diff --git a/AnkiDroid/src/main/res/layout/fragment_more.xml b/AnkiDroid/src/main/res/layout/fragment_more.xml
index 5d6a7f2ac234..3cc7c56334b8 100644
--- a/AnkiDroid/src/main/res/layout/fragment_more.xml
+++ b/AnkiDroid/src/main/res/layout/fragment_more.xml
@@ -26,7 +26,9 @@
             app:titleTextAppearance="?attr/textAppearanceTitleLarge" />
     </com.google.android.material.appbar.AppBarLayout>
 
-    <ScrollView
+    <!-- Nested scrolling lets the bottom navigation hide on scroll -->
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/more_scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -339,5 +341,5 @@
             </LinearLayout>
 
         </LinearLayout>
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 </LinearLayout>
diff --git a/AnkiDroid/src/main/res/layout/fragment_note_editor.xml b/AnkiDroid/src/main/res/layout/fragment_note_editor.xml
index cf016ac66b3a..0489cdef747c 100644
--- a/AnkiDroid/src/main/res/layout/fragment_note_editor.xml
+++ b/AnkiDroid/src/main/res/layout/fragment_note_editor.xml
@@ -177,4 +177,8 @@
         android:id="@+id/editor_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
+    <androidx.compose.ui.platform.ComposeView
+        android:id="@+id/toolbar_layout_dialog"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/AnkiDroid/src/main/res/layout/fragment_reviewer.xml b/AnkiDroid/src/main/res/layout/fragment_reviewer.xml
index a13c0bd006c2..1cae4d926f45 100644
--- a/AnkiDroid/src/main/res/layout/fragment_reviewer.xml
+++ b/AnkiDroid/src/main/res/layout/fragment_reviewer.xml
@@ -91,7 +91,7 @@
             android:layout_weight="1"
             android:layout_marginHorizontal="@dimen/reviewer_side_margin">
 
-            <com.ichi2.anki.workarounds.SafeWebViewLayout
+            <com.ichi2.anki.cardviewer.TypeAnswerWebViewLayout
                 android:id="@+id/web_view_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -196,4 +196,4 @@
 
         </LinearLayout>
     </LinearLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/AnkiDroid/src/main/res/layout/fragment_study_options.xml b/AnkiDroid/src/main/res/layout/fragment_study_options.xml
index 024a49dc0809..33706fa4bca7 100644
--- a/AnkiDroid/src/main/res/layout/fragment_study_options.xml
+++ b/AnkiDroid/src/main/res/layout/fragment_study_options.xml
@@ -13,6 +13,7 @@
             android:layout_width="15dp"
             android:layout_height="0dp"
             app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             android:background="@drawable/shadow_left"
             android:visibility="gone"/>
@@ -217,7 +218,7 @@
 
                     <androidx.constraintlayout.widget.Group
                         android:id="@+id/group_counts"
-                        app:constraint_referenced_ids="studyoptions_new_count,studyoptions_new_count_label,studyoptions_new_bury,studyoptions_learning_count,studyoptions_learning_count_label,studyoptions_learning_bury,studyoptions_review_count,studyoptions_review_count_label,studyoptions_review_bury,studyoptions_total_new_label,studyoptions_total_new_count,studyoptions_total_label,studyoptions_total_count"
+                        app:constraint_referenced_ids="studyoptions_new_count,studyoptions_new_count_label,studyoptions_learning_count,studyoptions_learning_count_label,studyoptions_review_count,studyoptions_review_count_label,studyoptions_total_new_label,studyoptions_total_new_count,studyoptions_total_label,studyoptions_total_count"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/AnkiDroid/src/main/res/layout/view_permissions_item.xml b/AnkiDroid/src/main/res/layout/view_permissions_item.xml
index 6510ed9422b6..17507400c305 100644
--- a/AnkiDroid/src/main/res/layout/view_permissions_item.xml
+++ b/AnkiDroid/src/main/res/layout/view_permissions_item.xml
@@ -15,12 +15,11 @@
         android:id="@+id/icon"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_marginTop="20dp"
         android:layout_marginEnd="8dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toStartOf="@id/guideline_front"
-        app:layout_constraintBottom_toBottomOf="@id/title"
-        app:layout_constraintTop_toTopOf="@id/title"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:src="@drawable/ic_action_mic"
         tools:tint="?attr/colorControlNormal"/>
 
@@ -65,4 +64,4 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         app:layout_constraintGuide_begin="56dp" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/AnkiDroid/src/main/res/menu/card_template_editor.xml b/AnkiDroid/src/main/res/menu/card_template_editor.xml
index ee6a3f62c118..aeaddeabdecb 100644
--- a/AnkiDroid/src/main/res/menu/card_template_editor.xml
+++ b/AnkiDroid/src/main/res/menu/card_template_editor.xml
@@ -20,11 +20,9 @@
         android:id="@+id/action_add"
         android:title="@string/add_card_type"
         ankidroid:showAsAction="never"/>
-    <!-- not implemented -->
     <item
         android:id="@+id/action_reposition"
         android:title="@string/card_template_reposition_template"
-        android:visible="false"
         ankidroid:showAsAction="never"/>
     <item
         android:id="@+id/action_rename"
diff --git a/AnkiDroid/src/main/res/menu/note_editor.xml b/AnkiDroid/src/main/res/menu/note_editor.xml
index d8ad9ed56d34..3c83775084e7 100644
--- a/AnkiDroid/src/main/res/menu/note_editor.xml
+++ b/AnkiDroid/src/main/res/menu/note_editor.xml
@@ -34,15 +34,8 @@
         android:title="@string/note_editor_capitalize"
         ankidroid:showAsAction="never"/>
     <item
-        android:id="@+id/action_show_toolbar"
-        android:title="@string/menu_show_toolbar"
-        android:checkable="true"
-        ankidroid:showAsAction="never"/>
-    <item
-        android:id="@+id/action_scroll_toolbar"
-        android:title="@string/menu_scroll_toolbar"
-        android:checkable="true"
-        android:checked="true"
+        android:id="@+id/action_toolbar_layout"
+        android:title="@string/note_editor_toolbar_layout"
         ankidroid:showAsAction="never"/>
     <item
         android:id="@+id/action_toggle_previewer"
diff --git a/AnkiDroid/src/main/res/values/attrs.xml b/AnkiDroid/src/main/res/values/attrs.xml
index b8924f1d0706..6147c20e6c91 100644
--- a/AnkiDroid/src/main/res/values/attrs.xml
+++ b/AnkiDroid/src/main/res/values/attrs.xml
@@ -5,12 +5,6 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="DuplicateCrowdInStrings">
 
-    <!-- Android provides a straightforward way to control action bar styles; an additional color attribute
-     specifically for action bar text color isn't necessary, but it simplifies the color setting
-     while making it accessible everywhere and eases the use of themes -->
-    <attr name="actionBarTextColor" format="color"/> <!-- For title and subtitle, and any other text that may appear in action bar-->
-    <attr name="actionBarPopupTextColor" format="color"/>
-
     <!-- Custom preferences -->
     <attr name="allowEmpty" format="boolean" />
     <attr name="min" format="integer" />
@@ -54,8 +48,6 @@
         <attr name="helpLink" format="string"/>
     </declare-styleable>
 
-    <attr name="incrementerButtonBackground" format="color|reference" />
-
     <declare-styleable name="SliderPreference">
         <!-- Format string to be used as template to display the value
              There must be ONLY ONE placeholder, which will be replaced by the preference value -->
@@ -97,102 +89,6 @@
         <attr name="nextTime" format="string"/>
     </declare-styleable>
 
-    <!-- appBarColor and customTabNavBarColor are declared in :common:android (shared activity code resolves them) -->
-    <attr name="widgetColorActivated" format="color"/>
-    <!-- Deck list colors, divider, and expander -->
-    <attr name="currentDeckBackground" format="reference"/>
-    <attr name="currentDeckBackgroundColor" format="color"/>
-    <attr name="focusedRowBackgroundColor" format="color"/>
-    <attr name="dynDeckColor" format="color"/>
-    <attr name="deckDivider" format="reference"/>
-    <attr name="expandRef" format="reference"/>
-    <attr name="collapseRef" format="reference"/>
-    <!-- Navigation drawer -->
-    <attr name="navDrawerItemColor" format="reference"/>
-    <attr name="navDrawerItemBackgroundColor" format="reference"/>
-    <!-- Card count colors -->
-    <attr name="newCountColor" format="color"/>
-    <attr name="learnCountColor" format="color"/>
-    <attr name="reviewCountColor" format="color"/>
-    <attr name="zeroCountColor" format="color"/>
-    <attr name="buryCountColor" format="color"/>
-    <!-- Study Screen button backgrounds -->
-    <attr name="showAnswerButtonBackground" format="color"/>
-    <attr name="answerButtonBackground" format="color"/>
-    <attr name="againButtonBackground" format="color"/>
-    <attr name="hardButtonBackground" format="color"/>
-    <attr name="goodButtonBackground" format="color"/>
-    <attr name="easyButtonBackground" format="color"/>
-    <attr name="showAnswerColor" format="reference"/>
-    <attr name="againButtonRef" format="reference"/>
-    <attr name="hardButtonRef" format="reference"/>
-    <attr name="goodButtonRef" format="reference"/>
-    <attr name="easyButtonRef" format="reference"/>
-    <!-- Same thing but with ripples -->
-    <attr name="againButtonRippleRef" format="reference"/>
-    <attr name="hardButtonRippleRef" format="reference"/>
-    <attr name="goodButtonRippleRef" format="reference"/>
-    <attr name="easyButtonRippleRef" format="reference"/>
-    <!-- Study Screen button text colors-->
-    <attr name="answerButtonTextColor" format="color"/>
-    <attr name="againButtonTextColor" format="color"/>
-    <attr name="hardButtonTextColor" format="color"/>
-    <attr name="goodButtonTextColor" format="color"/>
-    <attr name="easyButtonTextColor" format="color"/>
-
-    <attr name="againTextColor" format="color"/>
-    <attr name="hardTextColor" format="color"/>
-    <attr name="goodTextColor" format="color"/>
-    <attr name="easyTextColor" format="color"/>
-    <attr name="againBackgroundColor" format="color"/>
-    <attr name="hardBackgroundColor" format="color"/>
-    <attr name="goodBackgroundColor" format="color"/>
-    <attr name="easyBackgroundColor" format="color"/>
-    <attr name="againIconColor" format="color"/>
-    <attr name="hardIconColor" format="color"/>
-    <attr name="goodIconColor" format="color"/>
-    <attr name="easyIconColor" format="color"/>
-    <!-- Card Browser Colors -->
-    <attr name="cardBrowserDivider" format="color"/>
-    <!-- Study Screen other colors -->
-    <attr name="topBarColor" format="color"/>
-    <attr name="maxTimerColor" format="color"/>
-    <attr name="alternativeBackgroundColor" format="color"/>
-    <!-- Browser colors -->
-    <attr name="suspendedColor" format="color"/>
-    <attr name="buriedColor" format="color"/>
-    <attr name="selectedColor" format="color"/>
-    <attr name="markedColor" format="color"/>
-    <!-- Note editor colors -->
-    <attr name="duplicateColor" format="color"/>
-    <attr name="editTextBackgroundColor" format="color"/>
-    <attr name="editTextHighlightColor" format="color"/><!-- TODO replace this with colorOnPrimaryContainer, see #19361 -->
-    <attr name="toolbarBackgroundColor" format="color"/>
-    <attr name="toolbarIconColor" format="color"/>
-    <attr name="buttonShadowColor" format="color"/>
-    <attr name="buttonRippleColor" format="color"/>
-    <attr name="buttonForegroundColor" format="color"/>
-    <!-- Images -->
-    <attr name="navDrawerImage" format="integer"/>
-
-    <!-- Introduction -->
-    <attr name="introductionLogoTransparent" format="color"/>
-
-    <!-- FAB -->
-    <attr name="fab_normal" format="color"/> <!-- Also color of the Study button in StudyOptions -->
-    <attr name="fab_pressed" format="color"/>
-    <!-- Popup menus' background color -->
-    <attr name="popupBackgroundColor" format="reference"/>
-    <attr name="overflowAndPopupMenuIconColor" format="color"/>
-
-    <attr name="editTextDisabled" format="color"/>
-
-    <attr name="snackbarBackgroundTintColor" format="color"/>
-    <attr name="dialogBackground" format="color"/>
-    <attr name="snackbarButtonTextColor" format="color"/>
-
-    <attr name="clozeColor" format="color" />
-
     <declare-styleable name="CheckBoxTriStates">
         <attr name="cycle_checked_to_indeterminate" format="boolean" />
         <attr name="cycle_indeterminate_to_checked" format="boolean" />
@@ -202,27 +98,4 @@
         <attr name="display_vertical_line" format="boolean" />
         <attr name="android:background" />
     </declare-styleable>
-
-    <!-- Background color for Tab layout. It is essentially the color of the toolbar.
-         The latter is set by colorPrimary, but theme overlay can't use it,
-         as it itself overrides colorPrimary, which is used by the view directly. -->
-    <attr name="tabLayoutBackgroundColor" format="color"/>
-    <attr name="tabActiveIconColor" format="color"/>
-
-    <attr name="checkMediaListBackground" format="color" />
-    <attr name="checkMediaListForeground" format="color" />
-
-    <attr name="progressDialogButtonTextColor" format="color"/>
-
-    <!-- Reminder troubleshooting -->
-    <attr name="reminderTroubleshootingOk" format="color"/>
-    <attr name="reminderTroubleshootingWarning" format="color"/>
-
-
-    <attr name="badgeWarningColor" format="color"/>
-    <attr name="badgeErrorColor" format="color"/>
-    <attr name="widgetStrokeWidth" format="dimension"/>
-    <attr name="widgetStrokeColor" format="color"/>
-    <attr name="studyScreenElevation" format="dimension"/>
-    <attr name="whiteboardToolbarCardStyle" format="reference"/>
 </resources>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/values/colors.xml b/AnkiDroid/src/main/res/values/colors.xml
index f4412725a513..94d64c86bfe3 100644
--- a/AnkiDroid/src/main/res/values/colors.xml
+++ b/AnkiDroid/src/main/res/values/colors.xml
@@ -7,23 +7,8 @@
 
     <color name="wb_fg_color">#B00000FF</color>
     <color name="wb_fg_color_inv">#0099FF</color>
-    <color name="transparent">#00000000</color>
-    <color name="white">#ffffff</color>
-    <color name="black">#000000</color>
-    <color name="semi_transparent_black">#80000000</color>
-
-    <color name="answer_buttons_highlight_color">#66FFFFFF</color>
     <color name="whiteboard_eraser">#80808080</color>
 
-    <!-- The Material Design color palette lives in :common:android (common/android/.../res/values/colors.xml) -->
-
-    <!-- Green from the system 'Battery health' screen -->
-    <color name="google_green_300">#81c995</color>
-    <color name="google_green_700">#388E3C</color>
-
-    <color name="google_yellow_300">#fdd633</color>
-    <color name="warning_orange">#DE4900</color>
-
     <color name="note_editor_selected_item_background">#D1D0CE</color>
     <color name="note_editor_selected_item_text">#000000</color>
 
@@ -44,19 +29,11 @@
 
     <color name="fab_background">#ff757575</color>
 
-    <color name="theme_light_drawer_row_current">#E8E8E8</color>
-    <color name="popup_background_theme_dark">#434343</color>
-    <color name="popup_background_theme_black">#252525</color>
-
     <!-- Audio Recorder Colors -->
     <color name="audio_recorder_red">#FF4747</color>
     <color name="audio_recorder_green">#6FF06F</color>
     <color name="audio_recorder_grey">#444444</color>
 
-    <!-- color used for bury count in study options(same as anki for light and dark) -->
-    <color name="disabled_gray_light">#858585</color>
-    <color name="disabled_gray_dark">#fcfcfc</color>
-
     <!-- color used for the resizable screens-->
     <color name="idle_divider_color">#C7C7C7</color>
     <color name="drag_divider_color">#1A90FF</color>
diff --git a/AnkiDroid/src/main/res/values/constants.xml b/AnkiDroid/src/main/res/values/constants.xml
index cc987959152d..c772b39856ee 100644
--- a/AnkiDroid/src/main/res/values/constants.xml
+++ b/AnkiDroid/src/main/res/values/constants.xml
@@ -109,6 +109,7 @@
     <string name="link_sync_conflict_help">https://docs.ankidroid.org/#AnkiWebConflicts</string>
     <string name="link_user_actions_help">https://docs.ankidroid.org/#userActions</string>
     <string name="link_faq_tts">https://github.com/ankidroid/Anki-Android/wiki/FAQ#tts--text-to-speech-is-not-speaking</string>
+    <string name="link_faq_tts_no_engine">https://github.com/ankidroid/Anki-Android/wiki/FAQ#no-text-to-speech-engine-installed</string>
     <string name="link_faq_missing_media" tools:ignore="Typos">https://github.com/ankidroid/Anki-Android/wiki/FAQ#why-doesnt-my-sound-or-image-work-on-ankidroid</string>
     <string name="link_third_party_api_apps">https://github.com/ankidroid/Anki-Android/wiki/Third-Party-Apps</string>
     <string name="shared_decks_url">https://ankiweb.net/shared/decks/</string>
@@ -165,31 +166,6 @@
         <item>@string/theme_night</item>
     </string-array>
 
-    <string name="theme_follow_system_value">0</string>
-    <string name="theme_day_scheme_value">1</string>
-    <string name="theme_night_scheme_value">2</string>
-    <string name="theme_eink_scheme_value">3</string>
-
-    <string name="theme_light_value">1</string>
-    <string name="theme_plain_value">2</string>
-    <string name="theme_black_value">3</string>
-    <string name="theme_dark_value">4</string>
-
-    <string-array name="app_theme_values">
-        <item>@string/theme_follow_system_value</item>
-        <item>@string/theme_day_scheme_value</item>
-        <item>@string/theme_night_scheme_value</item>
-    </string-array>
-    <string-array name="day_theme_values">
-        <item>@string/theme_light_value</item>
-        <item>@string/theme_plain_value</item>
-        <item>@string/theme_eink_scheme_value</item>
-    </string-array>
-    <string-array name="night_theme_values">
-        <item>@string/theme_black_value</item>
-        <item>@string/theme_dark_value</item>
-    </string-array>
-
     <string-array name="sync_media_entries">
         <item>@string/sync_media_always</item>
         <item>@string/sync_media_only_unmetered</item>
@@ -327,12 +303,6 @@
         <item>@string/fragment_accessibility_preferences</item>
     </string-array>
 
-    <!-- Sample deck names and for Deck Picker Widget layout in widget picker screen
-       These strings are marked as `translatable=false` because translating them would defeat the purpose of the example, which relies on specific language usage.-->
-    <string name="deck1Name_deck_picker_widget" translatable="false" comment="Example of a Deck name. Android's widget provider displays it as an example of what the Deck Picker widget may look like">English</string>
-    <string name="deck2Name_deck_picker_widget" translatable="false" comment="Example of a Deck name. Android's widget provider displays it as an example of what the Deck Picker widget may look like">Español</string>
-    <string name="deck3Name_deck_picker_widget" translatable="false" comment="Example of a Deck name. Android's widget provider displays it as an example of what the Deck Picker widget may look like">日本語</string>
-
     <string name="answer_buttons_position_preference" translatable="false">answerButtonPosition</string>
     <string-array name="answer_buttons_position" translatable="false">
         <item>top</item>
diff --git a/AnkiDroid/src/main/res/values/dimens.xml b/AnkiDroid/src/main/res/values/dimens.xml
index 413f673d1478..6f80cf8214f0 100644
--- a/AnkiDroid/src/main/res/values/dimens.xml
+++ b/AnkiDroid/src/main/res/values/dimens.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources,DuplicateCrowdInStrings">
-    <!-- Material UI side margin: http://web.archive.org/web/20180105203433if_/https://material.io/guidelines/layout/metrics-keylines.html#metrics-keylines-keylines-spacing -->
-    <dimen name="side_margin">16dp</dimen>
     <dimen name="default_width">56dp</dimen>
     <dimen name="keyline_1">16dp</dimen>
     <dimen name="study_options_padding">8dp</dimen>
@@ -16,13 +14,11 @@
     <!-- Material design dialogs -->
     <dimen name="dialog_frame_margin">24dp</dimen>
     <dimen name="title_frame_margin_bottom">16dp</dimen>
-    <dimen name="content_vertical_padding">8dp</dimen>
     <dimen name="input_layout_padding">8dp</dimen>
     <dimen name="icon_margin">16dp</dimen>
 
     <!-- Material design typography -->
     <dimen name="title_textsize">20sp</dimen>
-    <dimen name="content_textsize">18sp</dimen>
 
     <!-- DeckPicker -->
     <dimen name="deck_picker_left_padding_small">0dp</dimen>
@@ -30,10 +26,6 @@
     <dimen name="deck_picker_right_padding">4dp</dimen>
     <dimen name="note_editor_toolbar_height">52dp</dimen>
 
-    <dimen name="mtrl_snackbar_background_corner_radius">8dp</dimen>
-    <dimen name="popup_corner_radius">4dp</dimen>
-    <dimen name="dialog_corner_radius">8dp</dimen>
-
     <dimen name="reviewer_side_margin">8dp</dimen>
     <dimen name="answer_button_margin_horizontal">3dp</dimen>
     <dimen name="answer_button_corner_radius">12dp</dimen>
diff --git a/AnkiDroid/src/main/res/values/ids.xml b/AnkiDroid/src/main/res/values/ids.xml
index e2d4feb53b21..f70272303cae 100644
--- a/AnkiDroid/src/main/res/values/ids.xml
+++ b/AnkiDroid/src/main/res/values/ids.xml
@@ -43,6 +43,4 @@
     <item type="id" name="user_action_7"/>
     <item type="id" name="user_action_8"/>
     <item type="id" name="user_action_9"/>
-
-    <item type="id" name="pending_snackbar"/>
 </resources>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/values/preferences.xml b/AnkiDroid/src/main/res/values/preferences.xml
index 9d79985089ed..51aa2333e8d9 100644
--- a/AnkiDroid/src/main/res/values/preferences.xml
+++ b/AnkiDroid/src/main/res/values/preferences.xml
@@ -33,6 +33,7 @@
     <string name="pref_backup_limits_screen_key">backupLimitsScreen</string>
     <!-- Editing -->
     <string name="paste_png_key">pastePNG</string>
+    <string name="last_shared_deck_id_key">lastSharedDeckId</string>
     <!-- Switch Profile -->
     <string name="pref_switch_profile_screen_key">switchProfileScreen</string>
     <string name="pref_enable_switch_profile_key">enableSwitchProfile</string>
@@ -212,7 +213,6 @@
     <string name="pref_reset_languages_key">resetLanguages</string>
     <!-- Notification preferences -->
     <string name="pref_notifications_screen_key">notificationsScreen</string>
-    <string name="pref_notifications_minimum_cards_due_key">minimumCardsDueForNotification</string>
     <string name="pref_notifications_vibrate_key">widgetVibrate</string>
     <string name="pref_notifications_blink_key">widgetBlink</string>
     <!-- Review reminders -->
@@ -233,7 +233,6 @@
     <string name="pref_corrupt_fsrs_params">debug_corrupt_fsrs_params</string>
     <string name="new_congrats_screen_pref_key">new_congrats_screen</string>
     <string name="new_reviewer_options_key">newReviewerOptions</string>
-    <string name="pref_new_review_reminders">newReviewReminders</string>
     <string name="developer_options_enabled_by_user_key">devOptionsEnabledByUser</string>
     <string name="pref_cat_wip_key">workInProgressDevOptions</string>
     <string name="reviewer_port_pref_key">reviewerPort</string>
diff --git a/AnkiDroid/src/main/res/values/styles.xml b/AnkiDroid/src/main/res/values/styles.xml
index f5ba1bb96faa..94d6d5949f88 100644
--- a/AnkiDroid/src/main/res/values/styles.xml
+++ b/AnkiDroid/src/main/res/values/styles.xml
@@ -15,18 +15,6 @@
         <item name="android:layout_marginRight">@dimen/nav_drawer_margin_offset</item>
     </style>
 
-    <style name="OverflowMenuStyle" parent="Widget.Material3.PopupMenu.Overflow">
-        <item name="android:popupBackground">@drawable/bg_popup</item>
-    </style>
-
-    <style name="PopupMenuStyle" parent="Widget.Material3.PopupMenu">
-        <item name="android:popupBackground">@drawable/bg_popup</item>
-    </style>
-
-    <style name="SpinnerStyle" parent="Widget.AppCompat.Spinner">
-        <item name="android:popupBackground">@drawable/bg_popup</item>
-    </style>
-
     <style name="AnswerButton" parent="Widget.Material3.Button.ElevatedButton">
         <item name="android:padding">0dp</item>
         <item name="cornerRadius">@dimen/answer_button_corner_radius</item>
@@ -174,36 +162,6 @@
         <item name="android:background">@drawable/ic_gesture_tap</item>
     </style>
 
-    <!-- Snackbars -->
-    <style name="SnackbarStyle" parent="Widget.Material3.Snackbar">
-        <item name="android:backgroundTint">?attr/snackbarBackgroundTintColor</item>
-    </style>
-    <style name="SnackbarButtonStyle" parent="Widget.Material3.Button.TextButton.Snackbar">
-        <item name="android:textColor">?attr/snackbarButtonTextColor</item>
-    </style>
-
-    <!-- Switches -->
-    <style name="Preference.SwitchPreferenceCompat.Material3" parent="@style/Preference.SwitchPreferenceCompat.Material">
-        <item name="widgetLayout">@layout/preference_material_switch_widget</item>
-    </style>
-
-    <style name="SliderLabelStyle" parent="Widget.MaterialComponents.Tooltip">
-        <item name="android:textColor">@color/white</item>
-    </style>
-
-    <style name="SliderStyle" parent="Widget.Material3.Slider">
-        <item name="trackColorActive">@color/slider_active_track_color</item>
-        <item name="trackColorInactive">@color/slider_inactive_track_color</item>
-        <item name="haloColor">@color/slider_halo_color</item>
-        <item name="thumbColor">@color/slider_thumb_color</item>
-        <item name="labelStyle">@style/SliderLabelStyle</item>
-        <item name="tickVisible">false</item>
-    </style>
-
-    <style name="PreferenceThemeOverlay.AnkiDroid">
-        <item name="singleLineTitle">false</item>
-    </style>
-
     <style name="AppCompatProgressDialogStyle" parent="Theme.AppCompat.Dialog.Alert">
         <item name="colorAccent">?attr/progressDialogButtonTextColor</item>
         <item name="android:textColorPrimary">?android:attr/textColor</item>
@@ -219,12 +177,6 @@
         <item name="android:dialogCornerRadius" tools:targetApi="p">@dimen/dialog_corner_radius</item>
     </style>
 
-    <style name="ThemeOverlay.AnkiDroid.AlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
-        <item name="dialogCornerRadius">@dimen/m3_alert_dialog_corner_size</item>
-        <item name="materialAlertDialogBodyTextStyle">@style/AnkiDroid.AlertDialog.Body.Text</item>
-        <item name="android:windowBackground">@drawable/material_dialog_background</item>
-    </style>
-
     <style name="ThemeOverlay.AnkiDroid.AlertDialog.FullScreen" parent="ThemeOverlay.AnkiDroid.AlertDialog">
         <item name="android:windowIsFloating">false</item>
         <item name="android:windowIsTranslucent">false</item>
@@ -235,11 +187,6 @@
 
     <style name="TextAppearance.AnkiDroid.TopAppBar.Subtitle" parent="TextAppearance.Material3.ActionBar.Subtitle" />
 
-    <style name="AnkiDroid.AlertDialog.Body.Text" parent="MaterialAlertDialog.Material3.Body.Text">
-        <!-- The default style uses onSurfaceVariant, which isn't defined yet -->
-        <item name="android:textColor">?android:attr/textColor</item>
-    </style>
-
     <style name="CustomButtonBarButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
         <item name="android:textColor">?attr/progressDialogButtonTextColor</item>
     </style>
@@ -258,10 +205,6 @@
         <item name="android:alertDialogStyle">@style/AlertDialogStyle</item>
     </style>
 
-    <style name="ThemeOverlay.App.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
-        <item name="android:navigationBarColor" tools:ignore="NewApi">@android:color/transparent</item>
-    </style>
-
     <style name="Widget.AnkiDroid.CardView.Recording" parent="CardView">
         <item name="cardElevation">?attr/studyScreenElevation</item>
         <item name="cardPreventCornerOverlap">false</item>
@@ -281,16 +224,6 @@
         <item name="colorPrimaryContainer">?colorPrimary</item>
     </style>
 
-    <!-- TODO remove this style when a proper 'colorOnPrimaryContainer' is set in themes, without
-           this override the user doesn't see the text selection highlight in TextInputLayouts -->
-    <style name="TextInputSelectionColorFixStyle" parent="@style/Widget.Material3.TextInputLayout.OutlinedBox">
-        <item name="materialThemeOverlay">@style/ThemeOverlay.TextInputSelectionFix</item>
-    </style>
-
-    <style name="ThemeOverlay.TextInputSelectionFix" parent="ThemeOverlay.Material3.TextInputEditText.OutlinedBox">
-        <item name="colorOnPrimaryContainer">?attr/editTextHighlightColor</item>
-    </style>
-
     <!-- Applied to a TextInputLayout which should show the error outline, but not an error message. -->
     <style name="TextAppearance.AnkiDroid.HiddenError" parent="TextAppearance.Design.Error">
         <item name="android:textSize">0sp</item>
@@ -319,10 +252,4 @@
         <item name="iconTint">@color/sort_pill_content_color</item>
         <item name="backgroundTint">@color/sort_pill_background_color</item>
     </style>
-
-    <style name="Widget.AnkiDroid.WhiteboardToolbarCard.Eink" parent="Widget.Material3.CardView.Elevated">
-        <item name="strokeWidth">?attr/widgetStrokeWidth</item>
-        <item name="strokeColor">?attr/widgetStrokeColor</item>
-        <item name="cardElevation">0dp</item>
-    </style>
 </resources>
diff --git a/AnkiDroid/src/main/res/xml/preferences_reviewing.xml b/AnkiDroid/src/main/res/xml/preferences_reviewing.xml
index 074a25cfa864..42ca53a588d3 100644
--- a/AnkiDroid/src/main/res/xml/preferences_reviewing.xml
+++ b/AnkiDroid/src/main/res/xml/preferences_reviewing.xml
@@ -29,12 +29,11 @@
             app:max="999"
             app:min="0"
             app:summaryFormat="@plurals/pref_summ_minutes"/>
-        <com.ichi2.preferences.IncrementerNumberRangePreferenceCompat
+        <Preference
             android:key="@string/time_limit_preference"
             android:title="@string/time_limit"
-            app:max="999"
-            app:min="0"
-            app:summaryFormat="@plurals/pref_summ_minutes"/>
+            android:summary="@string/disabled"
+            android:fragment="com.ichi2.anki.preferences.TimeboxSettingsFragment" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/pref_cat_advanced">
         <SwitchPreferenceCompat
diff --git a/AnkiDroid/src/main/resources/META-INF/services/org.acra.collector.Collector b/AnkiDroid/src/main/resources/META-INF/services/org.acra.collector.Collector
new file mode 100644
index 000000000000..f48bdc38bd9e
--- /dev/null
+++ b/AnkiDroid/src/main/resources/META-INF/services/org.acra.collector.Collector
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+com.ichi2.anki.exception.SanitizedReportCollector
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/AbstractFlashcardViewerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/AbstractFlashcardViewerTest.kt
index e539bf9654a7..832e60f0480b 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/AbstractFlashcardViewerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/AbstractFlashcardViewerTest.kt
@@ -31,8 +31,12 @@ import com.ichi2.anki.reviewer.AutomaticAnswer
 import com.ichi2.anki.reviewer.AutomaticAnswerAction
 import com.ichi2.anki.reviewer.AutomaticAnswerSettings
 import com.ichi2.anki.servicelayer.LanguageHintService
+import com.ichi2.testutils.assertNoActivityStarted
 import com.ichi2.testutils.common.Flaky
 import com.ichi2.testutils.common.OS
+import com.ichi2.testutils.ext.snackbarText
+import com.ichi2.testutils.mockWebResourceRequest
+import com.ichi2.testutils.registerWebBrowser
 import kotlinx.coroutines.runBlocking
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.containsString
@@ -49,10 +53,13 @@ import org.junit.jupiter.params.provider.MethodSource
 import org.junit.runner.RunWith
 import org.mockito.Mockito.mock
 import org.robolectric.Robolectric
+import org.robolectric.Shadows.shadowOf
 import org.robolectric.android.controller.ActivityController
 import timber.log.Timber
 import java.util.Locale
 import java.util.stream.Stream
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
 
 @Suppress("SameParameterValue")
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O) // getImeHintLocales, toLanguageTags, onRenderProcessGone, RenderProcessGoneDetail
@@ -62,8 +69,14 @@ class AbstractFlashcardViewerTest : RobolectricTest() {
 
     class NonAbstractFlashcardViewer : AbstractFlashcardViewer() {
         var answered: Rating? = null
+        var startActivityFailure: Exception? = null
         private var lastTime = 0
 
+        override fun startActivity(intent: Intent) {
+            startActivityFailure?.let { throw it }
+            super.startActivity(intent)
+        }
+
         override fun performReload() {
             // intentionally blank
         }
@@ -123,6 +136,25 @@ class AbstractFlashcardViewerTest : RobolectricTest() {
         }
     }
 
+    @Test
+    fun `rejected web link launch shows an error and consumes navigation`() {
+        editPreferences { putBoolean(targetContext.getString(R.string.pref_allow_card_external_launch_key), false) }
+        targetContext.registerWebBrowser()
+        val viewer = getViewer(addCard = true)
+        viewer.startActivityFailure = SecurityException("The handler requires a permission")
+        val webView = assertNotNull(viewer.webView)
+
+        assertTrue(
+            shadowOf(webView).webViewClient.shouldOverrideUrlLoading(
+                webView,
+                mockWebResourceRequest("https://example.org"),
+            ),
+        )
+        advanceRobolectricLooper()
+        targetContext.assertNoActivityStarted()
+        assertEquals(viewer.getString(CommonString.activity_start_failed), viewer.snackbarText)
+    }
+
     @ParameterizedTest
     @MethodSource("getSignalFromUrlTest_args")
     fun getSignalFromUrlTest(
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/AcraCrashReporterAnalyticsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/AcraCrashReporterAnalyticsTest.kt
index cd06ac990a32..155f53d1a347 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/AcraCrashReporterAnalyticsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/AcraCrashReporterAnalyticsTest.kt
@@ -11,6 +11,8 @@ import com.ichi2.anki.common.crashreporting.CrashReportService
 import com.ichi2.anki.common.crashreporting.CrashReporter.Companion.FEEDBACK_REPORT_KEY
 import com.ichi2.anki.common.crashreporting.CrashReporter.Companion.FEEDBACK_REPORT_NEVER
 import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.targetContext
 import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.unmockkObject
@@ -22,18 +24,16 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class AcraCrashReporterAnalyticsTest : RobolectricTest() {
+class AcraCrashReporterAnalyticsTest : AndroidTest {
     @Before
-    override fun setUp() {
-        super.setUp()
+    fun setUp() {
         targetContext.sharedPrefs().edit { putString(FEEDBACK_REPORT_KEY, FEEDBACK_REPORT_NEVER) }
         mockkObject(Analytics)
         every { Analytics.sendAnalyticsException(any(), any()) } returns Unit
     }
 
     @After
-    override fun tearDown() {
-        super.tearDown()
+    fun tearDown() {
         unmockkObject(Analytics)
     }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ActivityStartupMetaTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ActivityStartupMetaTest.kt
index bfa3565d3349..58fc0d512f1d 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ActivityStartupMetaTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ActivityStartupMetaTest.kt
@@ -7,13 +7,20 @@ import com.ichi2.anki.compat.CompatHelper.Companion.getPackageInfoCompat
 import com.ichi2.anki.compat.GET_ACTIVITIES_L
 import com.ichi2.anki.compat.PackageInfoFlagsCompat
 import com.ichi2.testutils.ActivityList
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.targetContext
 import org.hamcrest.MatcherAssert
 import org.hamcrest.Matchers
 import org.junit.Test
+import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
 
 @RunWith(AndroidJUnit4::class)
-class ActivityStartupMetaTest : RobolectricTest() {
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class ActivityStartupMetaTest : AndroidTest {
     @Test
     fun ensureAllActivitiesAreTested() {
         // if this fails, you may need to add the missing activity to ActivityList.allActivitiesAndIntents()
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/AllActivitiesRecreationTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/AllActivitiesRecreationTest.kt
index 9a05d9ef7550..9a0e089be389 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/AllActivitiesRecreationTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/AllActivitiesRecreationTest.kt
@@ -5,6 +5,8 @@ package com.ichi2.anki
 import android.os.Build
 import android.os.Bundle
 import androidx.core.content.edit
+import com.google.testing.junit.testparameterinjector.TestParameter
+import com.google.testing.junit.testparameterinjector.TestParameterValuesProvider
 import com.ichi2.anki.account.AccountActivity
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.multimedia.MultimediaActivity
@@ -23,28 +25,25 @@ import org.hamcrest.Matchers.equalTo
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.RobolectricTestParameterInjector
 import org.robolectric.android.controller.ActivityController
 
 /**
  * Tests "Don't keep activities" for all activities in the manifest.
  *
  * @see ActivityList.allActivitiesAndIntents
- *
- * TODO: consider RobolectricTestParameterInjector after #14796 is fixed
  */
-@RunWith(ParameterizedRobolectricTestRunner::class)
+@RunWith(RobolectricTestParameterInjector::class)
 class AllActivitiesRecreationTest : RobolectricTest() {
-    @ParameterizedRobolectricTestRunner.Parameter
-    @JvmField // required for Parameter
-    var config: ActivityConfig? = null
+    @TestParameter(valuesProvider = ActivityLauncherProvider::class)
+    lateinit var config: ActivityConfig
 
-    private val launcher: ActivityLaunchParam get() = config!!.launcher
+    private val launcher: ActivityLaunchParam get() = config.launcher
 
     @Before
     fun startAsAnExistingUser() {
         grantWritePermissions()
-        targetContext.sharedPrefs().edit { putBoolean(IntroductionActivity.INTRODUCTION_SLIDES_SHOWN, true) }
+        targetContext.sharedPrefs().edit { putBoolean(IntroductionActivity.PREF_INTRODUCTION_SLIDES_SHOWN, true) }
     }
 
     @Before
@@ -144,16 +143,15 @@ class AllActivitiesRecreationTest : RobolectricTest() {
         override fun toString(): String = launcher.simpleName
     }
 
-    companion object {
-        // Use the same sandbox as the other activity tests until the backend supports multiple classloaders.
-        @ParameterizedRobolectricTestRunner.Parameters(name = "{0}")
-        @JvmStatic // required for initParameters
-        fun initParameters(): List<ActivityConfig> =
+    class ActivityLauncherProvider : TestParameterValuesProvider() {
+        override fun provideValues(context: Context?): List<ActivityConfig> =
             ActivityList
                 .allActivitiesAndIntents()
                 .filterNot { handled.contains(it.activity) }
                 .map { ActivityConfig(it) }
+    }
 
+    companion object {
         /**
          * Activities which finish on the way up given what this test provides: an empty
          * collection, no card to review, no notetype and no widget id.
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/AllActivitiesScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/AllActivitiesScreenshotTest.kt
index 755c1dca23bb..f39c83f1960e 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/AllActivitiesScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/AllActivitiesScreenshotTest.kt
@@ -13,6 +13,7 @@ import androidx.core.view.WindowInsetsCompat
 import com.google.testing.junit.testparameterinjector.TestParameter
 import com.google.testing.junit.testparameterinjector.TestParameterValuesProvider
 import com.ichi2.anki.account.AccountActivity
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.instantnoteeditor.InstantNoteEditorActivity
 import com.ichi2.anki.multimedia.MultimediaActivity
 import com.ichi2.anki.notetype.ManageNotetypes
@@ -21,12 +22,12 @@ import com.ichi2.anki.previewer.CardViewerActivity
 import com.ichi2.anki.shareddeck.SharedDecksActivity
 import com.ichi2.anki.ui.windows.managespace.ManageSpaceActivity
 import com.ichi2.anki.ui.windows.permissions.AllPermissionsExplanationActivity
+import com.ichi2.anki.ui.windows.permissions.PermissionsActivity
 import com.ichi2.anki.utils.ConfigAwareSingleFragmentActivity
 import com.ichi2.testutils.ActivityList
 import com.ichi2.testutils.ActivityList.ActivityLaunchParam
 import com.ichi2.testutils.BackupManagerTestUtilities
 import com.ichi2.testutils.skipTest
-import com.ichi2.utils.dp
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
@@ -111,6 +112,8 @@ class AllActivitiesScreenshotTest : ScreenshotTest() {
                     AccountActivity::class.java,
                     // AllPermissionsExplanationScreenshotTest
                     AllPermissionsExplanationActivity::class.java,
+                    // PermissionsActivityScreenshotTest
+                    PermissionsActivity::class.java,
                     // CardTemplateEditorScreenshotTest
                     CardTemplateEditor::class.java,
                     // DeckPickerScreenshotTest
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/AllPermissionsExplanationScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/AllPermissionsExplanationScreenshotTest.kt
index 074c15c5f718..4209eca63b5e 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/AllPermissionsExplanationScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/AllPermissionsExplanationScreenshotTest.kt
@@ -12,9 +12,9 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsCompat.Type.displayCutout
 import androidx.core.view.WindowInsetsCompat.Type.navigationBars
 import androidx.core.view.WindowInsetsCompat.Type.statusBars
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.ui.windows.permissions.AllPermissionsExplanationActivity
 import com.ichi2.testutils.insetsOf
-import com.ichi2.utils.dp
 import org.junit.Test
 import org.robolectric.RuntimeEnvironment
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/AndroidTtsPlayerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/AndroidTtsPlayerTest.kt
index 15bc8c8540c5..d8e0676097aa 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/AndroidTtsPlayerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/AndroidTtsPlayerTest.kt
@@ -33,6 +33,59 @@ import kotlin.time.Duration.Companion.seconds
 /** Test for [AndroidTtsPlayer] */
 @RunWith(AndroidJUnit4::class)
 class AndroidTtsPlayerTest {
+    @Test
+    fun `locale fallback respects engine preference order`() {
+        val first = AndroidTtsVoice(fakeVoice("first", Locale.FRANCE), ENGINE_A)
+        val second = AndroidTtsVoice(fakeVoice("second", Locale.FRANCE), ENGINE_B)
+
+        for (voices in listOf(listOf(first, second), listOf(second, first))) {
+            val player = AndroidTtsPlayer(voices)
+            assertThat(player.voiceForTag(frenchTag()), equalTo(TtsVoiceMatch(voices.first(), rank = -100)))
+        }
+    }
+
+    @Test
+    fun `unavailable voices follow installed voices with engine order preserved in both groups`() {
+        val installedB = AndroidTtsVoice(fakeVoice("installed-b", Locale.FRANCE), ENGINE_B)
+        val unavailableB = AndroidTtsVoice(fakeVoice("unavailable-b", Locale.FRANCE, installed = false), ENGINE_B)
+        val installedA = AndroidTtsVoice(fakeVoice("installed-a", Locale.FRANCE), ENGINE_A)
+        val unavailableA = AndroidTtsVoice(fakeVoice("unavailable-a", Locale.FRANCE, installed = false), ENGINE_A)
+        val installedC = AndroidTtsVoice(fakeVoice("installed-c", Locale.FRANCE), ENGINE_C)
+        val unavailableC = AndroidTtsVoice(fakeVoice("unavailable-c", Locale.FRANCE, installed = false), ENGINE_C)
+        val player = AndroidTtsPlayer(listOf(unavailableB, installedB, unavailableA, installedA, unavailableC, installedC))
+
+        assertThat(player.voices(), equalTo(listOf(installedB, installedA, installedC, unavailableB, unavailableA, unavailableC)))
+        assertThat(player.voiceForTag(frenchTag()), equalTo(TtsVoiceMatch(installedB, rank = -100)))
+    }
+
+    @Test
+    fun `locale fallback uses another engine when the default lacks the language`() {
+        val french = AndroidTtsVoice(fakeVoice("french", Locale.FRANCE), ENGINE_A)
+        val english = AndroidTtsVoice(fakeVoice("english", Locale.US), ENGINE_B)
+        val player = AndroidTtsPlayer(listOf(english, french))
+
+        assertThat(player.voiceForTag(frenchTag()), equalTo(TtsVoiceMatch(french, rank = -100)))
+    }
+
+    @Test
+    fun `installed voice from another engine precedes unavailable default engine voice`() {
+        val installed = AndroidTtsVoice(fakeVoice("installed", Locale.FRANCE), ENGINE_A)
+        val unavailable = AndroidTtsVoice(fakeVoice("unavailable", Locale.FRANCE, installed = false), ENGINE_B)
+        val player = AndroidTtsPlayer(listOf(unavailable, installed))
+
+        assertThat(player.voiceForTag(frenchTag()), equalTo(TtsVoiceMatch(installed, rank = -100)))
+    }
+
+    @Test
+    fun `explicit voice from another engine takes precedence over the default engine`() {
+        val requested = AndroidTtsVoice(fakeVoice("requested", Locale.FRANCE), ENGINE_A)
+        val preferred = AndroidTtsVoice(fakeVoice("preferred", Locale.FRANCE), ENGINE_B)
+        val player = AndroidTtsPlayer(listOf(preferred, requested))
+
+        assertThat(player.voiceForTag(frenchTag(requested.name)), equalTo(TtsVoiceMatch(requested, rank = 0)))
+        assertThat(player.voiceForTag(frenchTag("missing")), equalTo(TtsVoiceMatch(preferred, rank = -100)))
+    }
+
     @Test
     fun `network timeout is reported with its specific error code`() {
         val error = AndroidTtsError.fromErrorCode(TextToSpeech.ERROR_NETWORK_TIMEOUT)
@@ -265,6 +318,7 @@ class AndroidTtsPlayerTest {
     companion object {
         private const val ENGINE_A = "com.example.engine.a"
         private const val ENGINE_B = "com.example.engine.b"
+        private const val ENGINE_C = "com.example.engine.c"
         private const val ENGINE_FAILING = "com.example.engine.failing"
         private val PLAYBACK_TIMEOUT = 5.seconds
     }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidAppTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidAppTest.kt
index 77f982d1034e..e0d7fa1b8b56 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidAppTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/AnkiDroidAppTest.kt
@@ -13,7 +13,7 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.common.crashreporting.CrashReportService.sendExceptionReport
 import com.ichi2.anki.multiprofile.ProfileManager
-import com.ichi2.anki.multiprofile.ProfileManager.Companion.KEY_LAST_ACTIVE_PROFILE_ID
+import com.ichi2.anki.multiprofile.ProfileManager.Companion.PREF_LAST_ACTIVE_PROFILE_ID
 import com.ichi2.anki.multiprofile.ProfileManager.Companion.PROFILE_REGISTRY_FILENAME
 import com.ichi2.anki.multiprofile.isPhoenixProcess
 import io.mockk.every
@@ -95,7 +95,7 @@ class AnkiDroidAppTest {
 
     @Test
     fun `storage follows a non-default profile`() {
-        profileRegistry.edit(commit = true) { putString(KEY_LAST_ACTIVE_PROFILE_ID, "p_routed") }
+        profileRegistry.edit(commit = true) { putString(PREF_LAST_ACTIVE_PROFILE_ID, "p_routed") }
 
         val app = startApplication()
         app.getSharedPreferences("settings", Context.MODE_PRIVATE).edit(commit = true) {
@@ -122,7 +122,7 @@ class AnkiDroidAppTest {
 
         val app = startApplication()
 
-        assertNull(profileRegistry.getString(KEY_LAST_ACTIVE_PROFILE_ID, null))
+        assertNull(profileRegistry.getString(PREF_LAST_ACTIVE_PROFILE_ID, null))
         assertEquals(frameworkBase.filesDir, app.filesDir)
     }
 
@@ -134,7 +134,7 @@ class AnkiDroidAppTest {
 
         val app = startApplication()
 
-        assertNull(profileRegistry.getString(KEY_LAST_ACTIVE_PROFILE_ID, null))
+        assertNull(profileRegistry.getString(PREF_LAST_ACTIVE_PROFILE_ID, null))
         assertEquals(frameworkBase.filesDir, app.filesDir)
     }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/BaselineProfileTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/BaselineProfileTest.kt
index abcdd50d6a5d..6fb0375dbe15 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/BaselineProfileTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/BaselineProfileTest.kt
@@ -13,6 +13,51 @@ import kotlin.test.assertTrue
  * Ensures a manual run of the baseline profile won't drop rules.
  */
 class BaselineProfileTest {
+    /** A populated deck list needs both row inflation and binding on a cold launch. */
+    @Test
+    fun `baseline profile covers creating and binding deck rows`() {
+        val rules = readProfile("baseline-prof.txt")
+        val recordedMethods =
+            rules
+                .filterIsInstance<MethodRule>()
+                .filter { it.className == "com.ichi2.anki.widgets.DeckAdapter" }
+                .map { it.methodSignature }
+                .toSet()
+        val requiredMethods =
+            setOf(
+                "onCreateViewHolder(Landroid/view/ViewGroup;I)Lcom/ichi2/anki/widgets/DeckAdapter\$ViewHolder;",
+                "onBindViewHolder(Lcom/ichi2/anki/widgets/DeckAdapter\$ViewHolder;I)V",
+            )
+        val missing = requiredMethods - recordedMethods
+
+        assertTrue(
+            missing.isEmpty(),
+            "baseline-prof.txt does not cover rendering a populated deck list. Missing DeckAdapter methods: " +
+                "${missing.joinToString()}. Seed a collection before capture, wait for a deck row, " +
+                "then regenerate the profiles (baselineprofile/README.md).",
+        )
+    }
+
+    /** R8 needs the row classes as well as the activity to optimize a populated deck list's startup. */
+    @Test
+    fun `startup profile includes deck row rendering classes`() {
+        // A method rule also identifies its declaring class for startup layout optimization.
+        val recordedClasses = readProfile("startup-prof.txt").map { it.className }.toSet()
+        val requiredClasses =
+            setOf(
+                "com.ichi2.anki.widgets.DeckAdapter\$ViewHolder",
+                "com.ichi2.anki.databinding.ItemDeckBinding",
+            )
+        val missing = requiredClasses - recordedClasses
+
+        assertTrue(
+            missing.isEmpty(),
+            "startup-prof.txt does not cover rendering a populated deck list. Missing classes: " +
+                "${missing.joinToString()}. Record a cold launch with a populated collection " +
+                "and wait for a deck row before ending capture, then regenerate the profiles.",
+        )
+    }
+
     /**
      * [DeckPicker.onResume] runs on every launch before the deck list is
      * usable, so it must stay ahead-of-time compiled.
@@ -43,4 +88,10 @@ class BaselineProfileTest {
                 "journey, then regenerate (baselineprofile/README.md).",
         )
     }
+
+    private fun readProfile(name: String): List<BaselineProfileEntry> {
+        val profile = File("src/main/generated/baselineProfiles/$name")
+        assertTrue(profile.isFile, "profile not found at ${profile.absolutePath}")
+        return BaselineProfileEntry.parseProfile(profile.readLines())
+    }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/BottomNavigationScrollTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/BottomNavigationScrollTest.kt
new file mode 100644
index 000000000000..ec1194f04518
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/BottomNavigationScrollTest.kt
@@ -0,0 +1,367 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: 2026 Shaan Narendran <shaannaren06@gmail.com>
+
+package com.ichi2.anki
+
+import android.content.Intent
+import android.os.SystemClock
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.webkit.WebView
+import android.widget.ScrollView
+import android.widget.TextView
+import androidx.core.view.ViewCompat
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.android.material.behavior.HideViewOnScrollBehavior
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import com.ichi2.anki.BottomNavController.NavigationItem
+import com.ichi2.anki.common.utils.dp
+import com.ichi2.anki.databinding.FragmentMoreBinding
+import com.ichi2.anki.databinding.PageStatisticsBinding
+import com.ichi2.anki.pages.scrolledUpToBottom
+import com.ichi2.testutils.dispatchInsets
+import com.ichi2.testutils.withBooleanPreference
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.lessThanOrEqualTo
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class BottomNavigationScrollTest : RobolectricTest() {
+    @Test
+    fun `scrolling down hides the bar and scrolling up restores it`() =
+        withBottomNavigation { deckPicker ->
+            val nav = deckPicker.bottomNav
+            val behavior = HideViewOnScrollBehavior.from(nav)
+            val deckList = deckPicker.deckPickerBinding.decks
+
+            assertThat(behavior.isScrolledIn, equalTo(true))
+            deckPicker.scrollFrom(deckList, 40)
+            assertThat(behavior.isScrolledOut, equalTo(true))
+            deckPicker.scrollFrom(deckList, -40)
+            assertThat(behavior.isScrolledIn, equalTo(true))
+        }
+
+    @Test
+    fun `switching tabs restores a hidden bar`() =
+        withBottomNavigation { deckPicker ->
+            val nav = deckPicker.bottomNav
+            val behavior = HideViewOnScrollBehavior.from(nav)
+
+            deckPicker.scrollFrom(deckPicker.deckPickerBinding.decks, 40)
+            assertThat(behavior.isScrolledOut, equalTo(true))
+
+            nav.selectedItemId = NavigationItem.BROWSER.id
+            advanceRobolectricLooper()
+            assertThat(behavior.isScrolledIn, equalTo(true))
+        }
+
+    @Test
+    fun `scrolling up in the browser restores the hidden bar`() =
+        withBottomNavigation { deckPicker ->
+            val nav = deckPicker.bottomNav
+            nav.selectedItemId = NavigationItem.BROWSER.id
+            advanceRobolectricLooper()
+            val list = deckPicker.findViewById<RecyclerView>(R.id.card_browser_list)
+            list.adapter =
+                object : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+                    override fun getItemCount() = 80
+
+                    override fun onCreateViewHolder(
+                        parent: ViewGroup,
+                        viewType: Int,
+                    ) = object : RecyclerView.ViewHolder(
+                        TextView(parent.context).apply {
+                            layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 100)
+                        },
+                    ) {}
+
+                    override fun onBindViewHolder(
+                        holder: RecyclerView.ViewHolder,
+                        position: Int,
+                    ) = Unit
+                }
+            list.scrollToPosition(40)
+            deckPicker.scrollFrom(list, 40)
+            assertThat(HideViewOnScrollBehavior.from(nav).isScrolledOut, equalTo(true))
+
+            list.scrollBy(0, -100)
+            assertThat(HideViewOnScrollBehavior.from(nav).isScrolledIn, equalTo(true))
+        }
+
+    @Test
+    fun `scrolling More content hides the bar and scrolling back restores it`() =
+        withBottomNavigation { deckPicker ->
+            val nav = deckPicker.bottomNav
+            nav.selectedItemId = NavigationItem.MORE.id
+            advanceRobolectricLooper()
+            val scrollView = deckPicker.moreBinding.moreScrollView
+            val behavior = HideViewOnScrollBehavior.from(nav)
+
+            deckPicker.scrollFrom(scrollView, 40)
+            assertThat(behavior.isScrolledOut, equalTo(true))
+            deckPicker.scrollFrom(scrollView, -40)
+            assertThat(behavior.isScrolledIn, equalTo(true))
+        }
+
+    /** The hidden bar gives More extra height, which pulls a bottom scroll position back up */
+    @Test
+    fun `More stays at the bottom with the bar hidden after the content grows`() =
+        withBottomNavigation { deckPicker ->
+            val nav = deckPicker.bottomNav
+            nav.selectedItemId = NavigationItem.MORE.id
+            advanceRobolectricLooper()
+            val scrollView = deckPicker.moreBinding.moreScrollView
+            val behavior = HideViewOnScrollBehavior.from(nav)
+            scrollView.scrollTo(0, scrollView.getChildAt(0).height)
+
+            deckPicker.scrollFrom(scrollView, 40)
+            assertThat(behavior.isScrolledOut, equalTo(true))
+            // the container grows into the bar's space
+            deckPicker.binding.root.requestLayout()
+            advanceRobolectricLooper()
+
+            assertThat("the bar must not come back without an upward scroll", behavior.isScrolledOut, equalTo(true))
+        }
+
+    /** Content which fits once the bar is hidden cannot scroll, so only the gesture can restore the bar */
+    @Test
+    fun `dragging down restores the hidden bar when the content cannot scroll`() =
+        withBottomNavigation { deckPicker ->
+            val nav = deckPicker.bottomNav
+            nav.selectedItemId = NavigationItem.MORE.id
+            advanceRobolectricLooper()
+            val behavior = HideViewOnScrollBehavior.from(nav)
+            behavior.slideOut(nav)
+            assertThat(behavior.isScrolledOut, equalTo(true))
+
+            // More is at the top: dragging the finger down cannot scroll it any further
+            deckPicker.dragFinger(fromY = 200f, toY = 400f)
+
+            assertThat(behavior.isScrolledIn, equalTo(true))
+        }
+
+    @Test
+    fun `upward reversal does not repeatedly restore the bar in More`() =
+        withBottomNavigation { activity ->
+            val nav = activity.bottomNav
+            nav.selectedItemId = NavigationItem.MORE.id
+            advanceRobolectricLooper()
+            val scroll = activity.moreBinding.moreScrollView
+            scroll.scrollTo(0, 200)
+            advanceRobolectricLooper()
+            assertThat("More must be scrolled away from the top", scroll.scrollY > 70, equalTo(true))
+            val behavior = HideViewOnScrollBehavior.from(nav)
+            val states = mutableListOf<Int>()
+            behavior.addOnScrollStateChangedListener { _, state -> states.add(state) }
+            val origin = IntArray(2).also(scroll::getLocationInWindow)
+            val start = SystemClock.uptimeMillis()
+
+            fun touch(
+                action: Int,
+                offset: Float,
+                delta: Long,
+            ) {
+                val event = MotionEvent.obtain(start, start + delta, action, 100f, origin[1] + offset, 0)
+                activity.dispatchTouchEvent(event)
+                event.recycle()
+                advanceRobolectricLooper()
+            }
+            // Keep the finger down throughout the reversal. Vertical coordinates are relative to More.
+            touch(MotionEvent.ACTION_DOWN, 60f, 0)
+            touch(MotionEvent.ACTION_MOVE, 130f, 100)
+            touch(MotionEvent.ACTION_MOVE, 110f, 200)
+            assertThat("Reversing upwards must hide the bar", behavior.isScrolledOut, equalTo(true))
+            // Continue upwards while still below the initial touch position.
+            states.clear()
+            touch(MotionEvent.ACTION_MOVE, 90f, 300)
+            touch(MotionEvent.ACTION_UP, 90f, 400)
+            assertThat(
+                "Continuing upwards must not show the bar; observed states: $states",
+                states.contains(HideViewOnScrollBehavior.STATE_SCROLLED_IN),
+                equalTo(false),
+            )
+            assertThat(behavior.isScrolledOut, equalTo(true))
+        }
+
+    @Test
+    fun `scrolling Statistics content hides the bar`() =
+        withBottomNavigation { deckPicker ->
+            val nav = deckPicker.bottomNav
+            nav.selectedItemId = NavigationItem.STATS.id
+            advanceRobolectricLooper()
+            val webView = deckPicker.statisticsWebView
+
+            val behavior = HideViewOnScrollBehavior.from(nav)
+            webView.scrollTo(0, 100)
+            assertThat(behavior.isScrolledOut, equalTo(true))
+            webView.scrollTo(0, 0)
+            assertThat(behavior.isScrolledIn, equalTo(true))
+        }
+
+    @Test
+    fun `first upward Statistics scroll after layout restores the bar`() =
+        withBottomNavigation { deckPicker ->
+            val nav = deckPicker.bottomNav
+            nav.selectedItemId = NavigationItem.STATS.id
+            advanceRobolectricLooper()
+            val webView = deckPicker.statisticsWebView
+            val behavior = HideViewOnScrollBehavior.from(nav)
+
+            webView.scrollTo(0, 1000)
+            assertThat(behavior.isScrolledOut, equalTo(true))
+            advanceRobolectricLooper()
+
+            // Away from the bottom, resizing need not scroll the page. The next scroll is user input.
+            webView.scrollTo(0, 950)
+            assertThat("an upward non-touch scroll must restore the bar", behavior.isScrolledIn, equalTo(true))
+        }
+
+    /**
+     * The hidden bar makes Statistics taller, so a page at the bottom scrolls itself up to stay in
+     * range. Robolectric's WebView has no scroll range, so the rule is checked on a [ScrollView].
+     */
+    @Test
+    fun `an upward scroll which ends at the bottom is not user input`() {
+        val scrollView =
+            ScrollView(targetContext).apply {
+                addView(View(targetContext).apply { minimumHeight = 1000 })
+                measure(
+                    View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY),
+                    View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY),
+                )
+                layout(0, 0, 100, 100)
+            }
+
+        scrollView.scrollTo(0, 900)
+        assertThat("pulled back to the bottom by a resize", scrollView.scrolledUpToBottom(dy = -50), equalTo(true))
+        assertThat("scrolling down is always user input", scrollView.scrolledUpToBottom(dy = 50), equalTo(false))
+
+        scrollView.scrollTo(0, 500)
+        assertThat("the user scrolled up, away from the bottom", scrollView.scrolledUpToBottom(dy = -50), equalTo(false))
+    }
+
+    @Test
+    fun `Studied summary sits above the visible nav bar`() =
+        withBottomNavigation { deckPicker ->
+            val summary = deckPicker.deckPickerBinding.reviewSummaryTextView
+            val nav = deckPicker.bottomNav
+            deckPicker.deckPickerBinding.deckPickerContent.visibility = View.VISIBLE
+            summary.text = "Studied 10 cards today"
+            summary.visibility = View.VISIBLE
+            deckPicker.binding.root.requestLayout()
+            advanceRobolectricLooper()
+
+            assertThat(summary.height > 0, equalTo(true))
+            assertThat(summary.contentBottomOnScreen, lessThanOrEqualTo(nav.topOnScreen))
+        }
+
+    @Test
+    fun `Studied summary stays visible above the system navigation bar when the bar hides`() =
+        withBottomNavigation { deckPicker ->
+            val summary = deckPicker.deckPickerBinding.reviewSummaryTextView
+            val nav = deckPicker.bottomNav
+            deckPicker.deckPickerBinding.deckPickerContent.visibility = View.VISIBLE
+            summary.text = "Studied 10 cards today"
+            summary.visibility = View.VISIBLE
+            deckPicker.binding.root.requestLayout()
+            advanceRobolectricLooper()
+
+            assertThat(summary.height > 0, equalTo(true))
+            deckPicker.scrollFrom(deckPicker.deckPickerBinding.decks, 40)
+            advanceRobolectricLooper()
+            // Robolectric re-dispatches zero insets when the bar's state changes: apply a real nav bar after
+            deckPicker.dispatchInsets(navBarBottom = 48.dp)
+            deckPicker.binding.root.requestLayout()
+            advanceRobolectricLooper()
+
+            assertThat(HideViewOnScrollBehavior.from(nav).isScrolledOut, equalTo(true))
+            assertThat(summary.alpha, equalTo(1f))
+            // back at its resting position, which pads it above the system navigation bar
+            assertThat(summary.translationY, equalTo(0f))
+            assertThat(summary.paddingBottom, equalTo(48.dp.toPx(deckPicker)))
+
+            deckPicker.scrollFrom(deckPicker.deckPickerBinding.decks, -40)
+            advanceRobolectricLooper()
+            assertThat(summary.alpha, equalTo(1f))
+            assertThat(summary.contentBottomOnScreen, lessThanOrEqualTo(nav.topOnScreen))
+        }
+
+    @Test
+    fun `deck list fade stays anchored to the summary while the bottom bar is hidden`() =
+        withBottomNavigation { deckPicker ->
+            val deckList = deckPicker.deckPickerBinding.decks
+            val fade = deckPicker.deckPickerBinding.decksFadeWrapper
+            val summary = deckPicker.deckPickerBinding.reviewSummaryTextView
+
+            assertThat(fade.anchorView, equalTo(summary))
+            deckPicker.scrollFrom(deckList, 40)
+            assertThat(fade.anchorView, equalTo(summary))
+            deckPicker.scrollFrom(deckList, -40)
+            assertThat(fade.anchorView, equalTo(summary))
+        }
+
+    @Test
+    fun `hidden bar releases space for fragment content`() =
+        withBottomNavigation { deckPicker ->
+            val nav = deckPicker.bottomNav
+            val container = deckPicker.binding.bottomNavFragmentContainer!!
+            deckPicker.scrollFrom(deckPicker.deckPickerBinding.decks, 40)
+
+            assertThat(HideViewOnScrollBehavior.from(nav).isScrolledOut, equalTo(true))
+            assertThat((container.layoutParams as ViewGroup.MarginLayoutParams).bottomMargin < nav.height, equalTo(true))
+        }
+
+    private fun withBottomNavigation(test: (DeckPicker) -> Unit) =
+        withBooleanPreference(R.string.dev_bottom_nav_key, true) {
+            setIntroductionSlidesShown(true)
+            test(startActivityControllerNormallyOpenCollectionWithIntent(DeckPicker::class.java, Intent()).get())
+        }
+
+    private fun DeckPicker.scrollFrom(
+        source: View,
+        dy: Int,
+    ) {
+        val root = binding.root
+        if (root.onStartNestedScroll(source, source, ViewCompat.SCROLL_AXIS_VERTICAL, ViewCompat.TYPE_TOUCH)) {
+            root.onNestedScroll(source, 0, dy, 0, 0, ViewCompat.TYPE_TOUCH)
+            root.onStopNestedScroll(source, ViewCompat.TYPE_TOUCH)
+        }
+    }
+
+    private fun DeckPicker.dragFinger(
+        fromY: Float,
+        toY: Float,
+    ) {
+        val time = SystemClock.uptimeMillis()
+        val steps = listOf(MotionEvent.ACTION_DOWN to fromY, MotionEvent.ACTION_MOVE to toY, MotionEvent.ACTION_UP to toY)
+        for ((action, y) in steps) {
+            val event = MotionEvent.obtain(time, time, action, 100f, y, 0)
+            dispatchTouchEvent(event)
+            event.recycle()
+        }
+        advanceRobolectricLooper()
+    }
+
+    private val View.topOnScreen: Int
+        get() = IntArray(2).also { getLocationOnScreen(it) }[1]
+
+    private val View.contentBottomOnScreen: Int
+        get() = topOnScreen + height - paddingBottom
+
+    private val DeckPicker.moreBinding: FragmentMoreBinding
+        get() = FragmentMoreBinding.bind(supportFragmentManager.findFragmentByTag(NavigationItem.MORE.tag)!!.requireView())
+
+    private val DeckPicker.statisticsBinding: PageStatisticsBinding
+        get() = PageStatisticsBinding.bind(supportFragmentManager.findFragmentByTag(NavigationItem.STATS.tag)!!.requireView())
+
+    /** The [WebView] wrapped by the Statistics page's [com.ichi2.anki.workarounds.SafeWebViewLayout] */
+    private val DeckPicker.statisticsWebView: WebView
+        get() = statisticsBinding.webviewLayout.getChildAt(0) as WebView
+
+    private val DeckPicker.bottomNav: BottomNavigationView
+        get() = binding.bottomNavigation!!
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserInsetsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserInsetsTest.kt
index 2203207dcec9..508c4c302b03 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserInsetsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserInsetsTest.kt
@@ -6,11 +6,11 @@ import android.view.View
 import android.view.View.MeasureSpec
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.ui.RecyclerFastScroller
 import com.ichi2.testutils.dispatchInsets
 import com.ichi2.testutils.lastItemView
 import com.ichi2.testutils.scrollToLastPosition
-import com.ichi2.utils.dp
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.allOf
 import org.hamcrest.Matchers.equalTo
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserScreenshotTest.kt
index 0f2443ba43fa..b093d5cf8e76 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserScreenshotTest.kt
@@ -13,13 +13,13 @@ import androidx.core.view.WindowInsetsCompat.Type.displayCutout
 import androidx.core.view.WindowInsetsCompat.Type.navigationBars
 import androidx.core.view.WindowInsetsCompat.Type.statusBars
 import androidx.recyclerview.widget.RecyclerView
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.ui.RecyclerFastScroller
 import com.ichi2.testutils.HIDDEN_GESTURE_BAR
 import com.ichi2.testutils.insetsOf
 import com.ichi2.testutils.scrollToEnd
 import com.ichi2.testutils.simulateKeyboard
 import com.ichi2.testutils.simulateSystemBars
-import com.ichi2.utils.dp
 import org.junit.Test
 import org.robolectric.RuntimeEnvironment
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
index f58abe595ff7..496cede618a1 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
@@ -5,9 +5,12 @@ package com.ichi2.anki
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
+import android.os.SystemClock
 import android.text.TextUtils
 import android.view.Menu
+import android.view.MotionEvent
 import android.view.View
+import android.widget.LinearLayout
 import android.widget.Spinner
 import android.widget.SpinnerAdapter
 import android.widget.TextView
@@ -41,12 +44,12 @@ import anki.search.BrowserRow
 import anki.search.BrowserRow.Color
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CollectionManager.withCol
-import com.ichi2.anki.IntentHandler.Companion.grantedStoragePermissions
 import com.ichi2.anki.RobolectricTest.Companion.advanceRobolectricLooper
 import com.ichi2.anki.RobolectricTest.Companion.advanceRobolectricLooperUntil
 import com.ichi2.anki.browser.BrowserColumnKey
 import com.ichi2.anki.browser.BrowserMultiColumnAdapter
 import com.ichi2.anki.browser.BrowserMultiColumnAdapter.Companion.LINES_VISIBLE_WHEN_COLLAPSED
+import com.ichi2.anki.browser.BrowserSearchFeedbackMode
 import com.ichi2.anki.browser.CardBrowserColumn
 import com.ichi2.anki.browser.CardBrowserColumn.DECK
 import com.ichi2.anki.browser.CardBrowserColumn.QUESTION
@@ -57,13 +60,13 @@ import com.ichi2.anki.browser.CardBrowserViewModelTest
 import com.ichi2.anki.browser.CardOrNoteId
 import com.ichi2.anki.browser.FindAndReplaceDialogFragment
 import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ALL_FIELDS_AS_FIELD
-import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_FIELD
-import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_MATCH_CASE
-import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_ONLY_SELECTED_NOTES
-import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_REGEX
-import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_REPLACEMENT
-import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.ARG_SEARCH
 import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.REQUEST_FIND_AND_REPLACE
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.RESULT_FIELD
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.RESULT_MATCH_CASE
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.RESULT_ONLY_SELECTED_NOTES
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.RESULT_REGEX
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.RESULT_REPLACEMENT
+import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.RESULT_SEARCH
 import com.ichi2.anki.browser.FindAndReplaceDialogFragment.Companion.TAGS_AS_FIELD
 import com.ichi2.anki.browser.IdsFile
 import com.ichi2.anki.browser.column1
@@ -71,6 +74,8 @@ import com.ichi2.anki.browser.selectRowAtPosition
 import com.ichi2.anki.browser.setColumn
 import com.ichi2.anki.browser.setSelectedDeck
 import com.ichi2.anki.browser.toRowSelection
+import com.ichi2.anki.common.destinations.NoteEditorDestination
+import com.ichi2.anki.common.storage.grantedStoragePermissions
 import com.ichi2.anki.common.time.TimeManager
 import com.ichi2.anki.common.utils.isRunningAsUnitTest
 import com.ichi2.anki.dialogs.DeckSelectionDialog
@@ -102,12 +107,11 @@ import com.ichi2.testutils.ext.snackbarText
 import com.ichi2.testutils.getSharedPrefs
 import com.ichi2.testutils.parcelledCopy
 import com.ichi2.testutils.saveState
+import com.ichi2.testutils.withSplitPaneUi
 import com.ichi2.testutils.withSplitPaneUiAsync
 import com.ichi2.utils.LanguageUtil
 import io.mockk.every
-import io.mockk.mockkObject
 import io.mockk.mockkStatic
-import io.mockk.unmockkObject
 import io.mockk.unmockkStatic
 import kotlinx.coroutines.runBlocking
 import org.hamcrest.CoreMatchers.allOf
@@ -473,7 +477,7 @@ class CardBrowserTest : RobolectricTest() {
     fun startupFromCardBrowserActionItemShouldEndActivityIfNoPermissions() {
         try {
             mockkStatic(::isRunningAsUnitTest)
-            mockkObject(IntentHandler)
+            mockkStatic("com.ichi2.anki.common.storage.LegacyStorageKt")
 
             every { grantedStoragePermissions(any(), any()) } returns false
             every { isRunningAsUnitTest } returns false
@@ -485,7 +489,7 @@ class CardBrowserTest : RobolectricTest() {
             assertThat("Activity should be finishing", cardBrowser.isFinishing)
         } finally {
             unmockkStatic(::isRunningAsUnitTest)
-            unmockkObject(IntentHandler)
+            unmockkStatic("com.ichi2.anki.common.storage.LegacyStorageKt")
         }
     }
 
@@ -526,7 +530,8 @@ class CardBrowserTest : RobolectricTest() {
                     CardBrowserViewModel.SearchState.Completed(
                         rowCount = count,
                         cardsOrNotes = mode,
-                        resultMessage = CardBrowserViewModel.SearchResultMessage.CardCount(includeSearchAllDecksAction = false),
+                        feedbackMode = BrowserSearchFeedbackMode.SEARCH_RESULTS,
+                        allDecksSelected = true,
                     )
                 assertThat(search.formatCardCount(targetContext.resources), equalTo(expected))
             }
@@ -832,8 +837,8 @@ class CardBrowserTest : RobolectricTest() {
             b.supportFragmentManager.setFragmentResult(
                 ForgetCardsDialog.REQUEST_KEY_FORGET,
                 Bundle().apply {
-                    putBoolean(ForgetCardsDialog.ARG_RESTORE_ORIGINAL, true)
-                    putBoolean(ForgetCardsDialog.ARG_RESET_REPETITION, false)
+                    putBoolean(ForgetCardsDialog.RESULT_RESTORE_ORIGINAL, true)
+                    putBoolean(ForgetCardsDialog.RESULT_RESET_REPETITION, false)
                 },
             )
 
@@ -1296,15 +1301,8 @@ class CardBrowserTest : RobolectricTest() {
     }
 
     @Test
-    @Ignore("Issue 22065: search task starts while activity is finishing")
     fun `deck id is remembered - issue 15072`() =
         runTest {
-            // WARN: This doesn't mirror reality due to the use of coroutines
-            // in the issue, selectDeckAndSave() was called AFTER the search had been performed
-            // due to this being called immediately in a test-based context
-
-            // We're going to move this functionality entirely to the ViewModel over the next few weeks
-            // so this test should be updated and working after the refactorings are completed
             addBasicNote().moveToDeck("First")
             addBasicNote().moveToDeck("Second")
 
@@ -1314,6 +1312,8 @@ class CardBrowserTest : RobolectricTest() {
                 viewModel.setSelectedDeck(secondDeckId)
                 assertThat(viewModel.deckId, equalTo(secondDeckId))
                 finish()
+                // Pending search updates must not start tasks for the finishing browser.
+                advanceRobolectricLooper()
             }
 
             browserWithNoNewCards.apply {
@@ -1878,8 +1878,7 @@ class CardBrowserTest : RobolectricTest() {
                     R.id.action_copy_note to true,
                     R.id.action_font_size to true,
                     R.id.action_capitalize to true,
-                    R.id.action_show_toolbar to true,
-                    R.id.action_scroll_toolbar to true,
+                    R.id.action_toolbar_layout to true,
                     R.id.action_toggle_previewer to false,
                 )
 
@@ -1922,8 +1921,7 @@ class CardBrowserTest : RobolectricTest() {
                     R.id.action_copy_note to true,
                     R.id.action_font_size to true,
                     R.id.action_capitalize to true,
-                    R.id.action_show_toolbar to true,
-                    R.id.action_scroll_toolbar to true,
+                    R.id.action_toolbar_layout to true,
                     R.id.action_toggle_previewer to false,
                 )
 
@@ -1967,6 +1965,29 @@ class CardBrowserTest : RobolectricTest() {
             )
         }
 
+    @Test
+    @Config(qualifiers = "w1024dp-h768dp")
+    fun `resizing the note editor's panes does not resize the split browser`() {
+        withSplitPaneUi {
+            val noteEditor =
+                startActivityNormallyOpenCollectionWithIntent(
+                    NoteEditorActivity::class.java,
+                    NoteEditorDestination.AddNote().toIntent(targetContext),
+                )
+            advanceRobolectricLooper()
+            noteEditor.findViewById<View>(R.id.note_editor_resizing_divider).dragBy(-100f)
+        }
+
+        withBrowser(noteCount = 1, fragmented = true) {
+            val editorPane = findViewById<View>(R.id.note_editor_frame)
+            assertThat(
+                "the browser's editor pane keeps its default weight",
+                (editorPane.layoutParams as LinearLayout.LayoutParams).weight,
+                equalTo(2f),
+            )
+        }
+    }
+
     @Test
     fun `deck chip performs a search`() {
         // The deck chip uses `DeckSelectionListener`, which uses a different code path
@@ -2112,13 +2133,13 @@ class CardBrowserTest : RobolectricTest() {
         supportFragmentManager.setFragmentResult(
             REQUEST_FIND_AND_REPLACE,
             Bundle().apply {
-                putString(ARG_SEARCH, search)
-                putString(ARG_REPLACEMENT, replacement)
-                putString(ARG_FIELD, field)
-                putBoolean(ARG_ONLY_SELECTED_NOTES, onlyInSelectedNotes)
+                putString(RESULT_SEARCH, search)
+                putString(RESULT_REPLACEMENT, replacement)
+                putString(RESULT_FIELD, field)
+                putBoolean(RESULT_ONLY_SELECTED_NOTES, onlyInSelectedNotes)
                 // "Ignore case" checkbox text => when it's checked we pass false to the backend
-                putBoolean(ARG_MATCH_CASE, matchCase)
-                putBoolean(ARG_REGEX, regex)
+                putBoolean(RESULT_MATCH_CASE, matchCase)
+                putBoolean(RESULT_REGEX, regex)
             },
         )
     }
@@ -2204,6 +2225,18 @@ fun setCardBrowserFragmented(value: Boolean) = Prefs.putBoolean(R.string.dev_car
 
 fun setUsingSearchView(value: Boolean) = Prefs.putBoolean(R.string.dev_card_browser_search_view, value)
 
+private fun View.dragBy(dx: Float) {
+    val downTime = SystemClock.uptimeMillis()
+    for ((action, x) in listOf(MotionEvent.ACTION_DOWN to 0f, MotionEvent.ACTION_MOVE to dx, MotionEvent.ACTION_UP to dx)) {
+        val event = MotionEvent.obtain(downTime, downTime, action, x, 0f, 0)
+        try {
+            dispatchTouchEvent(event)
+        } finally {
+            event.recycle()
+        }
+    }
+}
+
 private fun CardBrowser.rerenderAllCards() {
     cardBrowserFragment.cardsAdapter.notifyDataSetChanged()
     advanceRobolectricLooper()
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateEditorScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateEditorScreenshotTest.kt
index 91d54f0489ef..1e9b7f2bcdad 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateEditorScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateEditorScreenshotTest.kt
@@ -6,6 +6,7 @@ import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import androidx.appcompat.app.AlertDialog
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsCompat.Type.displayCutout
@@ -13,13 +14,17 @@ import androidx.core.view.WindowInsetsCompat.Type.navigationBars
 import androidx.core.view.WindowInsetsCompat.Type.statusBars
 import androidx.test.core.app.ActivityScenario
 import com.google.testing.junit.testparameterinjector.TestParameter
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.testutils.dispatchInsets
 import com.ichi2.testutils.insetsOf
 import com.ichi2.testutils.simulateKeyboard
-import com.ichi2.utils.dp
+import com.ichi2.utils.getInputField
+import com.ichi2.utils.positiveButton
 import org.junit.Assert.assertFalse
 import org.junit.Test
 import org.robolectric.RuntimeEnvironment
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.shadows.ShadowDialog
 
 /**
  * Screenshot tests for [CardTemplateEditor]
@@ -27,6 +32,37 @@ import org.robolectric.RuntimeEnvironment
  * `./gradlew :AnkiDroid:recordRoborazziPlayDebug -Pscreenshot --tests "com.ichi2.anki.CardTemplateEditorScreenshotTest"`
  */
 class CardTemplateEditorScreenshotTest : ScreenshotTest() {
+    @Test
+    fun repositionFullSyncConfirmation() =
+        withCardTemplateEditor(col.notetypes.basicAndReversed) {
+            col.setSchemaModified()
+            col.db.execute("update col set ls = scm")
+            shadowOf(this).clickMenuItem(R.id.action_reposition)
+            advanceRobolectricLooper()
+            val dialog = ShadowDialog.getLatestDialog() as AlertDialog
+            dialog.getInputField().setText("2")
+            dialog.positiveButton.performClick()
+            advanceRobolectricLooper()
+            captureScreen("reposition_full_sync_confirmation")
+        }
+
+    @Test
+    fun reposition() =
+        withCardTemplateEditor(col.notetypes.basicAndReversed) {
+            openOptionsMenu()
+            advanceRobolectricLooper()
+            captureScreen("reposition_menu")
+            closeOptionsMenu()
+            shadowOf(this).clickMenuItem(R.id.action_reposition)
+            advanceRobolectricLooper()
+            val dialog = ShadowDialog.getLatestDialog() as AlertDialog
+            dialog.getInputField().setText("2")
+            captureScreen("reposition_dialog")
+            dialog.positiveButton.performClick()
+            advanceRobolectricLooper()
+            captureScreen("reposition_result")
+        }
+
     @Test
     fun basic() {
         val collectionBasicNoteTypeOriginal = getCurrentDatabaseNoteTypeCopy("Basic")
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateEditorTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateEditorTest.kt
index ab14fc41ff5d..19ae5f006546 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateEditorTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateEditorTest.kt
@@ -10,14 +10,18 @@ import android.os.Looper
 import android.view.KeyEvent
 import android.view.View
 import android.widget.EditText
+import androidx.lifecycle.ViewModelProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.CardTemplateEditor.CardTemplateFragment
 import com.ichi2.anki.CardTemplateEditor.CardTemplateFragment.CardTemplate
 import com.ichi2.anki.CollectionManager.withCol
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.common.utils.ext.deepClonedInto
 import com.ichi2.anki.dialogs.InsertFieldDialog
+import com.ichi2.anki.dialogs.InsertFieldDialogViewModel
 import com.ichi2.anki.libanki.CardOrdinal
 import com.ichi2.anki.libanki.NotetypeJson
+import com.ichi2.anki.libanki.Notetypes
 import com.ichi2.anki.libanki.testutils.ext.addNote
 import com.ichi2.anki.model.SelectableDeck
 import com.ichi2.anki.notetype.ManageNoteTypesState.CardEditor
@@ -27,7 +31,6 @@ import com.ichi2.anki.scheduling.selectTab
 import com.ichi2.testutils.assertFalse
 import com.ichi2.testutils.dispatchInsets
 import com.ichi2.testutils.withSplitPaneUi
-import com.ichi2.utils.dp
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.positiveButton
 import org.hamcrest.CoreMatchers.equalTo
@@ -47,9 +50,55 @@ import kotlin.test.junit5.JUnit5Asserter.assertNotEquals
 import kotlin.test.junit5.JUnit5Asserter.assertNotNull
 import kotlin.test.junit5.JUnit5Asserter.assertNull
 import kotlin.test.junit5.JUnit5Asserter.assertTrue
+import kotlin.time.Duration
 
 @RunWith(AndroidJUnit4::class)
 class CardTemplateEditorTest : RobolectricTest() {
+    @Test
+    fun `field insertion previews the original card after an unsaved deletion`() {
+        val note = addBasicAndReversedNote()
+        val reverseCardId = note.cards().single { it.ord == 1 }.id
+        val intent = CardTemplateEditor.getIntent(targetContext, col.notetypes.basicAndReversed.id, note.id)
+        val editor = startActivityNormallyOpenCollectionWithIntent(CardTemplateEditor::class.java, intent)
+
+        with(editor) {
+            deleteSelectedCardType()
+            currentFragment!!.showInsertFieldDialog()
+            advanceRobolectricLooper()
+            val dialog = supportFragmentManager.fragments.filterIsInstance<InsertFieldDialog>().single()
+            val metadata = ViewModelProvider(dialog)[InsertFieldDialogViewModel::class.java].metadata
+
+            assertEquals("The preview should use the surviving card", reverseCardId, metadata.cardId)
+        }
+    }
+
+    @Test
+    fun `deletion confirmation counts the original card type after an unsaved deletion`() {
+        val noteType = col.notetypes.basicAndReversed
+        val spare =
+            Notetypes.newTemplate("Spare").apply {
+                qfmt = "{{Front}} spare"
+                afmt = "{{Back}}"
+            }
+        col.notetypes.addTemplate(noteType, spare)
+        addBasicAndReversedNote("one", "back")
+        addBasicAndReversedNote("two", "")
+
+        withCardTemplateEditor(noteType) {
+            deleteSelectedCardType()
+            selectTab(0)
+            advanceRobolectricLooper()
+            assertTrue("Unable to delete the card type", shadowOf(this).clickMenuItem(R.id.action_delete))
+            advanceRobolectricLooper()
+
+            assertEquals(
+                "The remaining reverse card type has one card in the database",
+                getQuantityString(CommonPlurals.card_template_editor_confirm_delete, 1, 1, "Card 2"),
+                getAlertDialogText(true),
+            )
+        }
+    }
+
     @Test
     fun `change detection does not serialize the note type - Issue 21912`() {
         val original = col.notetypes.basic
@@ -275,7 +324,7 @@ class CardTemplateEditorTest : RobolectricTest() {
         // Assert.assertEquals("Wrong dialog shown?", "This will create NN cards. Proceed?", getDialogText());
         // clickDialogButton(WhichButton.POSITIVE);
         assertTrue("Note type should have changed", testEditor.noteTypeHasChanged())
-        assertEquals("Change not pending add?", 1, CardTemplateNotetype.getAdjustedAddOrdinalAtChangeIndex(testEditor.tempNoteType!!, 0))
+        assertNull("New templates have no database ordinal", testEditor.tempNoteType!!.getOriginalOrdinal(1))
         assertFalse("Ordinal pending add?", testEditor.tempNoteType.isOrdinalPendingAdd(0))
         assertTrue("Ordinal not pending add?", testEditor.tempNoteType.isOrdinalPendingAdd(1))
         assertEquals("Note type should have 2 templates now", 2, testEditor.tempNoteType!!.templateCount)
@@ -389,7 +438,7 @@ class CardTemplateEditorTest : RobolectricTest() {
                 getCurrentDatabaseNoteTypeCopy(noteTypeName).toString().trim(),
             )
             assertFalse("Ordinal pending add?", testEditor.tempNoteType.isOrdinalPendingAdd(0))
-            assertEquals("Change incorrectly added to list?", 0, testEditor.templateChangeCount)
+            assertFalse("A blocked deletion must not change the note type", testEditor.noteTypeHasChanged())
 
             // Assert can delete 'Card 2'
             assertNotNull("Cannot delete unused template?", collectionBasicNoteTypeOriginal.getCardIds(1))
@@ -480,11 +529,7 @@ class CardTemplateEditorTest : RobolectricTest() {
             // the templates must be different
             testEditor.tempNoteType!!.getTemplate(2).qfmt += "different_template"
             assertTrue("Note type should have changed", testEditor.noteTypeHasChanged())
-            assertEquals(
-                "Change added but not adjusted correctly?",
-                2,
-                CardTemplateNotetype.getAdjustedAddOrdinalAtChangeIndex(testEditor.tempNoteType!!, 0),
-            )
+            assertNull("New templates have no database ordinal", testEditor.tempNoteType!!.getOriginalOrdinal(2))
             assertFalse("Ordinal pending add?", testEditor.tempNoteType.isOrdinalPendingAdd(0))
             assertFalse("Ordinal pending add?", testEditor.tempNoteType.isOrdinalPendingAdd(1))
             assertTrue("Ordinal not pending add?", testEditor.tempNoteType.isOrdinalPendingAdd(2))
@@ -516,22 +561,14 @@ class CardTemplateEditorTest : RobolectricTest() {
 
             // Add another template - but we work in memory for a while before saving
             addCardType(testEditor, shadowTestEditor)
-            assertEquals(
-                "Change added but not adjusted correctly?",
-                3,
-                CardTemplateNotetype.getAdjustedAddOrdinalAtChangeIndex(testEditor.tempNoteType!!, 0),
-            )
+            assertNull("New templates have no database ordinal", testEditor.tempNoteType!!.getOriginalOrdinal(3))
             assertTrue("Note type should have changed", testEditor.noteTypeHasChanged())
             assertEquals("Note type should have 4 templates now", 4, testEditor.tempNoteType?.templateCount)
             assertFalse("Ordinal pending add?", testEditor.tempNoteType.isOrdinalPendingAdd(0))
             assertFalse("Ordinal pending add?", testEditor.tempNoteType.isOrdinalPendingAdd(1))
             assertFalse("Ordinal pending add?", testEditor.tempNoteType.isOrdinalPendingAdd(2))
             assertTrue("Ordinal not pending add?", testEditor.tempNoteType.isOrdinalPendingAdd(3))
-            assertEquals(
-                "Change added but not adjusted correctly?",
-                3,
-                CardTemplateNotetype.getAdjustedAddOrdinalAtChangeIndex(testEditor.tempNoteType!!, 0),
-            )
+            assertNull("New templates have no database ordinal", testEditor.tempNoteType!!.getOriginalOrdinal(3))
 
             // Delete two pre-existing templates for real now - but still without saving it out, should work fine
             advanceRobolectricLooper()
@@ -570,21 +607,7 @@ class CardTemplateEditorTest : RobolectricTest() {
                 collectionBasicNoteTypeOriginal.toString().trim(),
                 getCurrentDatabaseNoteTypeCopy(noteTypeName).toString().trim(),
             )
-            assertEquals(
-                "Change added but not adjusted correctly?",
-                1,
-                CardTemplateNotetype.getAdjustedAddOrdinalAtChangeIndex(testEditor.tempNoteType!!, 0),
-            )
-            assertEquals(
-                "Change incorrectly pending add?",
-                -1,
-                CardTemplateNotetype.getAdjustedAddOrdinalAtChangeIndex(testEditor.tempNoteType!!, 1),
-            )
-            assertEquals(
-                "Change incorrectly pending add?",
-                -1,
-                CardTemplateNotetype.getAdjustedAddOrdinalAtChangeIndex(testEditor.tempNoteType!!, 2),
-            )
+            assertNull("New templates have no database ordinal", testEditor.tempNoteType!!.getOriginalOrdinal(1))
 
             // Now confirm everything to persist it to the database
             assertTrue("Unable to click?", shadowTestEditor.clickMenuItem(R.id.action_confirm))
@@ -661,11 +684,7 @@ class CardTemplateEditorTest : RobolectricTest() {
             // Add a template - click add, click confirm for card add, click confirm again for full sync
             addCardType(testEditor, shadowTestEditor)
             assertTrue("Note type should have changed", testEditor.noteTypeHasChanged())
-            assertEquals(
-                "Change added but not adjusted correctly?",
-                1,
-                CardTemplateNotetype.getAdjustedAddOrdinalAtChangeIndex(testEditor.tempNoteType!!, 1),
-            )
+            assertNull("New templates have no database ordinal", testEditor.tempNoteType!!.getOriginalOrdinal(1))
             assertFalse("Ordinal pending add?", testEditor.tempNoteType.isOrdinalPendingAdd(0))
             assertTrue("Ordinal not pending add?", testEditor.tempNoteType.isOrdinalPendingAdd(1))
             assertEquals("Note type should have 2 templates", 2, testEditor.tempNoteType?.templateCount)
@@ -908,8 +927,8 @@ class CardTemplateEditorTest : RobolectricTest() {
                 shadowEditor.nextStartedActivity,
                 Activity.RESULT_OK,
                 Intent()
-                    .putExtra(CardTemplateBrowserAppearanceEditor.INTENT_QUESTION_FORMAT, "q")
-                    .putExtra(CardTemplateBrowserAppearanceEditor.INTENT_ANSWER_FORMAT, "a"),
+                    .putExtra(CardTemplateBrowserAppearanceEditor.EXTRA_QUESTION_FORMAT, "q")
+                    .putExtra(CardTemplateBrowserAppearanceEditor.EXTRA_ANSWER_FORMAT, "a"),
             )
             assertDiscardChangesDialogShown(shadowEditor)
         }
@@ -1069,7 +1088,7 @@ class CardTemplateEditorTest : RobolectricTest() {
         advanceRobolectricLooper()
 
         val resultBundle = Bundle()
-        resultBundle.putString(InsertFieldDialog.KEY_INSERTED_FIELD, expectedFieldText)
+        resultBundle.putString(InsertFieldDialog.RESULT_INSERTED_FIELD, expectedFieldText)
         testEditor.supportFragmentManager.setFragmentResult(firstFragmentAgain.insertFieldRequestKey, resultBundle)
         advanceRobolectricLooper()
 
@@ -1142,6 +1161,251 @@ class CardTemplateEditorTest : RobolectricTest() {
         }
     }
 
+    @Test
+    fun `adding a second card type still counts the notes`() {
+        addBasicNote()
+        val intent = Intent(Intent.ACTION_VIEW).putExtra("noteTypeId", col.notetypes.byName("Basic")!!.id)
+        val controller =
+            Robolectric
+                .buildActivity(CardTemplateEditor::class.java, intent)
+                .create()
+                .start()
+                .resume()
+                .visible()
+        saveControllerForCleanup(controller)
+        val editor = controller.get()
+
+        addCardType(editor, shadowOf(editor))
+        assertTrue("Unable to click?", shadowOf(editor).clickMenuItem(R.id.action_add))
+        advanceRobolectricLooper()
+        assertEquals(
+            "Adding from a new card type should count the notes",
+            getQuantityString(CommonPlurals.card_template_editor_confirm_add, 1, 1),
+            getAlertDialogText(true),
+        )
+    }
+
+    @Test
+    fun `adding an optional reverse template with an empty condition creates no cards`() {
+        val noteType = col.notetypes.byName("Basic (optional reversed card)")!!
+        val note = col.newNote(noteType)
+        note.setField(0, "Front")
+        note.setField(1, "Back")
+        note.setField(2, "")
+        col.addNote(note)
+        assertEquals("Only the forward card should exist", 1, getNoteTypeCardCount(noteType))
+
+        withCardTemplateEditor(noteType) {
+            selectTab(1)
+            advanceRobolectricLooper()
+            assertEquals("The optional reverse template should be selected", 1, selectedTabPosition)
+
+            assertTrue("Unable to add a card type", shadowOf(this).clickMenuItem(R.id.action_add))
+            advanceRobolectricLooper()
+            val confirmation = getAlertDialogText(true)
+            clickAlertDialogButton { positiveButton }
+            assertEquals("The duplicate template should be added", 3, tempNoteType!!.templateCount)
+
+            // Saving rejects identical fronts. Keep the empty condition while making the new front distinct.
+            advanceRobolectricLooper()
+            templateFragment(2).binding.editText.setText("{{#Add Reverse}}{{Front}} {{Back}}{{/Add Reverse}}")
+
+            assertTrue("Unable to save the templates", shadowOf(this).clickMenuItem(R.id.action_confirm))
+            advanceRobolectricLooper()
+            val savedNoteType = col.notetypes.get(noteType.id)!!
+            assertEquals("The duplicate template should be saved", 3, savedNoteType.templates.length())
+            assertEquals("An empty Add Reverse field should prevent generating another card", 1, getNoteTypeCardCount(noteType))
+            assertEquals(
+                "The confirmation must not promise a card that will not be generated",
+                getQuantityString(CommonPlurals.card_template_editor_confirm_add, 0, 0),
+                confirmation,
+            )
+        }
+    }
+
+    @Test
+    fun `adding from an unsaved optional reverse template creates no cards`() {
+        val noteType = col.notetypes.byName("Basic (optional reversed card)")!!
+        val note = col.newNote(noteType)
+        note.setField(0, "Front")
+        note.setField(1, "Back")
+        note.setField(2, "")
+        col.addNote(note)
+        assertEquals("Only the forward card should exist", 1, getNoteTypeCardCount(noteType))
+
+        withCardTemplateEditor(noteType) {
+            selectTab(1)
+            advanceRobolectricLooper()
+            addCardType(this, shadowOf(this))
+            advanceRobolectricLooper()
+            assertEquals("The first duplicate should be selected", 2, selectedTabPosition)
+            assertTrue(
+                "The selected template must be unsaved",
+                CardTemplateNotetype.isOrdinalPendingAdd(tempNoteType!!, selectedTabPosition),
+            )
+
+            // Keep the empty condition, but make each front distinct so saving succeeds.
+            templateFragment(2).binding.editText.setText("{{#Add Reverse}}{{Front}} {{Back}}{{/Add Reverse}}")
+            assertTrue("Unable to add a card type", shadowOf(this).clickMenuItem(R.id.action_add))
+            advanceRobolectricLooper()
+            val confirmation = getAlertDialogText(true)
+            clickAlertDialogButton { positiveButton }
+            advanceRobolectricLooper()
+            assertEquals("The second duplicate should be selected", 3, selectedTabPosition)
+            templateFragment(3).binding.editText.setText("{{#Add Reverse}}{{Back}} {{Front}}{{/Add Reverse}}")
+
+            assertTrue("Unable to save the templates", shadowOf(this).clickMenuItem(R.id.action_confirm))
+            advanceRobolectricLooper()
+            assertEquals(
+                "Both new templates should be saved",
+                4,
+                col.notetypes
+                    .get(noteType.id)!!
+                    .templates
+                    .length(),
+            )
+            assertEquals("Neither conditional template should generate cards", 1, getNoteTypeCardCount(noteType))
+            assertEquals(
+                "Adding from an unsaved conditional template must not promise a card that will not be generated",
+                getQuantityString(CommonPlurals.card_template_editor_confirm_add, 0, 0),
+                confirmation,
+            )
+        }
+    }
+
+    @Test
+    fun `adding from a broken template does not crash`() {
+        addBasicAndReversedNote()
+        withCardTemplateEditor(col.notetypes.basicAndReversed) {
+            templateFragment(0).binding.editText.setText("{{#Front}}")
+            assertTrue("Unable to add a card type", shadowOf(this).clickMenuItem(R.id.action_add))
+            advanceRobolectricLooper()
+            assertEquals(
+                "A broken template should not create cards",
+                getQuantityString(CommonPlurals.card_template_editor_confirm_add, 0, 0),
+                getAlertDialogText(true),
+            )
+        }
+    }
+
+    @Test
+    fun `adding a template with a card number condition counts generated cards`() {
+        addBasicAndReversedNote()
+        val noteType = col.notetypes.basicAndReversed
+        val initialCardCount = getNoteTypeCardCount(noteType)
+        assertEquals("Both original cards should exist", 2, initialCardCount)
+
+        withCardTemplateEditor(noteType) {
+            // Preview supplies c3 for the new template, but card generation does not.
+            templateFragment(0).binding.editText.setText("{{#c3}}{{Front}}{{/c3}}")
+            assertTrue("Unable to add a card type", shadowOf(this).clickMenuItem(R.id.action_add))
+            advanceRobolectricLooper()
+            val confirmation = getAlertDialogText(true)
+            clickAlertDialogButton { positiveButton }
+            advanceRobolectricLooper()
+            assertEquals("The new template should be selected", 2, selectedTabPosition)
+
+            // Avoid identical fronts without changing the condition or field requirements.
+            templateFragment(2).binding.editText.setText("{{#c3}}{{Front}} extra{{/c3}}")
+            assertTrue("Unable to save the templates", shadowOf(this).clickMenuItem(R.id.action_confirm))
+            advanceRobolectricLooper()
+            assertEquals(
+                "The new template should be saved",
+                3,
+                col.notetypes
+                    .get(noteType.id)!!
+                    .templates
+                    .length(),
+            )
+            val createdCards = getNoteTypeCardCount(noteType) - initialCardCount
+            assertEquals("The card number condition should prevent generation", 0, createdCards)
+            assertEquals(
+                "The confirmation must count generated cards, not nonempty previews",
+                getQuantityString(CommonPlurals.card_template_editor_confirm_add, createdCards, createdCards),
+                confirmation,
+            )
+        }
+    }
+
+    @Test
+    fun `counting falls back to the note count when it times out`() {
+        val noteType = col.notetypes.byName("Basic (optional reversed card)")!!
+        val note = col.newNote(noteType)
+        note.setField(0, "Front")
+        note.setField(1, "Back")
+        col.addNote(note)
+        val reverseTemplate = noteType.templates[1]
+
+        assertEquals("No reverse card is created", 0, col.countCardsCreatedBy(noteType, reverseTemplate))
+        assertEquals("A timeout counts every note", 1, col.countCardsCreatedBy(noteType, reverseTemplate, timeout = Duration.ZERO))
+    }
+
+    @Test
+    fun `a failed save does not add card types - Issue 19953`() {
+        addBasicNote()
+        val noteType = col.notetypes.basic
+        val savedNames = noteType.templatesNames
+
+        withCardTemplateEditor(noteType) {
+            repeat(2) {
+                assertTrue("Unable to add a card type", shadowOf(this).clickMenuItem(R.id.action_add))
+                advanceRobolectricLooper()
+                clickAlertDialogButton { positiveButton }
+                advanceRobolectricLooper()
+            }
+            assertEquals("The new card types should share a front", tempNoteType!!.getTemplate(1).qfmt, tempNoteType!!.getTemplate(2).qfmt)
+
+            throwOnShowError = false
+            saveChanges()
+            assertEquals("A failed save must not add card types", savedNames, col.notetypes.get(noteType.id)!!.templatesNames)
+
+            templateFragment(2).binding.editText.setText("{{Back}} {{Front}}")
+            val editedNames = tempNoteType!!.notetype.templatesNames
+            saveChanges()
+            assertEquals("Saving again should add each card type once", editedNames, col.notetypes.get(noteType.id)!!.templatesNames)
+        }
+    }
+
+    @Test
+    fun `deleting the first card type keeps the cards of the second`() {
+        val note = addBasicAndReversedNote()
+        val reverseCardId = note.cards().single { it.ord == 1 }.id
+
+        withCardTemplateEditor(col.notetypes.basicAndReversed) {
+            deleteSelectedCardType()
+            saveChanges()
+        }
+
+        assertEquals("Only the deleted card type's card should be removed", listOf(reverseCardId), note.cids())
+    }
+
+    @Test
+    fun `deleting the first card type keeps the cards of the second after recreation`() {
+        val note = addBasicAndReversedNote()
+        val reverseCardId = note.cards().single { it.ord == 1 }.id
+        val intent = CardEditor(ntid = col.notetypes.basicAndReversed.id).toIntent(targetContext)
+        val controller = startActivityControllerNormallyOpenCollectionWithIntent(CardTemplateEditor::class.java, intent)
+
+        controller.get().deleteSelectedCardType()
+        controller.recreate()
+        advanceRobolectricLooper()
+        controller.get().saveChanges()
+
+        assertEquals("Only the deleted card type's card should be removed", listOf(reverseCardId), note.cids())
+    }
+
+    private fun CardTemplateEditor.deleteSelectedCardType() {
+        assertTrue("Unable to delete the card type", shadowOf(this).clickMenuItem(R.id.action_delete))
+        advanceRobolectricLooper()
+        clickAlertDialogButton { positiveButton }
+        advanceRobolectricLooper()
+    }
+
+    private fun CardTemplateEditor.saveChanges() {
+        assertTrue("Unable to save", shadowOf(this).clickMenuItem(R.id.action_confirm))
+        advanceRobolectricLooper()
+    }
+
     private fun CardTemplateEditor.templateFragment(ord: Int) = supportFragmentManager.findFragmentByTag("f$ord") as CardTemplateFragment
 
     private fun addCardType(
@@ -1214,9 +1478,6 @@ Hello World{{Front}}
         return CardTemplateNotetype.isOrdinalPendingAdd(this, ordinal)
     }
 
-    private val CardTemplateEditor.templateChangeCount
-        get() = tempNoteType?.templateChanges?.size
-
     private suspend fun NotetypeJson.getCardIds(vararg ords: Int): List<Long>? = withCol { notetypes.getCardIdsForNoteType(id, ords) }
 }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateNotetypeTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateNotetypeTest.kt
index 6201f6aa4ea1..6bc4c2c4b8f0 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateNotetypeTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateNotetypeTest.kt
@@ -4,26 +4,45 @@
 package com.ichi2.anki
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.CardTemplateNotetype.ChangeType.ADD
-import com.ichi2.anki.CardTemplateNotetype.ChangeType.DELETE
-import com.ichi2.anki.CardTemplateNotetype.TemplateChange
-import com.ichi2.anki.compat.CompatHelper.Companion.getSerializableCompat
 import com.ichi2.anki.libanki.NotetypeJson
+import com.ichi2.anki.libanki.Notetypes
+import com.ichi2.anki.libanki.utils.append
+import com.ichi2.anki.libanki.utils.remove
+import net.ankiweb.rsdroid.BackendException
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
 import timber.log.Timber
-import java.io.ByteArrayInputStream
-import java.io.ByteArrayOutputStream
 import java.io.IOException
-import java.io.ObjectInputStream
-import java.io.ObjectOutputStream
-import java.io.Serializable
 import kotlin.test.junit5.JUnit5Asserter.assertNotNull
+import kotlin.test.junit5.JUnit5Asserter.assertNull
 
 @RunWith(AndroidJUnit4::class)
 class CardTemplateNotetypeTest : RobolectricTest() {
+    @Test
+    fun `failed validation preserves a bundle saved before the save attempt`() =
+        runTest {
+            val original = col.notetypes.basicAndReversed
+            val edited = CardTemplateNotetype(original.deepClone())
+            edited.getTemplate(0).qfmt = "{{Missing}}"
+            val state = edited.toBundle()
+
+            try {
+                edited.saveToDatabase()
+                Assert.fail("An unknown field must fail validation")
+            } catch (_: BackendException) {
+                // The saved bundle must remain usable after validation fails.
+            }
+
+            val restored = CardTemplateNotetype.fromBundle(state)
+            assertNotNull("Failed validation must preserve the saved editor state", restored)
+            Assert.assertEquals(edited.notetype.toString(), restored!!.notetype.toString())
+            restored.getTemplate(0).qfmt = original.templates[0].qfmt
+            restored.saveToDatabase()
+            assertNull("A successful save should clear the temporary file", CardTemplateNotetype.fromBundle(state))
+        }
+
     @Test
     @Throws(Exception::class)
     fun testTempNoteTypeStorage() {
@@ -55,146 +74,117 @@ class CardTemplateNotetypeTest : RobolectricTest() {
     }
 
     @Test
-    fun testTemplateChangeSerialization() {
-        // Create a list of changes with both ADD and DELETE types
-        val original =
-            arrayListOf(
-                TemplateChange(0, ADD),
-                TemplateChange(1, DELETE),
-                TemplateChange(2, ADD),
-            )
+    fun `deletion checks preserve database ordinals across additions and deletions`() {
+        val edited = CardTemplateNotetype(col.notetypes.basicAndReversed.deepClone())
+        edited.appendTemplate("Third")
+        edited.appendTemplate("Fourth")
+        edited.deleteTemplate(1)
+        edited.deleteTemplate(1)
+
+        Assert.assertArrayEquals(intArrayOf(1, 0), edited.getDeleteDbOrds(0))
+        Assert.assertEquals(0, edited.getOriginalOrdinal(0))
+        assertNull("An unsaved addition must have no database ordinal", edited.getOriginalOrdinal(1))
+        Assert.assertTrue(CardTemplateNotetype.isOrdinalPendingAdd(edited, 1))
+
+        val restored = CardTemplateNotetype.fromBundle(edited.toBundle())!!
+        Assert.assertArrayEquals(intArrayOf(1), restored.getDeleteDbOrds(1))
+        restored.deleteTemplate(1)
+        restored.appendTemplate("Replacement")
+        Assert.assertArrayEquals(intArrayOf(1, 0), restored.getDeleteDbOrds(0))
+        Assert.assertTrue(CardTemplateNotetype.isOrdinalPendingAdd(restored, 1))
+    }
 
-        // Serialize the list to bytes (this is what Bundle.putSerializable does)
-        val byteOutput = ByteArrayOutputStream()
-        ObjectOutputStream(byteOutput).use {
-            it.writeObject(original)
-        }
-        val bytes = byteOutput.toByteArray()
-
-        // Deserialize back from bytes (this is what Bundle.getSerializable does)
-        @Suppress("UNCHECKED_CAST")
-        val deserialized =
-            ObjectInputStream(ByteArrayInputStream(bytes)).use {
-                it.readObject()
-            } as ArrayList<TemplateChange>
-
-        // Verify the deserialized data matches the original
-        Assert.assertEquals("list size should match", original.size, deserialized.size)
-        for (i in original.indices) {
-            Assert.assertEquals("ordinal at $i", original[i].ordinal, deserialized[i].ordinal)
-            Assert.assertEquals("type at $i", original[i].type, deserialized[i].type)
+    @Test
+    fun `deletion checks retain the order of multiple original deletions`() {
+        val notetype = col.notetypes.basicAndReversed.deepClone()
+        for (name in listOf("Third", "Fourth")) {
+            notetype.templates.append(Notetypes.newTemplate(name))
         }
+        Notetypes._updateTemplOrds(notetype)
+        val edited = CardTemplateNotetype(notetype)
+        edited.deleteTemplate(1)
+        edited.deleteTemplate(0)
+
+        Assert.assertArrayEquals(intArrayOf(1, 0, 2), edited.getDeleteDbOrds(0))
+        Assert.assertEquals(2, edited.getOriginalOrdinal(0))
+        Assert.assertEquals(3, edited.getOriginalOrdinal(1))
     }
 
     @Test
-    fun testAddDeleteTracking() {
-        // Assume you start with a 2 template model (like "Basic (and reversed)")
-        // Add a 3rd new template, remove the 2nd, remove the 1st, add a new now-2nd, remove 1st again
-        // ...and it should reduce to just removing the original 1st/2nd and adding the final as first
-        val tempNotetype = CardTemplateNotetype(NotetypeJson("{ \"foo\": \"bar\" }"))
-
-        tempNotetype.addTemplateChange(ADD, 3)
-        val expected1 = arrayOf(TemplateChange(3, ADD))
-        // 3 templates and one change now
-        assertTemplateChangesEqual(expected1, tempNotetype.templateChanges)
-        assertTemplateChangesEqual(expected1, tempNotetype.adjustedTemplateChanges)
-        Assert.assertArrayEquals(intArrayOf(3), tempNotetype.getDeleteDbOrds(3))
-
-        tempNotetype.addTemplateChange(DELETE, 2)
-        // 2 templates and two changes now
-        val expected2 = arrayOf(TemplateChange(3, ADD), TemplateChange(2, DELETE))
-        val adjExpected2 = arrayOf(TemplateChange(2, ADD), TemplateChange(2, DELETE))
-        assertTemplateChangesEqual(expected2, tempNotetype.templateChanges)
-        assertTemplateChangesEqual(adjExpected2, tempNotetype.adjustedTemplateChanges)
-        Assert.assertArrayEquals(intArrayOf(2, 4), tempNotetype.getDeleteDbOrds(3))
-
-        tempNotetype.addTemplateChange(DELETE, 1)
-        // 1 template and three changes now
-        Assert.assertArrayEquals(intArrayOf(2, 1, 5), tempNotetype.getDeleteDbOrds(3))
-        val expected3 = arrayOf(TemplateChange(3, ADD), TemplateChange(2, DELETE), TemplateChange(1, DELETE))
-        val adjExpected3 = arrayOf(TemplateChange(1, ADD), TemplateChange(2, DELETE), TemplateChange(1, DELETE))
-        assertTemplateChangesEqual(expected3, tempNotetype.templateChanges)
-        assertTemplateChangesEqual(adjExpected3, tempNotetype.adjustedTemplateChanges)
-
-        tempNotetype.addTemplateChange(ADD, 2)
-        // 2 templates and 4 changes now
-        Assert.assertArrayEquals(intArrayOf(2, 1, 5), tempNotetype.getDeleteDbOrds(3))
-        val expected4 = arrayOf(TemplateChange(3, ADD), TemplateChange(2, DELETE), TemplateChange(1, DELETE), TemplateChange(2, ADD))
-        val adjExpected4 = arrayOf(TemplateChange(1, ADD), TemplateChange(2, DELETE), TemplateChange(1, DELETE), TemplateChange(2, ADD))
-        assertTemplateChangesEqual(expected4, tempNotetype.templateChanges)
-        assertTemplateChangesEqual(adjExpected4, tempNotetype.adjustedTemplateChanges)
-
-        // Make sure we can resurrect these changes across lifecycle
-        val outBundle = tempNotetype.toBundle()
-        assertTemplateChangesEqual(expected4, outBundle.getSerializableCompat("mTemplateChanges"))
-
-        // This is the hard part. We will delete a template we added so everything shifts.
-        // The template currently at ordinal 1 was added as template 3 at the start before it slid down on the deletes
-        // So the first template add should be negated by this delete, and the second template add should slide down to 1
-        tempNotetype.addTemplateChange(DELETE, 1)
-        // 1 template and 3 changes now (the delete just cancelled out one of the adds)
-        Assert.assertArrayEquals(intArrayOf(2, 1, 5), tempNotetype.getDeleteDbOrds(3))
-        val expected5 = arrayOf(TemplateChange(2, DELETE), TemplateChange(1, DELETE), TemplateChange(1, ADD))
-        val adjExpected5 = arrayOf(TemplateChange(2, DELETE), TemplateChange(1, DELETE), TemplateChange(1, ADD))
-        assertTemplateChangesEqual(expected5, tempNotetype.templateChanges)
-        assertTemplateChangesEqual(adjExpected5, tempNotetype.adjustedTemplateChanges)
-
-        tempNotetype.addTemplateChange(ADD, 2)
-        // 2 template and 4 changes now (the delete just cancelled out one of the adds)
-        Assert.assertArrayEquals(intArrayOf(2, 1, 5), tempNotetype.getDeleteDbOrds(3))
-        val expected6 = arrayOf(TemplateChange(2, DELETE), TemplateChange(1, DELETE), TemplateChange(1, ADD), TemplateChange(2, ADD))
-        val adjExpected6 = arrayOf(TemplateChange(2, DELETE), TemplateChange(1, DELETE), TemplateChange(1, ADD), TemplateChange(2, ADD))
-        assertTemplateChangesEqual(expected6, tempNotetype.templateChanges)
-        assertTemplateChangesEqual(adjExpected6, tempNotetype.adjustedTemplateChanges)
-
-        tempNotetype.addTemplateChange(ADD, 3)
-        // 2 template and 4 changes now (the delete just cancelled out one of the adds)
-        Assert.assertArrayEquals(intArrayOf(2, 1, 5), tempNotetype.getDeleteDbOrds(3))
-        val expected7 =
-            arrayOf(
-                TemplateChange(2, DELETE),
-                TemplateChange(1, DELETE),
-                TemplateChange(1, ADD),
-                TemplateChange(2, ADD),
-                TemplateChange(3, ADD),
-            )
-        val adjExpected7 =
-            arrayOf(
-                TemplateChange(2, DELETE),
-                TemplateChange(1, DELETE),
-                TemplateChange(1, ADD),
-                TemplateChange(2, ADD),
-                TemplateChange(3, ADD),
+    fun `all reposition destinations preserve the cards belonging to each template`() =
+        runTest {
+            val original = col.notetypes.basicAndReversed
+            col.notetypes.addTemplate(
+                original,
+                Notetypes.newTemplate("Third").apply {
+                    qfmt = "{{Front}} third"
+                    afmt = "{{Back}}"
+                },
             )
-        assertTemplateChangesEqual(expected7, tempNotetype.templateChanges)
-        assertTemplateChangesEqual(adjExpected7, tempNotetype.adjustedTemplateChanges)
-
-        tempNotetype.addTemplateChange(DELETE, 3)
-        // 1 template and 3 changes now (two deletes cancelled out adds)
-        Assert.assertArrayEquals(intArrayOf(2, 1, 5), tempNotetype.getDeleteDbOrds(3))
-        val expected8 = arrayOf(TemplateChange(2, DELETE), TemplateChange(1, DELETE), TemplateChange(1, ADD), TemplateChange(2, ADD))
-        val adjExpected8 = arrayOf(TemplateChange(2, DELETE), TemplateChange(1, DELETE), TemplateChange(1, ADD), TemplateChange(2, ADD))
-        assertTemplateChangesEqual(expected8, tempNotetype.templateChanges)
-        assertTemplateChangesEqual(adjExpected8, tempNotetype.adjustedTemplateChanges)
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    private fun assertTemplateChangesEqual(
-        expected: Array<TemplateChange>,
-        actual: Serializable?,
-    ) {
-        if (actual !is ArrayList<*>) {
-            Assert.fail("actual array null or not the correct type")
+            val note = addBasicAndReversedNote()
+            val originalCards = note.cards().associate { it.id to it.template().name }
+            for (from in 0..2) {
+                for (to in 0..2) {
+                    if (from == to) continue
+                    val edited = CardTemplateNotetype(col.notetypes.get(original.id)!!.deepClone())
+                    val expectedNames = original.templatesNames.toMutableList()
+                    expectedNames.add(to, expectedNames.removeAt(from))
+                    edited.repositionTemplate(from, to)
+                    edited.saveToDatabase()
+
+                    Assert.assertEquals(expectedNames, col.notetypes.get(original.id)!!.templatesNames)
+                    Assert.assertEquals(originalCards, note.cards().associate { it.id to it.template().name })
+                    col.undo()
+                }
+            }
         }
-        Assert.assertEquals(
-            "arrays didn't have the same length?",
-            expected.size.toLong(),
-            (actual as ArrayList<TemplateChange>).size.toLong(),
-        )
-        for (i in expected.indices) {
-            val actualChange = actual[i]
-            Assert.assertEquals("ordinal at $i not correct?", expected[i].ordinal, actualChange.ordinal)
-            Assert.assertEquals("changeType at $i not correct?", expected[i].type, actualChange.type)
+
+    @Test
+    fun `mixed moves additions and deletions survive recreation and a failed save`() =
+        runTest {
+            val original = col.notetypes.basicAndReversed
+            val note = addBasicAndReversedNote()
+            val originalCards = note.cards().sortedBy { it.ord }
+            val edited = CardTemplateNotetype(original.deepClone())
+            edited.appendTemplate("New")
+            edited.getTemplate(2).apply {
+                qfmt = "{{Front}} new"
+                afmt = "{{Back}}"
+            }
+            edited.repositionTemplate(2, 0)
+            edited.deleteTemplate(2)
+            edited.repositionTemplate(1, 0)
+            Assert.assertArrayEquals(intArrayOf(1, 0), edited.getDeleteDbOrds(0))
+            Assert.assertTrue(CardTemplateNotetype.isOrdinalPendingAdd(edited, 1))
+            edited.getTemplate(0).qfmt = "{{Missing}}"
+
+            val restored = CardTemplateNotetype.fromBundle(edited.toBundle())!!
+            try {
+                restored.saveToDatabase()
+                Assert.fail("An unknown field must fail validation")
+            } catch (_: BackendException) {
+                Assert.assertEquals(originalCards.map { it.id }.toSet(), note.cids().toSet())
+            }
+            restored.getTemplate(0).qfmt = original.templates[0].qfmt
+            restored.saveToDatabase()
+
+            Assert.assertEquals(listOf("Card 1", "New"), col.notetypes.get(original.id)!!.templatesNames)
+            Assert.assertEquals(originalCards[0].id, note.cards().single { it.ord == 0 }.id)
+            Assert.assertFalse(note.cids().contains(originalCards[1].id))
+            Assert.assertEquals(2, note.cids().size)
+            col.undo()
+            Assert.assertEquals(originalCards.map { it.id }.toSet(), note.cids().toSet())
         }
+
+    private fun CardTemplateNotetype.appendTemplate(name: String) {
+        notetype.templates.append(Notetypes.newTemplate(name))
+        Notetypes._updateTemplOrds(notetype)
+        addNewTemplate()
+    }
+
+    private fun CardTemplateNotetype.deleteTemplate(ordinal: Int) {
+        removeTemplate(ordinal)
+        notetype.templates.remove(getTemplate(ordinal))
+        Notetypes._updateTemplOrds(notetype)
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateRepositionTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateRepositionTest.kt
new file mode 100644
index 000000000000..8c77f4f3d4dd
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardTemplateRepositionTest.kt
@@ -0,0 +1,312 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki
+
+import androidx.appcompat.app.AlertDialog
+import androidx.lifecycle.ViewModelProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.dialogs.InsertFieldDialog
+import com.ichi2.anki.dialogs.InsertFieldDialogViewModel
+import com.ichi2.anki.libanki.Notetypes
+import com.ichi2.anki.libanki.testutils.ext.addNote
+import com.ichi2.testutils.withSplitPaneUi
+import com.ichi2.utils.getInputField
+import com.ichi2.utils.negativeButton
+import com.ichi2.utils.positiveButton
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.shadows.ShadowDialog
+
+@RunWith(AndroidJUnit4::class)
+class CardTemplateRepositionTest : RobolectricTest() {
+    @Test
+    fun `reposition keeps edits and editor selection with the moved template`() {
+        withCardTemplateEditor(col.notetypes.basicAndReversed) {
+            val expectedFront = tempNoteType!!.getTemplate(0).qfmt + " unsaved edit"
+            currentFragment!!.binding.editText.setText(expectedFront)
+            currentFragment!!.binding.bottomNavigation.selectedItemId = R.id.back_edit
+            val expectedBack =
+                currentFragment!!
+                    .binding.editText.text
+                    .toString()
+            currentFragment!!.binding.editText.setSelection(4)
+
+            moveSelectedTemplateTo(2)
+
+            assertEquals(listOf("Card 2", "Card 1"), tempNoteType!!.notetype.templatesNames)
+            assertEquals(1, selectedTabPosition)
+            assertEquals(
+                "Card 1",
+                topBinding.slidingTabs
+                    .getTabAt(1)!!
+                    .text
+                    .toString(),
+            )
+            assertEquals(R.id.back_edit, currentFragment!!.binding.bottomNavigation.selectedItemId)
+            assertEquals(
+                expectedBack,
+                currentFragment!!
+                    .binding.editText.text
+                    .toString(),
+            )
+            assertEquals(4, currentFragment!!.binding.editText.selectionStart)
+            assertEquals(expectedFront, tempNoteType!!.getTemplate(1).qfmt)
+            assertEquals(0, tempNoteType!!.getOriginalOrdinal(1))
+            assertTrue(noteTypeHasChanged())
+            assertTrue(displayDiscardChangesCallback.isEnabled)
+
+            // Edits after the move must write to the new position, without changing the other template.
+            currentFragment!!.binding.editText.append(" moved back")
+            assertEquals(expectedBack + " moved back", tempNoteType!!.getTemplate(1).afmt)
+            assertEquals(
+                col.notetypes.basicAndReversed.templates[1]
+                    .afmt,
+                tempNoteType!!.getTemplate(0).afmt,
+            )
+
+            moveSelectedTemplateTo(1)
+            assertEquals(0, selectedTabPosition)
+            assertEquals(
+                expectedBack + " moved back",
+                currentFragment!!
+                    .binding.editText.text
+                    .toString(),
+            )
+        }
+    }
+
+    @Test
+    fun `saving a reposition preserves card identities and scheduling and supports undo`() =
+        runTest {
+            val note = addBasicAndReversedNote()
+            val originalCards = note.cards().sortedBy { it.ord }
+            val scheduledCard =
+                originalCards.first().apply {
+                    due = 123
+                    ivl = 7
+                }
+            col.updateCard(scheduledCard)
+
+            withCardTemplateEditor(col.notetypes.basicAndReversed) {
+                moveSelectedTemplateTo(2)
+                assertEquals(listOf("Card 1", "Card 2"), col.notetypes.basicAndReversed.templatesNames)
+                assertEquals(listOf(0, 1), originalCards.map { col.getCard(it.id).ord })
+                saveChanges()
+            }
+
+            assertEquals(listOf("Card 2", "Card 1"), col.notetypes.basicAndReversed.templatesNames)
+            assertEquals(listOf(1, 0), originalCards.map { col.getCard(it.id).ord })
+            assertEquals(123, col.getCard(scheduledCard.id).due)
+            assertEquals(7, col.getCard(scheduledCard.id).ivl)
+            assertEquals(originalCards.map { it.id }.toSet(), note.cids().toSet())
+
+            col.undo()
+            assertEquals(listOf("Card 1", "Card 2"), col.notetypes.basicAndReversed.templatesNames)
+            assertEquals(listOf(0, 1), originalCards.map { col.getCard(it.id).ord })
+            col.redo()
+            assertEquals(listOf(1, 0), originalCards.map { col.getCard(it.id).ord })
+        }
+
+    @Test
+    fun `deleting a moved template after recreation deletes only its cards`() {
+        val note = addBasicAndReversedNote()
+        val reverseCardId = note.cards().single { it.ord == 1 }.id
+        val intent = CardTemplateEditor.getIntent(targetContext, col.notetypes.basicAndReversed.id, note.id, ord = 0)
+        val controller = startActivityControllerNormallyOpenCollectionWithIntent(CardTemplateEditor::class.java, intent)
+
+        controller.get().moveSelectedTemplateTo(2)
+        controller.recreate()
+        advanceRobolectricLooper()
+        with(controller.get()) {
+            assertEquals(1, selectedTabPosition)
+            deleteSelectedTemplate()
+            saveChanges()
+        }
+
+        assertEquals(listOf(reverseCardId), note.cids())
+        assertEquals(listOf("Card 2"), col.notetypes.basicAndReversed.templatesNames)
+    }
+
+    @Test
+    fun `moving and deleting an unsaved addition preserves the original cards`() {
+        val note = addBasicAndReversedNote()
+        val originalIds = note.cids().toSet()
+        withCardTemplateEditor(col.notetypes.basicAndReversed) {
+            assertTrue(shadowOf(this).clickMenuItem(R.id.action_add))
+            advanceRobolectricLooper()
+            clickAlertDialogButton { positiveButton }
+            advanceRobolectricLooper()
+            assertEquals(2, selectedTabPosition)
+
+            moveSelectedTemplateTo(1)
+            assertTrue(CardTemplateNotetype.isOrdinalPendingAdd(tempNoteType!!, 0))
+            deleteSelectedTemplate()
+            assertEquals(listOf("Card 1", "Card 2"), tempNoteType!!.notetype.templatesNames)
+            assertFalse(noteTypeHasChanged())
+            saveChanges()
+        }
+        assertEquals(originalIds, note.cids().toSet())
+    }
+
+    @Test
+    fun `deletion checks after a move use the original ordinal`() {
+        val noteType = col.notetypes.byName("Basic (optional reversed card)")!!
+        col.addNote(
+            col.newNote(noteType).apply {
+                setField(0, "Front")
+                setField(1, "Back")
+            },
+        )
+        withCardTemplateEditor(noteType) {
+            moveSelectedTemplateTo(2)
+            assertTrue(shadowOf(this).clickMenuItem(R.id.action_delete))
+            advanceRobolectricLooper()
+            assertEquals(getResourceString(CommonString.orphan_note_message), getAlertDialogText(true))
+            clickAlertDialogButton { positiveButton }
+            assertEquals(2, tempNoteType!!.templateCount)
+        }
+    }
+
+    @Test
+    fun `deletion confirmation counts the moved card type`() {
+        val noteType = col.notetypes.basicAndReversed
+        val spare =
+            Notetypes.newTemplate("Spare").apply {
+                qfmt = "{{Front}} spare"
+                afmt = "{{Back}}"
+            }
+        col.notetypes.addTemplate(noteType, spare)
+        addBasicAndReversedNote("one", "back")
+        addBasicAndReversedNote("two", "")
+
+        withCardTemplateEditor(noteType) {
+            selectTab(1)
+            advanceRobolectricLooper()
+            moveSelectedTemplateTo(1)
+            assertTrue(shadowOf(this).clickMenuItem(R.id.action_delete))
+            advanceRobolectricLooper()
+            assertEquals(
+                getQuantityString(CommonPlurals.card_template_editor_confirm_delete, 1, 1, "Card 2"),
+                getAlertDialogText(true),
+            )
+        }
+    }
+
+    @Test
+    fun `field insertion after a move previews the original card`() {
+        val note = addBasicAndReversedNote()
+        val forwardCardId = note.cards().single { it.ord == 0 }.id
+        val intent = CardTemplateEditor.getIntent(targetContext, col.notetypes.basicAndReversed.id, note.id)
+        val editor = startActivityNormallyOpenCollectionWithIntent(CardTemplateEditor::class.java, intent)
+        with(editor) {
+            moveSelectedTemplateTo(2)
+            currentFragment!!.showInsertFieldDialog()
+            advanceRobolectricLooper()
+            val dialog = supportFragmentManager.fragments.filterIsInstance<InsertFieldDialog>().single()
+            val metadata = ViewModelProvider(dialog)[InsertFieldDialogViewModel::class.java].metadata
+            assertEquals(forwardCardId, metadata.cardId)
+        }
+    }
+
+    @Test
+    fun `split preview follows the moved template`() =
+        withSplitPaneUi {
+            withCardTemplateEditor(col.notetypes.basicAndReversed) {
+                moveSelectedTemplateTo(2)
+                assertEquals(1, previewer.ord)
+                assertEquals(1, selectedTabPosition)
+            }
+        }
+
+    @Test
+    fun `cancel and the current position leave the note type unchanged`() {
+        withCardTemplateEditor(col.notetypes.basicAndReversed) {
+            assertTrue(shadowOf(this).clickMenuItem(R.id.action_reposition))
+            advanceRobolectricLooper()
+            clickAlertDialogButton { negativeButton }
+            assertFalse(noteTypeHasChanged())
+            moveSelectedTemplateTo(1)
+            assertFalse(noteTypeHasChanged())
+            assertFalse(displayDiscardChangesCallback.isEnabled)
+            assertEquals(0, selectedTabPosition)
+        }
+    }
+
+    @Test
+    fun `a synced collection requires confirmation before repositioning`() {
+        val note = addBasicAndReversedNote()
+        val originalIds = note.cids().toSet()
+        // Align the schema timestamp with the mock clock before simulating a completed sync.
+        col.setSchemaModified()
+        col.db.execute("update col set ls = scm")
+        assertFalse(col.schemaChanged())
+        withCardTemplateEditor(col.notetypes.basicAndReversed) {
+            moveSelectedTemplateTo(2)
+            assertEquals(getResourceString(CommonString.full_sync_confirmation), getAlertDialogText(true))
+            assertFalse(noteTypeHasChanged())
+            clickAlertDialogButton { negativeButton }
+            advanceRobolectricLooper()
+            assertFalse(noteTypeHasChanged())
+            assertFalse(col.schemaChanged())
+            assertEquals(0, selectedTabPosition)
+
+            moveSelectedTemplateTo(2)
+            clickAlertDialogButton { positiveButton }
+            advanceRobolectricLooper()
+            assertEquals(listOf("Card 2", "Card 1"), tempNoteType!!.notetype.templatesNames)
+            assertTrue(col.schemaChanged())
+            saveChanges()
+        }
+        assertEquals(originalIds, note.cids().toSet())
+    }
+
+    @Test
+    fun `the current position does not require a full sync`() {
+        col.setSchemaModified()
+        col.db.execute("update col set ls = scm")
+        withCardTemplateEditor(col.notetypes.basicAndReversed) {
+            moveSelectedTemplateTo(1)
+            assertFalse(noteTypeHasChanged())
+            assertFalse(col.schemaChanged())
+            assertFalse(ShadowDialog.getLatestDialog().isShowing)
+        }
+    }
+
+    @Test
+    fun `reposition is available only for standard note types with multiple templates`() {
+        for (noteType in listOf(col.notetypes.basic, col.notetypes.cloze, col.notetypes.byName("Image Occlusion")!!)) {
+            withCardTemplateEditor(noteType) {
+                assertFalse(shadowOf(this).optionsMenu!!.findItem(R.id.action_reposition).isVisible)
+            }
+        }
+        withCardTemplateEditor(col.notetypes.basicAndReversed) {
+            assertTrue(shadowOf(this).optionsMenu!!.findItem(R.id.action_reposition).isVisible)
+        }
+    }
+
+    private fun CardTemplateEditor.moveSelectedTemplateTo(position: Int) {
+        assertTrue(shadowOf(this).clickMenuItem(R.id.action_reposition))
+        advanceRobolectricLooper()
+        val dialog = ShadowDialog.getLatestDialog() as AlertDialog
+        dialog.getInputField().setText(position.toString())
+        assertTrue(dialog.positiveButton.isEnabled)
+        dialog.positiveButton.performClick()
+        advanceRobolectricLooper()
+    }
+
+    private fun CardTemplateEditor.deleteSelectedTemplate() {
+        assertTrue(shadowOf(this).clickMenuItem(R.id.action_delete))
+        advanceRobolectricLooper()
+        clickAlertDialogButton { positiveButton }
+        advanceRobolectricLooper()
+    }
+
+    private fun CardTemplateEditor.saveChanges() {
+        assertTrue(shadowOf(this).clickMenuItem(R.id.action_confirm))
+        advanceRobolectricLooper()
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CardUtilsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CardUtilsTest.kt
index 8a9aa58831c2..c3b74a73f6db 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CardUtilsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CardUtilsTest.kt
@@ -3,14 +3,12 @@
 
 package com.ichi2.anki
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.testutils.JvmTest
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
-class CardUtilsTest : RobolectricTest() {
+class CardUtilsTest : JvmTest() {
     @Test
     fun getDeckIdForCard_regularDeck_returnsDid() {
         val note = addBasicNote("Front", "Back")
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CollectionLeaseTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CollectionLeaseTest.kt
index 8c56fa4b4368..bdf4f1550c65 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CollectionLeaseTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CollectionLeaseTest.kt
@@ -11,6 +11,7 @@ import com.ichi2.anki.CollectionManager.withLeaseForTest
 import com.ichi2.anki.exception.CollectionLockedException
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.async
@@ -144,6 +145,7 @@ class CollectionLeaseTest : RobolectricTest() {
     fun `a lease cannot overtake brief work paused before queue dispatch`() =
         runTest {
             val queue = StandardTestDispatcher(testScheduler)
+            val pausedBrief = CoroutineName("paused brief")
             var dispatchBrief: (() -> Unit)? = null
             val pausedQueue =
                 object : CoroutineDispatcher() {
@@ -151,8 +153,10 @@ class CollectionLeaseTest : RobolectricTest() {
                         context: CoroutineContext,
                         block: Runnable,
                     ) {
-                        if (dispatchBrief == null) {
+                        if (context[CoroutineName] === pausedBrief) {
                             // Pause after admission but before submitting to the serial queue.
+                            // Only this coroutine may save dispatchBrief: application background
+                            // work can dispatch concurrently and must not overwrite the saved task.
                             dispatchBrief = { queue.dispatch(context, block) }
                         } else {
                             queue.dispatch(context, block)
@@ -161,8 +165,11 @@ class CollectionLeaseTest : RobolectricTest() {
                 }
             withCollectionQueue(pausedQueue) {
                 val events = mutableListOf<String>()
+                // Application startup can submit unrelated work (for example, the rollover alarm).
+                // It must not steal the pause intended for the brief call below.
+                launch(start = CoroutineStart.UNDISPATCHED) { withCol { } }
                 val brief =
-                    async(start = CoroutineStart.UNDISPATCHED) {
+                    async(pausedBrief, start = CoroutineStart.UNDISPATCHED) {
                         tryWithCol { events.add("brief") }
                     }
                 val otherBrief =
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CollectionManagerStackTraceTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CollectionManagerStackTraceTest.kt
index 7c3c407fa678..3a7d786e4ba1 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CollectionManagerStackTraceTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CollectionManagerStackTraceTest.kt
@@ -2,19 +2,17 @@
 
 package com.ichi2.anki
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.exception.CollectionLockedException
+import com.ichi2.testutils.JvmTest
 import kotlinx.coroutines.test.StandardTestDispatcher
 import net.ankiweb.rsdroid.BackendException.BackendDbException.BackendDbLockedException
 import org.junit.Test
-import org.junit.runner.RunWith
 import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
 import kotlin.test.assertIs
 import kotlin.test.assertTrue
 
-@RunWith(AndroidJUnit4::class)
-class CollectionManagerStackTraceTest : RobolectricTest() {
+class CollectionManagerStackTraceTest : JvmTest() {
     @Test
     fun `opening failure records the withCol caller`() =
         runTest {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ComposeScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ComposeScreenshotTest.kt
new file mode 100644
index 000000000000..06538161aa7a
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ComposeScreenshotTest.kt
@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.test.SemanticsMatcher
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.isRoot
+import androidx.compose.ui.test.junit4.v2.createComposeRule
+import com.github.takahirom.roborazzi.ExperimentalRoborazziApi
+import com.github.takahirom.roborazzi.captureRoboImage
+import com.github.takahirom.roborazzi.provideRoborazziContext
+import com.google.testing.junit.testparameterinjector.TestParameterValuesProvider
+import com.ichi2.anki.settings.enums.DayTheme
+import com.ichi2.anki.settings.enums.NightTheme
+import com.ichi2.anki.settings.enums.Theme
+import com.ichi2.compose.ui.preview.AnkiDroidPreview
+import com.ichi2.compose.ui.preview.AnkiDroidThemeProvider
+import com.ichi2.testutils.EmptyApplication
+import org.junit.Rule
+import org.junit.experimental.categories.Category
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestParameterInjector
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.GraphicsMode
+
+/**
+ * Captures Compose content with an AnkiDroid XML theme, without starting an app screen.
+ *
+ * Subclasses call [capture] with their content. For a dialog, pass `node = isDialog()`.
+ * Parameterize a test method with [ThemeProvider] to cover every theme.
+ * Use [capture]'s `beforeCapture` callback to interact with the content before capturing it.
+ * Screenshots participate in the root `recordScreenshots`, `compareScreenshots` and
+ * `verifyScreenshots` tasks with `-Pscreenshot`.
+ */
+@RunWith(RobolectricTestParameterInjector::class)
+@Category(ScreenshotTestCategory::class, EmptyApplicationCategory::class)
+@Config(application = EmptyApplication::class, sdk = [36], qualifiers = "w411dp-h891dp-xxhdpi")
+@GraphicsMode(GraphicsMode.Mode.NATIVE)
+abstract class ComposeScreenshotTest {
+    @get:Rule
+    val composeRule = createComposeRule()
+
+    @OptIn(ExperimentalRoborazziApi::class)
+    protected fun capture(
+        name: String,
+        node: SemanticsMatcher = isRoot(),
+        fontScale: Float = 1f,
+        theme: Theme = DayTheme.LIGHT,
+        beforeCapture: () -> Unit = {},
+        content: @Composable () -> Unit,
+    ) {
+        if (theme is NightTheme) RuntimeEnvironment.setQualifiers("+night")
+        RuntimeEnvironment.setFontScale(fontScale)
+        composeRule.setContent {
+            AnkiDroidPreview(theme = theme, content = content)
+        }
+        composeRule.waitForIdle()
+        beforeCapture()
+        composeRule.waitForIdle()
+        val classDir = "build/outputs/roborazzi/${javaClass.simpleName}"
+        val options = provideRoborazziContext().options
+        composeRule.onNode(node).assertIsDisplayed().captureRoboImage(
+            filePath = "$classDir/${name}_${theme.toString().lowercase()}.png",
+            roborazziOptions = options.copy(compareOptions = options.compareOptions.copy(outputDirectoryPath = "$classDir/diffs")),
+        )
+    }
+
+    class ThemeProvider : TestParameterValuesProvider() {
+        override fun provideValues(context: Context?): List<Theme> = AnkiDroidThemeProvider().values.toList()
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CoroutineHelpersRobolectricTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CoroutineHelpersRobolectricTest.kt
index a62291e9bde4..fc9ae6452dca 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CoroutineHelpersRobolectricTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CoroutineHelpersRobolectricTest.kt
@@ -17,6 +17,9 @@ import com.ichi2.anki.exception.CollectionLockedException
 import com.ichi2.anki.exception.StorageNotConfiguredException
 import com.ichi2.anki.preferences.PreferencesActivity
 import com.ichi2.testutils.BackendEmulatingOpenConflict
+import com.ichi2.testutils.FragmentCoroutineTracker
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.awaitCancellation
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.runTest
 import org.hamcrest.CoreMatchers.containsString
@@ -38,7 +41,11 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
+import kotlin.test.assertNotSame
+import kotlin.test.assertNull
+import kotlin.test.assertSame
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class CoroutineHelpersRobolectricTest : RobolectricTest() {
@@ -70,24 +77,63 @@ class CoroutineHelpersRobolectricTest : RobolectricTest() {
         verify(crashReporter, never()).sendExceptionReport(any<Throwable>(), anyOrNull(), anyOrNull(), any())
     }
 
-    /** Issue 22348: removal can precede lifecycle scope registration and the queued task. */
+    /** Issue 22348/22065: removal can precede lifecycle scope registration and the queued task. */
     @Test
-    fun `fragment removed before catching task starts fails under Robolectric`() =
-        assertLifecycleFailure("not attached to an activity") {
-            val controller = Robolectric.buildActivity(FragmentActivity::class.java).setup()
-            saveControllerForCleanup(controller)
-            val activity = controller.get()
+    fun `fragment removed before catching task starts skips the task`() {
+        val controller = Robolectric.buildActivity(FragmentActivity::class.java).setup()
+        saveControllerForCleanup(controller)
+        val activity = controller.get()
+        val manager = activity.supportFragmentManager
+        FragmentCoroutineTracker(manager).use { tracker ->
             var ran = false
+            lateinit var task: Job
             val job =
                 activity.lifecycleScope.launch {
                     val fragment = Fragment()
-                    activity.supportFragmentManager.commitNow { add(fragment, "task") }
-                    fragment.launchCatchingTask { ran = true }
-                    activity.supportFragmentManager.commitNow { remove(fragment) }
+                    manager.commitNow { add(fragment, "task") }
+                    task = fragment.launchCatchingTask { ran = true }
+                    manager.commitNow { remove(fragment) }
                 }
             advanceRobolectricLooper()
             assertTrue(job.isCompleted)
+            assertTrue(task.isCompleted)
             assertFalse(ran)
+            tracker.assertDestroyedLifecyclesAreIdle()
+        }
+        verify(crashReporter, never()).sendExceptionReport(any<Throwable>(), anyOrNull(), anyOrNull(), any())
+    }
+
+    @Test
+    fun `readded fragment only runs tasks for its new lifecycle`() {
+        val controller = Robolectric.buildActivity(FragmentActivity::class.java).setup()
+        saveControllerForCleanup(controller)
+        val activity = controller.get()
+        val manager = activity.supportFragmentManager
+        FragmentCoroutineTracker(manager).use { tracker ->
+            val tasksRun = mutableListOf<String>()
+            val job =
+                activity.lifecycleScope.launch {
+                    val fragment = Fragment()
+                    manager.commitNow { add(fragment, "task") }
+                    val oldLifecycle = fragment.lifecycle
+                    fragment.launchCatchingTask { tasksRun.add("old") }
+                    manager.commitNow { remove(fragment) }
+                    manager.commitNow { add(fragment, "task") }
+                    assertNotSame(oldLifecycle, fragment.lifecycle)
+                    fragment.launchCatchingTask { tasksRun.add("new") }
+                }
+            advanceRobolectricLooper()
+            assertTrue(job.isCompleted)
+            assertEquals(listOf("new"), tasksRun)
+            tracker.assertDestroyedLifecyclesAreIdle()
+        }
+    }
+
+    @Test
+    fun `unattached fragment task fails under Robolectric`() =
+        assertLifecycleFailure("not attached to an activity") {
+            Fragment().launchCatchingTask { error("Unattached fragment task must not run") }
+            advanceRobolectricLooper()
         }
 
     @Test
@@ -137,6 +183,56 @@ class CoroutineHelpersRobolectricTest : RobolectricTest() {
         verify(crashReporter, never()).sendExceptionReport(any<Throwable>(), anyOrNull(), anyOrNull(), any())
     }
 
+    @Test
+    fun `view task is cancelled when the view is destroyed but the fragment remains attached`() {
+        val controller = Robolectric.buildActivity(FragmentActivity::class.java).setup()
+        saveControllerForCleanup(controller)
+        val activity = controller.get()
+        val fragment = Fragment(android.R.layout.simple_list_item_1)
+        activity.supportFragmentManager.commitNow { add(android.R.id.content, fragment) }
+
+        var cancelled = false
+        val job =
+            assertNotNull(
+                fragment.launchCatchingViewTask {
+                    try {
+                        awaitCancellation()
+                    } finally {
+                        cancelled = true
+                    }
+                },
+            )
+        assertTrue(job.isActive)
+
+        activity.supportFragmentManager.commitNow { detach(fragment) }
+        advanceRobolectricLooper()
+
+        assertNull(fragment.view)
+        assertSame(activity, fragment.activity)
+        assertTrue(job.isCancelled)
+        assertTrue(cancelled)
+    }
+
+    @Test
+    fun `finishing activity fails view task under Robolectric`() =
+        assertLifecycleFailure("activity is finishing") {
+            val controller = Robolectric.buildActivity(FragmentActivity::class.java).setup()
+            saveControllerForCleanup(controller)
+            val activity = controller.get()
+            val fragment = Fragment(android.R.layout.simple_list_item_1)
+            activity.supportFragmentManager.commitNow { add(android.R.id.content, fragment) }
+            var ran = false
+
+            activity.lifecycleScope.launch {
+                fragment.launchCatchingViewTask { ran = true }
+                activity.finish()
+            }
+            advanceRobolectricLooper()
+
+            assertTrue(activity.isFinishing)
+            assertFalse(ran)
+        }
+
     /**
      * A [StorageNotConfiguredException] escaping a coroutine means an activity raced or
      * outlived its [ensureStorageIsReady][com.ichi2.anki.startup.ensureStorageIsReady] check:
@@ -169,7 +265,7 @@ class CoroutineHelpersRobolectricTest : RobolectricTest() {
             throwOnShowError = false
             val controller = Robolectric.buildActivity(FragmentActivity::class.java).also(::saveControllerForCleanup)
             val activity = controller.create().get()
-            activity.setTheme(R.style.Theme_Light)
+            activity.setTheme(CommonR.style.Theme_Light)
 
             activity.launchCatchingTask { withCol { } }
             advanceRobolectricLooper()
@@ -200,7 +296,7 @@ class CoroutineHelpersRobolectricTest : RobolectricTest() {
             throwOnShowError = false
             val controller = Robolectric.buildActivity(FragmentActivity::class.java).also(::saveControllerForCleanup)
             val activity = controller.create().get()
-            activity.setTheme(R.style.Theme_Light)
+            activity.setTheme(CommonR.style.Theme_Light)
 
             activity.launchCatchingTask { withCol { } }
             advanceRobolectricLooper()
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/CrashReportDataTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/CrashReportDataTest.kt
index c3a9bd958eca..33e37327d4ad 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/CrashReportDataTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/CrashReportDataTest.kt
@@ -2,19 +2,14 @@
 
 package com.ichi2.anki
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.CrashReportData.Companion.isDeckNotFoundInLimitsMapException
-import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.JvmTest
 import com.ichi2.testutils.ext.triggerDeckNotFoundInLimitsMap
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.annotation.Config
 import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
 
-@RunWith(AndroidJUnit4::class)
-@Config(application = EmptyApplication::class)
-class CrashReportDataTest : RobolectricTest() {
+class CrashReportDataTest : JvmTest() {
     /** #15195: corrupt deck hierarchy raises 'deck not found in limits map' */
     @Test
     fun `deck not found in limits map regression test`() {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/DeckAdapterFilterTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/DeckAdapterFilterTest.kt
index a96ccd1dc353..0aedf9157a7a 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/DeckAdapterFilterTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/DeckAdapterFilterTest.kt
@@ -3,16 +3,14 @@
 
 package com.ichi2.anki
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.deckpicker.addVisibleToList
 import com.ichi2.anki.libanki.filterAndFlatten
 import com.ichi2.anki.libanki.sched.DeckNode
+import com.ichi2.testutils.JvmTest
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
-class DeckAdapterFilterTest : RobolectricTest() {
+class DeckAdapterFilterTest : JvmTest() {
     @Test
     fun verifyFilterResultsReturnsCorrectList() {
         val pattern = "Math"
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerImportTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerImportTest.kt
index 5c8c9039a222..990b9f7c29db 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerImportTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerImportTest.kt
@@ -2,18 +2,215 @@
 
 package com.ichi2.anki
 
+import android.content.ContentProvider
 import android.content.Intent
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import android.database.MatrixCursor
+import android.net.Uri
+import android.os.Looper
+import android.provider.OpenableColumns
+import androidx.appcompat.app.AlertDialog
+import androidx.core.content.edit
+import androidx.core.net.toUri
+import androidx.lifecycle.ViewModelProvider
+import com.ichi2.anki.deckpicker.DeckPickerViewModel
+import com.ichi2.anki.deckpicker.DeckPickerViewModel.AnkiDroidEnvironment
 import com.ichi2.anki.dialogs.AsyncDialogFragment
+import com.ichi2.anki.dialogs.DialogHandler
 import com.ichi2.anki.dialogs.ImportDialog
+import com.ichi2.anki.testutils.SingleViewModelFactory
+import com.ichi2.anki.utils.ext.DIALOG_FRAGMENT_TAG
+import com.ichi2.testutils.BackupManagerTestUtilities
+import com.ichi2.utils.ImportResolution
+import com.ichi2.utils.ImportResult
+import com.ichi2.utils.ImportUtils
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers
+import org.junit.After
 import org.junit.Assert.fail
+import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doAnswer
+import org.mockito.kotlin.doCallRealMethod
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.whenever
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.Robolectric
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.shadows.ShadowContentResolver
+import java.io.File
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
 
-@RunWith(AndroidJUnit4::class)
+@RunWith(ParameterizedRobolectricTestRunner::class)
 class DeckPickerImportTest : RobolectricTest() {
+    @ParameterizedRobolectricTestRunner.Parameter
+    @JvmField
+    var qualifiers: String? = null
+
+    companion object {
+        @ParameterizedRobolectricTestRunner.Parameters
+        @JvmStatic
+        fun configurations(): Collection<String> = listOf("normal", "xlarge")
+    }
+
+    @Before
+    fun configureScreen() {
+        RuntimeEnvironment.setQualifiers(qualifiers)
+        setIntroductionSlidesShown(true)
+        InitialActivity.setUpgradedToLatestVersion(getPreferences())
+        getPreferences().edit { putBoolean("backupPromptDisabled", true) }
+        BackupManagerTestUtilities.setupSpaceForBackup(targetContext)
+    }
+
+    @After
+    fun resetBackupSpace() {
+        BackupManagerTestUtilities.reset()
+    }
+
+    @Test
+    fun `selected package displays one confirmation with its cached path`() {
+        val activity = startActivityNormallyOpenCollectionWithIntent(DeckPickerImport::class.java, Intent())
+        val fileName = "deck name.apkg"
+        val uri = "content://import/document/123".toUri()
+        // FileProvider's Android path handling depends on the host filesystem.
+        val provider = mock<ContentProvider>()
+        whenever(provider.query(uri, arrayOf(OpenableColumns.DISPLAY_NAME), null, null, null)).thenAnswer {
+            MatrixCursor(arrayOf(OpenableColumns.DISPLAY_NAME)).apply { addRow(arrayOf(fileName)) }
+        }
+        ShadowContentResolver.registerProviderInternal("import", provider)
+        shadowOf(activity.contentResolver).registerInputStreamSupplier(uri) { "package contents".byteInputStream() }
+        val cachedPath = Uri.fromFile(File(activity.cacheDir, fileName)).encodedPath!!
+        val executor = Executors.newSingleThreadExecutor()
+        try {
+            executor.submit { activity.onSelectedPackageToImport(Intent(Intent.ACTION_VIEW, uri)) }.get(10, TimeUnit.SECONDS)
+            advanceRobolectricLooper()
+            activity.assertSingleImportConfirmation(ImportDialog.Type.DIALOG_IMPORT_ADD_CONFIRM, cachedPath)
+        } finally {
+            executor.shutdownNow()
+            File(cachedPath).delete()
+        }
+    }
+
+    @Test
+    fun `prepared deck waits for resume and selects Add from its resolved type`() {
+        assertPreparedConfirmation(
+            ImportResult.Success(
+                ImportResolution.DeckPackage(ImportResolution.Source("content://unavailable/deck.apkg".toUri(), "deck.apkg")),
+                "/cache/cached.colpkg",
+            ),
+            ImportDialog.Type.DIALOG_IMPORT_ADD_CONFIRM,
+        )
+    }
+
+    @Test
+    fun `prepared collection waits for resume and selects Replace from its resolved type`() {
+        assertPreparedConfirmation(
+            ImportResult.Success(
+                ImportResolution.CollectionPackage(ImportResolution.Source("content://unavailable/backup.colpkg".toUri(), "backup.colpkg")),
+                "/cache/cached.apkg",
+            ),
+            ImportDialog.Type.DIALOG_IMPORT_REPLACE_CONFIRM,
+        )
+    }
+
+    private fun assertPreparedConfirmation(
+        result: ImportResult.Success,
+        type: ImportDialog.Type,
+    ) {
+        val controller = startActivityControllerNormallyOpenCollectionWithIntent(DeckPickerImport::class.java, Intent())
+        val activity = controller.get()
+
+        activity.openImport(result)
+        advanceRobolectricLooper()
+        assertTrue(activity.importConfirmations.isEmpty(), "The caller or onResume must dispatch the stored confirmation")
+
+        controller
+            .pause()
+            .stop()
+            .start()
+            .resume()
+            .visible()
+        advanceRobolectricLooper()
+
+        activity.assertSingleImportConfirmation(type, result.path)
+    }
+
+    private fun DeckPickerImport.assertSingleImportConfirmation(
+        type: ImportDialog.Type,
+        path: String,
+    ) {
+        assertEquals(1, importConfirmations.size, "One import must display exactly one confirmation")
+        val (thread, fragment) = importConfirmations.single()
+        assertEquals(Looper.getMainLooper().thread, thread)
+        assertEquals(type.code, fragment.requireArguments().getInt(ImportDialog.ARG_DIALOG_TYPE))
+        assertEquals(path, fragment.requireArguments().getString(ImportDialog.ARG_PACKAGE_PATH))
+        assertTrue(assertNotNull(fragment.dialog as? AlertDialog).isShowing)
+    }
+
+    @Test
+    fun `import confirmation survives delayed startup`() {
+        val viewModel = spy(DeckPickerViewModel())
+        lateinit var startupEnvironment: AnkiDroidEnvironment
+        doAnswer { invocation ->
+            startupEnvironment = invocation.getArgument(0)
+            null
+        }.whenever(viewModel).handleStartup(any())
+
+        DialogHandler.storeMessage(ImportUtils.CollectionImportAdd("deck.apkg").toMessage())
+        val controller = Robolectric.buildActivity(DeckPicker::class.java)
+        saveControllerForCleanup(controller)
+        val activity = controller.get()
+        ViewModelProvider(activity, SingleViewModelFactory.create(viewModel))[DeckPickerViewModel::class.java]
+        controller
+            .create()
+            .start()
+            .resume()
+            .visible()
+        advanceRobolectricLooper()
+        activity.assertImportConfirmationVisible()
+
+        // Opening the collection at startup can finish after the pending import dialog is shown.
+        doCallRealMethod().whenever(viewModel).handleStartup(any())
+        viewModel.handleStartup(startupEnvironment)
+        viewModel.awaitStartup()
+        advanceRobolectricLooper()
+
+        activity.assertImportConfirmationVisible()
+    }
+
+    @Test
+    fun `import confirmation survives startup`() {
+        DialogHandler.storeMessage(ImportUtils.CollectionImportAdd("deck.apkg").toMessage())
+
+        deckPicker {
+            assertImportConfirmationVisible()
+        }
+    }
+
+    @Test
+    fun `import confirmation survives returning from file picker`() {
+        val controller = startActivityControllerNormallyOpenCollectionWithIntent(DeckPicker::class.java, Intent())
+        controller.pause().stop()
+        DialogHandler.storeMessage(ImportUtils.CollectionImportAdd("deck.apkg").toMessage())
+
+        controller.start().resume().visible()
+        advanceRobolectricLooper()
+
+        controller.get().assertImportConfirmationVisible()
+    }
+
+    private fun DeckPicker.assertImportConfirmationVisible() {
+        val fragment = assertNotNull(supportFragmentManager.findFragmentByTag(DIALOG_FRAGMENT_TAG) as? ImportDialog)
+        assertTrue(assertNotNull(fragment.dialog as? AlertDialog).isShowing)
+    }
+
     @Test
     fun importAddShowsImportDialog() {
         val deckPicker = super.startActivityNormallyOpenCollectionWithIntent(DeckPickerImport::class.java, Intent())
@@ -34,6 +231,7 @@ class DeckPickerImportTest : RobolectricTest() {
 
     private class DeckPickerImport : DeckPicker() {
         private var dialogFragment: AsyncDialogFragment? = null
+        val importConfirmations = mutableListOf<Pair<Thread, ImportDialog>>()
 
         fun getAsyncDialogFragmentClass(): Class<*> {
             if (dialogFragment == null) {
@@ -44,6 +242,9 @@ class DeckPickerImportTest : RobolectricTest() {
 
         override fun showAsyncDialogFragment(newFragment: AsyncDialogFragment) {
             dialogFragment = newFragment
+            if (newFragment is ImportDialog) {
+                importConfirmations.add(Thread.currentThread() to newFragment)
+            }
             super.showAsyncDialogFragment(newFragment)
         }
     }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerInsetsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerInsetsTest.kt
index 3c887b6bf074..963d0fc20e1f 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerInsetsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerInsetsTest.kt
@@ -11,9 +11,9 @@ import androidx.core.view.isVisible
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.android.view.locationInWindow
 import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.testutils.BackupManagerTestUtilities
 import com.ichi2.testutils.dispatchInsets
-import com.ichi2.utils.dp
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.greaterThan
@@ -37,10 +37,14 @@ class DeckPickerInsetsTest : RobolectricTest() {
         addDeck("Test Deck")
         val controller = startActivityControllerNormallyOpenCollectionWithIntent(DeckPicker::class.java, Intent())
         val deckPicker = controller.get()
+        advanceRobolectricLooperUntil(lazyMessage = { "the deck list should be shown" }) {
+            deckPicker.deckPickerBinding.deckPickerContent.isVisible
+        }
         deckPicker.dispatchInsets(navBarBottom = 48.dp)
         deckPicker.layoutForTest()
         val list = deckPicker.deckPickerBinding.decks
         val observer = deckPicker.deckPickerBinding.root.viewTreeObserver
+        check(list.height > 0) { "the deck list must be laid out, or the layout listener is a no-op" }
         val padding = list.paddingBottom
         check(padding > 0)
 
@@ -191,6 +195,10 @@ class DeckPickerInsetsTest : RobolectricTest() {
             // delete every deck: the deck picker enters the initial state
             col.decks.remove(listOf("Test Deck 0", "Test Deck 1").map { col.decks.id(it) })
             deckPicker.updateDeckList()
+            // Refreshing the decks runs on IO: draining the main looper alone may finish first.
+            advanceRobolectricLooperUntil(lazyMessage = { "the empty collection placeholder should be shown" }) {
+                deckPicker.deckPickerBinding.noDecksPlaceholder.isVisible
+            }
             deckPicker.layoutForTest()
             check(deckPicker.fabBottomMargin == 0) { "the FAB should be unraised initially" }
 
@@ -198,6 +206,9 @@ class DeckPickerInsetsTest : RobolectricTest() {
             // so no layout pass fires on it
             addDeck("A Deck")
             deckPicker.updateDeckList()
+            advanceRobolectricLooperUntil(lazyMessage = { "the deck list should be shown again" }) {
+                deckPicker.deckPickerBinding.deckPickerContent.isVisible
+            }
             deckPicker.layoutForTest()
 
             assertThat(
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerOnDiskTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerOnDiskTest.kt
index 1846daddefbc..38825e49a18e 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerOnDiskTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerOnDiskTest.kt
@@ -45,7 +45,7 @@ class DeckPickerOnDiskTest : RobolectricTest() {
     fun before() {
         RuntimeEnvironment.setQualifiers(qualifiers)
         getPreferences().edit {
-            putBoolean(IntroductionActivity.INTRODUCTION_SLIDES_SHOWN, true)
+            putBoolean(IntroductionActivity.PREF_INTRODUCTION_SLIDES_SHOWN, true)
         }
     }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerSchedulerUpgradeTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerSchedulerUpgradeTest.kt
new file mode 100644
index 000000000000..dc1f2d4f6846
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerSchedulerUpgradeTest.kt
@@ -0,0 +1,167 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki
+
+import android.content.Intent
+import android.view.KeyEvent
+import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AlertDialog
+import androidx.core.content.edit
+import com.ichi2.anki.CollectionManager.TR
+import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.anki.common.utils.ext.schedulerVersion
+import com.ichi2.anki.dialogs.utils.message
+import com.ichi2.anki.dialogs.utils.title
+import com.ichi2.testutils.BackupManagerTestUtilities
+import kotlinx.coroutines.runBlocking
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.android.controller.ActivityController
+import org.robolectric.shadows.ShadowDialog
+import org.robolectric.shadows.ShadowToast
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNotSame
+import kotlin.test.assertSame
+import kotlin.test.assertTrue
+
+@RunWith(ParameterizedRobolectricTestRunner::class)
+class DeckPickerSchedulerUpgradeTest : RobolectricTest() {
+    @ParameterizedRobolectricTestRunner.Parameter
+    @JvmField
+    var qualifiers: String = ""
+
+    @Before
+    fun prepareCollection() {
+        RuntimeEnvironment.setQualifiers(qualifiers)
+        setIntroductionSlidesShown(true)
+        addBasicNote()
+        BackupManagerTestUtilities.setupSpaceForBackup(targetContext)
+        InitialActivity.setUpgradedToLatestVersion(targetContext.sharedPrefs())
+        getPreferences().edit { putBoolean("backupPromptDisabled", true) }
+    }
+
+    @After
+    fun resetBackupSpace() = BackupManagerTestUtilities.reset()
+
+    @Test
+    fun `required prompt survives repeated recreation and collection refresh`() {
+        val controller = launchWithPrompt()
+        val viewModel = controller.get().viewModel
+        val original = upgradeDialog(controller.get())
+
+        repeat(2) {
+            recreate(controller)
+            assertSame(viewModel, controller.get().viewModel)
+            refresh(controller.get())
+            val restored = upgradeDialog(controller.get())
+            assertNotSame(original, restored)
+            assertEquals(original.title, restored.title)
+            assertEquals(original.message, restored.message)
+            assertEquals(1L, col.config.schedulerVersion)
+        }
+    }
+
+    @Test
+    fun `confirming the restored prompt upgrades once`() {
+        val controller = launchWithPrompt()
+        recreate(controller)
+        val dialog = upgradeDialog(controller.get())
+        ShadowToast.reset()
+
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick()
+        advanceRobolectricLooperUntil { col.config.schedulerVersion == 2L }
+        advanceRobolectricLooper()
+
+        assertFalse(dialog.isShowing)
+        assertEquals(1, ShadowToast.shownToastCount())
+        assertEquals(TR.schedulingUpdateDone(), ShadowToast.getTextOfLatestToast())
+        recreate(controller)
+        refresh(controller.get())
+        assertNoUpgradePrompt()
+        assertEquals(1, ShadowToast.shownToastCount())
+    }
+
+    @Test
+    fun `Cancel on the restored prompt uses the current activity`() = cancelRestoredPrompt(back = false)
+
+    @Test
+    fun `Back on the restored prompt uses the current activity`() = cancelRestoredPrompt(back = true)
+
+    private fun cancelRestoredPrompt(back: Boolean) {
+        val controller = launchWithPrompt()
+        recreate(controller)
+        val activity = controller.get()
+        var cancellations = 0
+        activity.onBackPressedDispatcher.addCallback(
+            activity,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    cancellations++
+                }
+            },
+        )
+        val dialog = upgradeDialog(activity)
+
+        if (back) {
+            dialog.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK))
+            dialog.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK))
+        } else {
+            dialog.getButton(AlertDialog.BUTTON_NEGATIVE).performClick()
+        }
+        advanceRobolectricLooper()
+
+        assertEquals(1, cancellations)
+        assertEquals(1L, col.config.schedulerVersion)
+        assertFalse(dialog.isShowing)
+        recreate(controller)
+        refresh(controller.get())
+        assertNoUpgradePrompt()
+    }
+
+    private fun launchWithPrompt(): ActivityController<DeckPicker> {
+        val controller = startActivityControllerNormallyOpenCollectionWithIntent(DeckPicker::class.java, Intent())
+        col.config.set("schedVer", 1L)
+        col.modSchema(check = false)
+        refresh(controller.get())
+        upgradeDialog(controller.get())
+        return controller
+    }
+
+    private fun refresh(activity: DeckPicker) {
+        runBlocking { activity.viewModel.reloadDeckCounts().join() }
+        advanceRobolectricLooper()
+    }
+
+    private fun recreate(controller: ActivityController<DeckPicker>) {
+        val original = controller.get()
+        controller.recreate()
+        controller.get().viewModel.awaitStartup()
+        advanceRobolectricLooper()
+        assertNotSame(original, controller.get())
+    }
+
+    private fun upgradeDialog(activity: DeckPicker): AlertDialog {
+        val dialogs = ShadowDialog.getShownDialogs().filterIsInstance<AlertDialog>().filter { it.isShowing }
+        assertEquals(1, dialogs.size)
+        return dialogs.single().also {
+            assertTrue(it.isShowing)
+            assertSame(activity, it.context.findAnkiActivity())
+            assertEquals(activity.getString(CommonString.scheduler_upgrade_required_dialog_title), it.title)
+        }
+    }
+
+    private fun assertNoUpgradePrompt() {
+        assertFalse(ShadowDialog.getShownDialogs().any { it.isShowing })
+    }
+
+    companion object {
+        @ParameterizedRobolectricTestRunner.Parameters(name = "{0}")
+        @JvmStatic
+        fun configurations() = listOf("normal", "xlarge")
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerScreenshotTest.kt
index 6f974f066c01..e313d056a10d 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerScreenshotTest.kt
@@ -10,6 +10,7 @@ import com.google.android.material.snackbar.Snackbar
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.android.view.locationInWindow
 import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.snackbar.showSnackbar
@@ -19,7 +20,6 @@ import com.ichi2.testutils.dispatchInsets
 import com.ichi2.testutils.lastItemView
 import com.ichi2.testutils.scrollToEnd
 import com.ichi2.testutils.simulateKeyboard
-import com.ichi2.utils.dp
 import kotlinx.coroutines.flow.first
 import org.junit.After
 import org.junit.Before
@@ -119,6 +119,18 @@ class DeckPickerScreenshotTest : ScreenshotTest() {
             captureScreen("keyboard_open_scrolled_to_bottom")
         }
 
+    /** The studied summary and final deck must remain above the keyboard with bottom navigation enabled. */
+    @Test
+    fun bottom_navigation_keyboard_open_scrolled_to_bottom() {
+        enableBottomNavigation()
+        withDeckPicker(deckCount = 30) { deckPicker ->
+            deckPicker.searchWithKeyboard()
+            deckPicker.deckPickerBinding.decks.scrollToEnd()
+
+            captureScreen("bottom_navigation_keyboard_open_scrolled_to_bottom")
+        }
+    }
+
     @Test
     fun hierarchy_lines() =
         runTest {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTabletScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTabletScreenshotTest.kt
index ad4704e00362..2ba63b856bec 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTabletScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTabletScreenshotTest.kt
@@ -7,6 +7,7 @@ import com.ichi2.testutils.simulateKeyboard
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
+import org.robolectric.RuntimeEnvironment
 
 /**
  * Screenshot tests for [DeckPicker] in fragmented mode.
@@ -36,10 +37,16 @@ class DeckPickerTabletScreenshotTest : ScreenshotTest() {
     fun deckPickerWith30Decks() =
         withDeckPicker(deckCount = 30, withCards = true) { deckPicker ->
             deckPicker.simulateEdgeToEdge()
-            // Allow tryShowStudyOptionsPanel()'s async fragment commit to finalize
-            // before capturing, otherwise the right pane is empty.
-            advanceRobolectricLooper()
-            advanceRobolectricLooper()
             captureScreen("30_decks_tablet")
         }
+
+    @Test
+    fun deckPickerWith30DecksRtl() =
+        runTest {
+            RuntimeEnvironment.setQualifiers("+ar")
+            withDeckPicker(deckCount = 30, withCards = true) { deckPicker ->
+                deckPicker.simulateEdgeToEdge()
+                captureScreen("30_decks_tablet_rtl")
+            }
+        }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTest.kt
index ee059f4d911e..785ff4380dd4 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTest.kt
@@ -8,6 +8,7 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.pm.PackageManager
+import android.content.res.Configuration
 import android.database.sqlite.SQLiteDatabaseCorruptException
 import android.os.Bundle
 import android.os.SystemClock
@@ -17,6 +18,7 @@ import android.view.Menu
 import android.view.MotionEvent
 import android.view.View
 import android.view.View.MeasureSpec
+import android.widget.LinearLayout
 import android.widget.ScrollView
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
@@ -33,6 +35,8 @@ import androidx.core.view.size
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.commitNow
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
 import androidx.test.core.app.ActivityScenario
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
@@ -44,6 +48,8 @@ import anki.scheduler.CardAnswer.Rating
 import app.cash.turbine.test
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.ichi2.anki.CollectionManager.TR
+import com.ichi2.anki.CollectionManager.withCol
+import com.ichi2.anki.DeckPickerFloatingActionMenu.CloseAnimation
 import com.ichi2.anki.browser.CardBrowserFragment
 import com.ichi2.anki.browser.CardBrowserViewModel.RowSelection
 import com.ichi2.anki.common.preferences.sharedPrefs
@@ -52,8 +58,10 @@ import com.ichi2.anki.common.utils.android.getResFromAttr
 import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.common.utils.ext.getParcelableExtraCompat
 import com.ichi2.anki.databinding.ActivityHomescreenBinding
+import com.ichi2.anki.deckpicker.DeckFilters
 import com.ichi2.anki.deckpicker.DeckPickerViewModel
 import com.ichi2.anki.deckpicker.SyncIconState
+import com.ichi2.anki.deckpicker.filterAndFlattenDisplay
 import com.ichi2.anki.dialogs.DatabaseErrorDialog
 import com.ichi2.anki.dialogs.DatabaseErrorDialog.DatabaseErrorDialogType
 import com.ichi2.anki.dialogs.DeckPickerConfirmDeleteDeckDialog
@@ -66,10 +74,12 @@ import com.ichi2.anki.dialogs.utils.input
 import com.ichi2.anki.dialogs.utils.message
 import com.ichi2.anki.dialogs.utils.performPositiveClick
 import com.ichi2.anki.dialogs.utils.title
+import com.ichi2.anki.libanki.Consts.DEFAULT_DECK_ID
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.model.SelectableDeck
 import com.ichi2.anki.navigation.AnkiDroidNavigator
 import com.ichi2.anki.observability.ChangeManager
+import com.ichi2.anki.pages.CongratsPage
 import com.ichi2.anki.preferences.PreferencesActivity
 import com.ichi2.anki.reviewreminders.ScheduleRemindersFragment
 import com.ichi2.anki.settings.Prefs
@@ -89,6 +99,7 @@ import com.ichi2.testutils.common.OS
 import com.ichi2.testutils.dispatchTouch
 import com.ichi2.testutils.ext.addBasicNoteWithOp
 import com.ichi2.testutils.ext.menu
+import com.ichi2.testutils.ext.snackbarText
 import com.ichi2.testutils.ext.text
 import com.ichi2.testutils.grantWritePermissions
 import com.ichi2.testutils.revokeWritePermissions
@@ -106,6 +117,7 @@ import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.containsInAnyOrder
 import org.hamcrest.Matchers.containsString
 import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.greaterThan
 import org.hamcrest.Matchers.not
 import org.hamcrest.Matchers.notNullValue
 import org.hamcrest.Matchers.nullValue
@@ -137,6 +149,7 @@ import kotlin.test.assertNotSame
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
 import kotlin.time.Duration.Companion.seconds
+import com.ichi2.anki.common.android.R as CommonR
 
 typealias ContextMenuOption = DeckPickerContextMenuOption
 
@@ -159,6 +172,43 @@ class DeckPickerTest : RobolectricTest() {
         setIntroductionSlidesShown(true)
     }
 
+    @Test
+    fun `study shortcut on hidden Default shows the empty deck message`() {
+        val other = addDeck("Other")
+        col.setDeck(listOf(addBasicNote().firstCard().id), other)
+        assertEquals(DEFAULT_DECK_ID, col.decks.selected())
+        assertThat(col.sched.deckDueTree().find(DEFAULT_DECK_ID), nullValue())
+
+        deckPicker {
+            advanceRobolectricLooperUntil { deckPickerBinding.decks.adapter?.itemCount == 1 }
+            shadowOf(this).clearNextStartedActivities()
+
+            assertTrue(onKeyUp(KeyEvent.KEYCODE_S, KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_S)))
+            advanceRobolectricLooperUntil { snackbarText == getString(CommonString.empty_deck) }
+
+            assertEquals(DEFAULT_DECK_ID, col.decks.selected())
+            assertThat(shadowOf(this).nextStartedActivity, nullValue())
+        }
+    }
+
+    @Test
+    fun `study shortcut on an empty filtered deck opens the finished screen`() {
+        addBasicNote()
+        val filtered = col.decks.newFiltered("Filtered")
+
+        deckPicker {
+            advanceRobolectricLooperUntil { deckPickerBinding.decks.adapter?.itemCount == 2 }
+            shadowOf(this).clearNextStartedActivities()
+
+            assertTrue(onKeyUp(KeyEvent.KEYCODE_S, KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_S)))
+            advanceRobolectricLooperUntil { shadowOf(this).peekNextStartedActivity() != null }
+
+            val intent = assertNotNull(shadowOf(this).nextStartedActivity)
+            assertEquals(CongratsPage::class.java.name, intent.getStringExtra(SingleFragmentActivity.EXTRA_FRAGMENT_NAME))
+            assertEquals(filtered, col.decks.selected())
+        }
+    }
+
     @Test
     fun `receiving opExecuted call doesn't crash if ViewModel is not yet initialized`() {
         // Instantiate DeckPicker directly to simulate a state where the object exists,
@@ -173,16 +223,16 @@ class DeckPickerTest : RobolectricTest() {
     fun getPreviousVersionUpgradeFrom201to292() {
         val newVersion = 20900302 // 2.9.2
         val preferences = mock(SharedPreferences::class.java)
-        whenever(preferences.getLong(DeckPickerViewModel.UPGRADE_VERSION_KEY, newVersion.toLong()))
+        whenever(preferences.getLong(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION, newVersion.toLong()))
             .thenThrow(ClassCastException::class.java)
-        whenever(preferences.getInt(DeckPickerViewModel.UPGRADE_VERSION_KEY, newVersion))
+        whenever(preferences.getInt(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION, newVersion))
             .thenThrow(ClassCastException::class.java)
-        whenever(preferences.getString(DeckPickerViewModel.UPGRADE_VERSION_KEY, ""))
+        whenever(preferences.getString(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION, ""))
             .thenReturn("2.0.1")
         val editor = mock(SharedPreferences.Editor::class.java)
         whenever(preferences.edit()).thenReturn(editor)
         val updated = mock(SharedPreferences.Editor::class.java)
-        whenever(editor.remove(DeckPickerViewModel.UPGRADE_VERSION_KEY)).thenReturn(updated)
+        whenever(editor.remove(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION)).thenReturn(updated)
         ActivityScenario.launch(DeckPicker::class.java).use { scenario ->
             scenario.onActivity { deckPicker: DeckPicker ->
                 val previousVersion =
@@ -190,7 +240,7 @@ class DeckPickerTest : RobolectricTest() {
                 assertEquals(0, previousVersion)
             }
         }
-        verify(editor, times(1)).remove(DeckPickerViewModel.UPGRADE_VERSION_KEY)
+        verify(editor, times(1)).remove(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION)
         verify(updated, times(1)).apply()
     }
 
@@ -199,23 +249,23 @@ class DeckPickerTest : RobolectricTest() {
     fun getPreviousVersionUpgradeFrom202to292() {
         val newVersion: Long = 20900302 // 2.9.2
         val preferences = mock(SharedPreferences::class.java)
-        whenever(preferences.getLong(DeckPickerViewModel.UPGRADE_VERSION_KEY, newVersion))
+        whenever(preferences.getLong(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION, newVersion))
             .thenThrow(ClassCastException::class.java)
-        whenever(preferences.getInt(DeckPickerViewModel.UPGRADE_VERSION_KEY, 20900203))
+        whenever(preferences.getInt(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION, 20900203))
             .thenThrow(ClassCastException::class.java)
-        whenever(preferences.getString(DeckPickerViewModel.UPGRADE_VERSION_KEY, ""))
+        whenever(preferences.getString(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION, ""))
             .thenReturn("2.0.2")
         val editor = mock(SharedPreferences.Editor::class.java)
         whenever(preferences.edit()).thenReturn(editor)
         val updated = mock(SharedPreferences.Editor::class.java)
-        whenever(editor.remove(DeckPickerViewModel.UPGRADE_VERSION_KEY)).thenReturn(updated)
+        whenever(editor.remove(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION)).thenReturn(updated)
         ActivityScenario.launch(DeckPicker::class.java).use { scenario ->
             scenario.onActivity { deckPicker: DeckPicker ->
                 val previousVersion = deckPicker.viewModel.getPreviousVersion(preferences, newVersion)
                 assertEquals(40, previousVersion)
             }
         }
-        verify(editor, times(1)).remove(DeckPickerViewModel.UPGRADE_VERSION_KEY)
+        verify(editor, times(1)).remove(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION)
         verify(updated, times(1)).apply()
     }
 
@@ -225,21 +275,21 @@ class DeckPickerTest : RobolectricTest() {
         val prevVersion = 20800301 // 2.8.1
         val newVersion: Long = 20900301 // 2.9.1
         val preferences = mock(SharedPreferences::class.java)
-        whenever(preferences.getLong(DeckPickerViewModel.UPGRADE_VERSION_KEY, newVersion))
+        whenever(preferences.getLong(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION, newVersion))
             .thenThrow(ClassCastException::class.java)
-        whenever(preferences.getInt(DeckPickerViewModel.UPGRADE_VERSION_KEY, 20900203))
+        whenever(preferences.getInt(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION, 20900203))
             .thenReturn(prevVersion)
         val editor = mock(SharedPreferences.Editor::class.java)
         whenever(preferences.edit()).thenReturn(editor)
         val updated = mock(SharedPreferences.Editor::class.java)
-        whenever(editor.remove(DeckPickerViewModel.UPGRADE_VERSION_KEY)).thenReturn(updated)
+        whenever(editor.remove(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION)).thenReturn(updated)
         ActivityScenario.launch(DeckPicker::class.java).use { scenario ->
             scenario.onActivity { deckPicker: DeckPicker ->
                 val previousVersion = deckPicker.viewModel.getPreviousVersion(preferences, newVersion)
                 assertEquals(prevVersion.toLong(), previousVersion)
             }
         }
-        verify(editor, times(1)).remove(DeckPickerViewModel.UPGRADE_VERSION_KEY)
+        verify(editor, times(1)).remove(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION)
         verify(updated, times(1)).apply()
     }
 
@@ -248,7 +298,7 @@ class DeckPickerTest : RobolectricTest() {
         val prevVersion: Long = 20900301 // 2.9.1
         val newVersion: Long = 20900302 // 2.9.2
         val preferences = mock(SharedPreferences::class.java)
-        whenever(preferences.getLong(DeckPickerViewModel.UPGRADE_VERSION_KEY, newVersion))
+        whenever(preferences.getLong(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION, newVersion))
             .thenReturn(prevVersion)
         val editor = mock(SharedPreferences.Editor::class.java)
         whenever(preferences.edit()).thenReturn(editor)
@@ -258,7 +308,7 @@ class DeckPickerTest : RobolectricTest() {
                 assertEquals(prevVersion, previousVersion)
             }
         }
-        verify(editor, never()).remove(DeckPickerViewModel.UPGRADE_VERSION_KEY)
+        verify(editor, never()).remove(DeckPickerViewModel.PREF_LAST_UPGRADE_VERSION)
     }
 
     @Test
@@ -689,26 +739,23 @@ class DeckPickerTest : RobolectricTest() {
         }
 
     @Test
-    fun `ContextMenu testDynRebuildAndEmpty`() =
-        deckPicker {
-            val cardIds =
-                (0..3)
-                    .map { addBasicNote("$it", "").firstCard().id }
-            assertTrue(allCardsInSameDeck(cardIds, 1))
-            val deckId = addDynamicDeck("Deck 1")
-            getColUnsafe.sched.rebuildFilteredDeck(deckId)
-            assertTrue(allCardsInSameDeck(cardIds, deckId))
-            updateDeckList()
-            assertEquals(1, visibleDeckCount)
-
-            selectContextMenuOption(ContextMenuOption.CUSTOM_STUDY_EMPTY, deckId)
+    fun `ContextMenu testDynRebuildAndEmpty`() {
+        val cardIds = (0..3).map { addBasicNote("$it", "").firstCard().id }
+        assertTrue(allCardsInSameDeck(cardIds, 1))
+        val deckId = addDynamicDeck("Deck 1")
+        col.sched.rebuildFilteredDeck(deckId)
+        assertTrue(allCardsInSameDeck(cardIds, deckId))
 
-            assertTrue(allCardsInSameDeck(cardIds, 1))
-
-            selectContextMenuOption(ContextMenuOption.CUSTOM_STUDY_REBUILD, deckId)
+        deckPicker(expectedDeckIds = listOf(deckId)) {
+            selectContextMenuOptionAndAwait(ContextMenuOption.CUSTOM_STUDY_EMPTY, deckId) {
+                allCardsInSameDeck(cardIds, 1)
+            }
 
-            assertTrue(allCardsInSameDeck(cardIds, deckId))
+            selectContextMenuOptionAndAwait(ContextMenuOption.CUSTOM_STUDY_REBUILD, deckId) {
+                allCardsInSameDeck(cardIds, deckId)
+            }
         }
+    }
 
     private suspend fun <T> TestScope.withQueuedCollectionAccess(block: suspend () -> T): T {
         val previousQueue = CollectionManager.setTestDispatcher(StandardTestDispatcher(testScheduler), useReentrantLock = false)
@@ -746,26 +793,54 @@ class DeckPickerTest : RobolectricTest() {
         )
     }
 
+    // Menu invalidation can replace the action view, so resolve it on each access.
+    private val DeckPicker.searchView: AccessibleSearchView
+        get() = menu().findItem(R.id.deck_picker_action_filter).actionView as AccessibleSearchView
+
+    @Test
+    fun `dragging next to the tablet divider resizes the panes`() {
+        assumeTrue("We are running on a tablet", qualifiers!!.contains("xlarge"))
+        addBasicNote()
+        val deckPicker = super.startActivityNormallyOpenCollectionWithIntent(DeckPickerEx::class.java, Intent())
+        advanceRobolectricLooper()
+        val divider = deckPicker.findViewById<View>(R.id.resizing_divider)
+        val deckPickerPane = deckPicker.findViewById<View>(R.id.deck_picker_pane)
+        val weightBefore = (deckPickerPane.layoutParams as LinearLayout.LayoutParams).weight
+        val location = IntArray(2).also { divider.getLocationInWindow(it) }
+        val startX = location[0] + divider.width / 2f - 16 * divider.resources.displayMetrics.density
+        val y = location[1] + divider.height / 2f
+        val window = deckPicker.window.decorView
+        val downTime = SystemClock.uptimeMillis()
+
+        window.dispatchTouchEvent(MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_DOWN, startX, y, 0))
+        for (step in 1..10) {
+            window.dispatchTouchEvent(
+                MotionEvent.obtain(downTime, downTime + step * 10L, MotionEvent.ACTION_MOVE, startX + step * 10f, y, 0),
+            )
+        }
+        window.dispatchTouchEvent(MotionEvent.obtain(downTime, downTime + 200, MotionEvent.ACTION_UP, startX + 100f, y, 0))
+
+        val weightAfter = (deckPickerPane.layoutParams as LinearLayout.LayoutParams).weight
+        assertThat("the deck list grows when dragged towards the end", weightAfter, greaterThan(weightBefore))
+    }
+
     @Test
     fun `deck search stays open while filtering`() {
         addBasicNote()
         repeat(10) { addDeck("Test Deck $it") }
 
         deckPicker {
-            advanceRobolectricLooper()
             val searchItem = menu().findItem(R.id.deck_picker_action_filter)
             assertTrue(searchItem.isVisible)
             assertTrue(searchItem.expandActionView())
-            val searchView = searchItem.actionView as AccessibleSearchView
 
             for ((query, expectedCount) in listOf("s" to 10, "Test Deck 1" to 1, "missing" to 0, "" to 11)) {
                 searchView.setQuery(query, false)
-                advanceRobolectricLooper()
+                advanceRobolectricLooperUntil { visibleDeckCount == expectedCount }
 
                 val currentSearchItem = menu().findItem(R.id.deck_picker_action_filter)
                 assertTrue(currentSearchItem.isActionViewExpanded, "Search should stay open for '$query'")
-                assertEquals(query, (currentSearchItem.actionView as AccessibleSearchView).query.toString())
-                advanceRobolectricLooperUntil { visibleDeckCount == expectedCount }
+                assertEquals(query, searchView.query.toString())
             }
         }
     }
@@ -782,7 +857,7 @@ class DeckPickerTest : RobolectricTest() {
                 retainedViewModel = deckPicker.viewModel
                 val searchItem = deckPicker.menu().findItem(R.id.deck_picker_action_filter)
                 assertTrue(searchItem.expandActionView())
-                (searchItem.actionView as AccessibleSearchView).setQuery("Test Deck 1", false)
+                deckPicker.searchView.setQuery("Test Deck 1", false)
                 advanceRobolectricLooperUntil { deckPicker.visibleDeckCount == 1 }
             }
 
@@ -794,7 +869,7 @@ class DeckPickerTest : RobolectricTest() {
                 assertEquals("Test Deck 1", deckPicker.viewModel.deckSearchQuery)
                 val searchItem = deckPicker.menu().findItem(R.id.deck_picker_action_filter)
                 assertTrue(searchItem.isActionViewExpanded)
-                assertEquals("Test Deck 1", (searchItem.actionView as AccessibleSearchView).query.toString())
+                assertEquals("Test Deck 1", deckPicker.searchView.query.toString())
                 advanceRobolectricLooperUntil { deckPicker.visibleDeckCount == 1 }
                 deckPicker.invalidateOptionsMenu()
             }
@@ -803,7 +878,7 @@ class DeckPickerTest : RobolectricTest() {
             scenario.onActivity { deckPicker ->
                 val searchItem = deckPicker.menu().findItem(R.id.deck_picker_action_filter)
                 assertTrue(searchItem.isActionViewExpanded)
-                assertEquals("Test Deck 1", (searchItem.actionView as AccessibleSearchView).query.toString())
+                assertEquals("Test Deck 1", deckPicker.searchView.query.toString())
                 assertEquals(1, deckPicker.visibleDeckCount)
                 assertTrue(searchItem.collapseActionView())
                 assertFalse(deckPicker.viewModel.isDeckSearchExpanded)
@@ -823,7 +898,7 @@ class DeckPickerTest : RobolectricTest() {
             val menu = deckPicker.menu()
             val searchItem = menu.findItem(R.id.deck_picker_action_filter)
             assertTrue(searchItem.expandActionView())
-            (searchItem.actionView as AccessibleSearchView).setQuery("Test Deck 1", false)
+            deckPicker.searchView.setQuery("Test Deck 1", false)
             advanceRobolectricLooperUntil { deckPicker.visibleDeckCount == 1 }
 
             // A synchronous collection refresh restores the query a second time, masking
@@ -836,7 +911,7 @@ class DeckPickerTest : RobolectricTest() {
 
                 val restoredSearchItem = menu.findItem(R.id.deck_picker_action_filter)
                 assertTrue(restoredSearchItem.isActionViewExpanded)
-                assertEquals("Test Deck 1", (restoredSearchItem.actionView as AccessibleSearchView).query.toString())
+                assertEquals("Test Deck 1", deckPicker.searchView.query.toString())
                 advanceRobolectricLooper()
                 assertEquals("Test Deck 1", deckPicker.viewModel.deckSearchQuery)
 
@@ -864,7 +939,7 @@ class DeckPickerTest : RobolectricTest() {
             scenario.onActivity { deckPicker ->
                 val searchItem = deckPicker.menu().findItem(R.id.deck_picker_action_filter)
                 assertTrue(searchItem.isActionViewExpanded)
-                assertEquals("", (searchItem.actionView as AccessibleSearchView).query.toString())
+                assertEquals("", deckPicker.searchView.query.toString())
                 assertTrue(searchItem.collapseActionView())
             }
 
@@ -874,7 +949,7 @@ class DeckPickerTest : RobolectricTest() {
             scenario.onActivity { deckPicker ->
                 val searchItem = deckPicker.menu().findItem(R.id.deck_picker_action_filter)
                 assertFalse(searchItem.isActionViewExpanded)
-                assertEquals(11, deckPicker.visibleDeckCount)
+                advanceRobolectricLooperUntil { deckPicker.visibleDeckCount == 11 }
             }
         }
     }
@@ -1260,7 +1335,7 @@ class DeckPickerTest : RobolectricTest() {
 
             assertThat(
                 shadowOf(selectedDeck.background).createdFromResId,
-                equalTo(getResFromAttr(this, R.attr.currentDeckBackground)),
+                equalTo(getResFromAttr(this, CommonR.attr.currentDeckBackground)),
             )
         }
     }
@@ -1369,12 +1444,12 @@ class DeckPickerTest : RobolectricTest() {
         }
 
     @Test
-    fun `adding a note by single tap closes the FAB menu`() = assertAddingNoteByTouchClosesMenu(doubleTap = false)
+    fun `adding a note by single tap preserves the visible FAB menu`() = assertAddingNoteByTouchPreservesMenu(doubleTap = false)
 
     @Test
-    fun `adding a note by double tap closes the FAB menu`() = assertAddingNoteByTouchClosesMenu(doubleTap = true)
+    fun `adding a note by double tap preserves the visible FAB menu`() = assertAddingNoteByTouchPreservesMenu(doubleTap = true)
 
-    private fun assertAddingNoteByTouchClosesMenu(doubleTap: Boolean) =
+    private fun assertAddingNoteByTouchPreservesMenu(doubleTap: Boolean) =
         deckPicker {
             val fab = floatingActionButtonBinding.fabMain
             val startTime = SystemClock.uptimeMillis()
@@ -1401,11 +1476,75 @@ class DeckPickerTest : RobolectricTest() {
                 tap(100)
                 val intent = AnkiDroidNavigator.toIntent(awaitItem())
                 assertEquals("com.ichi2.anki.NoteEditorActivity", intent.component!!.className)
-                assertFalse(floatingActionMenu.isFABOpen, "Adding a note must close the FAB menu")
-                assertEquals(View.GONE, floatingActionButtonBinding.fabBGLayout.visibility)
+                assertFalse(floatingActionMenu.isFABOpen, "Adding a note must save a closed menu state")
+                assertTrue(floatingActionButtonBinding.fabMain.isExtended)
+                assertEquals(View.VISIBLE, floatingActionButtonBinding.fabBGLayout.visibility)
             }
         }
 
+    @Test
+    fun `selecting Add during FAB reopening keeps menu buttons visible`() =
+        deckPicker {
+            floatingActionMenu.showFloatingActionMenu()
+            shadowOf(mainLooper).idleFor(java.time.Duration.ofMillis(200))
+            floatingActionMenu.closeFloatingActionMenu(style = CloseAnimation.SHORT)
+            shadowOf(mainLooper).idleFor(java.time.Duration.ofMillis(200))
+            assertEquals(View.GONE, floatingActionButtonBinding.addDeckButton.visibility)
+
+            floatingActionMenu.showFloatingActionMenu()
+            // Select Add before the opening animations have finished.
+            floatingActionButtonBinding.fabMain.performClick()
+            shadowOf(mainLooper).idleFor(java.time.Duration.ofMillis(200))
+
+            with(floatingActionButtonBinding) {
+                assertTrue(fabMain.isExtended)
+                assertEquals(View.VISIBLE, addDeckButton.visibility)
+                assertEquals(View.VISIBLE, addFilteredDeckButton.visibility)
+                assertEquals(View.VISIBLE, addSharedButton.visibility)
+            }
+        }
+
+    @Test
+    fun `Add menu resets on resume without stopping in multi-window`() {
+        ActivityScenario.launch(DeckPicker::class.java).use { scenario ->
+            val events = mutableListOf<Lifecycle.Event>()
+            scenario.onActivity { deckPicker ->
+                deckPicker.lifecycle.addObserver(LifecycleEventObserver { _, event -> events.add(event) })
+                deckPicker.floatingActionMenu.showFloatingActionMenu()
+                advanceRobolectricLooper()
+                with(deckPicker.floatingActionButtonBinding) {
+                    val expandedColor = fabMain.backgroundTintList
+                    fabMain.performClick()
+                    assertTrue(fabMain.isExtended)
+                    assertEquals(expandedColor, fabMain.backgroundTintList)
+                    assertEquals(View.VISIBLE, fabBGLayout.visibility)
+                }
+            }
+
+            // A visible activity can be paused without being stopped in multi-window mode.
+            scenario.moveToState(Lifecycle.State.STARTED)
+            scenario.onActivity { deckPicker ->
+                assertTrue(deckPicker.floatingActionButtonBinding.fabMain.isExtended)
+            }
+            scenario.moveToState(Lifecycle.State.RESUMED)
+
+            scenario.onActivity { deckPicker ->
+                assertTrue(Lifecycle.Event.ON_PAUSE in events)
+                assertFalse(Lifecycle.Event.ON_STOP in events)
+                with(deckPicker.floatingActionButtonBinding) {
+                    assertFalse(fabMain.isExtended)
+                    assertEquals(View.GONE, fabBGLayout.visibility)
+                    assertEquals(View.GONE, addDeckButton.visibility)
+                    assertEquals(View.GONE, addFilteredDeckButton.visibility)
+                    assertEquals(View.GONE, addSharedButton.visibility)
+                    fabMain.performClick()
+                    assertTrue(deckPicker.floatingActionMenu.isFABOpen)
+                    assertEquals(View.VISIBLE, fabBGLayout.visibility)
+                }
+            }
+        }
+    }
+
     @Test
     fun `FAB menu opens on ENTER key`() =
         deckPicker {
@@ -1434,6 +1573,24 @@ class DeckPickerTest : RobolectricTest() {
             )
         }
 
+    @Test
+    fun `FAB menu closes when clicking background inside menu container`() =
+        deckPicker {
+            floatingActionMenu.showFloatingActionMenu()
+            assertThat("menu is open", floatingActionMenu.isFABOpen, equalTo(true))
+
+            // Click the background inside the FAB menu container
+            // (simulating, for example, tapping to the left of narrower buttons such as the "Add" button)
+            val linearLayout = floatingActionButtonBinding.fabLinearLayout
+            linearLayout.performClick()
+
+            assertThat(
+                "clicking the background inside the FAB menu container closes the menu",
+                floatingActionMenu.isFABOpen,
+                equalTo(false),
+            )
+        }
+
     @Test
     fun `expanded FAB menu is restored after recreation`() {
         ActivityScenario.launch(DeckPicker::class.java).use { scenario ->
@@ -1663,7 +1820,7 @@ class DeckPickerTest : RobolectricTest() {
                     browser.childFragmentManager.setFragmentResult(
                         DeckSelectionDialog.REQUEST_SELECT_DECK,
                         Bundle().apply {
-                            putParcelable(DeckSelectionDialog.ARG_SELECTED_DECK, SelectableDeck.AllDecks)
+                            putParcelable(DeckSelectionDialog.RESULT_SELECTED_DECK, SelectableDeck.AllDecks)
                         },
                     )
                 }
@@ -1716,6 +1873,24 @@ class DeckPickerTest : RobolectricTest() {
             )
         }
 
+    @Test
+    fun `rotating while finishing to show the App Intro does not crash`() {
+        setIntroductionSlidesShown(false)
+        val controller = Robolectric.buildActivity(DeckPicker::class.java, Intent()).create()
+        saveControllerForCleanup(controller)
+        val deckPicker = controller.get()
+        assertTrue(deckPicker.isFinishing, "DeckPicker should finish to show the App Intro")
+
+        val current = deckPicker.resources.configuration
+        val rotated =
+            Configuration(current).apply {
+                orientation = Configuration.ORIENTATION_LANDSCAPE
+                screenWidthDp = current.screenHeightDp
+                screenHeightDp = current.screenWidthDp
+            }
+        assertDoesNotThrow { controller.configurationChange(rotated, deckPicker.resources.displayMetrics) }
+    }
+
     @Test
     fun `startup response is cleared after handling so it does not re-run on resume`() =
         deckPicker {
@@ -1923,13 +2098,19 @@ class DeckPickerTest : RobolectricTest() {
 
 fun RobolectricTest.setIntroductionSlidesShown(shown: Boolean) {
     getPreferences().edit {
-        putBoolean(IntroductionActivity.INTRODUCTION_SLIDES_SHOWN, shown)
+        putBoolean(IntroductionActivity.PREF_INTRODUCTION_SLIDES_SHOWN, shown)
     }
 }
 
+/**
+ * Launches the deck picker, waiting for the initial deck list after successful startup.
+ * When supplied, also waits for [expectedDeckIds] in adapter order before running [function].
+ * Prepare collection data before calling this helper.
+ */
 fun RobolectricTest.deckPicker(
     exposeTestData: Boolean = false,
     skipIntroduction: Boolean = true,
+    expectedDeckIds: List<DeckId>? = null,
     function: suspend DeckPicker.() -> Unit,
 ) = runTest {
     setIntroductionSlidesShown(skipIntroduction)
@@ -1938,6 +2119,18 @@ fun RobolectricTest.deckPicker(
             if (exposeTestData) DeckPickerTest.DeckPickerEx::class.java else DeckPicker::class.java,
             Intent(),
         )
+    val viewModel = deckPicker.viewModel
+    // Startup can stop at permissions, an error dialog, or the app introduction.
+    if (!deckPicker.isFinishing && viewModel.startupJob?.isCompleted == true && viewModel.flowOfStartupResponse.value == null) {
+        val expectedCount =
+            withCol {
+                sched.deckDueTree().filterAndFlattenDisplay(DeckFilters.create(viewModel.deckSearchQuery), decks.selected()).size
+            }
+        RobolectricTest.advanceRobolectricLooperUntil(
+            lazyMessage = { "Expected $expectedCount visible decks, got ${deckPicker.visibleDeckCount}" },
+        ) { deckPicker.visibleDeckCount == expectedCount }
+    }
+    expectedDeckIds?.let { deckPicker.awaitVisibleDecks(it) }
     function(deckPicker)
 }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTestFixture.kt b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTestFixture.kt
index 88f3b2fdc0bf..e93116f563c7 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTestFixture.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/DeckPickerTestFixture.kt
@@ -4,11 +4,16 @@ package com.ichi2.anki
 
 import android.content.Intent
 import androidx.core.content.edit
-import com.ichi2.anki.RobolectricTest.Companion.advanceRobolectricLooper
+import androidx.core.view.isVisible
 import com.ichi2.anki.RobolectricTest.Companion.advanceRobolectricLooperUntil
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.deckpicker.DeckPickerViewModel
 import com.ichi2.anki.deckpicker.DeckPickerViewModel.StartupResponse
+import com.ichi2.anki.dialogs.DeckPickerContextMenu.DeckPickerContextMenuOption
+import com.ichi2.anki.dialogs.DeckPickerContextMenuResult
+import com.ichi2.anki.dialogs.setDeckPickerContextMenuResult
+import com.ichi2.anki.libanki.DeckId
+import com.ichi2.anki.widgets.DeckAdapter
 import com.ichi2.testutils.BackupManagerTestUtilities
 
 // TODO: move to testFixtures once RobolectricTest is moved
@@ -32,7 +37,10 @@ fun withDeckPicker(
     }
     val deckPicker =
         test.startActivityNormallyOpenCollectionWithIntent(DeckPicker::class.java, Intent()).also {
-            advanceRobolectricLooper() // may be a fix for flaky tests
+            // Deck refreshes run on IO, so draining the main looper alone may finish first.
+            advanceRobolectricLooperUntil(lazyMessage = { "the deck list or empty collection placeholder should be shown" }) {
+                it.deckPickerBinding.deckPickerContent.isVisible || it.deckPickerBinding.noDecksPlaceholder.isVisible
+            }
         }
     block(deckPicker)
 }
@@ -41,3 +49,26 @@ fun DeckPickerViewModel.awaitStartup() =
     advanceRobolectricLooperUntil {
         startupJob?.isActive != true && flowOfStartupResponse.value !is StartupResponse.Success
     }
+
+/** Waits for the adapter to display the expected decks, including background list diffs. */
+fun DeckPicker.awaitVisibleDecks(expectedDeckIds: List<DeckId>) {
+    val adapter = deckPickerBinding.decks.adapter as DeckAdapter
+    advanceRobolectricLooperUntil(
+        lazyMessage = { "Expected visible decks $expectedDeckIds, but found ${adapter.currentList.map { it.did }}" },
+    ) {
+        adapter.currentList.map { it.did } == expectedDeckIds
+    }
+}
+
+/** Selects a context-menu action and waits for its observable result before returning. */
+fun DeckPicker.selectContextMenuOptionAndAwait(
+    option: DeckPickerContextMenuOption,
+    deckId: DeckId,
+    condition: () -> Boolean,
+) {
+    supportFragmentManager.setDeckPickerContextMenuResult(DeckPickerContextMenuResult(deckId = deckId, option = option))
+    advanceRobolectricLooperUntil(
+        lazyMessage = { "Context-menu action $option on deck $deckId did not reach its expected state" },
+        condition = condition,
+    )
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ErrorMessageTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ErrorMessageTest.kt
new file mode 100644
index 000000000000..70648ac25014
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ErrorMessageTest.kt
@@ -0,0 +1,127 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki
+
+import android.text.Spanned
+import android.text.style.TypefaceSpan
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.utils.formatSearchError
+import com.ichi2.anki.utils.showSearchError
+import com.ichi2.testutils.EmptyAnkiActivity
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.shadows.ShadowDialog
+import kotlin.test.assertContains
+import kotlin.test.assertEquals
+import kotlin.test.assertIs
+
+@RunWith(AndroidJUnit4::class)
+class ErrorMessageTest : RobolectricTest() {
+    @Test
+    fun `inline code is rendered in monospace`() {
+        val message = showMessage("Invalid search: an `and` was found. Try `\"and\"`.")
+        assertEquals("Invalid search: an and was found. Try \"and\".", message.toString())
+        assertEquals(listOf("and", "\"and\""), codeSpans(message))
+    }
+
+    @Test
+    fun `preformatted errors preserve whitespace and literal code`() {
+        val code = "regex parse error:\n    (?i)b[<>&`\n         ^\nerror: unclosed character class"
+        val message = showMessage("<pre>$code</pre>")
+        assertEquals(code, message.toString())
+        assertEquals(listOf(code), codeSpans(message))
+    }
+
+    @Test
+    fun `ordinary text and unmatched delimiters are preserved`() {
+        val text = "Error: <tag> &amp; a_b *c*\n  `unfinished <pre>"
+        assertEquals(text, showMessage(text).toString())
+    }
+
+    @Test
+    fun `regex diagnostics preserve embedded closing tags`() {
+        val code = "regex parse error:\n    (?i)</pre>[<b>&amp;`\n              ^\nerror: unclosed character class"
+        val message = formatSearchError("<pre>$code</pre>")
+        assertEquals(code, message.toString())
+        assertEquals(listOf(code), codeSpans(message))
+    }
+
+    @Test
+    fun `malformed or unsupported code delimiters remain literal`() {
+        val messages =
+            listOf(
+                "an `unclosed",
+                "`a` and `unclosed",
+                "``a``",
+                "`a``b`",
+                "`a` then ` `",
+                "`a\nb`",
+                "`a\rb`",
+                "\\`a\\`",
+            )
+        for (text in messages) {
+            val message = formatSearchError(text)
+            assertEquals(text, message.toString())
+            assertEquals(emptyList(), codeSpans(message))
+        }
+    }
+
+    @Test
+    fun `inline code trims edge whitespace like Python Markdown`() {
+        val message = formatSearchError("Use `  and  ` or ` <b>&amp; `.")
+        assertEquals("Use and or <b>&amp;.", message.toString())
+        assertEquals(listOf("and", "<b>&amp;"), codeSpans(message))
+    }
+
+    @Test
+    fun `generic errors keep code delimiters literal`() {
+        val text = "File `name` failed: <pre>  diagnostic</pre>"
+        assertEquals(text, showMessage(text, searchError = false).toString())
+    }
+
+    @Test
+    fun `browser formats actual backend search errors`() =
+        runTest {
+            throwOnShowError = false
+            addBasicNote()
+            val browser = startRegularActivity<CardBrowser>()
+            browser.searchCardsSync("and")
+            advanceRobolectricLooper()
+            assertEquals(listOf("and", "\"and\""), codeSpans(latestMessage()))
+            ShadowDialog.getLatestDialog().dismiss()
+
+            for (regex in listOf("b[", "</pre>[")) {
+                browser.searchCardsSync("re:$regex")
+                advanceRobolectricLooper()
+                val diagnostic = latestMessage()
+                assertContains(diagnostic.toString(), "(?i)$regex")
+                assertEquals(listOf(diagnostic.toString()), codeSpans(diagnostic))
+                ShadowDialog.getLatestDialog().dismiss()
+            }
+        }
+
+    private fun showMessage(
+        message: String,
+        searchError: Boolean = true,
+    ): CharSequence {
+        throwOnShowError = false
+        val activity = startRegularActivity<EmptyAnkiActivity>()
+        if (searchError) activity.showSearchError(message) else activity.showError(message, crashReportData = null)
+        return latestMessage()
+    }
+
+    private fun latestMessage(): CharSequence {
+        val dialog = ShadowDialog.getLatestDialog() as AlertDialog
+        return requireNotNull(dialog.findViewById<TextView>(android.R.id.message)).text
+    }
+
+    private fun codeSpans(message: CharSequence): List<String> {
+        val spanned = assertIs<Spanned>(message)
+        return spanned.getSpans(0, spanned.length, TypefaceSpan::class.java).map {
+            assertEquals("monospace", it.family)
+            spanned.subSequence(spanned.getSpanStart(it), spanned.getSpanEnd(it)).toString()
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/FlagTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/FlagTest.kt
index 2a2067d75dc7..31dafaabe4e8 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/FlagTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/FlagTest.kt
@@ -2,23 +2,15 @@
 
 package com.ichi2.anki
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.libanki.testutils.AnkiTest
 import com.ichi2.anki.utils.ext.flag
-import com.ichi2.testutils.EmptyApplication
 import com.ichi2.testutils.JvmTest
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.hasSize
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import org.junit.experimental.categories.Category
-import org.junit.runner.RunWith
-import org.robolectric.annotation.Config
 
 /** Tests for [Flag] */
-@RunWith(AndroidJUnit4::class)
-@Config(application = EmptyApplication::class)
-@Category(EmptyApplicationCategory::class)
 class FlagTest : JvmTest() {
     @Test
     fun `search node conversion integration test`() {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ForegroundMediaNetworkTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ForegroundMediaNetworkTest.kt
index 1b0ead8b4aeb..fc26f3fe7956 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ForegroundMediaNetworkTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ForegroundMediaNetworkTest.kt
@@ -8,6 +8,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.work.NetworkType
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
+import anki.sync.FullUploadOrDownloadRequest
 import anki.sync.SyncCollectionResponse
 import anki.sync.syncCollectionResponse
 import com.ichi2.anki.dialogs.SyncErrorDialog
@@ -15,6 +16,7 @@ import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.settings.enums.ShouldFetchMedia
 import com.ichi2.anki.utils.ext.DIALOG_FRAGMENT_TAG
 import com.ichi2.anki.worker.UniqueWorkNames
+import com.ichi2.testutils.BackupManagerTestUtilities
 import com.ichi2.utils.NetworkUtils
 import io.mockk.every
 import io.mockk.mockkObject
@@ -38,6 +40,9 @@ import kotlin.test.assertNotNull
 class ForegroundMediaNetworkTest : RobolectricTest() {
     private var metered = false
     private var syncRequired = SyncCollectionResponse.ChangesRequired.NO_CHANGES
+    private var fullSyncRequest: FullUploadOrDownloadRequest? = null
+
+    override fun getCollectionStorageMode() = CollectionStorageMode.ON_DISK
 
     override fun setupTestDispatcher(dispatcher: TestDispatcher) {
         super.setupTestDispatcher(dispatcher)
@@ -47,6 +52,7 @@ class ForegroundMediaNetworkTest : RobolectricTest() {
 
     @Before
     fun prepareSync() {
+        BackupManagerTestUtilities.setupSpaceForBackup(targetContext)
         Prefs.hkey = "test"
         Prefs.lastSyncTime = 0
         Prefs.allowSyncOnMeteredConnections = false
@@ -65,13 +71,16 @@ class ForegroundMediaNetworkTest : RobolectricTest() {
                     return syncCollectionResponse { required = syncRequired }
                 }
 
-                override fun fullUploadOrDownload(input: anki.sync.FullUploadOrDownloadRequest) = Unit
+                override fun fullUploadOrDownload(input: FullUploadOrDownloadRequest) {
+                    fullSyncRequest = input
+                }
             }
         }
     }
 
     @After
     fun resetSync() {
+        BackupManagerTestUtilities.reset()
         BackendFactory.setOverride(null)
         unmockkObject(NetworkUtils)
     }
@@ -127,9 +136,10 @@ class ForegroundMediaNetworkTest : RobolectricTest() {
         deckPicker {
             syncRequired = SyncCollectionResponse.ChangesRequired.FULL_SYNC
 
-            val request = syncAndGetMediaWork(resolveConflict = true)
+            val request = syncAndGetMediaWork(resolveConflict = ConflictResolution.FULL_UPLOAD)
 
             assertThat(request.constraints.requiredNetworkType, equalTo(NetworkType.UNMETERED))
+            assertFullSyncDoesNotStartMedia(upload = true)
         }
 
     @Test
@@ -138,15 +148,56 @@ class ForegroundMediaNetworkTest : RobolectricTest() {
             metered = true
             syncRequired = SyncCollectionResponse.ChangesRequired.FULL_SYNC
 
-            val request = syncAndGetMediaWork(confirmWarning = true, resolveConflict = true)
+            val request = syncAndGetMediaWork(confirmWarning = true, resolveConflict = ConflictResolution.FULL_UPLOAD)
 
             assertThat(Prefs.allowSyncOnMeteredConnections, equalTo(false))
             assertThat(request.constraints.requiredNetworkType, equalTo(NetworkType.CONNECTED))
+            assertFullSyncDoesNotStartMedia(upload = true)
+        }
+
+    @Test
+    fun `conflict download leaves media startup to the constrained worker`() =
+        deckPicker {
+            syncRequired = SyncCollectionResponse.ChangesRequired.FULL_SYNC
+
+            val request = syncAndGetMediaWork(resolveConflict = ConflictResolution.FULL_DOWNLOAD)
+
+            assertThat(request.constraints.requiredNetworkType, equalTo(NetworkType.UNMETERED))
+            assertFullSyncDoesNotStartMedia(upload = false)
+        }
+
+    @Test
+    fun `direct full upload leaves media startup to the constrained worker`() =
+        deckPicker {
+            syncRequired = SyncCollectionResponse.ChangesRequired.FULL_UPLOAD
+
+            val request = syncAndGetMediaWork()
+
+            assertThat(request.constraints.requiredNetworkType, equalTo(NetworkType.UNMETERED))
+            assertFullSyncDoesNotStartMedia(upload = true)
         }
 
+    @Test
+    fun `direct full download leaves media startup to the constrained worker`() =
+        deckPicker {
+            syncRequired = SyncCollectionResponse.ChangesRequired.FULL_DOWNLOAD
+
+            val request = syncAndGetMediaWork()
+
+            assertThat(request.constraints.requiredNetworkType, equalTo(NetworkType.UNMETERED))
+            assertFullSyncDoesNotStartMedia(upload = false)
+        }
+
+    private fun assertFullSyncDoesNotStartMedia(upload: Boolean) {
+        val request = requireNotNull(fullSyncRequest)
+        assertThat(request.upload, equalTo(upload))
+        // Supplying serverUsn makes the Rust backend start media before WorkManager can gate it.
+        assertThat("the full sync must not start native media sync", request.hasServerUsn(), equalTo(false))
+    }
+
     private fun DeckPicker.syncAndGetMediaWork(
         confirmWarning: Boolean = false,
-        resolveConflict: Boolean = false,
+        resolveConflict: ConflictResolution? = null,
     ): WorkInfo {
         val manager = WorkManager.getInstance(this)
         sync()
@@ -154,10 +205,14 @@ class ForegroundMediaNetworkTest : RobolectricTest() {
             (ShadowDialog.getLatestDialog() as AlertDialog).getButton(DialogInterface.BUTTON_POSITIVE).performClick()
         }
         advanceRobolectricLooperUntil { Prefs.lastSyncTime != 0L }
-        if (resolveConflict) {
+        if (resolveConflict != null) {
             Prefs.lastSyncTime = 0
-            // Choose "Keep AnkiDroid" and confirm replacing the server collection.
-            conflictDialog().getButton(DialogInterface.BUTTON_POSITIVE).performClick()
+            val button =
+                when (resolveConflict) {
+                    ConflictResolution.FULL_UPLOAD -> DialogInterface.BUTTON_POSITIVE
+                    ConflictResolution.FULL_DOWNLOAD -> DialogInterface.BUTTON_NEGATIVE
+                }
+            conflictDialog().getButton(button).performClick()
             advanceRobolectricLooper()
             conflictDialog().getButton(DialogInterface.BUTTON_POSITIVE).performClick()
             advanceRobolectricLooperUntil { Prefs.lastSyncTime != 0L }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/FragmentCoroutineLifecycleTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/FragmentCoroutineLifecycleTest.kt
index 7d78a6fd3a68..a034a695999c 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/FragmentCoroutineLifecycleTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/FragmentCoroutineLifecycleTest.kt
@@ -15,7 +15,6 @@ import com.ichi2.anki.FragmentLifecycleFixture.Transition.REMOVE
 import com.ichi2.testutils.FragmentCoroutineTracker
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
-import org.junit.Assume.assumeFalse
 import org.junit.Assume.assumeTrue
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -111,7 +110,6 @@ class FragmentCoroutineLifecycleTest(
         if (transition != REMOVE) {
             assumeTrue("$fixture has no fragment view", fixture.hasFragmentView)
         }
-        assumeFalse("Known startup failure: $fixture during $transition (Issue 22065)", transition in fixture.knownFailures)
         withHost { activity, fragment ->
             // Main.immediate queues nested launches until this outer coroutine finishes.
             // This lets the test destroy the fragment/view before its startup work runs.
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/FragmentLifecycleFixture.kt b/AnkiDroid/src/test/java/com/ichi2/anki/FragmentLifecycleFixture.kt
index 6935ec49a536..62377a2f8e7b 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/FragmentLifecycleFixture.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/FragmentLifecycleFixture.kt
@@ -3,9 +3,6 @@
 package com.ichi2.anki
 
 import androidx.fragment.app.Fragment
-import com.ichi2.anki.FragmentLifecycleFixture.Transition.DESTROY_VIEW
-import com.ichi2.anki.FragmentLifecycleFixture.Transition.RECREATE_VIEW
-import com.ichi2.anki.FragmentLifecycleFixture.Transition.REMOVE
 import com.ichi2.anki.browser.BrowserColumnSelectionFragment
 import com.ichi2.anki.cardviewer.SingleCardSide
 import com.ichi2.anki.dialogs.ChangeNoteTypeDialog
@@ -33,8 +30,6 @@ class FragmentLifecycleFixture(
     private val name: String,
     val host: Class<out AnkiActivity> = AnkiActivity::class.java,
     val hasFragmentView: Boolean = true,
-    // Confirmed failures in the startup stress test. Remove each entry when its failure is fixed.
-    val knownFailures: Set<Transition> = emptySet(),
     val create: RobolectricTest.() -> Fragment,
 ) {
     enum class Transition { REMOVE, DESTROY_VIEW, RECREATE_VIEW }
@@ -44,36 +39,40 @@ class FragmentLifecycleFixture(
 
 fun fragmentLifecycleFixtures(): List<FragmentLifecycleFixture> =
     listOf(
-        FragmentLifecycleFixture("StudyOptions", knownFailures = setOf(REMOVE)) { StudyOptionsFragment() },
-        FragmentLifecycleFixture("AppearanceSettings", knownFailures = setOf(REMOVE)) { AppearanceSettingsFragment() },
-        FragmentLifecycleFixture("GeneralSettings", knownFailures = setOf(REMOVE)) { GeneralSettingsFragment() },
-        FragmentLifecycleFixture("ReviewerOptions", knownFailures = setOf(REMOVE)) { ReviewerOptionsFragment() },
-        FragmentLifecycleFixture("ReviewingSettings", knownFailures = setOf(REMOVE)) { ReviewingSettingsFragment() },
+        FragmentLifecycleFixture("StudyOptions") { StudyOptionsFragment() },
+        FragmentLifecycleFixture("AppearanceSettings") { AppearanceSettingsFragment() },
+        FragmentLifecycleFixture("GeneralSettings") { GeneralSettingsFragment() },
+        FragmentLifecycleFixture("ReviewerOptions") { ReviewerOptionsFragment() },
+        FragmentLifecycleFixture("ReviewingSettings") { ReviewingSettingsFragment() },
         FragmentLifecycleFixture("AdvancedSettings") { AdvancedSettingsFragment() },
         FragmentLifecycleFixture("DeveloperOptions") { DeveloperOptionsFragment() },
         FragmentLifecycleFixture("SyncSettings") { SyncSettingsFragment() },
         FragmentLifecycleFixture("About") { AboutFragment() },
-        FragmentLifecycleFixture("ScheduleReminders", knownFailures = setOf(REMOVE, DESTROY_VIEW)) { ScheduleRemindersFragment() },
-        FragmentLifecycleFixture("FilteredDeckOptions", knownFailures = setOf(REMOVE, DESTROY_VIEW, RECREATE_VIEW)) {
+        FragmentLifecycleFixture("ScheduleReminders") { ScheduleRemindersFragment() },
+        FragmentLifecycleFixture("FilteredDeckOptions") {
             FilteredDeckOptionsFragment()
         },
-        FragmentLifecycleFixture("MediaCheck", knownFailures = setOf(REMOVE, DESTROY_VIEW)) { MediaCheckFragment() },
-        FragmentLifecycleFixture("ManageSpace", knownFailures = setOf(REMOVE)) { ManageSpaceFragment() },
-        FragmentLifecycleFixture("ChangeNoteType", knownFailures = setOf(REMOVE)) {
+        FragmentLifecycleFixture("MediaCheck") { MediaCheckFragment() },
+        FragmentLifecycleFixture("ManageSpace") { ManageSpaceFragment() },
+        FragmentLifecycleFixture("ChangeNoteType") {
             ChangeNoteTypeDialog.newInstance(listOf(addBasicNote().id))
         },
-        FragmentLifecycleFixture("CustomStudy", hasFragmentView = false) { CustomStudyDialog.createInstance(col.decks.selected()) },
-        FragmentLifecycleFixture("AddReminder", hasFragmentView = false, knownFailures = setOf(REMOVE)) {
+        FragmentLifecycleFixture("CustomStudy", hasFragmentView = false) {
+            // Empty decks dismiss the dialog instead of remaining resumed.
+            addBasicNote()
+            CustomStudyDialog.createInstance(col.decks.selected())
+        },
+        FragmentLifecycleFixture("AddReminder", hasFragmentView = false) {
             AddEditReminderDialog.getInstance(AddEditReminderDialog.DialogMode.Add(ReviewReminderScope.Global))
         },
-        FragmentLifecycleFixture("InsertField", knownFailures = setOf(REMOVE)) {
+        FragmentLifecycleFixture("InsertField") {
             InsertFieldDialog.newInstance(
                 fieldItems = listOf("Front", "Back"),
                 metadata = InsertFieldMetadata(SingleCardSide.FRONT, "Card 1", "Basic", null, null, null, "Default"),
                 requestKey = "insert-field-test",
             )
         },
-        FragmentLifecycleFixture("BrowserColumns", host = CardBrowser::class.java, knownFailures = setOf(REMOVE, DESTROY_VIEW)) {
+        FragmentLifecycleFixture("BrowserColumns", host = CardBrowser::class.java) {
             BrowserColumnSelectionFragment.createInstance(CardsOrNotes.CARDS)
         },
     )
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ImportAdapterTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ImportAdapterTest.kt
new file mode 100644
index 000000000000..07477479211d
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ImportAdapterTest.kt
@@ -0,0 +1,162 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki
+
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.ContentProvider
+import android.content.Intent
+import android.database.MatrixCursor
+import android.net.Uri
+import android.provider.OpenableColumns
+import androidx.core.net.toUri
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.common.crashreporting.CrashReportService
+import com.ichi2.anki.common.crashreporting.CrashReporter
+import com.ichi2.anki.pages.CsvImporter
+import com.ichi2.utils.ImportResult
+import com.ichi2.utils.ImportUtils
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.doThrow
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoInteractions
+import org.mockito.kotlin.whenever
+import org.robolectric.Robolectric
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.shadows.ShadowContentResolver
+import java.io.File
+import java.io.FileNotFoundException
+import java.io.IOException
+import java.io.InputStream
+import kotlin.test.assertEquals
+import kotlin.test.assertIs
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+
+/** The legacy adapter must report both preparation and launch failures to its caller. */
+@RunWith(AndroidJUnit4::class)
+class ImportAdapterTest : RobolectricTest() {
+    private lateinit var originalCrashReporter: CrashReporter
+    private val crashReporter = mock<CrashReporter>()
+
+    @Before
+    fun captureCrashReports() {
+        originalCrashReporter = CrashReportService.getReporter()
+        CrashReportService.setReporter(crashReporter)
+    }
+
+    @After
+    fun restoreCrashReporter() {
+        CrashReportService.setReporter(originalCrashReporter)
+    }
+
+    @Test
+    fun `missing text source returns failure without opening the importer`() {
+        val activity = importActivity()
+        val missingFile = File(tempFolder.root, "deleted.csv")
+        val uri = textSource("deleted.csv") { missingFile.inputStream() }
+
+        val result = ImportUtils.handleFileImport(activity, Intent(Intent.ACTION_VIEW, uri))
+
+        val failure = assertIs<ImportResult.Failure>(result)
+        assertIs<FileNotFoundException>(failure.exception)
+        assertEquals(activity.getString(CommonString.import_error_copy_to_cache_title), failure.title)
+        assertNull(shadowOf(activity).nextStartedActivity)
+        verifyNoInteractions(crashReporter)
+    }
+
+    @Test
+    fun `unreadable text source returns failure and reports the copy error`() {
+        val activity = importActivity()
+        val exception = IOException("Could not read selected text file")
+        val uri =
+            textSource("unreadable.tsv") {
+                object : InputStream() {
+                    override fun read(): Int = throw exception
+                }
+            }
+
+        val result = ImportUtils.handleFileImport(activity, Intent(Intent.ACTION_VIEW, uri))
+
+        val failure = assertIs<ImportResult.Failure>(result)
+        assertEquals(exception, failure.exception)
+        assertEquals(activity.getString(CommonString.import_error_copy_to_cache_title), failure.title)
+        assertNull(shadowOf(activity).nextStartedActivity)
+        verify(crashReporter).sendExceptionReport(exception, "ImportUtils", null, false)
+    }
+
+    @Test
+    fun `text import copies bytes and opens the raw cached path before returning`() {
+        val activity = importActivity()
+        val fileName = "notes 好 + %.csv"
+        val contents = "front,back\nhello,world\n"
+        val uri = textSource(fileName) { contents.byteInputStream() }
+
+        val result = ImportUtils.handleFileImport(activity, Intent(Intent.ACTION_VIEW, uri))
+
+        assertIs<ImportResult.Success>(result)
+        val cachedFile = File(activity.cacheDir, fileName)
+        assertEquals(contents, cachedFile.readText())
+        val intent = assertNotNull(shadowOf(activity).nextStartedActivity)
+        assertEquals(SingleFragmentActivity::class.java.name, intent.component?.className)
+        assertEquals(CsvImporter::class.java.name, intent.getStringExtra(SingleFragmentActivity.EXTRA_FRAGMENT_NAME))
+        assertEquals(cachedFile.absolutePath, intent.getBundleExtra(SingleFragmentActivity.EXTRA_FRAGMENT_ARGS)?.getString("filePath"))
+        assertEquals(DeckPicker::class.java.name, shadowOf(activity).nextStartedActivity?.component?.className)
+        assertNull(shadowOf(activity).nextStartedActivity)
+    }
+
+    @Test
+    fun `preparation copies text without opening the importer`() {
+        val activity = importActivity()
+        val contents = "front,back"
+        val uri = textSource("notes.csv") { contents.byteInputStream() }
+
+        val result = assertIs<ImportResult.Success>(ImportUtils.prepareImport(activity, Intent(Intent.ACTION_VIEW, uri)))
+
+        assertEquals(uri, result.file.source.uri)
+        assertEquals(File(activity.cacheDir, "notes.csv").absolutePath, result.path)
+        assertEquals(contents, File(result.path).readText())
+        assertNull(shadowOf(activity).nextStartedActivity)
+    }
+
+    @Test
+    fun `failure to launch text importer is returned to the caller`() {
+        val activity = spy(importActivity())
+        val exception = ActivityNotFoundException("Importer could not be opened")
+        doThrow(exception).whenever(activity).startActivities(any(), anyOrNull())
+        val uri = textSource("notes.csv") { "front,back".byteInputStream() }
+
+        val result = ImportUtils.handleFileImport(activity, Intent(Intent.ACTION_VIEW, uri))
+
+        assertEquals(exception, assertIs<ImportResult.Failure>(result).exception)
+        verify(crashReporter).sendExceptionReport(exception, "handleFileImport", null, false)
+    }
+
+    private fun importActivity(): Activity {
+        val controller = Robolectric.buildActivity(Activity::class.java).create()
+        saveControllerForCleanup(controller)
+        return controller.get()
+    }
+
+    private fun textSource(
+        fileName: String,
+        open: () -> InputStream,
+    ): Uri {
+        val uri = "content://import/document/123".toUri()
+        val provider = mock<ContentProvider>()
+        whenever(provider.query(any(), anyOrNull(), anyOrNull<String>(), anyOrNull(), anyOrNull())).thenAnswer {
+            MatrixCursor(arrayOf(OpenableColumns.DISPLAY_NAME)).apply { addRow(arrayOf(fileName)) }
+        }
+        whenever(provider.getType(uri)).thenReturn("text/csv")
+        ShadowContentResolver.registerProviderInternal("import", provider)
+        shadowOf(targetContext.contentResolver).registerInputStreamSupplier(uri) { open() }
+        return uri
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/InfoInsetsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/InfoInsetsTest.kt
index 23a3953319ca..9af48667d532 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/InfoInsetsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/InfoInsetsTest.kt
@@ -5,8 +5,8 @@ package com.ichi2.anki
 import android.content.Intent
 import android.view.View
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.testutils.dispatchInsets
-import com.ichi2.utils.dp
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/InfoScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/InfoScreenshotTest.kt
index 8237b529b674..c76aa702e7f5 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/InfoScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/InfoScreenshotTest.kt
@@ -13,8 +13,8 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsCompat.Type.displayCutout
 import androidx.core.view.WindowInsetsCompat.Type.navigationBars
 import androidx.core.view.WindowInsetsCompat.Type.statusBars
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.testutils.insetsOf
-import com.ichi2.utils.dp
 import org.junit.Test
 import org.robolectric.RuntimeEnvironment
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/InfoTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/InfoTest.kt
new file mode 100644
index 000000000000..fdc0e3081ac4
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/InfoTest.kt
@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki
+
+import android.content.Intent
+import android.webkit.WebView
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.workarounds.SafeWebViewLayout
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.not
+import org.hamcrest.Matchers.sameInstance
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Shadows.shadowOf
+
+@RunWith(AndroidJUnit4::class)
+class InfoTest : RobolectricTest() {
+    private fun launchInfo(): Info =
+        startActivityNormallyOpenCollectionWithIntent(
+            Info::class.java,
+            Intent(targetContext, Info::class.java),
+        )
+
+    private fun Info.webViewLayout(): SafeWebViewLayout = findViewById(R.id.web_view)
+
+    @Test
+    fun `onRenderProcessGone recovers by recreating the inner WebView`() {
+        val activity = launchInfo()
+        val webViewLayout = activity.webViewLayout()
+        val initialInnerWebView = webViewLayout.getChildAt(0) as WebView
+
+        webViewLayout.onRenderProcessGone(initialInnerWebView)
+
+        assertThat("crashed WebView is destroyed", shadowOf(initialInnerWebView).wasDestroyCalled(), equalTo(true))
+        assertThat("a fresh WebView replaces it", webViewLayout.childCount, equalTo(1))
+        val recoveredInnerWebView = webViewLayout.getChildAt(0) as WebView
+        assertThat("recovered WebView is a new instance", recoveredInnerWebView, not(sameInstance(initialInnerWebView)))
+        assertThat("recovered WebView is not destroyed", shadowOf(recoveredInnerWebView).wasDestroyCalled(), equalTo(false))
+    }
+
+    @Test
+    fun `onRenderProcessGone does not finish the activity`() {
+        val activity = launchInfo()
+        val webViewLayout = activity.webViewLayout()
+        val innerWebView = webViewLayout.getChildAt(0) as WebView
+
+        webViewLayout.onRenderProcessGone(innerWebView)
+
+        assertThat("activity stays alive after render-process crash", activity.isFinishing, equalTo(false))
+    }
+
+    @Test
+    fun `safeDestroy tears down the inner WebView`() {
+        val controller =
+            startActivityControllerNormallyOpenCollectionWithIntent(
+                Info::class.java,
+                Intent(targetContext, Info::class.java),
+            )
+        val innerWebView = controller.get().webViewLayout().getChildAt(0) as WebView
+        controller.pause().stop().destroy()
+        assertThat("WebView.destroy() called on teardown", shadowOf(innerWebView).wasDestroyCalled(), equalTo(true))
+    }
+
+    @Test
+    fun `safeDestroy after render-process crash does not call destroy twice`() {
+        val activity = launchInfo()
+        val webViewLayout = activity.webViewLayout()
+        val crashedWebView = webViewLayout.getChildAt(0) as WebView
+
+        webViewLayout.onRenderProcessGone(crashedWebView)
+        assertThat(shadowOf(crashedWebView).wasDestroyCalled(), equalTo(true))
+
+        val recoveredWebView = webViewLayout.getChildAt(0) as WebView
+        webViewLayout.safeDestroy()
+        assertThat("recovered WebView is destroyed on teardown", shadowOf(recoveredWebView).wasDestroyCalled(), equalTo(true))
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/IntentHandlerImportTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/IntentHandlerImportTest.kt
index cfc1b0a53973..6ce5407b81b6 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/IntentHandlerImportTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/IntentHandlerImportTest.kt
@@ -8,6 +8,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.net.toUri
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.dialogs.utils.message
+import com.ichi2.utils.ImportResolution
 import com.ichi2.utils.ImportResult
 import com.ichi2.utils.ImportUtils
 import io.mockk.every
@@ -58,7 +59,11 @@ class IntentHandlerImportTest : RobolectricTest() {
 
     @Test
     fun `successful import finishes the intent handler`() {
-        every { ImportUtils.handleFileImport(any(), any()) } returns ImportResult.Success
+        every { ImportUtils.handleFileImport(any(), any()) } returns
+            ImportResult.Success(
+                ImportResolution.DeckPackage(ImportResolution.Source("content://import/deck.apkg".toUri(), "deck.apkg")),
+                "/cache/deck.apkg",
+            )
 
         assertTrue(launchImport().isFinishing)
     }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/IntentSyncTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/IntentSyncTest.kt
new file mode 100644
index 000000000000..4e0a08988fb9
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/IntentSyncTest.kt
@@ -0,0 +1,115 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.settings.Prefs
+import com.ichi2.anki.settings.enums.ShouldFetchMedia
+import com.ichi2.anki.sync.MeteredSyncPolicy
+import com.ichi2.anki.worker.SyncWorker
+import com.ichi2.utils.NetworkUtils
+import io.mockk.every
+import io.mockk.justRun
+import io.mockk.mockkObject
+import io.mockk.unmockkAll
+import io.mockk.verify
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.sameInstance
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.shadows.ShadowDialog
+
+@RunWith(AndroidJUnit4::class)
+class IntentSyncTest : RobolectricTest() {
+    @Before
+    fun setUpSync() {
+        mockkObject(NetworkUtils, MeteredSyncPolicy, SyncWorker.Companion)
+        every { NetworkUtils.isOnline } returns true
+        every { MeteredSyncPolicy.shouldBlock() } returns false
+        justRun { SyncWorker.start(any(), any(), any()) }
+    }
+
+    @After
+    fun resetMocks() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `sync intent schedules collection and media independently of the finishing activity`() =
+        deckPicker {
+            Prefs.hkey = "test"
+            Prefs.lastSyncTime = 0
+            Prefs.putEnum(R.string.sync_fetch_media_key, ShouldFetchMedia.ALWAYS)
+
+            IntentHandler.Companion.DoSync().handleAsyncMessage(this)
+
+            assertThat(isFinishing, equalTo(true))
+            verify(exactly = 1) { SyncWorker.start(this@deckPicker, match { it.hkey == "test" }, true) }
+        }
+
+    @Test
+    fun `sync intent respects disabled media sync`() =
+        deckPicker {
+            Prefs.hkey = "test"
+            Prefs.lastSyncTime = 0
+            Prefs.putEnum(R.string.sync_fetch_media_key, ShouldFetchMedia.NEVER)
+
+            IntentHandler.Companion.DoSync().handleAsyncMessage(this)
+
+            verify(exactly = 1) { SyncWorker.start(this@deckPicker, any(), false) }
+        }
+
+    @Test
+    fun `sync intent respects metered connection policy`() =
+        deckPicker {
+            Prefs.hkey = "test"
+            val previousSyncTime = 1_000L
+            Prefs.lastSyncTime = previousSyncTime
+            every { MeteredSyncPolicy.shouldBlock() } returns true
+            val previousDialog = ShadowDialog.getLatestDialog()
+
+            IntentHandler.Companion.DoSync().handleAsyncMessage(this)
+
+            verify(exactly = 0) { SyncWorker.start(any(), any(), any()) }
+            assertThat("sync must not open a confirmation dialog", ShadowDialog.getLatestDialog(), sameInstance(previousDialog))
+            assertThat(isFinishing, equalTo(true))
+            assertThat("blocked sync must not count as a sync attempt", Prefs.lastSyncTime, equalTo(previousSyncTime))
+        }
+
+    @Test
+    fun `sync intent respects rate limit`() =
+        deckPicker {
+            Prefs.hkey = "test"
+            setLastSyncTimeToNow()
+
+            IntentHandler.Companion.DoSync().handleAsyncMessage(this)
+
+            verify(exactly = 0) { SyncWorker.start(any(), any(), any()) }
+        }
+
+    @Test
+    fun `sync intent does not sync when offline`() =
+        deckPicker {
+            Prefs.hkey = "test"
+            Prefs.lastSyncTime = 0
+            every { NetworkUtils.isOnline } returns false
+
+            IntentHandler.Companion.DoSync().handleAsyncMessage(this)
+
+            verify(exactly = 0) { SyncWorker.start(any(), any(), any()) }
+        }
+
+    @Test
+    fun `sync intent does not sync when logged out`() =
+        deckPicker {
+            Prefs.hkey = ""
+            Prefs.lastSyncTime = 0
+
+            IntentHandler.Companion.DoSync().handleAsyncMessage(this)
+
+            verify(exactly = 0) { SyncWorker.start(any(), any(), any()) }
+        }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/IntentSyncWorkTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/IntentSyncWorkTest.kt
new file mode 100644
index 000000000000..1f4d58d949ab
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/IntentSyncWorkTest.kt
@@ -0,0 +1,167 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki
+
+import android.content.Intent
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.work.ExistingWorkPolicy
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkInfo
+import androidx.work.WorkManager
+import com.ichi2.anki.CollectionManager.withLeaseForTest
+import com.ichi2.anki.worker.SyncWorker
+import com.ichi2.anki.worker.UniqueWorkNames
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkObject
+import io.mockk.unmockkObject
+import kotlinx.coroutines.flow.MutableSharedFlow
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.nullValue
+import org.hamcrest.Matchers.sameInstance
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.Shadows.shadowOf
+import java.util.UUID
+import java.util.concurrent.TimeUnit
+
+@RunWith(AndroidJUnit4::class)
+class IntentSyncWorkTest : RobolectricTest() {
+    @Test
+    fun `sync intent leaves pending background sync intact`() {
+        val workId = enqueueSync()
+
+        val activity = launchIntent("com.ichi2.anki.DO_SYNC")
+
+        assertThat(workManager.getWorkInfoById(workId).get()!!.state, equalTo(WorkInfo.State.ENQUEUED))
+        assertThat("a duplicate sync must not open the collection in DeckPicker", shadowOf(activity).nextStartedActivity, nullValue())
+    }
+
+    @Test
+    fun `sync intent leaves foreground collection sync intact`() =
+        runTest {
+            for (operation in listOf(CollectionOperation.SYNC, CollectionOperation.FULL_UPLOAD, CollectionOperation.FULL_DOWNLOAD)) {
+                withLeaseForTest(operation) {
+                    val lease = CollectionManager.collectionLease
+
+                    val activity = launchIntent("com.ichi2.anki.DO_SYNC")
+
+                    assertThat(
+                        "a duplicate $operation intent must not open DeckPicker",
+                        shadowOf(activity).nextStartedActivity,
+                        nullValue(),
+                    )
+                    assertThat("the existing $operation must retain its lease", CollectionManager.collectionLease, sameInstance(lease))
+                }
+            }
+        }
+
+    @Test
+    fun `sync intent checks foreground sync after the work query completes`() =
+        runTest {
+            withPendingSyncQuery { results ->
+                Robolectric.buildActivity(IntentHandler::class.java, Intent("com.ichi2.anki.DO_SYNC")).use { controller ->
+                    controller.create().start().resume()
+                    val activity = controller.get()
+                    assertThat(results.subscriptionCount.value, equalTo(1))
+
+                    withLeaseForTest(CollectionOperation.SYNC) {
+                        results.emit(emptyList())
+
+                        assertThat(activity.isFinishing, equalTo(true))
+                        assertThat("a new foreground sync must prevent navigation", shadowOf(activity).nextStartedActivity, nullValue())
+                    }
+                }
+            }
+        }
+
+    @Test
+    fun `opening the app still cancels background collection sync`() {
+        val workId = enqueueSync()
+
+        launchIntent(Intent.ACTION_MAIN)
+
+        assertThat(workManager.getWorkInfoById(workId).get()!!.state, equalTo(WorkInfo.State.CANCELLED))
+    }
+
+    @Test
+    fun `sync intent opens DeckPicker when no sync is pending`() {
+        val activity = launchIntent("com.ichi2.anki.DO_SYNC")
+        val intent = shadowOf(activity).nextStartedActivity
+
+        assertThat(intent.component!!.className, equalTo(DeckPicker::class.java.name))
+        assertThat(intent.action, equalTo("com.ichi2.anki.DO_SYNC"))
+    }
+
+    @Test
+    fun `finishing the handler before the work query completes prevents navigation`() =
+        runTest {
+            withPendingSyncQuery { results ->
+                Robolectric.buildActivity(IntentHandler::class.java, Intent("com.ichi2.anki.DO_SYNC")).use { controller ->
+                    controller.create().start().resume()
+                    val activity = controller.get()
+                    assertThat(results.subscriptionCount.value, equalTo(1))
+
+                    activity.finish()
+                    results.emit(emptyList())
+
+                    assertThat("a finishing handler must not launch DeckPicker", shadowOf(activity).nextStartedActivity, nullValue())
+                }
+            }
+        }
+
+    @Test
+    fun `destroying the handler cancels its pending work query`() =
+        runTest {
+            withPendingSyncQuery { results ->
+                Robolectric.buildActivity(IntentHandler::class.java, Intent("com.ichi2.anki.DO_SYNC")).use { controller ->
+                    controller.create().start().resume()
+                    val activity = controller.get()
+                    assertThat(results.subscriptionCount.value, equalTo(1))
+
+                    activity.finish()
+                    controller.pause().stop().destroy()
+                    assertThat(results.subscriptionCount.value, equalTo(0))
+                    results.emit(emptyList())
+
+                    assertThat("a destroyed handler must not launch DeckPicker", shadowOf(activity).nextStartedActivity, nullValue())
+                }
+            }
+        }
+
+    private suspend fun withPendingSyncQuery(block: suspend (MutableSharedFlow<List<WorkInfo>>) -> Unit) {
+        val results = MutableSharedFlow<List<WorkInfo>>()
+        val manager = mockk<WorkManager>()
+        mockkObject(WorkManager.Companion)
+        try {
+            every { WorkManager.getInstance(any()) } returns manager
+            every { manager.getWorkInfosForUniqueWorkFlow(UniqueWorkNames.SYNC) } returns results
+            block(results)
+        } finally {
+            unmockkObject(WorkManager.Companion)
+        }
+    }
+
+    private val workManager get() = WorkManager.getInstance(targetContext)
+
+    private fun enqueueSync(): UUID {
+        // Keep the real worker queued without starting a network request.
+        val work =
+            OneTimeWorkRequestBuilder<SyncWorker>()
+                .setInitialDelay(1, TimeUnit.HOURS)
+                .build()
+        workManager.enqueueUniqueWork(UniqueWorkNames.SYNC, ExistingWorkPolicy.KEEP, work).result.get()
+        assertThat(workManager.getWorkInfoById(work.id).get()!!.state, equalTo(WorkInfo.State.ENQUEUED))
+        return work.id
+    }
+
+    private fun launchIntent(action: String): IntentHandler {
+        val controller = Robolectric.buildActivity(IntentHandler::class.java, Intent(action))
+        saveControllerForCleanup(controller)
+        val activity = controller.create().get()
+        advanceRobolectricLooperUntil { activity.isFinishing }
+        return activity
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/IntroductionActivityTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/IntroductionActivityTest.kt
index 80e798d484de..07c07dea004e 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/IntroductionActivityTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/IntroductionActivityTest.kt
@@ -72,7 +72,7 @@ class IntroductionActivityTest : RobolectricTest() {
             val activity = startRegularActivity<IntroductionActivity>(Intent())
 
             activity.supportFragmentManager.setFragmentResult(
-                SetupCollectionFragment.FRAGMENT_KEY,
+                SetupCollectionFragment.REQUEST_COLLECTION_SETUP,
                 Bundle().apply { putParcelable(SetupCollectionFragment.RESULT_KEY, DeckPickerWithNewCollection) },
             )
 
@@ -83,19 +83,19 @@ class IntroductionActivityTest : RobolectricTest() {
             )
             assertThat(
                 "DeckPicker isn't asked to sync (Get Started, not Sync)",
-                intent.getBooleanExtra(DeckPicker.INTENT_SYNC_FROM_LOGIN, false),
+                intent.getBooleanExtra(DeckPicker.EXTRA_SYNC_FROM_LOGIN, false),
                 equalTo(false),
             )
             assertThat(
                 "intro is marked as shown so it doesn't reappear",
-                getPreferences().getBoolean(IntroductionActivity.INTRODUCTION_SLIDES_SHOWN, false),
+                getPreferences().getBoolean(IntroductionActivity.PREF_INTRODUCTION_SLIDES_SHOWN, false),
                 equalTo(true),
             )
         }
 
     private fun IntroductionActivity.clickSync() {
         supportFragmentManager.setFragmentResult(
-            SetupCollectionFragment.FRAGMENT_KEY,
+            SetupCollectionFragment.REQUEST_COLLECTION_SETUP,
             Bundle().apply { putParcelable(SetupCollectionFragment.RESULT_KEY, SyncFromExistingAccount) },
         )
     }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/IntroductionInsetsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/IntroductionInsetsTest.kt
index bc7e3f69b25d..e1acae5534a3 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/IntroductionInsetsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/IntroductionInsetsTest.kt
@@ -5,9 +5,9 @@ package com.ichi2.anki
 import android.content.Intent
 import android.view.View
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.introduction.SetupCollectionFragment
 import com.ichi2.testutils.dispatchInsets
-import com.ichi2.utils.dp
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/IntroductionScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/IntroductionScreenshotTest.kt
index 4d7c17388559..2fed3139e6c9 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/IntroductionScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/IntroductionScreenshotTest.kt
@@ -13,8 +13,8 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsCompat.Type.displayCutout
 import androidx.core.view.WindowInsetsCompat.Type.navigationBars
 import androidx.core.view.WindowInsetsCompat.Type.statusBars
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.testutils.insetsOf
-import com.ichi2.utils.dp
 import org.junit.Test
 import org.robolectric.RuntimeEnvironment
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ManifestThemeTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ManifestThemeTest.kt
index 680d088ceff8..894c45fbe79e 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ManifestThemeTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ManifestThemeTest.kt
@@ -6,11 +6,16 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.compat.CompatHelper.Companion.getPackageInfoCompat
 import com.ichi2.anki.compat.GET_ACTIVITIES_L
 import com.ichi2.anki.compat.PackageInfoFlagsCompat
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.targetContext
 import com.ichi2.themes.Themes
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.empty
 import org.junit.Test
+import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
 
 /**
  * [Themes.setTheme] applies the user's theme in `onCreate`, so activities should not set
@@ -21,7 +26,9 @@ import org.junit.runner.RunWith
  *   the stale background is then visible behind transparent content
  */
 @RunWith(AndroidJUnit4::class)
-class ManifestThemeTest : RobolectricTest() {
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class ManifestThemeTest : AndroidTest {
     /**
      * Manifest themes which are intentional. Additions to this list should explain why the
      * activity cannot use the application theme.
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/MediaRegistrationTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/MediaRegistrationTest.kt
new file mode 100644
index 000000000000..7cd991b386d8
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/MediaRegistrationTest.kt
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki
+
+import android.content.ClipDescription
+import android.content.ContentProvider
+import android.database.MatrixCursor
+import android.net.Uri
+import android.provider.OpenableColumns
+import androidx.core.net.toUri
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.shadows.ShadowContentResolver
+import kotlin.test.assertContentEquals
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+@RunWith(AndroidJUnit4::class)
+class MediaRegistrationTest : RobolectricTest() {
+    override fun getCollectionStorageMode() = CollectionStorageMode.ON_DISK
+
+    @Test
+    fun `pasted image references the normalized media filename`() {
+        assertPastedMedia("image.png", "image/png", """<img src="%s">""")
+    }
+
+    @Test
+    fun `pasted audio references the normalized media filename`() {
+        assertPastedMedia("audio.mp3", "audio/mpeg", "[sound:%s]")
+    }
+
+    private fun assertPastedMedia(
+        filename: String,
+        mimeType: String,
+        expectedTag: String,
+    ) {
+        val data = "pasted media".toByteArray()
+        // Exceed the backend's filename length limit using characters valid on every OS.
+        val originalFilename = "a".repeat(120) + filename
+        val uri = stubClipboardMedia(originalFilename, data)
+
+        val html =
+            MediaRegistration.loadMediaIntoCollection(
+                targetContext,
+                uri,
+                ClipDescription("media", arrayOf(mimeType)),
+                pasteAsPng = false,
+                showError = { error("Unexpected paste error: $it") },
+            )
+
+        val importedFile =
+            col.media.dir
+                .listFiles()!!
+                .single()
+        assertTrue(importedFile.name.length < originalFilename.length, "Expected the backend to shorten the filename")
+        assertContentEquals(data, importedFile.readBytes())
+        assertEquals(expectedTag.format(importedFile.name), html)
+    }
+
+    private fun stubClipboardMedia(
+        filename: String,
+        data: ByteArray,
+    ): Uri {
+        val uri = "content://clipboard/media".toUri()
+        val cursor = MatrixCursor(arrayOf(OpenableColumns.DISPLAY_NAME)).apply { addRow(arrayOf(filename)) }
+        val provider = mock<ContentProvider>()
+        whenever(provider.query(uri, null, null, null, null)).thenReturn(cursor)
+        ShadowContentResolver.registerProviderInternal("clipboard", provider)
+        shadowOf(targetContext.contentResolver).registerInputStreamSupplier(uri) { data.inputStream() }
+        return uri
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/NavigationDrawerScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/NavigationDrawerScreenshotTest.kt
index 7efc3ffa2d74..236e664897b5 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/NavigationDrawerScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/NavigationDrawerScreenshotTest.kt
@@ -12,10 +12,11 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsCompat.Type.navigationBars
 import androidx.core.view.WindowInsetsCompat.Type.statusBars
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.testutils.insetsOf
-import com.ichi2.utils.dp
 import org.junit.Test
 import org.robolectric.RuntimeEnvironment
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Screenshot tests for the navigation drawer of [NavigationDrawerActivity]
@@ -73,7 +74,7 @@ class NavigationDrawerScreenshotTest : ScreenshotTest() {
         val navBarOverlay =
             View(this).apply {
                 // the navigationBarColor of the app's themes
-                setBackgroundResource(R.color.semi_transparent_black)
+                setBackgroundResource(CommonR.color.semi_transparent_black)
             }
         decor.addView(
             navBarOverlay,
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorDeckSelectionTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorDeckSelectionTest.kt
index bb8e809a8c68..99b616af9d17 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorDeckSelectionTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorDeckSelectionTest.kt
@@ -13,11 +13,11 @@ import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.model.SelectableDeck
 import com.ichi2.anki.noteeditor.getNoteEditorFragment
 import com.ichi2.anki.noteeditor.openNoteEditorWithArgs
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
 
@@ -31,24 +31,29 @@ class NoteEditorDeckSelectionTest : RobolectricTest() {
         col.config.addingDefaultsMode = mode
     }
 
-    private fun share(text: String) =
-        openNoteEditorWithArgs(
-            Bundle().apply { putString(Intent.EXTRA_TEXT, text) },
-            Intent.ACTION_SEND,
-        )
+    private fun share(
+        text: String,
+        deckId: DeckId? = null,
+    ) = openNoteEditorWithArgs(
+        Bundle().apply {
+            putString(Intent.EXTRA_TEXT, text)
+            deckId?.let { putLong(NoteEditorFragment.EXTRA_DID, it) }
+        },
+        Intent.ACTION_SEND,
+    )
 
     private fun NoteEditorFragment.select(did: DeckId) {
         onDeckSelected(SelectableDeck.Deck(did, col.decks.name(did)))
     }
 
     @Test
-    @Ignore("Issue 22065: save task starts while activity is finishing")
-    fun `successive shares use the study deck in current-deck mode`() =
+    fun `successive shares remember the destination without changing the study deck`() =
         runTest {
             useAddingDefaults(AddingDefaultsMode.USE_CURRENT_DECK)
             val a = addDeck("Study A", setAsSelected = true)
             val b = addDeck("Add B")
             val first = share("first share")
+            assertEquals(a, first.deckId)
             val activity = first.requireActivity()
             first.select(b)
             first.saveNote()
@@ -56,11 +61,11 @@ class NoteEditorDeckSelectionTest : RobolectricTest() {
             assertTrue(activity.isFinishing)
             assertEquals(listOf(b), col.findCards("").map { col.getCard(it).did })
             assertEquals(a, col.decks.selected())
-            assertEquals(a, share("second share").deckId)
+            assertEquals(b, share("second share").deckId)
+            assertEquals(a, openAdd().deckId)
         }
 
     @Test
-    @Ignore("Issue 22065: save task starts while activity is finishing")
     fun `successive shares remember the destination in note-type mode`() =
         runTest {
             useAddingDefaults(AddingDefaultsMode.DECIDE_BY_NOTE_TYPE)
@@ -80,6 +85,127 @@ class NoteEditorDeckSelectionTest : RobolectricTest() {
             assertEquals(b, second.deckId)
         }
 
+    private suspend fun saveSharedNote(deckId: DeckId) {
+        val editor = share("saved share")
+        val activity = editor.requireActivity()
+        editor.select(deckId)
+        editor.saveNote()
+        advanceRobolectricLooper()
+        assertTrue(activity.isFinishing)
+    }
+
+    @Test
+    fun `in-app additions do not replace the shared destination`() =
+        runTest {
+            useAddingDefaults(AddingDefaultsMode.USE_CURRENT_DECK)
+            val study = addDeck("Study", setAsSelected = true)
+            val shared = addDeck("Shared")
+            val inApp = addDeck("In app")
+            saveSharedNote(shared)
+
+            val editor = openAdd(inApp)
+            editor.setFieldValueFromUi(0, "added in app")
+            editor.saveNote()
+            advanceRobolectricLooper()
+
+            assertEquals(2, col.noteCount())
+            assertEquals(shared, share("next share").deckId)
+            assertEquals(study, col.decks.selected())
+        }
+
+    @Test
+    fun `canceling a share does not replace the saved destination`() =
+        runTest {
+            useAddingDefaults(AddingDefaultsMode.USE_CURRENT_DECK)
+            addDeck("Study", setAsSelected = true)
+            val saved = addDeck("Saved")
+            val canceled = addDeck("Canceled")
+            saveSharedNote(saved)
+
+            val editor = share("canceled share")
+            editor.select(canceled)
+            editor.requireActivity().finish()
+
+            assertEquals(1, col.noteCount())
+            assertEquals(saved, share("next share").deckId)
+        }
+
+    @Test
+    fun `a failed share does not replace the saved destination`() =
+        runTest {
+            useAddingDefaults(AddingDefaultsMode.USE_CURRENT_DECK)
+            addDeck("Study", setAsSelected = true)
+            val saved = addDeck("Saved")
+            val failed = addDeck("Failed")
+            saveSharedNote(saved)
+
+            val editor = share("")
+            editor.select(failed)
+            editor.saveNote()
+            advanceRobolectricLooper()
+            assertNotNull(editor.addNoteErrorMessage)
+            assertFalse(editor.requireActivity().isFinishing)
+            editor.requireActivity().finish()
+
+            assertEquals(1, col.noteCount())
+            assertEquals(saved, share("next share").deckId)
+        }
+
+    @Test
+    fun `a deleted shared destination falls back to the study deck`() =
+        runTest {
+            useAddingDefaults(AddingDefaultsMode.USE_CURRENT_DECK)
+            val study = addDeck("Study", setAsSelected = true)
+            val deleted = addDeck("Deleted")
+            saveSharedNote(deleted)
+            col.decks.remove(listOf(deleted))
+
+            assertEquals(study, share("next share").deckId)
+        }
+
+    @Test
+    fun `note-type defaults take precedence over the last shared destination`() =
+        runTest {
+            useAddingDefaults(AddingDefaultsMode.USE_CURRENT_DECK)
+            addDeck("Study", setAsSelected = true)
+            val shared = addDeck("Shared")
+            val remembered = addDeck("Remembered")
+            saveSharedNote(shared)
+            col.config.addingDefaultsMode = AddingDefaultsMode.DECIDE_BY_NOTE_TYPE
+            val reversed = col.notetypes.basicAndReversed
+            col.addNote(col.newNote(reversed).apply { fields[0] = "saved reversed" }, remembered)
+
+            val editor = share("next share")
+            assertEquals(reversed.id, editor.editorNote!!.noteTypeId)
+            assertEquals(remembered, editor.deckId)
+        }
+
+    @Test
+    fun `an explicit share destination takes precedence over the last shared deck`() =
+        runTest {
+            useAddingDefaults(AddingDefaultsMode.USE_CURRENT_DECK)
+            addDeck("Study", setAsSelected = true)
+            saveSharedNote(addDeck("Shared"))
+
+            assertEquals(1L, share("explicit share", deckId = 1L).deckId)
+        }
+
+    @Test
+    fun `selected text uses the last shared destination`() =
+        runTest {
+            useAddingDefaults(AddingDefaultsMode.USE_CURRENT_DECK)
+            addDeck("Study", setAsSelected = true)
+            val shared = addDeck("Shared")
+            saveSharedNote(shared)
+
+            val editor =
+                openNoteEditorWithArgs(
+                    Bundle().apply { putString(Intent.EXTRA_PROCESS_TEXT, "selected text") },
+                    Intent.ACTION_PROCESS_TEXT,
+                )
+            assertEquals(shared, editor.deckId)
+        }
+
     @Test
     fun `explicit Default deck takes precedence over the remembered deck`() =
         runTest {
@@ -310,4 +436,21 @@ class NoteEditorDeckSelectionTest : RobolectricTest() {
             assertEquals(basic.id, col.defaultsForAdding().notetypeId)
             assertEquals(1, col.noteCount())
         }
+
+    @Test
+    fun `restored selection takes precedence over the original destination`() =
+        runTest {
+            useAddingDefaults(AddingDefaultsMode.USE_CURRENT_DECK)
+            val a = addDeck("Original A", setAsSelected = true)
+            val b = addDeck("Chosen B")
+            val controller =
+                startActivityControllerNormallyOpenCollectionWithIntent(
+                    NoteEditorActivity::class.java,
+                    NoteEditorDestination.AddNote(a).toIntent(),
+                )
+            controller.get().getNoteEditorFragment().select(b)
+            controller.recreate()
+            advanceRobolectricLooper()
+            assertEquals(b, controller.get().getNoteEditorFragment().deckId)
+        }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorInsetsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorInsetsTest.kt
index 722d334b6fb9..64fe6ca2eca1 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorInsetsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorInsetsTest.kt
@@ -10,11 +10,11 @@ import androidx.core.content.edit
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
 import com.ichi2.anki.common.destinations.NoteEditorDestination
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.noteeditor.getNoteEditorFragment
 import com.ichi2.anki.noteeditor.toIntent
 import com.ichi2.testutils.dispatchInsets
 import com.ichi2.testutils.withSplitPaneUi
-import com.ichi2.utils.dp
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorScreenshotTest.kt
index e6832022ea46..5c1b4340920c 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorScreenshotTest.kt
@@ -12,11 +12,11 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsCompat.Type.navigationBars
 import androidx.core.view.WindowInsetsCompat.Type.statusBars
 import com.ichi2.anki.common.destinations.NoteEditorDestination
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.noteeditor.toIntent
 import com.ichi2.testutils.dispatchInsets
 import com.ichi2.testutils.insetsOf
 import com.ichi2.testutils.simulateKeyboard
-import com.ichi2.utils.dp
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorTest.kt
index 0c6a5cbe01b3..3ed2913cf0e0 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorTest.kt
@@ -365,6 +365,299 @@ class NoteEditorTest : RobolectricTest() {
         assertThat("Deck ID in the new note should be the ID provided in the intent", newNoteEditor.deckId, equalTo(currentDid))
     }
 
+    @Test
+    fun copyNoteCopiesNoteType() {
+        val originalNote = addBasicAndReversedNote()
+
+        addBasicNote()
+
+        val editor =
+            openNoteEditorWithArgs(NoteEditorDestination.EditSelection(listOf(originalNote.firstCard().id), DEFAULT).toBundle())
+        val copyNoteBundle = getCopyNoteIntent(editor)
+        val newNoteEditor = openNoteEditorWithArgs(copyNoteBundle)
+
+        assertThat(
+            "the note type of the copied note should match the original",
+            newNoteEditor.editorNote!!.notetype.name,
+            equalTo(col.notetypes.basicAndReversed.name),
+        )
+    }
+
+    @Test
+    fun copyNoteAllowsChangingNoteType() =
+        withRealSpinnerSelection {
+            val originalNote = addBasicNote("front", "back")
+            val editor =
+                openNoteEditorWithArgs(NoteEditorDestination.EditSelection(listOf(originalNote.firstCard().id), DEFAULT).toBundle())
+            val copiedEditor = openNoteEditorWithArgs(getCopyNoteIntent(editor))
+            advanceRobolectricLooper()
+
+            val requestedType = col.notetypes.basicAndReversed
+            copiedEditor.setCurrentlySelectedNoteType(requestedType.id)
+            advanceRobolectricLooper()
+
+            assertEquals(
+                requestedType.name,
+                copiedEditor.noteTypeSpinner!!.selectedItem.toString(),
+                "Changing the copied note's type should not reselect the original type",
+            )
+            assertEquals(requestedType.id, copiedEditor.editorNote!!.noteTypeId)
+            assertEquals(listOf("front", "back"), copiedEditor.currentFieldStrings.toList())
+        }
+
+    @Test
+    fun copyNoteOverridesDeckNoteTypeAndPreservesAllFields() =
+        withRealSpinnerSelection {
+            val name = addStandardNoteType("Three Fields", arrayOf("Front", "Back", "Extra"), "{{Front}}", "{{Back}}{{Extra}}")
+            val originalNote = addNoteUsingNoteTypeName(name, "front value", "back value", "third value")
+            addBasicNote()
+
+            // Selecting a note type in the add editor also stores it on the current deck.
+            val currentDeck = col.decks.current()
+            currentDeck.noteTypeId = col.notetypes.basic.id
+            col.decks.save(currentDeck)
+
+            val editor =
+                openNoteEditorWithArgs(NoteEditorDestination.EditSelection(listOf(originalNote.firstCard().id), DEFAULT).toBundle())
+            val copiedEditor = openNoteEditorWithArgs(getCopyNoteIntent(editor))
+            advanceRobolectricLooper()
+
+            assertEquals(
+                originalNote.noteTypeId,
+                copiedEditor.editorNote!!.noteTypeId,
+                "The copied note's type should take precedence over the deck's remembered type",
+            )
+            assertEquals(
+                listOf("front value", "back value", "third value"),
+                copiedEditor.currentFieldStrings.toList(),
+                "All fields should be copied even when the deck's remembered note type has fewer fields",
+            )
+        }
+
+    @Test
+    fun copyNotePreservesChangedTypeAndFieldsAcrossRecreation() =
+        withRealSpinnerSelection {
+            ensureCollectionLoadIsSynchronous()
+            val originalNote = addBasicNote("front", "back")
+            val editor =
+                openNoteEditorWithArgs(
+                    NoteEditorDestination.EditSelection(listOf(originalNote.firstCard().id), DEFAULT).toBundle(),
+                )
+            val args = getCopyNoteIntent(editor)
+            val typeName =
+                addStandardNoteType("Recreation Three Fields", arrayOf("Front", "Back", "Extra"), "{{Front}}", "{{Back}}{{Extra}}")
+            val requestedType = col.notetypes.byName(typeName)!!
+            ActivityScenario.launch<NoteEditorActivity>(NoteEditorDestination.PassArguments(args).toIntent()).use { scenario ->
+                scenario.onNoteEditor { copied ->
+                    copied.setCurrentlySelectedNoteType(requestedType.id)
+                    advanceRobolectricLooper()
+                    assertEquals(requestedType.id, copied.editorNote!!.noteTypeId)
+                    copied.setField(2, "extra after change")
+                }
+                scenario.recreate()
+                scenario.onNoteEditor { recreated ->
+                    advanceRobolectricLooper()
+                    assertEquals(requestedType.id, recreated.editorNote!!.noteTypeId, "Changed type survives recreation")
+                    assertEquals(listOf("front", "back", "extra after change"), recreated.currentFieldStrings.toList())
+                }
+            }
+        }
+
+    @Test
+    fun copyNotePreservesHiddenFieldsAcrossTypeChanges() =
+        withRealSpinnerSelection {
+            val name = addStandardNoteType("Three Fields", arrayOf("Front", "Back", "Extra"), "{{Front}}", "{{Back}}{{Extra}}")
+            val original = addNoteUsingNoteTypeName(name, "front", "back", "extra")
+            val editor =
+                openNoteEditorWithArgs(
+                    NoteEditorDestination.EditSelection(listOf(original.firstCard().id), DEFAULT).toBundle(),
+                )
+            val copied = openNoteEditorWithArgs(getCopyNoteIntent(editor))
+            advanceRobolectricLooper()
+            copied.setCurrentlySelectedNoteType(col.notetypes.basic.id)
+            advanceRobolectricLooper()
+            copied.setField(0, "edited front")
+            copied.setField(1, "")
+            copied.setCurrentlySelectedNoteType(original.noteTypeId)
+            advanceRobolectricLooper()
+            assertEquals(listOf("edited front", "", "extra"), copied.currentFieldStrings.toList())
+        }
+
+    @Test
+    fun copyNotePreservesHiddenFieldsAcrossRecreation() =
+        withRealSpinnerSelection {
+            ensureCollectionLoadIsSynchronous()
+            val name = addStandardNoteType("Three Fields", arrayOf("Front", "Back", "Extra"), "{{Front}}", "{{Back}}{{Extra}}")
+            val original = addNoteUsingNoteTypeName(name, "front", "back", "extra")
+            val editor =
+                openNoteEditorWithArgs(
+                    NoteEditorDestination.EditSelection(listOf(original.firstCard().id), DEFAULT).toBundle(),
+                )
+            val args = getCopyNoteIntent(editor)
+            ActivityScenario.launch<NoteEditorActivity>(NoteEditorDestination.PassArguments(args).toIntent()).use { scenario ->
+                scenario.onNoteEditor { copied ->
+                    copied.setCurrentlySelectedNoteType(col.notetypes.basic.id)
+                    advanceRobolectricLooper()
+                }
+                scenario.recreate()
+                scenario.onNoteEditor { recreated ->
+                    advanceRobolectricLooper()
+                    recreated.setCurrentlySelectedNoteType(original.noteTypeId)
+                    advanceRobolectricLooper()
+                    assertEquals(listOf("front", "back", "extra"), recreated.currentFieldStrings.toList())
+                }
+            }
+        }
+
+    @Test
+    fun hiddenFieldsDoNotCarryOverAfterSaving() =
+        withRealSpinnerSelection {
+            runTest {
+                val name = addStandardNoteType("Three Fields", arrayOf("Front", "Back", "Extra"), "{{Front}}", "{{Back}}{{Extra}}")
+                val typeId = col.notetypes.byName(name)!!.id
+                val editor = openNoteEditorWithArgs(NoteEditorDestination.AddNote().toBundle())
+                editor.setCurrentlySelectedNoteType(typeId)
+                advanceRobolectricLooper()
+                editor.setField(0, "front")
+                editor.setField(1, "back")
+                editor.setField(2, "must not leak")
+                editor.setCurrentlySelectedNoteType(col.notetypes.basic.id)
+                advanceRobolectricLooper()
+                val previousCardCount = cardCount
+                editor.saveNote()
+                advanceRobolectricLooper()
+                assertEquals(previousCardCount + 1, cardCount)
+                editor.setCurrentlySelectedNoteType(typeId)
+                advanceRobolectricLooper()
+                assertEquals(listOf("", "", ""), editor.currentFieldStrings.toList())
+            }
+        }
+
+    @Test
+    fun hiddenStickyBaselineSurvivesRoundTrip() =
+        withRealSpinnerSelection {
+            runTest {
+                val name = addStandardNoteType("Sticky Three Fields", arrayOf("Front", "Back", "Extra"), "{{Front}}", "{{Back}}{{Extra}}")
+                val type = col.notetypes.byName(name)!!
+                type.markFieldAsSticky(2)
+                val editor = openNoteEditorWithArgs(NoteEditorDestination.AddNote().toBundle())
+                editor.setCurrentlySelectedNoteType(type.id)
+                advanceRobolectricLooper()
+                editor.setField(0, "front")
+                editor.setField(2, "sticky text")
+                editor.saveNote()
+                advanceRobolectricLooper()
+                assertEquals(listOf("", "", "sticky text"), editor.currentFieldStrings.toList())
+                assertFalse(editor.hasUnsavedChanges())
+                editor.setFieldValueFromUi(0, "temporary edit")
+                editor.setFieldValueFromUi(0, "")
+                assertFalse(editor.hasUnsavedChanges())
+                editor.setCurrentlySelectedNoteType(col.notetypes.basic.id)
+                advanceRobolectricLooper()
+                editor.setCurrentlySelectedNoteType(type.id)
+                advanceRobolectricLooper()
+                assertEquals(listOf("", "", "sticky text"), editor.currentFieldStrings.toList())
+                assertFalse(editor.hasUnsavedChanges(), "Only unchanged sticky content remains")
+            }
+        }
+
+    @Test
+    fun hiddenDraftStillRequiresDiscardConfirmation() =
+        withRealSpinnerSelection {
+            val name = addStandardNoteType("Hidden Draft", arrayOf("Front", "Back", "Extra"), "{{Front}}", "{{Back}}{{Extra}}")
+            val typeId = col.notetypes.byName(name)!!.id
+            val editor = openNoteEditorWithArgs(NoteEditorDestination.AddNote().toBundle())
+            editor.setCurrentlySelectedNoteType(typeId)
+            advanceRobolectricLooper()
+            editor.setField(2, "unsaved draft text")
+            assertTrue(editor.hasUnsavedChanges())
+            editor.setCurrentlySelectedNoteType(col.notetypes.basic.id)
+            advanceRobolectricLooper()
+            assertEquals(listOf("", ""), editor.currentFieldStrings.toList())
+            assertTrue(editor.hasUnsavedChanges(), "Hidden draft text must still trigger the discard confirmation")
+        }
+
+    @Test
+    fun hiddenDraftRequiresConfirmationAfterRecreation() = assertHiddenFieldStateAfterRecreation(sticky = false)
+
+    @Test
+    fun unchangedHiddenStickyFieldDoesNotRequireConfirmationAfterRecreation() = assertHiddenFieldStateAfterRecreation(sticky = true)
+
+    private fun assertHiddenFieldStateAfterRecreation(sticky: Boolean) =
+        withRealSpinnerSelection {
+            runTest {
+                ensureCollectionLoadIsSynchronous()
+                val name = addStandardNoteType("Draft Three Fields", arrayOf("Front", "Back", "Extra"), "{{Front}}", "{{Back}}{{Extra}}")
+                val type = col.notetypes.byName(name)!!
+                if (sticky) type.markFieldAsSticky(2)
+                ActivityScenario.launch<NoteEditorActivity>(NoteEditorDestination.AddNote().toIntent()).use { scenario ->
+                    lateinit var editor: NoteEditorFragment
+                    scenario.onNoteEditor { editor = it }
+                    editor.setCurrentlySelectedNoteType(type.id)
+                    advanceRobolectricLooper()
+                    editor.setField(2, "third field")
+                    if (sticky) {
+                        editor.setField(0, "saved note")
+                        editor.saveNote()
+                        advanceRobolectricLooper()
+                        assertEquals(listOf("", "", "third field"), editor.currentFieldStrings.toList())
+                        editor.setFieldValueFromUi(0, "reverted edit")
+                        editor.setFieldValueFromUi(0, "")
+                    }
+                    editor.setCurrentlySelectedNoteType(col.notetypes.basic.id)
+                    advanceRobolectricLooper()
+                    assertEquals(!sticky, editor.hasUnsavedChanges())
+                    scenario.recreate()
+                    scenario.onNoteEditor { restored ->
+                        advanceRobolectricLooper()
+                        assertEquals(!sticky, restored.hasUnsavedChanges(), "Hidden edits and their baseline survive recreation")
+                        restored.setCurrentlySelectedNoteType(type.id)
+                        advanceRobolectricLooper()
+                        assertEquals(listOf("", "", "third field"), restored.currentFieldStrings.toList())
+                        assertEquals(!sticky, restored.hasUnsavedChanges())
+                    }
+                }
+            }
+        }
+
+    @Test
+    fun copyNoteCopiesAllFieldsWhenNoteTypeChanges() {
+        val name = addStandardNoteType("Three Fields", arrayOf("Front", "Back", "Extra"), "{{Front}}", "{{Back}}{{Extra}}")
+        val originalNote = addNoteUsingNoteTypeName(name, "front value", "back value", "third value")
+
+        // The last-added note type has fewer fields than the note being copied.
+        addBasicNote()
+
+        val editor =
+            openNoteEditorWithArgs(NoteEditorDestination.EditSelection(listOf(originalNote.firstCard().id), DEFAULT).toBundle())
+        val copiedEditor = openNoteEditorWithArgs(getCopyNoteIntent(editor))
+        advanceRobolectricLooper()
+
+        assertEquals(originalNote.noteTypeId, copiedEditor.editorNote!!.noteTypeId)
+        assertEquals(
+            listOf("front value", "back value", "third value"),
+            copiedEditor.currentFieldStrings.toList(),
+            "All copied field contents should survive the note type change",
+        )
+    }
+
+    @Test
+    fun copyNoteCopiesDeckIdWhenDecidingDeckByNoteType() {
+        col.config.setBool(ConfigKey.Bool.ADDING_DEFAULTS_TO_CURRENT_DECK, false)
+        val sourceDeckId = addDeck("Source deck")
+        // Moving the cards leaves the note type's remembered deck unchanged.
+        val originalNote = addBasicAndReversedNote().updateCards { did = sourceDeckId }
+        addBasicNote()
+
+        val editor =
+            openNoteEditorWithArgs(NoteEditorDestination.EditSelection(listOf(originalNote.firstCard().id), DEFAULT).toBundle())
+        assertEquals(sourceDeckId, editor.deckId)
+        val copiedEditor = openNoteEditorWithArgs(getCopyNoteIntent(editor))
+        advanceRobolectricLooper()
+
+        assertEquals(sourceDeckId, copiedEditor.deckId, "The copied deck should take precedence over the note type's remembered deck")
+    }
+
     @Test
     fun stickyFieldsAreUnchangedAfterAdd() =
         runTest {
@@ -1015,6 +1308,22 @@ class NoteEditorTest : RobolectricTest() {
         }
     }
 
+    private fun withRealSpinnerSelection(block: () -> Unit) {
+        // Robolectric's legacy spinner shadow invokes callbacks immediately, which can hide
+        // selection changes made by the callback. Android dispatches them during layout instead.
+        val key = "robolectric.useRealSpinnerSelection"
+        val previousValue = System.setProperty(key, "true")
+        try {
+            block()
+        } finally {
+            if (previousValue == null) {
+                System.clearProperty(key)
+            } else {
+                System.setProperty(key, previousValue)
+            }
+        }
+    }
+
     private fun getCopyNoteIntent(editor: NoteEditorFragment): Bundle {
         val editorShadow = shadowOf(editor.requireActivity())
         editor.copyNote()
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorToolbarLayoutTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorToolbarLayoutTest.kt
new file mode 100644
index 000000000000..ab27ecf1fdd2
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/NoteEditorToolbarLayoutTest.kt
@@ -0,0 +1,114 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki
+
+import androidx.appcompat.widget.PopupMenu
+import androidx.compose.ui.test.assertIsSelected
+import androidx.compose.ui.test.junit4.v2.createEmptyComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.core.content.edit
+import androidx.core.view.isVisible
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.common.destinations.NoteEditorDestination
+import com.ichi2.anki.noteeditor.getNoteEditorFragment
+import com.ichi2.anki.noteeditor.label
+import com.ichi2.anki.noteeditor.presentation.ToolbarLayoutMode
+import com.ichi2.anki.noteeditor.toIntent
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class NoteEditorToolbarLayoutTest : RobolectricTest() {
+    @get:Rule
+    val composeRule = createEmptyComposeRule()
+
+    @Test
+    fun `chooser reads existing stack preference and applies scroll and hidden`() {
+        getPreferences().edit {
+            putBoolean("noteEditorShowToolbar", true)
+            putBoolean("noteEditorScrollToolbar", false)
+        }
+        val activity = startEditor()
+        openChooser(activity)
+        option(ToolbarLayoutMode.STACK).assertIsSelected()
+        option(ToolbarLayoutMode.SCROLL).performClick()
+        option(ToolbarLayoutMode.SCROLL).assertDoesNotExist()
+        assertTrue(getPreferences().getBoolean("noteEditorScrollToolbar", false))
+        assertTrue(
+            activity
+                .getNoteEditorFragment()
+                .binding.editorToolbar.isVisible,
+        )
+        openChooser(activity)
+        option(ToolbarLayoutMode.SCROLL).assertIsSelected()
+        option(ToolbarLayoutMode.HIDDEN).performClick()
+        option(ToolbarLayoutMode.HIDDEN).assertDoesNotExist()
+        assertFalse(getPreferences().getBoolean("noteEditorShowToolbar", true))
+        assertFalse(
+            activity
+                .getNoteEditorFragment()
+                .binding.editorToolbar.isVisible,
+        )
+        openChooser(activity)
+        option(ToolbarLayoutMode.HIDDEN).assertIsSelected()
+        option(ToolbarLayoutMode.STACK).performClick()
+        option(ToolbarLayoutMode.STACK).assertDoesNotExist()
+        assertTrue(getPreferences().getBoolean("noteEditorShowToolbar", false))
+        assertFalse(getPreferences().getBoolean("noteEditorScrollToolbar", true))
+        assertTrue(
+            activity
+                .getNoteEditorFragment()
+                .binding.editorToolbar.isVisible,
+        )
+    }
+
+    @Test
+    fun `chooser survives recreation and updates the recreated toolbar`() {
+        getPreferences().edit {
+            putBoolean("noteEditorShowToolbar", true)
+            putBoolean("noteEditorScrollToolbar", false)
+        }
+        val controller =
+            startActivityControllerNormallyOpenCollectionWithIntent(
+                NoteEditorActivity::class.java,
+                NoteEditorDestination.AddNote().toIntent(targetContext),
+            )
+        advanceRobolectricLooper()
+        openChooser(controller.get())
+        option(ToolbarLayoutMode.STACK).assertIsSelected()
+
+        controller.recreate()
+        advanceRobolectricLooper()
+
+        option(ToolbarLayoutMode.STACK).assertIsSelected()
+        option(ToolbarLayoutMode.HIDDEN).performClick()
+        option(ToolbarLayoutMode.HIDDEN).assertDoesNotExist()
+        assertFalse(
+            controller
+                .get()
+                .getNoteEditorFragment()
+                .binding.editorToolbar.isVisible,
+        )
+    }
+
+    private fun option(layout: ToolbarLayoutMode) = composeRule.onNodeWithText(targetContext.getString(layout.label()))
+
+    private fun startEditor(): NoteEditorActivity =
+        startActivityNormallyOpenCollectionWithIntent(
+            NoteEditorActivity::class.java,
+            NoteEditorDestination.AddNote().toIntent(targetContext),
+        ).also { advanceRobolectricLooper() }
+
+    private fun openChooser(activity: NoteEditorActivity) {
+        composeRule.runOnIdle {
+            val fragment = activity.getNoteEditorFragment()
+            val menu = PopupMenu(activity, fragment.requireView()).menu
+            activity.menuInflater.inflate(R.menu.note_editor, menu)
+            assertTrue(fragment.onMenuItemSelected(menu.findItem(R.id.action_toolbar_layout)))
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/NoteTypeFieldEditorTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/NoteTypeFieldEditorTest.kt
index d68100985752..f32f6e1069dd 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/NoteTypeFieldEditorTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/NoteTypeFieldEditorTest.kt
@@ -16,6 +16,7 @@ import org.hamcrest.Matchers
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.ParameterizedRobolectricTestRunner
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(ParameterizedRobolectricTestRunner::class)
 class NoteTypeFieldEditorTest(
@@ -88,7 +89,7 @@ class NoteTypeFieldEditorTest(
         fieldNameInput: EditText,
         fieldOperationType: FieldOperationType,
     ): AlertDialog =
-        AlertDialog.Builder(ContextThemeWrapper(targetContext, R.style.Theme_Light)).show {
+        AlertDialog.Builder(ContextThemeWrapper(targetContext, CommonR.style.Theme_Light)).show {
             positiveButton(text = "") {
                 try {
                     val noteTypeName = "Basic"
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ReadTextTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ReadTextTest.kt
index b3796277c8fe..b273d8febc98 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ReadTextTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ReadTextTest.kt
@@ -2,8 +2,12 @@
 
 package com.ichi2.anki
 
+import android.content.ComponentName
 import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import android.speech.tts.TextToSpeech
+import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -11,6 +15,7 @@ import com.ichi2.anki.ReadText.closeForTests
 import com.ichi2.anki.ReadText.initializeTts
 import com.ichi2.anki.ReadText.releaseTts
 import com.ichi2.anki.ReadText.textToSpeech
+import com.ichi2.anki.dialogs.utils.title
 import com.ichi2.anki.reviewer.CardSide
 import io.mockk.coEvery
 import io.mockk.coVerify
@@ -26,13 +31,18 @@ import org.mockito.Mockito.mock
 import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
 import org.mockito.Mockito.`when`
+import org.robolectric.Robolectric.buildActivity
 import org.robolectric.Shadows.shadowOf
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.Implementation
 import org.robolectric.annotation.Implements
+import org.robolectric.shadows.ShadowDialog
 import org.robolectric.shadows.ShadowTextToSpeech
+import org.robolectric.shadows.ShadowToast
 import java.util.Locale
+import kotlin.test.assertEquals
 import kotlin.test.assertFalse
+import kotlin.test.assertNull
 
 @RunWith(AndroidJUnit4::class)
 class ReadTextTest : RobolectricTest() {
@@ -92,6 +102,33 @@ class ReadTextTest : RobolectricTest() {
         assertThat(isTextToSpeechShutdown, equalTo(false))
     }
 
+    @Test
+    fun `legacy TTS initialization failure explains missing engines`() =
+        withTtsActivity { activity ->
+            initializeTextToSpeech(activity)
+            shadowOf(textToSpeech).onInitListener.onInit(TextToSpeech.ERROR)
+            val dialog = ShadowDialog.getLatestDialog() as AlertDialog
+            assertEquals("No text-to-speech engine installed", dialog.title)
+        }
+
+    @Test
+    fun `legacy TTS initialization failure with an installed engine shows a toast instead of installation guidance`() =
+        withTtsActivity { activity ->
+            shadowOf(activity.packageManager).apply {
+                val engine = ComponentName("test.tts", "TestTtsService")
+                addServiceIfNotPresent(engine)
+                addIntentFilterForService(
+                    engine,
+                    IntentFilter(TextToSpeech.Engine.INTENT_ACTION_TTS_SERVICE).apply { addCategory(Intent.CATEGORY_DEFAULT) },
+                )
+            }
+            initializeTextToSpeech(activity)
+            shadowOf(textToSpeech).onInitListener.onInit(TextToSpeech.ERROR)
+
+            assertEquals(activity.getString(CommonString.no_tts_available_message), ShadowToast.getTextOfLatestToast())
+            assertNull(ShadowDialog.getLatestDialog())
+        }
+
     @Test
     @Config(shadows = [NoLanguageQueryTextToSpeech::class])
     fun `reviewer TTS waits for cached languages without blocking the callback`() =
@@ -195,6 +232,17 @@ class ReadTextTest : RobolectricTest() {
     private val isTextToSpeechShutdown: Boolean
         get() = shadowOf(textToSpeech).isShutdown
 
+    private fun withTtsActivity(block: (AnkiActivity) -> Unit) {
+        buildActivity(AnkiActivity::class.java).use { controller ->
+            val activity = controller.setup().get()
+            try {
+                block(activity)
+            } finally {
+                releaseTts(activity)
+            }
+        }
+    }
+
     private fun initializeTextToSpeech(context: Context) {
         initializeTts(context, mock(AbstractFlashcardViewer.ReadTextListener::class.java))
     }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewCompletionTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewCompletionTest.kt
new file mode 100644
index 000000000000..6507475c38f2
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewCompletionTest.kt
@@ -0,0 +1,169 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+package com.ichi2.anki
+
+import android.content.Context
+import android.content.Intent
+import android.view.KeyEvent
+import androidx.core.content.edit
+import anki.scheduler.CardAnswer.Rating
+import com.ichi2.anki.AbstractFlashcardViewer.Companion.RESULT_NO_MORE_CARDS
+import com.ichi2.anki.CollectionManager.TR
+import com.ichi2.anki.NavigationDrawerActivity.Companion.EXTRA_STARTED_WITH_SHORTCUT
+import com.ichi2.anki.libanki.Consts.DEFAULT_DECK_ID
+import com.ichi2.anki.pages.CongratsPage
+import com.ichi2.testutils.ext.snackbarText
+import org.json.JSONArray
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.shadows.ShadowToast
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+@RunWith(ParameterizedRobolectricTestRunner::class)
+class ReviewCompletionTest : RobolectricTest() {
+    @ParameterizedRobolectricTestRunner.Parameter(0)
+    @JvmField
+    var newCongratsScreen = false
+
+    @ParameterizedRobolectricTestRunner.Parameter(1)
+    @JvmField
+    var fromShortcut = false
+
+    override fun getCollectionStorageMode() = CollectionStorageMode.IN_MEMORY_WITH_MEDIA
+
+    @Before
+    fun configureCompletionScreen() {
+        getPreferences().edit { putBoolean("new_congrats_screen", newCongratsScreen) }
+        ShadowToast.reset()
+    }
+
+    @Test
+    fun `finished parent with cards only in its child still shows completion`() {
+        val child = addDeck("Parent::Child")
+        col.setDeck(listOf(addBasicNote().firstCard().id), child)
+        col.decks.select(col.decks.id("Parent"))
+
+        completeReview(expectEmpty = false) {
+            col.sched.answerCard(assertNotNull(col.sched.card), Rating.EASY)
+            assertEquals(0, col.sched.totalCount())
+            assertEquals(1, col.decks.cardCount(child, includeSubdecks = true))
+        }
+    }
+
+    @Test
+    fun `filtered deck emptied by the final review still shows completion`() {
+        addBasicNote()
+        val filtered = addDynamicDeck("Filtered", "")
+
+        completeReview(expectEmpty = false) {
+            col.sched.answerCard(assertNotNull(col.sched.card), Rating.EASY)
+            assertEquals(0, col.decks.cardCount(filtered, includeSubdecks = true))
+        }
+    }
+
+    @Test
+    fun `learning later still shows completion with the next available time`() {
+        col.config.set("collapseTime", 0)
+        val config = col.decks.configDictForDeckId(DEFAULT_DECK_ID)
+        config.new.delays = JSONArray(listOf(1))
+        col.decks.save(config)
+        addBasicNote()
+
+        completeReview(
+            expectEmpty = false,
+            expectedMessage = {
+                it.getString(
+                    CommonString.studyoptions_congrats_next_due_in,
+                    TR.schedulingNextLearnDue("minutes", 1),
+                )
+            },
+        ) {
+            col.sched.answerCard(assertNotNull(col.sched.card), Rating.AGAIN)
+            assertNull(col.sched.card)
+        }
+    }
+
+    private fun completeReview(
+        expectEmpty: Boolean,
+        expectedMessage: (Context) -> String = {
+            it.getString(if (expectEmpty) CommonString.empty_deck else CommonString.studyoptions_congrats_finished)
+        },
+        finishCards: () -> Unit,
+    ) {
+        if (fromShortcut) {
+            runTest {
+                val reviewer =
+                    startActivityNormallyOpenCollectionWithIntent(
+                        Reviewer::class.java,
+                        Intent().putExtra(EXTRA_STARTED_WITH_SHORTCUT, true),
+                    )
+                advanceRobolectricLooper()
+                assertNotNull(reviewer.currentCardId)
+                finishCards()
+                val selected = col.decks.selected()
+                val undoStatus = col.undoStatus()
+
+                reviewer.updateCardAndRedraw()
+                advanceRobolectricLooper()
+
+                assertTrue(reviewer.isFinishing)
+                assertEquals(RESULT_NO_MORE_CARDS, shadowOf(reviewer).resultCode)
+                if (newCongratsScreen && !expectEmpty) {
+                    assertCongratsIntent(shadowOf(reviewer).nextStartedActivity)
+                } else {
+                    assertNull(shadowOf(reviewer).nextStartedActivity)
+                    assertEquals(expectedMessage(reviewer), ShadowToast.getTextOfLatestToast())
+                }
+                assertEquals(selected, col.decks.selected())
+                assertEquals(undoStatus, col.undoStatus())
+            }
+        } else {
+            deckPicker {
+                advanceRobolectricLooper()
+                val shadow = shadowOf(this)
+                shadow.clearNextStartedActivities()
+                assertTrue(onKeyUp(KeyEvent.KEYCODE_S, KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_S)))
+                advanceRobolectricLooperUntil { shadow.peekNextStartedActivity() != null }
+                val review = assertNotNull(shadow.nextStartedActivityForResult)
+                assertEquals(Reviewer::class.java.name, review.intent.component?.className)
+                shadow.clearNextStartedActivities()
+                finishCards()
+                val selected = col.decks.selected()
+                val undoStatus = col.undoStatus()
+
+                activityResultRegistry.dispatchResult(review.requestCode, RESULT_NO_MORE_CARDS, null)
+
+                if (newCongratsScreen && !expectEmpty) {
+                    advanceRobolectricLooperUntil { shadow.peekNextStartedActivity() != null }
+                    assertCongratsIntent(shadow.nextStartedActivity)
+                } else {
+                    advanceRobolectricLooperUntil { snackbarText == expectedMessage(this) }
+                    assertNull(shadow.nextStartedActivity)
+                }
+                assertEquals(selected, col.decks.selected())
+                assertEquals(undoStatus, col.undoStatus())
+            }
+        }
+    }
+
+    private fun assertCongratsIntent(intent: Intent?) {
+        assertEquals(
+            CongratsPage::class.java.name,
+            assertNotNull(intent).getStringExtra(SingleFragmentActivity.EXTRA_FRAGMENT_NAME),
+        )
+    }
+
+    companion object {
+        @ParameterizedRobolectricTestRunner.Parameters(name = "new screen = {0}, shortcut = {1}")
+        @JvmStatic
+        fun configurations() =
+            listOf(false, true).flatMap { newScreen ->
+                listOf(false, true).map { shortcut -> arrayOf(newScreen, shortcut) }
+            }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerInsetsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerInsetsTest.kt
index 62a55b5b9ec4..54260e47558b 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerInsetsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerInsetsTest.kt
@@ -16,13 +16,14 @@ import androidx.core.view.marginBottom
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
 import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.reviewer.FullScreenMode
 import com.ichi2.testutils.dispatchInsets
-import com.ichi2.utils.dp
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
 import org.junit.runner.RunWith
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * Edge-to-edge inset handling for the legacy [Reviewer].
@@ -72,7 +73,7 @@ class ReviewerInsetsTest : RobolectricTest() {
                 equalTo(48.dp.toPx(targetContext)),
             )
 
-            val sideMargin = targetContext.resources.getDimensionPixelSize(R.dimen.side_margin)
+            val sideMargin = targetContext.resources.getDimensionPixelSize(CommonR.dimen.side_margin)
             assertThat(
                 "the counts bar keeps its side margin past the cutout",
                 reviewer.countsBar.paddingLeft,
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerKeyboardInputTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerKeyboardInputTest.kt
index 8db9d895d5c1..8cb943e15935 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerKeyboardInputTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerKeyboardInputTest.kt
@@ -22,7 +22,7 @@ import com.ichi2.anki.AnkiDroidApp.Companion.sharedPrefs
 import com.ichi2.anki.cardviewer.Gesture
 import com.ichi2.anki.cardviewer.ViewerCommand
 import com.ichi2.anki.libanki.Card
-import com.ichi2.anki.reviewer.Binding.Companion.keyCode
+import com.ichi2.anki.reviewer.Binding.KeyCode
 import com.ichi2.anki.reviewer.Binding.ModifierKeys
 import com.ichi2.anki.reviewer.BindingMap
 import com.ichi2.anki.reviewer.CardSide
@@ -143,7 +143,7 @@ class ReviewerKeyboardInputTest : RobolectricTest() {
     fun pressingZShouldUndoIfAvailable() {
         ViewerCommand.UNDO.addBinding(
             sharedPrefs(),
-            ReviewerBinding(keyCode(KEYCODE_Z, ModifierKeys.none()), CardSide.BOTH),
+            ReviewerBinding(KeyCode(KEYCODE_Z, ModifierKeys.none()), CardSide.BOTH),
         )
         val underTest = KeyboardInputTestReviewer.displayingAnswer().withUndoAvailable(true)
         underTest.handleAndroidKeyPress(KEYCODE_Z)
@@ -154,7 +154,7 @@ class ReviewerKeyboardInputTest : RobolectricTest() {
     fun pressingZShouldNotUndoIfNotAvailable() {
         ViewerCommand.UNDO.addBinding(
             sharedPrefs(),
-            ReviewerBinding(keyCode(KEYCODE_Z, ModifierKeys.none()), CardSide.BOTH),
+            ReviewerBinding(KeyCode(KEYCODE_Z, ModifierKeys.none()), CardSide.BOTH),
         )
         val underTest = KeyboardInputTestReviewer.displayingAnswer().withUndoAvailable(false)
         underTest.handleUnicodeKeyPress('z')
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt
index 71f6b945e441..b4c1e7f74c1b 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerNoParamTest.kt
@@ -3,18 +3,22 @@
 package com.ichi2.anki
 
 import android.content.Intent
+import android.content.SharedPreferences
 import android.graphics.Color
 import androidx.annotation.CheckResult
 import androidx.core.content.edit
+import androidx.preference.PreferenceManager
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import anki.scheduler.CardAnswer.Rating
+import com.github.ivanshafran.sharedpreferencesmock.SPMockBuilder
+import com.ichi2.anki.AnkiDroidApp.Companion.sharedPrefs
 import com.ichi2.anki.cardviewer.Gesture
 import com.ichi2.anki.cardviewer.Gesture.SWIPE_DOWN
 import com.ichi2.anki.cardviewer.Gesture.SWIPE_RIGHT
 import com.ichi2.anki.cardviewer.Gesture.SWIPE_UP
 import com.ichi2.anki.cardviewer.GestureProcessor
 import com.ichi2.anki.cardviewer.ViewerCommand
-import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.anki.common.preferences.SharedPreferencesTestHook
 import com.ichi2.anki.libanki.Consts
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.model.WhiteboardPenColor
@@ -168,81 +172,87 @@ class ReviewerNoParamTest : RobolectricTest() {
         }
 
     @Test
-    @Flaky(OS.ALL, "hasDrawerSwipeConflicts was false")
-    fun defaultDrawerConflictIsTrueIfGesturesEnabled() {
-        enableGestureSetting()
-        enableGesture(SWIPE_RIGHT)
-        val reviewer = startReviewerFullScreen()
-
-        assertThat(reviewer.hasDrawerSwipeConflicts(), equalTo(true))
-    }
+    fun defaultDrawerConflictIsTrueIfGesturesEnabled() =
+        withIsolatedGesturePreferences {
+            enableGestureSetting()
+            enableGesture(SWIPE_RIGHT)
+            val reviewer = startReviewerFullScreen()
+            advanceRobolectricLooper()
+            assertThat(reviewer.hasDrawerSwipeConflicts(), equalTo(true))
+        }
 
     @Test
-    fun noDrawerConflictsBeforeOnCreate() {
-        enableGestureSetting()
-        val controller = Robolectric.buildActivity(Reviewer::class.java, Intent())
-        saveControllerForCleanup(controller)
-        try {
-            assertThat("no conflicts before onCreate", controller.get().hasDrawerSwipeConflicts(), equalTo(false))
-        } finally {
+    fun noDrawerConflictsBeforeOnCreate() =
+        withIsolatedGesturePreferences {
+            enableGestureSetting()
+            val controller = Robolectric.buildActivity(Reviewer::class.java, Intent())
+            saveControllerForCleanup(controller)
             try {
-                enableGesture(SWIPE_UP)
-            } catch (e: Exception) {
-                // ignore
+                assertThat("no conflicts before onCreate", controller.get().hasDrawerSwipeConflicts(), equalTo(false))
+            } finally {
+                try {
+                    enableGesture(SWIPE_UP)
+                } catch (e: Exception) {
+                    // ignore
+                }
             }
         }
-    }
 
     @Test
-    fun noDrawerConflictsIfGesturesDisabled() {
-        disableGestureSetting()
-        enableGesture(SWIPE_UP)
-        val reviewer = startReviewerFullScreen()
-        assertThat("gestures should be disabled", gestureProcessor.isEnabled, equalTo(false))
-        assertThat(reviewer.hasDrawerSwipeConflicts(), equalTo(false))
-    }
+    fun noDrawerConflictsIfGesturesDisabled() =
+        withIsolatedGesturePreferences {
+            disableGestureSetting()
+            enableGesture(SWIPE_UP)
+            val reviewer = startReviewerFullScreen()
+            assertThat("gestures should be disabled", gestureProcessor.isEnabled, equalTo(false))
+            assertThat(reviewer.hasDrawerSwipeConflicts(), equalTo(false))
+        }
 
     @Test
-    fun noDrawerConflictsIfNoGestures() {
-        enableGestureSetting()
-        disableConflictGestures()
-        val reviewer = startReviewerFullScreen()
-        assertThat("gestures should be enabled", gestureProcessor.isEnabled, equalTo(true))
-        assertThat("no conflicts, so no conflicts detected", reviewer.hasDrawerSwipeConflicts(), equalTo(false))
-    }
+    fun noDrawerConflictsIfNoGestures() =
+        withIsolatedGesturePreferences {
+            enableGestureSetting()
+            disableConflictGestures()
+            val reviewer = startReviewerFullScreen()
+            assertThat("gestures should be enabled", gestureProcessor.isEnabled, equalTo(true))
+            assertThat("no conflicts, so no conflicts detected", reviewer.hasDrawerSwipeConflicts(), equalTo(false))
+        }
 
     @Test
-    @Flaky(os = OS.ALL, "final assertion is false")
-    fun drawerConflictsIfUp() {
-        enableGestureSetting()
-        disableConflictGestures()
-        enableGesture(SWIPE_UP)
-        val reviewer = startReviewerFullScreen()
-        assertThat("gestures should be enabled", gestureProcessor.isEnabled, equalTo(true))
-        assertThat(reviewer.hasDrawerSwipeConflicts(), equalTo(true))
-    }
+    fun drawerConflictsIfUp() =
+        withIsolatedGesturePreferences {
+            enableGestureSetting()
+            disableConflictGestures()
+            enableGesture(SWIPE_UP)
+            val reviewer = startReviewerFullScreen()
+            assertThat("gestures should be enabled", gestureProcessor.isEnabled, equalTo(true))
+            advanceRobolectricLooper()
+            assertThat(reviewer.hasDrawerSwipeConflicts(), equalTo(true))
+        }
 
     @Test
-    @Flaky(os = OS.ALL, "final assertion is false")
-    fun drawerConflictsIfDown() {
-        enableGestureSetting()
-        disableConflictGestures()
-        enableGesture(SWIPE_DOWN)
-        val reviewer = startReviewerFullScreen()
-        assertThat("gestures should be enabled", gestureProcessor.isEnabled, equalTo(true))
-        assertThat(reviewer.hasDrawerSwipeConflicts(), equalTo(true))
-    }
+    fun drawerConflictsIfDown() =
+        withIsolatedGesturePreferences {
+            enableGestureSetting()
+            disableConflictGestures()
+            enableGesture(SWIPE_DOWN)
+            val reviewer = startReviewerFullScreen()
+            assertThat("gestures should be enabled", gestureProcessor.isEnabled, equalTo(true))
+            advanceRobolectricLooper()
+            assertThat(reviewer.hasDrawerSwipeConflicts(), equalTo(true))
+        }
 
     @Test
-    @Flaky(os = OS.ALL, "final assertion is false")
-    fun drawerConflictsIfRight() {
-        enableGestureSetting()
-        disableConflictGestures()
-        enableGesture(SWIPE_RIGHT)
-        val reviewer = startReviewerFullScreen()
-        assertThat("gestures should be enabled", gestureProcessor.isEnabled, equalTo(true))
-        assertThat(reviewer.hasDrawerSwipeConflicts(), equalTo(true))
-    }
+    fun drawerConflictsIfRight() =
+        withIsolatedGesturePreferences {
+            enableGestureSetting()
+            disableConflictGestures()
+            enableGesture(SWIPE_RIGHT)
+            val reviewer = startReviewerFullScreen()
+            assertThat("gestures should be enabled", gestureProcessor.isEnabled, equalTo(true))
+            advanceRobolectricLooper()
+            assertThat(reviewer.hasDrawerSwipeConflicts(), equalTo(true))
+        }
 
     @Test
     fun normalReviewerDoesNotFitSystemWindows() {
@@ -260,7 +270,7 @@ class ReviewerNoParamTest : RobolectricTest() {
     private val gestureProcessor: GestureProcessor
         get() {
             val gestureProcessor = GestureProcessor(null)
-            gestureProcessor.init(targetContext.sharedPrefs())
+            gestureProcessor.init(sharedPrefs())
             return gestureProcessor
         }
 
@@ -277,13 +287,13 @@ class ReviewerNoParamTest : RobolectricTest() {
     }
 
     private fun setGestureSetting(value: Boolean) {
-        targetContext.sharedPrefs().edit {
+        sharedPrefs().edit {
             putBoolean(GestureProcessor.PREF_KEY, value)
         }
     }
 
     private fun disableGestures(vararg gestures: Gesture) {
-        val prefs = targetContext.sharedPrefs()
+        val prefs = sharedPrefs()
         for (command in ViewerCommand.entries) {
             for (mappableBinding in ReviewerBinding.fromPreference(prefs, command)) {
                 val gestureBinding = mappableBinding.binding as? Binding.GestureInput? ?: continue
@@ -300,16 +310,56 @@ class ReviewerNoParamTest : RobolectricTest() {
 
     /** Enables a gesture (without changing the overall setting of whether gestures are allowed)  */
     private fun enableGesture(gesture: Gesture) {
-        val prefs = targetContext.sharedPrefs()
+        val prefs = sharedPrefs()
         ViewerCommand.ANSWER_AGAIN.addBinding(
             prefs,
             ReviewerBinding.fromGesture(gesture),
         )
     }
 
+    private fun withIsolatedGesturePreferences(block: () -> Unit) {
+        val previousOverride = AnkiDroidApp.sharedPreferencesTestingOverride
+        val previousHook = SharedPreferencesTestHook.override
+        val isolated = cloneDefaultSharedPreferences()
+        AnkiDroidApp.sharedPreferencesTestingOverride = isolated
+        SharedPreferencesTestHook.override = { sharedPrefs() }
+        try {
+            block()
+        } finally {
+            SharedPreferencesTestHook.override = previousHook
+            AnkiDroidApp.sharedPreferencesTestingOverride = previousOverride
+        }
+    }
+
+    private fun cloneDefaultSharedPreferences(): SharedPreferences {
+        val previousHook = SharedPreferencesTestHook.override
+        SharedPreferencesTestHook.override = null
+        try {
+            val source = PreferenceManager.getDefaultSharedPreferences(targetContext)
+            val target = SPMockBuilder().createSharedPreferences()
+            target.edit {
+                for ((key, value) in source.all) {
+                    when (value) {
+                        is String -> putString(key, value)
+                        is Int -> putInt(key, value)
+                        is Long -> putLong(key, value)
+                        is Float -> putFloat(key, value)
+                        is Boolean -> putBoolean(key, value)
+                        is Set<*> -> putStringSet(key, value.filterIsInstance<String>().toSet())
+                        else -> throw IllegalArgumentException("Unsupported preference type for $key")
+                    }
+                }
+            }
+            return target
+        } finally {
+            SharedPreferencesTestHook.override = previousHook
+        }
+    }
+
     private fun startReviewerFullScreen(): ReviewerExt {
-        val sharedPrefs = targetContext.sharedPrefs()
-        setPreference(sharedPrefs, FullScreenMode.BUTTONS_ONLY)
+        CollectionManager.getColUnsafe()
+        val preferences = sharedPrefs()
+        setPreference(preferences, FullScreenMode.BUTTONS_ONLY)
         return ReviewerTest.startReviewer(this, ReviewerExt::class.java)
     }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerScreenshotTest.kt
index 5a3d544d6a95..b6ea2e5a6383 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerScreenshotTest.kt
@@ -16,9 +16,9 @@ import androidx.core.view.WindowInsetsCompat.Type.displayCutout
 import androidx.core.view.WindowInsetsCompat.Type.navigationBars
 import androidx.core.view.WindowInsetsCompat.Type.statusBars
 import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.reviewer.FullScreenMode
 import com.ichi2.testutils.insetsOf
-import com.ichi2.utils.dp
 import org.junit.Test
 import org.robolectric.RuntimeEnvironment
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerTest.kt
index 0c8d226fce43..4e70ff531bc9 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ReviewerTest.kt
@@ -30,6 +30,7 @@ import com.ichi2.anki.cardviewer.ViewerCommand.ANSWER_EASY
 import com.ichi2.anki.cardviewer.ViewerCommand.MARK
 import com.ichi2.anki.cardviewer.ViewerCommand.SHOW_ANSWER
 import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.anki.common.storage.CollectionHelper.getMediaDirectory
 import com.ichi2.anki.common.time.MockTime
 import com.ichi2.anki.common.time.TimeManager
 import com.ichi2.anki.common.ui.TransitionDirection
@@ -48,12 +49,14 @@ import com.ichi2.anki.model.CardStateFilter
 import com.ichi2.anki.observability.undoableOp
 import com.ichi2.anki.preferences.PreferenceTestUtils
 import com.ichi2.anki.reviewer.ActionButtonStatus
+import com.ichi2.anki.snackbar.SnackbarBuilder
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.testutils.RecordingInputMethodManager
 import com.ichi2.testutils.common.Flaky
 import com.ichi2.testutils.common.OS
 import com.ichi2.testutils.ext.addNoSuggestNote
 import com.ichi2.testutils.ext.createInputConnection
+import com.ichi2.testutils.ext.text
 import com.ichi2.testutils.withBooleanPreference
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertFalse
@@ -73,7 +76,12 @@ import org.robolectric.RuntimeEnvironment
 import org.robolectric.Shadows
 import org.robolectric.annotation.Config
 import org.robolectric.shadow.api.Shadow
+import org.robolectric.shadows.ShadowMediaPlayer
+import org.robolectric.shadows.util.DataSource
 import timber.log.Timber
+import java.io.File
+import java.io.IOException
+import java.util.concurrent.ConcurrentLinkedQueue
 import kotlin.test.assertContains
 import kotlin.test.assertNotEquals
 import kotlin.test.junit5.JUnit5Asserter.assertNotNull
@@ -261,15 +269,31 @@ class ReviewerTest : RobolectricTest() {
     }
 
     @Test
-    fun noErrorShouldOccurIfSoundFileNotPresent() {
-        addBasicNote("[[sound:not_on_file_system.mp3]]", "World")
+    fun `missing sound is reported without interrupting review`() {
+        val filename = "not_on_file_system.mp3"
+        addBasicNote("[sound:$filename]", "World")
             .firstCard()
             .moveToReviewQueue()
 
-        val reviewer = startReviewer()
+        val reviewer = startReviewer(ReviewerWithSnackbarRecording::class.java)
+        val mediaDirectory = getMediaDirectory(reviewer)
+        assertFalse(File(mediaDirectory, filename).exists())
+        // The default media shadow accepts every file, including missing ones.
+        ShadowMediaPlayer.addException(
+            DataSource.toDataSource(AbstractFlashcardViewer.getMediaBaseUrl(mediaDirectory) + filename),
+            IOException("Missing sound file"),
+        )
         reviewer.displayCardQuestion()
 
-        assertThat("If the sound file with given name is not present, then no error occurs", true)
+        // Playback runs on Dispatchers.IO; draining the main looper alone can miss it.
+        advanceRobolectricLooperUntil { reviewer.snackbarMessages.isNotEmpty() && !reviewer.cardMediaPlayer.isPlaying }
+        assertThat(
+            reviewer.snackbarMessages.toList(),
+            equalTo(listOf(reviewer.getString(CommonString.card_viewer_could_not_find_image, filename))),
+        )
+        reviewer.displayCardAnswer()
+        assertTrue(reviewer.isDisplayingAnswer)
+        assertFalse(reviewer.isFinishing)
     }
 
     @Test
@@ -628,6 +652,15 @@ class ReviewerTest : RobolectricTest() {
     private val defaultDeckConfig
         get() = col.decks.configDictForDeckId(Consts.DEFAULT_DECK_ID)
 
+    private class ReviewerWithSnackbarRecording : Reviewer() {
+        val snackbarMessages = ConcurrentLinkedQueue<String>()
+
+        override val baseSnackbarBuilder: SnackbarBuilder = {
+            super.baseSnackbarBuilder.invoke(this)
+            text?.let(snackbarMessages::add)
+        }
+    }
+
     private class ReviewerForMenuItems : Reviewer() {
         var menu: Menu? = null
             private set
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/RobolectricTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/RobolectricTest.kt
index 0a7d9c6c3d6f..cf033b4cd681 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/RobolectricTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/RobolectricTest.kt
@@ -26,7 +26,9 @@ import com.ichi2.anki.CollectionManager.CollectionOpenFailure
 import com.ichi2.anki.RobolectricTest.CollectionStorageMode.IN_MEMORY_NO_FOLDERS
 import com.ichi2.anki.RobolectricTest.CollectionStorageMode.IN_MEMORY_WITH_MEDIA
 import com.ichi2.anki.RobolectricTest.CollectionStorageMode.ON_DISK
+import com.ichi2.anki.common.android.AdaptionUtil
 import com.ichi2.anki.common.annotations.UseContextParameter
+import com.ichi2.anki.common.preferences.SharedPreferencesTestHook
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.common.time.MockTime
 import com.ichi2.anki.common.time.TimeManager
@@ -81,8 +83,12 @@ import kotlin.time.Duration.Companion.seconds
 import kotlin.time.TimeSource
 import com.ichi2.testutils.Robolectric as RobolectricActivities
 
-open class RobolectricTest :
-    AnkiTest,
+/**
+ * @param loadBackend Disable for tests which do not use the native backend.
+ */
+open class RobolectricTest(
+    private val loadBackend: Boolean = true,
+) : AnkiTest,
     AndroidTest {
     @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
     private fun Any.wait(timeMs: Long) = (this as Object).wait(timeMs)
@@ -168,7 +174,7 @@ open class RobolectricTest :
 
         CollectionManager.closeCollectionBlocking()
 
-        maybeSetupBackend()
+        if (loadBackend) setupBackend()
 
         // Reset static variable for custom tabs failure.
         CustomTabActivityHelper.resetFailed()
@@ -181,6 +187,8 @@ open class RobolectricTest :
 
         // https://github.com/ankidroid/Anki-Android/pull/19004#discussion_r2739833965
         grantPermissions(Manifest.permission.INTERNET)
+
+        AdaptionUtil.resetWebBrowserAvailabilityCacheForTests()
     }
 
     @After
@@ -199,6 +207,10 @@ open class RobolectricTest :
         }
         controllersForCleanup.clear()
 
+        if (SharedPreferencesTestHook.override != null) {
+            Timber.w("SharedPreferencesTestHook was not reset! Setting it to null.")
+            SharedPreferencesTestHook.override = null
+        }
         if (AnkiDroidApp.sharedPreferencesTestingOverride != null) {
             Timber.w("AnkiDroidApp SharedPrefs test override was not reset to null! Setting it to null.")
             AnkiDroidApp.sharedPreferencesTestingOverride = null
@@ -465,16 +477,7 @@ open class RobolectricTest :
             undoableOp<OpChanges> { col.updateNote(note) }
         }
 
-    private fun maybeSetupBackend() {
-        try {
-            targetContext
-        } catch (exc: IllegalStateException) {
-            // We must make sure not to load the backend library into a test running outside
-            // the Robolectric classloader, or subsequent Robolectric tests that run in this
-            // process will be unable to make calls into the backend.
-            println("not annotated with junit, not setting up backend")
-            return
-        }
+    private fun setupBackend() {
         try {
             RustBackendLoader.ensureSetup()
         } catch (e: UnsatisfiedLinkError) {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ScreenshotTest.kt
index f0dd6c3072fb..9df05258c31e 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ScreenshotTest.kt
@@ -2,17 +2,23 @@
 
 package com.ichi2.anki
 
+import android.os.Build
 import android.view.View
 import android.view.WindowManager
 import android.widget.EditText
 import androidx.core.content.getSystemService
 import androidx.core.view.allViews
 import androidx.core.view.drawToBitmap
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import com.github.takahirom.roborazzi.ExperimentalRoborazziApi
 import com.github.takahirom.roborazzi.RobolectricDeviceQualifiers
+import com.github.takahirom.roborazzi.RoborazziATFAccessibilityCheckOptions
+import com.github.takahirom.roborazzi.RoborazziATFAccessibilityChecker
 import com.github.takahirom.roborazzi.RoborazziOptions
 import com.github.takahirom.roborazzi.captureRoboImage
 import com.github.takahirom.roborazzi.captureScreenRoboImage
+import com.github.takahirom.roborazzi.checkRoboAccessibility
 import com.github.takahirom.roborazzi.provideRoborazziContext
 import com.google.testing.junit.testparameterinjector.TestParameter
 import com.google.testing.junit.testparameterinjector.TestParameterValuesProvider
@@ -31,8 +37,6 @@ import org.robolectric.shadow.api.Shadow
 import org.robolectric.shadows.ShadowWindowManagerImpl
 import java.io.File
 
-interface ScreenshotTestCategory
-
 /**
  * Base class for [roborazzi](https://github.com/takahirom/roborazzi) screenshot tests
  */
@@ -147,13 +151,39 @@ abstract class ScreenshotTest : RobolectricTest() {
      * Captures a screenshot to `build/outputs/roborazzi/<TestClass>/<name>.png`.
      *
      * Writes to /diffs/ if there is an issue.
+     * Add `-PaccessibilityScan` to scan the live UI and log accessibility findings.
      */
     @OptIn(ExperimentalRoborazziApi::class)
     protected fun captureScreen(name: String) =
         capture(name) { filePath, options ->
             captureScreenRoboImage(filePath = filePath, roborazziOptions = options)
+            scanAccessibilityIfEnabled(filePath, options)
         }
 
+    /**
+     * Scan the live download UI across all themes, logging findings without failing on them:
+     * ```sh
+     * ./gradlew :AnkiDroid:testPlayDebugUnitTest -Pscreenshot -PaccessibilityScan -Ptheme=all \
+     *   --tests '*SharedDecksScreenshotTest.downloadFragment*'
+     * ```
+     */
+    @OptIn(ExperimentalRoborazziApi::class)
+    private fun scanAccessibilityIfEnabled(
+        filePath: String,
+        options: RoborazziOptions,
+    ) {
+        if (!java.lang.Boolean.getBoolean("screenshot.accessibilityScan")) return
+        check(Build.VERSION.SDK_INT >= 34) { "Accessibility scans require API 34 or newer" }
+        println("Accessibility scan: $filePath")
+        onView(isRoot()).checkRoboAccessibility(
+            roborazziATFAccessibilityCheckOptions =
+                RoborazziATFAccessibilityCheckOptions(
+                    failureLevel = RoborazziATFAccessibilityChecker.CheckLevel.LogOnly,
+                ),
+            roborazziOptions = options,
+        )
+    }
+
     /** Captures a laid-out view, including content extending beyond the screen. */
     protected fun captureView(
         name: String,
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/SearchErrorScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/SearchErrorScreenshotTest.kt
new file mode 100644
index 000000000000..9f3082629601
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/SearchErrorScreenshotTest.kt
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki
+
+import org.junit.Test
+import org.robolectric.shadows.ShadowDialog
+
+/**
+ * `./gradlew :AnkiDroid:verifyRoborazziPlayDebug -Pscreenshot --tests "com.ichi2.anki.SearchErrorScreenshotTest"`
+ */
+class SearchErrorScreenshotTest : ScreenshotTest() {
+    @Test
+    fun `browser search errors`() =
+        runTest {
+            throwOnShowError = false
+            addBasicNote()
+            val browser = startRegularActivity<CardBrowser>()
+            for ((query, name) in listOf("and" to "inline_code", "re:b[" to "regex_diagnostic")) {
+                browser.searchCardsSync(query)
+                advanceRobolectricLooper()
+                captureScreen(name)
+                ShadowDialog.getLatestDialog().dismiss()
+            }
+        }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/SingleFragmentScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/SingleFragmentScreenshotTest.kt
index 4241c3b41748..2036a9c0ac9d 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/SingleFragmentScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/SingleFragmentScreenshotTest.kt
@@ -3,8 +3,8 @@
 package com.ichi2.anki
 
 import android.content.Intent
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.testutils.simulateSystemBars
-import com.ichi2.utils.dp
 import org.junit.Test
 import org.robolectric.RuntimeEnvironment
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsFragmentTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsFragmentTest.kt
index 30a3e8b20f77..33cf1794a69a 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsFragmentTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsFragmentTest.kt
@@ -2,22 +2,37 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 package com.ichi2.anki
 
+import android.content.Context
+import android.content.res.Configuration
+import android.graphics.drawable.GradientDrawable
 import android.view.View
 import android.view.View.MeasureSpec
+import android.view.ViewGroup
 import android.widget.ScrollView
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.appcompat.view.menu.MenuBuilder
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.commit
 import androidx.fragment.app.commitNow
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.CollectionManager.TR
+import com.ichi2.anki.databinding.FragmentStudyOptionsBinding
+import com.ichi2.anki.libanki.Consts.DEFAULT_DECK_ID
+import com.ichi2.anki.observability.undoableOp
 import com.ichi2.anki.ui.internationalization.sentenceCase
+import com.ichi2.testutils.ext.menu
 import com.ichi2.testutils.ext.triggerDeckNotFoundInLimitsMap
 import com.ichi2.testutils.launchFragmentInContainer
 import com.ichi2.testutils.withFragment
 import com.ichi2.utils.neutralButton
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.TestScope
@@ -27,11 +42,14 @@ import org.junit.runner.RunWith
 import org.robolectric.Robolectric
 import org.robolectric.annotation.Config
 import org.robolectric.shadows.ShadowDialog
+import java.util.Locale
 import kotlin.test.assertContains
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
 import kotlin.test.assertIs
+import kotlin.test.assertNotNull
+import kotlin.test.assertNotSame
 import kotlin.test.assertNull
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
@@ -41,6 +59,48 @@ import kotlin.test.assertTrue
  */
 @RunWith(AndroidJUnit4::class)
 class StudyOptionsFragmentTest : RobolectricTest() {
+    /** Issue 22249: backend deletion can leave the tablet showing hidden Default. */
+    @Test
+    @Config(qualifiers = "xlarge")
+    fun `tablet shows empty Default after backend deletion and Undo restores custom study`() {
+        val keep = addDeck("Keep")
+        col.setDeck(listOf(addBasicNote().firstCard().id), keep)
+        val deleted = addDeck("Delete me", setAsSelected = true)
+        col.setDeck(listOf(addBasicNote().firstCard().id), deleted)
+
+        deckPicker {
+            advanceRobolectricLooperUntil { fragment?.viewModel?.selectedDeckId == deleted }
+            undoableOp { decks.remove(listOf(deleted)) }
+            advanceRobolectricLooperUntil { fragment?.viewModel?.state is StudyOptionsState.Empty }
+            advanceRobolectricLooper()
+
+            assertEquals(DEFAULT_DECK_ID, col.decks.selected())
+            assertEquals(DEFAULT_DECK_ID, fragment!!.viewModel.selectedDeckId)
+            assertEquals("Default", assertIs<StudyOptionsState.Empty>(fragment!!.viewModel.state).deckName)
+            assertNull(col.sched.deckDueTree().find(DEFAULT_DECK_ID))
+            val undoStatus = col.undoStatus()
+            val menu = menu()
+            fragment!!.onPrepareMenu(menu)
+            updateMenuFromState(menu)
+            assertFalse(assertNotNull(menu.findItem(R.id.action_custom_study)).isVisible)
+            assertTrue(assertNotNull(menu.findItem(R.id.action_deck_or_study_options)).isVisible)
+            assertEquals(undoStatus, col.undoStatus())
+
+            undoAndShowSnackbar()
+            advanceRobolectricLooperUntil { fragment?.viewModel?.selectedDeckId == deleted }
+            assertIs<StudyOptionsState.StudyOptions>(fragment!!.viewModel.state)
+            fragment!!.onPrepareMenu(menu)
+            assertTrue(menu.findItem(R.id.action_custom_study).isVisible)
+            assertNotNull(col.undoStatus().redo)
+
+            redoAndShowSnackbar()
+            advanceRobolectricLooperUntil { fragment?.viewModel?.state is StudyOptionsState.Empty }
+            fragment!!.onPrepareMenu(menu)
+            assertFalse(menu.findItem(R.id.action_custom_study).isVisible)
+            assertEquals(DEFAULT_DECK_ID, fragment!!.viewModel.selectedDeckId)
+        }
+    }
+
     @Test
     fun `empty filtered deck shows counts after a finished regular deck`() =
         runTest {
@@ -59,6 +119,37 @@ class StudyOptionsFragmentTest : RobolectricTest() {
             }
         }
 
+    @Test
+    fun `bury counts stay hidden without buried cards`() =
+        runTest {
+            addBasicNote()
+            withStudyOptions {
+                assertIs<StudyOptionsState.StudyOptions>(viewModel.state)
+                assertBuryCountsHidden()
+
+                reattachView()
+                assertBuryCountsHidden()
+            }
+        }
+
+    @Test
+    fun `bury count is shown next to the counts`() =
+        runTest {
+            addBasicAndReversedNote("Front", "Back")
+            val config = col.decks.configDictForDeckId(col.decks.current().id)
+            config.new.bury = true
+            col.decks.save(config)
+            withStudyOptions {
+                assertIs<StudyOptionsState.StudyOptions>(viewModel.state)
+                val newBury = binding.studyoptionsNewBury
+                assertEquals(View.VISIBLE, newBury.visibility)
+
+                reattachView()
+                assertEquals(View.VISIBLE, newBury.visibility)
+                assertEquals("+1 buried", newBury.text.toString())
+            }
+        }
+
     @Test
     fun `scroll position is retained on refresh and reset for another deck`() =
         runTest {
@@ -82,11 +173,30 @@ class StudyOptionsFragmentTest : RobolectricTest() {
             }
         }
 
+    @Test
+    fun `returning from another panel keeps a single progress observer`() =
+        runTest {
+            withStudyOptions {
+                val firstView = requireView()
+
+                parentFragmentManager.commit {
+                    replace(android.R.id.content, Fragment())
+                    addToBackStack(null)
+                }
+                parentFragmentManager.executePendingTransactions()
+                parentFragmentManager.popBackStackImmediate()
+
+                assertNotSame(firstView, requireView())
+                val progress = viewModel.progressManager.progress as MutableStateFlow<*>
+                assertEquals(1, progress.subscriptionCount.value)
+            }
+        }
+
     /** Issue 22348: replacing the tablet panel can detach it before its initial refresh starts. */
     @Test
     @Config(qualifiers = "xlarge")
-    fun `replacing study options before its refresh starts exposes lifecycle misuse`() =
-        assertLifecycleFailure("not attached to an activity") {
+    fun `replacing study options before its refresh starts skips the stale refresh`() =
+        runTest {
             setIntroductionSlidesShown(true)
             addBasicNote()
             val controller = Robolectric.buildActivity(DeckPicker::class.java).setup()
@@ -152,6 +262,28 @@ class StudyOptionsFragmentTest : RobolectricTest() {
             assertSame(initialState, fragment.viewModel.state)
         }
 
+    /** Issue 22065: the host can replace the fragment before its queued refresh starts. */
+    @Test
+    fun `refresh queued by view creation is skipped after synchronous replacement`() {
+        withNullCollection {
+            val controller = Robolectric.buildActivity(FragmentActivity::class.java).setup()
+            saveControllerForCleanup(controller)
+            val activity = controller.get()
+            val first = StudyOptionsFragment()
+            val second = StudyOptionsFragment()
+
+            activity.lifecycleScope.launch {
+                activity.supportFragmentManager.commitNow { replace(android.R.id.content, first) }
+                activity.supportFragmentManager.commitNow { replace(android.R.id.content, second) }
+            }
+            advanceRobolectricLooper()
+
+            assertNull(first.activity)
+            assertSame(second, activity.supportFragmentManager.findFragmentById(android.R.id.content))
+            assertTrue(second.isAdded)
+        }
+    }
+
     /** Issue 21981: a refresh must offer recovery when the deck hierarchy is corrupt. */
     @Test
     fun `corrupt deck hierarchy offers Check database instead of crashing`() =
@@ -251,6 +383,40 @@ class StudyOptionsFragmentTest : RobolectricTest() {
         }
     }
 
+    @Test
+    fun `study options gradient spans from top to bottom of parent`() =
+        runTest {
+            withStudyOptions {
+                val gradient = requireView().findViewById<View>(R.id.studyoptions_gradient)
+                val params = gradient.layoutParams as ConstraintLayout.LayoutParams
+                assertEquals(ConstraintLayout.LayoutParams.PARENT_ID, params.topToTop)
+                assertEquals(ConstraintLayout.LayoutParams.PARENT_ID, params.bottomToBottom)
+                assertEquals(ConstraintLayout.LayoutParams.PARENT_ID, params.startToStart)
+            }
+        }
+
+    @Test
+    fun `shadow_left drawable mirrors in RTL`() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        val ltrConfig =
+            Configuration(context.resources.configuration).apply {
+                setLayoutDirection(Locale.US)
+            }
+        val ltrContext = context.createConfigurationContext(ltrConfig)
+        val ltrDrawable =
+            AppCompatResources.getDrawable(ltrContext, R.drawable.shadow_left) as GradientDrawable
+        assertEquals(GradientDrawable.Orientation.LEFT_RIGHT, ltrDrawable.orientation)
+
+        val rtlConfig =
+            Configuration(context.resources.configuration).apply {
+                setLayoutDirection(Locale.forLanguageTag("ar"))
+            }
+        val rtlContext = context.createConfigurationContext(rtlConfig)
+        val rtlDrawable =
+            AppCompatResources.getDrawable(rtlContext, R.drawable.shadow_left) as GradientDrawable
+        assertEquals(GradientDrawable.Orientation.RIGHT_LEFT, rtlDrawable.orientation)
+    }
+
     private fun assertLifecycleFailure(
         message: String,
         block: suspend TestScope.() -> Unit,
@@ -266,6 +432,24 @@ class StudyOptionsFragmentTest : RobolectricTest() {
             scenario.withFragment(block)
         }
 
+    private val StudyOptionsFragment.binding
+        get() = FragmentStudyOptionsBinding.bind(requireView())
+
+    private fun StudyOptionsFragment.assertBuryCountsHidden() =
+        with(binding) {
+            for (bury in listOf(studyoptionsNewBury, studyoptionsLearningBury, studyoptionsReviewBury)) {
+                assertEquals(View.GONE, bury.visibility, resources.getResourceEntryName(bury.id))
+            }
+        }
+
+    private fun StudyOptionsFragment.reattachView() {
+        val view = requireView()
+        val parent = view.parent as ViewGroup
+        val index = parent.indexOfChild(view)
+        parent.removeView(view)
+        parent.addView(view, index)
+    }
+
     context(scope: TestScope)
     private fun StudyOptionsFragment.refreshAndAwait() {
         refreshInterface()
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsScreenshotTest.kt
index 814b4a2ea270..4be27ddd2767 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsScreenshotTest.kt
@@ -12,9 +12,9 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsCompat.Type.displayCutout
 import androidx.core.view.WindowInsetsCompat.Type.navigationBars
 import androidx.core.view.WindowInsetsCompat.Type.statusBars
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.testutils.insetsOf
 import com.ichi2.testutils.simulateKeyboard
-import com.ichi2.utils.dp
 import org.junit.Test
 import org.robolectric.RuntimeEnvironment
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsViewModelTest.kt
index 886d04a8ec93..c5a9ed0b3e33 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/StudyOptionsViewModelTest.kt
@@ -7,6 +7,7 @@ import anki.scheduler.CardAnswer.Rating
 import app.cash.turbine.test
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.observability.ensureOpsExecuted
+import com.ichi2.anki.progress.ViewModelProgress
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
@@ -172,6 +173,24 @@ class StudyOptionsViewModelTest : RobolectricTest() {
             }
         }
 
+    @Test
+    fun `rebuildCram - reports progress`() =
+        runTest {
+            addBasicNote()
+            addDynamicDeck("Filtered", "")
+
+            assertProgressAround(StudyOptionsProgress.REBUILDING_FILTERED_DECK) { viewModel.rebuildCram() }
+        }
+
+    @Test
+    fun `emptyCram - reports progress`() =
+        runTest {
+            addBasicNote()
+            addDynamicDeck("Filtered", "")
+
+            assertProgressAround(StudyOptionsProgress.EMPTYING_FILTERED_DECK) { viewModel.emptyCram() }
+        }
+
     @Test
     fun `unbury - is undoable`() =
         runTest {
@@ -197,19 +216,19 @@ class StudyOptionsViewModelTest : RobolectricTest() {
         }
 
     @Test
-    fun `refreshData - buried cards are counted`() =
+    fun `refreshData - buried siblings are counted`() =
         runTest {
-            addBasicNote("Front1", "Back1")
-            addBasicNote("Front2", "Back2")
+            addBasicAndReversedNote("Front", "Back")
             withCol {
-                val card = sched.card!!
-                sched.buryCards(listOf(card.id), true)
+                val config = decks.configDictForDeckId(decks.current().id)
+                config.new.bury = true
+                decks.save(config)
             }
 
             viewModel.refreshData()
 
             val state = assertIs<StudyOptionsState.StudyOptions>(viewModel.state)
-            assertTrue(state.data.buriedNew > 0, "expected buried new cards")
+            assertEquals(1, state.data.buriedNew)
             assertEquals(1, state.data.newCardsToday)
         }
 
@@ -300,6 +319,20 @@ class StudyOptionsViewModelTest : RobolectricTest() {
             }
         }
 
+    private suspend fun assertProgressAround(
+        message: StudyOptionsProgress,
+        op: suspend () -> Unit,
+    ) {
+        viewModel.progressManager.progress.test {
+            assertIs<ViewModelProgress.Idle>(awaitItem())
+            op()
+            val active = assertIs<ViewModelProgress.Active<StudyOptionsProgress>>(awaitItem())
+            assertEquals(message, active.message)
+            assertIs<ViewModelProgress.Idle>(awaitItem())
+            expectNoEvents()
+        }
+    }
+
     /** Hold the production queue as a sync would; restore Robolectric's lock after all work finishes. */
     private suspend fun withBlockedCollectionQueue(block: suspend CoroutineScope.(releaseQueue: () -> Unit) -> Unit) {
         val previousQueue = CollectionManager.setTestDispatcher(Dispatchers.IO.limitedParallelism(1), useReentrantLock = false)
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ThrowableFilterServiceTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ThrowableFilterServiceTest.kt
index 1659bb050980..b7c485eabe20 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ThrowableFilterServiceTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ThrowableFilterServiceTest.kt
@@ -3,12 +3,11 @@
 
 package com.ichi2.anki
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import anki.backend.backendError
 import com.ichi2.anki.exception.StorageAccessException
 import com.ichi2.anki.servicelayer.ThrowableFilterService
 import com.ichi2.anki.servicelayer.ThrowableFilterService.safeFromPII
-import com.ichi2.testutils.JvmTest
+import com.ichi2.utils.ExceptionUtil.causeChain
 import net.ankiweb.rsdroid.BackendException
 import net.ankiweb.rsdroid.BackendException.BackendSchedulerUpgradeRequiredException
 import net.ankiweb.rsdroid.exceptions.BackendDeckIsFilteredException
@@ -16,12 +15,15 @@ import net.ankiweb.rsdroid.exceptions.BackendNetworkException
 import net.ankiweb.rsdroid.exceptions.BackendSyncException
 import net.ankiweb.rsdroid.exceptions.BackendSyncException.BackendSyncServerMessageException
 import org.junit.Test
-import org.junit.runner.RunWith
+import kotlin.test.assertContentEquals
+import kotlin.test.assertEquals
 import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
+import kotlin.test.assertNotSame
+import kotlin.test.assertSame
 import kotlin.test.assertTrue
 
-@RunWith(AndroidJUnit4::class)
-class ThrowableFilterServiceTest : JvmTest() {
+class ThrowableFilterServiceTest {
     @Test
     fun `scheduler upgrade required exceptions are discarded`() {
         val exception = BackendSchedulerUpgradeRequiredException(backendError {})
@@ -61,4 +63,223 @@ class ThrowableFilterServiceTest : JvmTest() {
         val exception3 = StorageAccessException("test exception")
         assertTrue(ThrowableFilterService.shouldDiscardThrowable(exception3))
     }
+
+    @Test
+    fun `circular causes are discarded before reporting`() {
+        val exception = Exception()
+        val cause = Exception()
+        exception.initCause(cause)
+        cause.initCause(exception)
+
+        assertTrue(ThrowableFilterService.shouldDiscardThrowable(exception))
+    }
+
+    @Test
+    fun `PII in suppressed exceptions is filtered`() {
+        val exception = Exception()
+        val suppressed = Exception()
+        suppressed.addSuppressed(BackendSyncServerMessageException(backendError {}))
+        exception.addSuppressed(suppressed)
+
+        assertFalse(exception.safeFromPII())
+        assertTrue(ThrowableFilterService.shouldDiscardThrowable(exception))
+
+        suppressed.addSuppressed(exception)
+        assertFalse(exception.safeFromPII())
+    }
+
+    @Test
+    fun `ordinary uncaught exceptions reach the next handler unchanged`() {
+        val cause = IllegalArgumentException("wanted cause")
+        val exception = IllegalStateException("wanted", cause)
+
+        assertSame(exception, forwardUnhandled(exception))
+        exception.addSuppressed(cause)
+        assertFalse(ThrowableFilterService.shouldDiscardThrowable(exception))
+        assertSame(exception, forwardUnhandled(exception))
+    }
+
+    @Test
+    fun `unwanted uncaught exceptions reach crash reporting without messages`() {
+        val exceptions =
+            listOf(
+                BackendNetworkException(backendError { message = "private network details" }),
+                BackendSyncException(backendError { message = "private sync details" }),
+                BackendSchedulerUpgradeRequiredException(backendError { message = "private scheduler details" }),
+                StorageAccessException("private storage path"),
+                BackendSyncServerMessageException(backendError { message = "private@example.com" }),
+            )
+        for (exception in exceptions) {
+            val forwarded = forwardUnhandled(exception)
+
+            assertNotSame(exception, forwarded)
+            assertEquals(exception.javaClass.name, forwarded.toString())
+            assertContentEquals(exception.stackTrace, forwarded.stackTrace)
+            assertFalse(forwarded.stackTraceToString().contains("private"))
+            // Handled reports of the same types must continue to be filtered.
+            assertTrue(ThrowableFilterService.shouldDiscardThrowable(exception))
+        }
+    }
+
+    @Test
+    fun `uncaught PII exceptions have their entire cause chain sanitized`() {
+        val serverError = BackendSyncServerMessageException(backendError { message = "private@example.com" })
+        val cause =
+            object : IllegalArgumentException("private cause", serverError) {
+                override fun toString(): String = error("Must not read a custom description")
+
+                override fun getLocalizedMessage(): String = error("Must not read a localized message")
+            }
+        val exception = IllegalStateException("private outer message", cause)
+        // Sharing a cause as a suppressed exception must not truncate the main cause chain.
+        exception.addSuppressed(serverError)
+
+        val forwarded = forwardUnhandled(exception)
+
+        assertEquals(exception.javaClass.name, forwarded.toString())
+        assertContentEquals(exception.stackTrace, forwarded.stackTrace)
+        val forwardedCause = assertNotNull(forwarded.cause)
+        assertEquals(cause.javaClass.name, forwardedCause.toString())
+        assertContentEquals(cause.stackTrace, forwardedCause.stackTrace)
+        val forwardedServerError = assertNotNull(forwardedCause.cause)
+        assertEquals(serverError.javaClass.name, forwardedServerError.toString())
+        assertContentEquals(serverError.stackTrace, forwardedServerError.stackTrace)
+        assertFalse(forwarded.stackTraceToString().contains("private"))
+        assertEquals("private outer message", exception.message)
+        assertSame(cause, exception.cause)
+        assertSame(serverError, cause.cause)
+    }
+
+    @Test
+    fun `suppressed PII exceptions are detected and sanitized`() {
+        val exception = IllegalStateException("private outer message")
+        val suppressed = IllegalArgumentException("private suppressed message")
+        suppressed.addSuppressed(BackendSyncServerMessageException(backendError { message = "private@example.com" }))
+        exception.addSuppressed(suppressed)
+
+        assertFalse(exception.safeFromPII())
+        assertTrue(ThrowableFilterService.shouldDiscardThrowable(exception))
+        val forwarded = forwardUnhandled(exception)
+
+        val forwardedSuppressed = forwarded.suppressed.single()
+        assertEquals(suppressed.javaClass.name, forwardedSuppressed.toString())
+        assertContentEquals(suppressed.stackTrace, forwardedSuppressed.stackTrace)
+        val suppressedServerError = suppressed.suppressed.single()
+        assertEquals(suppressedServerError.javaClass.name, forwardedSuppressed.suppressed.single().toString())
+        assertFalse(forwarded.stackTraceToString().contains("private"))
+        assertSame(suppressed, exception.suppressed.single())
+    }
+
+    @Test
+    fun `circular exception graphs are sanitized with and without PII types`() {
+        val exception = Exception("private outer message")
+        val cause = Exception("private cause")
+        exception.initCause(cause)
+        cause.initCause(exception)
+        cause.addSuppressed(exception)
+        assertTrue(exception.safeFromPII())
+
+        repeat(2) {
+            val forwarded = forwardUnhandled(exception)
+            val forwardedCause = assertNotNull(forwarded.cause)
+            assertNotSame(exception, forwarded)
+            assertEquals(cause.javaClass.name, forwardedCause.toString())
+            assertEquals(null, forwardedCause.cause)
+            assertTrue(forwardedCause.suppressed.isEmpty())
+            assertTrue(ThrowableFilterService.shouldDiscardThrowable(exception))
+            assertFalse(forwarded.stackTraceToString().contains("private"))
+
+            exception.addSuppressed(BackendSyncServerMessageException(backendError { message = "private@example.com" }))
+            assertFalse(exception.safeFromPII())
+        }
+    }
+
+    @Test
+    fun `deep exception chains do not overflow filtering or sanitization`() {
+        var cause: Throwable = BackendSyncServerMessageException(backendError { message = "private@example.com" })
+        repeat(2000) { cause = Exception("private cause", cause) }
+
+        assertFalse(cause.safeFromPII())
+        val forwarded = forwardUnhandled(cause)
+
+        val forwardedCauses = forwarded.causeChain.toList()
+        assertEquals(2001, forwardedCauses.size)
+        assertTrue(forwardedCauses.none { it.message?.contains("private") == true })
+    }
+
+    @Test
+    fun `reinitialization keeps filtered fatal errors reportable`() {
+        val exception = StorageAccessException("private path")
+        val reports = mutableListOf<Throwable>()
+        withReportingHandler(
+            Thread.UncaughtExceptionHandler { _, throwable -> reports.add(throwable) },
+        ) {
+            ThrowableFilterService.reInitialize()
+            val handler = assertNotNull(Thread.getDefaultUncaughtExceptionHandler())
+
+            handler.uncaughtException(Thread.currentThread(), exception)
+
+            val report = reports.single()
+            assertEquals(exception.javaClass.name, report.toString())
+            assertFalse(report.stackTraceToString().contains("private"))
+        }
+    }
+
+    @Test
+    fun `installed filter forwards an uncaught worker thread exception`() {
+        val exception = StorageAccessException("private storage path")
+        val worker = Thread { throw exception }
+        var forwardedThread: Thread? = null
+        var forwarded: Throwable? = null
+        var reports = 0
+        withReportingHandler(
+            Thread.UncaughtExceptionHandler { thread, throwable ->
+                reports++
+                forwardedThread = thread
+                forwarded = throwable
+            },
+        ) {
+            worker.start()
+            worker.join(5000)
+
+            assertFalse(worker.isAlive)
+            assertEquals(1, reports)
+            assertSame(worker, forwardedThread)
+            assertEquals(exception.javaClass.name, assertNotNull(forwarded).toString())
+            assertFalse(assertNotNull(forwarded).stackTraceToString().contains("private"))
+        }
+    }
+
+    private fun withReportingHandler(
+        reportingHandler: Thread.UncaughtExceptionHandler,
+        block: () -> Unit,
+    ) {
+        val originalDefault = Thread.getDefaultUncaughtExceptionHandler()
+        val originalHandler = ThrowableFilterService.originalUncaughtExceptionHandler
+        try {
+            Thread.setDefaultUncaughtExceptionHandler(reportingHandler)
+            ThrowableFilterService.initialize()
+            block()
+        } finally {
+            Thread.setDefaultUncaughtExceptionHandler(originalDefault)
+            ThrowableFilterService.originalUncaughtExceptionHandler = originalHandler
+        }
+    }
+
+    private fun forwardUnhandled(exception: Throwable): Throwable {
+        val thread = Thread.currentThread()
+        var forwarded: Throwable? = null
+        var calls = 0
+        withReportingHandler(
+            Thread.UncaughtExceptionHandler { actualThread, throwable ->
+                assertSame(thread, actualThread)
+                forwarded = throwable
+                calls++
+            },
+        ) {
+            ThrowableFilterService.uncaughtExceptionHandler.uncaughtException(thread, exception)
+        }
+        assertEquals(1, calls, "The uncaught exception must reach the next handler exactly once")
+        return assertNotNull(forwarded)
+    }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/TranslationTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/TranslationTest.kt
index 6dc47400f2a8..1e6180698f95 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/TranslationTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/TranslationTest.kt
@@ -2,18 +2,17 @@
 
 package com.ichi2.anki
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import anki.i18n.GeneratedTranslations
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.TranslationTest.Companion.BASELINE_CASE_INSENSITIVE_DUPLICATES
 import com.ichi2.anki.TranslationTest.Companion.BASELINE_DUPLICATES
 import com.ichi2.testutils.BackendTranslation
+import com.ichi2.testutils.JvmTest
 import com.ichi2.testutils.XmlStringResource
 import com.ichi2.testutils.getAndroidManifestStringResourceNames
 import com.ichi2.testutils.getBackendNonArgStrings
 import com.ichi2.testutils.getTranslatableXmlStrings
 import org.junit.Test
-import org.junit.runner.RunWith
 import java.io.File
 import kotlin.test.fail
 
@@ -22,8 +21,7 @@ import kotlin.test.fail
  * (01-core, 02-strings, etc.) do not duplicate strings already available
  * from the backend via [GeneratedTranslations]/[TR].
  */
-@RunWith(AndroidJUnit4::class) // TODO: no Android dependencies; could be JvmTest
-class TranslationTest : RobolectricTest() {
+class TranslationTest : JvmTest() {
     @Test
     fun `CrowdIn-managed files do not reappear in this module`() {
         val resDir = File("src/main/res")
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/TtsVoicesCacheTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/TtsVoicesCacheTest.kt
index 70bff1e26881..21e3101a6152 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/TtsVoicesCacheTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/TtsVoicesCacheTest.kt
@@ -3,9 +3,7 @@
 package com.ichi2.anki
 
 import android.speech.tts.TextToSpeech
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.i18n.normalize
-import com.ichi2.testutils.EmptyApplication
 import com.ichi2.testutils.TtsVoicesCacheOverride
 import io.mockk.Runs
 import io.mockk.coEvery
@@ -14,15 +12,12 @@ import io.mockk.every
 import io.mockk.just
 import io.mockk.mockk
 import io.mockk.mockkObject
+import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.annotation.Config
 import java.util.Locale
 import kotlin.test.assertEquals
 
-@RunWith(AndroidJUnit4::class)
-@Config(application = EmptyApplication::class)
-class TtsVoicesCacheTest : RobolectricTest() {
+class TtsVoicesCacheTest {
     @Test
     fun `a new reviewer engine gets its own cached languages`() =
         runTest {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/TtsVoicesMultiEngineTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/TtsVoicesMultiEngineTest.kt
index c59eab0ebdd0..0281adbecad4 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/TtsVoicesMultiEngineTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/TtsVoicesMultiEngineTest.kt
@@ -103,7 +103,7 @@ class TtsVoicesMultiEngineTest {
 
             assertTrue(defaultLocales.isCompleted)
             assertEquals(emptyList(), defaultLocales.await().locales)
-            assertEquals(emptySet(), voices)
+            assertEquals(emptyList(), voices)
         }
 
     @Test
@@ -147,6 +147,61 @@ class TtsVoicesMultiEngineTest {
                 }
         }
 
+    @Test
+    fun `default engine comes first while other engines retain discovery order`() =
+        runTest {
+            val probe = probeTts()
+            every { probe.defaultEngine } returns ENGINE_B
+            every { probe.engines } returns
+                listOf(ENGINE_C, ENGINE_B, ENGINE_A).map { engine ->
+                    TextToSpeech.EngineInfo().apply { name = engine }
+                }
+
+            val voices =
+                TtsVoices.loadVoices(CompletableDeferred()) { engine ->
+                    if (engine == null) {
+                        probe
+                    } else {
+                        fakeTts(setOf(fakeVoice("first", Locale.US), fakeVoice("second", Locale.FRANCE)), emptySet())
+                    }
+                }
+
+            assertEquals(listOf(ENGINE_B, ENGINE_B, ENGINE_C, ENGINE_C, ENGINE_A, ENGINE_A), voices.map { it.engine })
+            assertEquals(listOf("first", "second", "first", "second", "first", "second"), voices.map { it.voice.name })
+        }
+
+    @Test
+    fun `default engine is included first even when missing from discovered engines`() =
+        runTest {
+            val probe = probeTts()
+            every { probe.defaultEngine } returns ENGINE_C
+
+            val voices =
+                TtsVoices.loadVoices(CompletableDeferred()) { engine ->
+                    if (engine == null) probe else fakeTts(setOf(fakeVoice("voice", Locale.US)), emptySet())
+                }
+
+            assertEquals(listOf(ENGINE_C, ENGINE_A, ENGINE_B), voices.map { it.engine })
+        }
+
+    @Test
+    fun `voices are distinct by engine and name while preserving their first occurrence`() =
+        runTest {
+            val first = fakeVoice("shared", Locale.US)
+            val duplicate = fakeVoice("shared", Locale.US)
+            val other = fakeVoice("other", Locale.FRANCE)
+            val engineB = fakeTts(setOf(first, duplicate, other), emptySet())
+            val engineA = fakeTts(setOf(fakeVoice("shared", Locale.US)), emptySet())
+
+            val voices =
+                TtsVoices.loadVoicesFromEngines(listOf(ENGINE_B, ENGINE_A, ENGINE_B)) { engine ->
+                    if (engine == ENGINE_B) engineB else engineA
+                }
+
+            assertEquals(listOf("$ENGINE_B-shared", "$ENGINE_B-other", "$ENGINE_A-shared"), voices.map { it.name })
+            assertSame(first, voices.first().voice)
+        }
+
     @Test
     fun `voices are aggregated across multiple engines`() =
         runBlocking {
@@ -222,7 +277,7 @@ class TtsVoicesMultiEngineTest {
             setUpFailingTts()
             val locales = CompletableDeferred<TtsVoices.EngineLocales>()
 
-            assertEquals(emptySet(), TtsVoices.loadVoices(locales, TtsVoices::createTts))
+            assertEquals(emptyList(), TtsVoices.loadVoices(locales, TtsVoices::createTts))
             assertEquals(TtsVoices.EngineLocales(null, emptyList()), locales.await())
         }
 
@@ -320,5 +375,6 @@ class TtsVoicesMultiEngineTest {
     companion object {
         private const val ENGINE_A = "com.example.engine.a"
         private const val ENGINE_B = "com.example.engine.b"
+        private const val ENGINE_C = "com.example.engine.c"
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/account/AccountActivityScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/account/AccountActivityScreenshotTest.kt
index 737f574b6323..b3cac6430283 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/account/AccountActivityScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/account/AccountActivityScreenshotTest.kt
@@ -16,9 +16,9 @@ import androidx.core.view.WindowInsetsCompat.Type.statusBars
 import androidx.test.core.app.ActivityScenario
 import com.ichi2.anki.R
 import com.ichi2.anki.ScreenshotTest
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.settings.Prefs
 import com.ichi2.testutils.insetsOf
-import com.ichi2.utils.dp
 import org.junit.Test
 import org.robolectric.RuntimeEnvironment
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/account/AccountInsetsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/account/AccountInsetsTest.kt
index d9a7929dfe82..94425ad6b563 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/account/AccountInsetsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/account/AccountInsetsTest.kt
@@ -7,10 +7,10 @@ import android.widget.Button
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.FragmentPageBinding
 import com.ichi2.anki.settings.Prefs
 import com.ichi2.testutils.dispatchInsets
-import com.ichi2.utils.dp
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/account/LoginFragmentTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/account/LoginFragmentTest.kt
index c527d3310765..3a7cf6c80649 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/account/LoginFragmentTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/account/LoginFragmentTest.kt
@@ -2,6 +2,8 @@
 
 package com.ichi2.anki.account
 
+import android.os.Looper
+import android.view.WindowManager
 import android.widget.Button
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.android.material.textfield.TextInputEditText
@@ -16,6 +18,9 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.robolectric.Shadows.shadowOf
+import kotlin.time.Duration.Companion.seconds
+import kotlin.time.TimeSource
 
 @RunWith(AndroidJUnit4::class)
 class LoginFragmentTest : RobolectricTest() {
@@ -43,8 +48,17 @@ class LoginFragmentTest : RobolectricTest() {
         activity.findViewById<TextInputEditField>(R.id.password).setText("hunter2")
 
         activity.findViewById<Button>(R.id.login_button).performClick()
-        advanceRobolectricLooper()
+        activity.waitForLoginToFinish()
 
         assertThat(getAlertDialogText(true), containsString("Advanced settings"))
     }
+
+    private fun AccountActivity.waitForLoginToFinish() {
+        val start = TimeSource.Monotonic.markNow()
+        while (window.attributes.flags and WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE != 0) {
+            check(start.elapsedNow() < 10.seconds) { "login did not finish" }
+            Thread.sleep(10)
+            shadowOf(Looper.getMainLooper()).idle()
+        }
+    }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/analytics/AnkiDroidUsageAnalyticsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/analytics/AnkiDroidUsageAnalyticsTest.kt
index 37de09938e24..7fbfdc77c530 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/analytics/AnkiDroidUsageAnalyticsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/analytics/AnkiDroidUsageAnalyticsTest.kt
@@ -32,24 +32,24 @@ class AnkiDroidUsageAnalyticsTest : RobolectricTest() {
         // itself, so a mismatch silently stops it controlling analytics
         assertThat(
             targetContext.getString(R.string.analytics_opt_in_key),
-            equalTo(AnkiDroidUsageAnalytics.ANALYTICS_OPTIN_KEY),
+            equalTo(AnkiDroidUsageAnalytics.PREF_ANALYTICS_OPTIN),
         )
     }
 
     @Test
     fun `opt-in key is the v2 key`() {
-        assertThat(AnkiDroidUsageAnalytics.ANALYTICS_OPTIN_KEY, equalTo("analytics_opt_in_v2"))
+        assertThat(AnkiDroidUsageAnalytics.PREF_ANALYTICS_OPTIN, equalTo("analytics_opt_in_v2"))
     }
 
     @Test
     fun `analytics is disabled by default`() {
-        assertThat(getPreferences().getBoolean(AnkiDroidUsageAnalytics.ANALYTICS_OPTIN_KEY, false), equalTo(false))
+        assertThat(getPreferences().getBoolean(AnkiDroidUsageAnalytics.PREF_ANALYTICS_OPTIN, false), equalTo(false))
     }
 
     @Test
     fun `a preference write from elsewhere rebuilds the client`() {
         withStubbedRebuild {
-            getPreferences().edit(commit = true) { putBoolean(AnkiDroidUsageAnalytics.ANALYTICS_OPTIN_KEY, true) }
+            getPreferences().edit(commit = true) { putBoolean(AnkiDroidUsageAnalytics.PREF_ANALYTICS_OPTIN, true) }
 
             assertThat(AnkiDroidUsageAnalytics.isEnabled, equalTo(true))
             verify(exactly = 1) { AnkiDroidUsageAnalytics.reinitialize(any()) }
@@ -59,7 +59,7 @@ class AnkiDroidUsageAnalyticsTest : RobolectricTest() {
     @Test
     fun `a write that leaves the value unchanged does not rebuild the client`() {
         withStubbedRebuild {
-            getPreferences().edit(commit = true) { putBoolean(AnkiDroidUsageAnalytics.ANALYTICS_OPTIN_KEY, false) }
+            getPreferences().edit(commit = true) { putBoolean(AnkiDroidUsageAnalytics.PREF_ANALYTICS_OPTIN, false) }
 
             verify(exactly = 0) { AnkiDroidUsageAnalytics.reinitialize(any()) }
         }
@@ -123,7 +123,7 @@ class AnkiDroidUsageAnalyticsTest : RobolectricTest() {
         } finally {
             // clear the preference before unmocking, so the resulting change
             // doesn't reach the real `reinitialize`
-            getPreferences().edit(commit = true) { remove(AnkiDroidUsageAnalytics.ANALYTICS_OPTIN_KEY) }
+            getPreferences().edit(commit = true) { remove(AnkiDroidUsageAnalytics.PREF_ANALYTICS_OPTIN) }
             unmockkObject(AnkiDroidUsageAnalytics)
             AnalyticsExceptionHandler.uninstall()
         }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/analytics/PreferencesAnalyticsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/analytics/PreferencesAnalyticsTest.kt
index a60648e2bf22..5cfd493f3107 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/analytics/PreferencesAnalyticsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/analytics/PreferencesAnalyticsTest.kt
@@ -3,6 +3,7 @@
 package com.ichi2.anki.analytics
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.CommonPreferenceKey
 import com.ichi2.anki.EmptyApplicationCategory
 import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
@@ -71,7 +72,7 @@ class PreferencesAnalyticsTest : RobolectricTest() {
             R.string.thirdparty_apps_key, // thirdpartyapps_link
             // will be reworked in the future
             // Notify when
-            R.string.pref_notifications_minimum_cards_due_key, // minimumCardsDueForNotification
+            CommonPreferenceKey.pref_notifications_minimum_cards_due_key, // minimumCardsDueForNotification
             // Vibrate
             R.string.pref_notifications_vibrate_key, // widgetVibrate
             // Blink light
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserColumnCollectionTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserColumnCollectionTest.kt
index 9b0f1f62e4df..bbac5fba2753 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserColumnCollectionTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserColumnCollectionTest.kt
@@ -4,23 +4,29 @@ package com.ichi2.anki.browser
 
 import androidx.annotation.CheckResult
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.EmptyApplicationCategory
 import com.ichi2.anki.browser.CardBrowserColumn.DECK
 import com.ichi2.anki.browser.CardBrowserColumn.FSRS_STABILITY
 import com.ichi2.anki.browser.CardBrowserColumn.SFLD
 import com.ichi2.anki.model.CardsOrNotes
 import com.ichi2.anki.model.CardsOrNotes.CARDS
 import com.ichi2.anki.model.CardsOrNotes.NOTES
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.EmptyApplication
 import com.ichi2.testutils.getSharedPrefs
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.hasSize
 import org.junit.Test
+import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
 
 /** @see BrowserColumnCollection */
 @RunWith(AndroidJUnit4::class)
-class BrowserColumnCollectionTest : RobolectricTest() {
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class BrowserColumnCollectionTest : AndroidTest {
     val prefs = this.getSharedPrefs()
 
     @Test
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserColumnKeyTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserColumnKeyTest.kt
index 27c544d02374..19b12162d2c5 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserColumnKeyTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserColumnKeyTest.kt
@@ -3,18 +3,12 @@
 
 package com.ichi2.anki.browser
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.testutils.EmptyApplication
 import com.ichi2.testutils.JvmTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.annotation.Config
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 
 /** Tests for [BrowserColumnKey] */
-@RunWith(AndroidJUnit4::class)
-@Config(application = EmptyApplication::class)
 class BrowserColumnKeyTest : JvmTest() {
     @Test
     fun `browser column key test`() {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserColumnSelectionFragmentScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserColumnSelectionFragmentScreenshotTest.kt
index 3d408df59655..8eb0b13dbace 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserColumnSelectionFragmentScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserColumnSelectionFragmentScreenshotTest.kt
@@ -6,12 +6,12 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.ichi2.anki.R
 import com.ichi2.anki.ScreenshotTest
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.model.CardsOrNotes
 import com.ichi2.anki.withCardBrowser
 import com.ichi2.testutils.scrollToEnd
 import com.ichi2.testutils.simulateSystemBars
 import com.ichi2.testutils.windowInsetsOf
-import com.ichi2.utils.dp
 import org.junit.Test
 import org.robolectric.RuntimeEnvironment
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserColumnSelectionTouchHelperCallbackTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserColumnSelectionTouchHelperCallbackTest.kt
index 7b76ffeef7ad..8522c5a48ee5 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserColumnSelectionTouchHelperCallbackTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserColumnSelectionTouchHelperCallbackTest.kt
@@ -10,11 +10,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.R
-import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.browser.BrowserColumnSelectionRecyclerItem.ColumnItem
 import com.ichi2.anki.browser.BrowserColumnSelectionRecyclerItem.UsageItem
 import com.ichi2.anki.browser.ColumnUsage.ACTIVE
 import com.ichi2.anki.browser.ColumnUsage.AVAILABLE
+import com.ichi2.testutils.AndroidTest
 import com.ichi2.testutils.changedPositions
 import com.ichi2.testutils.completeDroppedItem
 import com.ichi2.testutils.dispatchTouch
@@ -29,7 +29,7 @@ import org.junit.runner.RunWith
 
 /** Tests for [BrowserColumnSelectionTouchHelperCallback] */
 @RunWith(AndroidJUnit4::class)
-class BrowserColumnSelectionTouchHelperCallbackTest : RobolectricTest() {
+class BrowserColumnSelectionTouchHelperCallbackTest : AndroidTest {
     @Test
     fun `all rows are refreshed once a dropped row completes`() =
         withColumnSelectionList { list ->
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserHeaderVisibilityRegressionTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserHeaderVisibilityRegressionTest.kt
new file mode 100644
index 000000000000..a1e06254521f
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserHeaderVisibilityRegressionTest.kt
@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.browser
+
+import android.view.KeyEvent
+import android.view.View
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.CardBrowser
+import com.ichi2.anki.R
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.browser.search.SavedSearch
+import com.ichi2.anki.dialogs.SavedBrowserSearchesDialogFragment
+import com.ichi2.anki.model.SelectableDeck
+import com.ichi2.testutils.ext.snackbarAction
+import com.ichi2.testutils.ext.snackbarText
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
+
+@RunWith(AndroidJUnit4::class)
+class BrowserHeaderVisibilityRegressionTest : RobolectricTest() {
+    @Test
+    fun `saved search opened by shortcut reports its count during multi-select`() {
+        addBasicNote("cat", "meows")
+        addBasicNote("dog", "barks")
+        withCardBrowserFragment {
+            activityViewModel.setSelectedDeck(SelectableDeck.AllDecks)
+            awaitSearch()
+            assertEquals(SaveSearchResult.SUCCESS, activityViewModel.saveSearch(SavedSearch("Cats", "cat")))
+            activityViewModel.selectAll()?.join()
+            advanceRobolectricLooper()
+            assertTrue(activityViewModel.isInMultiSelectMode)
+            assertFalse(requireActivity().findViewById<TextView>(R.id.subtitle).isShown)
+
+            val shortcut =
+                KeyEvent(
+                    0,
+                    0,
+                    KeyEvent.ACTION_UP,
+                    KeyEvent.KEYCODE_S,
+                    0,
+                    KeyEvent.META_CTRL_ON or KeyEvent.META_ALT_ON,
+                )
+            assertTrue((requireActivity() as CardBrowser).onKeyUp(KeyEvent.KEYCODE_S, shortcut))
+            advanceRobolectricLooper()
+            val dialog = parentFragmentManager.fragments.filterIsInstance<SavedBrowserSearchesDialogFragment>().single()
+            val list = assertNotNull(dialog.requireDialog().findViewById<RecyclerView>(CommonR.id.dialog_recycler_view))
+            assertNotNull(list.findViewHolderForAdapterPosition(0)).itemView.performClick()
+            awaitSearch()
+
+            assertEquals("cat", activityViewModel.searchTerms)
+            assertEquals(1, activityViewModel.rowCount)
+            assertTrue(activityViewModel.isInMultiSelectMode)
+            assertTrue(assertNotNull(legacySearchView).isIconified)
+            assertFalse(requireActivity().findViewById<TextView>(R.id.subtitle).isShown)
+            assertEquals("1 card shown", snackbarText)
+            assertEquals(View.GONE, snackbarAction?.visibility)
+        }
+    }
+
+    private suspend fun CardBrowserFragment.awaitSearch() {
+        activityViewModel.searchJob?.join()
+        advanceRobolectricLooper()
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserMultiColumnAdapterRowsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserMultiColumnAdapterRowsTest.kt
index 0ffb13cf8256..33f543920811 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserMultiColumnAdapterRowsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserMultiColumnAdapterRowsTest.kt
@@ -8,16 +8,16 @@ import android.widget.FrameLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
 import org.junit.runner.RunWith
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class BrowserMultiColumnAdapterRowsTest : RobolectricTest() {
-    private val browserContext by lazy { ContextThemeWrapper(targetContext, R.style.Theme_Light) }
+    private val browserContext by lazy { ContextThemeWrapper(targetContext, CommonR.style.Theme_Light) }
 
     @Test
     fun `scroll during search refresh does not crash - Issue 17759`() =
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserSearchFeedbackTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserSearchFeedbackTest.kt
new file mode 100644
index 000000000000..a692f0a9eaa5
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/BrowserSearchFeedbackTest.kt
@@ -0,0 +1,141 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.browser
+
+import com.ichi2.anki.browser.BrowserSearchFeedback.COUNT
+import com.ichi2.anki.browser.BrowserSearchFeedback.COUNT_WITH_SEARCH_ALL_DECKS
+import com.ichi2.anki.browser.BrowserSearchFeedback.NONE
+import com.ichi2.anki.browser.BrowserSearchFeedback.NO_CARDS_IN_SELECTED_DECK
+import org.junit.Test
+import kotlin.test.assertEquals
+
+/** Feedback rules tested without Android views or a collection. */
+class BrowserSearchFeedbackTest {
+    @Test
+    fun `count-only feedback shows a hidden count regardless of scope or number of results`() {
+        for (allDecks in listOf(false, true)) {
+            for (count in listOf(0, 2)) {
+                assertEquals(
+                    COUNT,
+                    browserSearchFeedback(
+                        feedbackMode = BrowserSearchFeedbackMode.COUNT_ONLY,
+                        rowCount = count,
+                        allDecksSelected = allDecks,
+                        isHeaderCountVisible = false,
+                    ),
+                )
+                assertEquals(
+                    NONE,
+                    browserSearchFeedback(
+                        feedbackMode = BrowserSearchFeedbackMode.COUNT_ONLY,
+                        rowCount = count,
+                        allDecksSelected = allDecks,
+                        isHeaderCountVisible = true,
+                    ),
+                )
+            }
+        }
+    }
+
+    @Test
+    fun `disabled feedback stays quiet even when an empty deck could offer an action`() {
+        for (headerVisible in listOf(false, true)) {
+            assertEquals(
+                NONE,
+                browserSearchFeedback(
+                    feedbackMode = BrowserSearchFeedbackMode.NONE,
+                    rowCount = 0,
+                    allDecksSelected = false,
+                    isHeaderCountVisible = headerVisible,
+                ),
+            )
+            assertEquals(
+                NONE,
+                browserSearchFeedback(
+                    feedbackMode = BrowserSearchFeedbackMode.NONE,
+                    rowCount = 2,
+                    allDecksSelected = false,
+                    isHeaderCountVisible = headerVisible,
+                ),
+            )
+            assertEquals(
+                NONE,
+                browserSearchFeedback(
+                    feedbackMode = BrowserSearchFeedbackMode.NONE,
+                    rowCount = 0,
+                    allDecksSelected = true,
+                    isHeaderCountVisible = headerVisible,
+                ),
+            )
+            assertEquals(
+                NONE,
+                browserSearchFeedback(
+                    feedbackMode = BrowserSearchFeedbackMode.NONE,
+                    rowCount = 2,
+                    allDecksSelected = true,
+                    isHeaderCountVisible = headerVisible,
+                ),
+            )
+        }
+    }
+
+    @Test
+    fun `submitted search in all decks shows the count including zero when the header is hidden`() {
+        for (count in listOf(0, 2)) {
+            assertEquals(
+                COUNT,
+                browserSearchFeedback(
+                    feedbackMode = BrowserSearchFeedbackMode.SEARCH_RESULTS,
+                    rowCount = count,
+                    allDecksSelected = true,
+                    isHeaderCountVisible = false,
+                ),
+            )
+        }
+    }
+
+    @Test
+    fun `submitted search does not duplicate a visible count when there is no action`() {
+        for (count in listOf(0, 2)) {
+            assertEquals(
+                NONE,
+                browserSearchFeedback(
+                    feedbackMode = BrowserSearchFeedbackMode.SEARCH_RESULTS,
+                    rowCount = count,
+                    allDecksSelected = true,
+                    isHeaderCountVisible = true,
+                ),
+            )
+        }
+    }
+
+    @Test
+    fun `submitted search with matches in a deck offers search all decks even with a visible header`() {
+        for (headerVisible in listOf(false, true)) {
+            val feedback =
+                browserSearchFeedback(
+                    feedbackMode = BrowserSearchFeedbackMode.SEARCH_RESULTS,
+                    rowCount = 2,
+                    allDecksSelected = false,
+                    isHeaderCountVisible = headerVisible,
+                )
+            assertEquals(COUNT_WITH_SEARCH_ALL_DECKS, feedback)
+            assertEquals(true, feedback.offersSearchAllDecks)
+        }
+    }
+
+    @Test
+    fun `submitted search with no matches in a deck explains the scope and offers search all decks`() {
+        for (headerVisible in listOf(false, true)) {
+            val feedback =
+                browserSearchFeedback(
+                    feedbackMode = BrowserSearchFeedbackMode.SEARCH_RESULTS,
+                    rowCount = 0,
+                    allDecksSelected = false,
+                    isHeaderCountVisible = headerVisible,
+                )
+            assertEquals(NO_CARDS_IN_SELECTED_DECK, feedback)
+            assertEquals(true, feedback.offersSearchAllDecks)
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserColumnNonParamTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserColumnNonParamTest.kt
index 04e06e9765ca..88d9a578d359 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserColumnNonParamTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserColumnNonParamTest.kt
@@ -2,14 +2,11 @@
 
 package com.ichi2.anki.browser
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.testutils.JvmTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import kotlin.test.assertContentEquals
 
 /** @see CardBrowserColumn */
-@RunWith(AndroidJUnit4::class)
 class CardBrowserColumnNonParamTest : JvmTest() {
     @Test
     fun `all keys are documented`() {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserColumnTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserColumnTest.kt
index 6d145fc376b9..4685e577bd01 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserColumnTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserColumnTest.kt
@@ -5,22 +5,22 @@ package com.ichi2.anki.browser
 import com.ichi2.testutils.JvmTest
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.robolectric.ParameterizedRobolectricTestRunner
+import org.junit.runners.Parameterized
 import timber.log.Timber
 import kotlin.test.assertNotNull
 
 /** @see CardBrowserColumn */
-@RunWith(ParameterizedRobolectricTestRunner::class)
+@RunWith(Parameterized::class)
 class CardBrowserColumnTest : JvmTest() {
     companion object {
-        @ParameterizedRobolectricTestRunner.Parameters(name = "{0}")
+        @Parameterized.Parameters(name = "{0}")
         @JvmStatic // required for initParameters
         fun initParameters(): Collection<Array<Any>> =
             CardBrowserColumn.entries
                 .map { arrayOf(it) }
     }
 
-    @ParameterizedRobolectricTestRunner.Parameter
+    @Parameterized.Parameter
     @JvmField // required for Parameter
     var columnParam: CardBrowserColumn? = null
     private val column get() = columnParam!!
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserConcurrentSearchTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserConcurrentSearchTest.kt
new file mode 100644
index 000000000000..fe00be05def1
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserConcurrentSearchTest.kt
@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.browser
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.AnkiDroidApp
+import com.ichi2.testutils.JvmTest
+import com.ichi2.testutils.createTransientDirectory
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineStart
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.setMain
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
+import kotlin.test.assertNotSame
+import kotlin.test.assertTrue
+
+@RunWith(AndroidJUnit4::class)
+class CardBrowserConcurrentSearchTest : JvmTest() {
+    @Test
+    fun `queued searches cancel the earlier search after UI notification resumes`() =
+        runTest {
+            addBasicNote("cat", "meows")
+            val viewModel =
+                CardBrowserViewModel(
+                    lastDeckIdRepository = SharedPreferencesLastDeckIdRepository(),
+                    idsFileDirectory = createTransientDirectory(),
+                    options = null,
+                    preferences = AnkiDroidApp.sharedPreferencesProvider,
+                    isFragmented = true,
+                    initialDeckId = null,
+                    savedStateHandle = SavedStateHandle(),
+                    manualInit = true,
+                )
+            viewModel.manualInit()
+            viewModel.searchJob?.join()
+            Dispatchers.setMain(StandardTestDispatcher(testScheduler))
+
+            val editorGate = CompletableDeferred<Unit>()
+            val firstClearGate = CompletableDeferred<Unit>()
+            val secondClearGate = CompletableDeferred<Unit>()
+            var notifications = 0
+            val editorCollector =
+                backgroundScope.launch(start = CoroutineStart.UNDISPATCHED) {
+                    viewModel.flowOfNoteEditorCommand.collect { editorGate.await() }
+                }
+            val cardsCollector =
+                backgroundScope.launch(start = CoroutineStart.UNDISPATCHED) {
+                    viewModel.flowOfCardsUpdated.collect {
+                        when (notifications++) {
+                            0 -> firstClearGate.await()
+                            1 -> secondClearGate.await()
+                        }
+                    }
+                }
+            try {
+                // Keep both UI subscribers busy so two requests suspend while clearing the rows.
+                viewModel.flowOfNoteEditorCommand.emit(CardBrowserViewModel.NoteEditorCommand.HidePane)
+                viewModel.flowOfCardsUpdated.emit(Unit)
+
+                viewModel.launchSearchForCards(feedbackMode = BrowserSearchFeedbackMode.COUNT_ONLY)
+                viewModel.launchSearchForCards()
+                testScheduler.runCurrent()
+
+                // Start the first search, keeping it active until the editor can receive its command.
+                firstClearGate.complete(Unit)
+                testScheduler.runCurrent()
+                val earlierSearch = assertNotNull(viewModel.searchJob)
+                assertFalse(earlierSearch.isCompleted, "the first search waits for the editor callback")
+
+                secondClearGate.complete(Unit)
+                testScheduler.runCurrent()
+                val newerSearch = assertNotNull(viewModel.searchJob)
+                assertNotSame(earlierSearch, newerSearch, "the second request starts another search")
+                assertTrue(earlierSearch.isCancelled, "the newer request must cancel the earlier search")
+            } finally {
+                viewModel.searchJob?.cancel()
+                editorCollector.cancel()
+                cardsCollector.cancel()
+                editorGate.complete(Unit)
+                firstClearGate.complete(Unit)
+                secondClearGate.complete(Unit)
+                testScheduler.runCurrent()
+            }
+        }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserFragmentViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserFragmentViewModelTest.kt
index e91e26a0aea1..377345fba0ec 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserFragmentViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserFragmentViewModelTest.kt
@@ -3,23 +3,29 @@
 
 package com.ichi2.anki.browser
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import app.cash.turbine.test
-import com.ichi2.anki.RobolectricTest
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
 import org.junit.Test
-import org.junit.runner.RunWith
 
 /** Test of [CardBrowserFragmentViewModel] */
-@RunWith(AndroidJUnit4::class)
-class CardBrowserFragmentViewModelTest : RobolectricTest() {
+class CardBrowserFragmentViewModelTest {
     @Test
     fun `openDeckSelectionDialog emits from flowOfSearchForDecks`() =
         runTest {
-            val viewModel = CardBrowserFragmentViewModel()
+            Dispatchers.setMain(StandardTestDispatcher(testScheduler))
+            try {
+                val viewModel = CardBrowserFragmentViewModel()
 
-            viewModel.flowOfSearchForDecks.test {
-                viewModel.openDeckSelectionDialog()
-                awaitItem()
+                viewModel.flowOfSearchForDecks.test {
+                    viewModel.openDeckSelectionDialog()
+                    awaitItem()
+                }
+            } finally {
+                Dispatchers.resetMain()
             }
         }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserSearchFeedbackTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserSearchFeedbackTest.kt
index cc6109955e70..051f99d00839 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserSearchFeedbackTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserSearchFeedbackTest.kt
@@ -5,6 +5,7 @@ package com.ichi2.anki.browser
 import android.view.View
 import android.view.inputmethod.EditorInfo.IME_ACTION_SEARCH
 import android.widget.TextView
+import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.model.SelectableDeck
@@ -12,6 +13,7 @@ import com.ichi2.anki.model.SortType
 import com.ichi2.testutils.ext.snackbarAction
 import com.ichi2.testutils.ext.snackbarText
 import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.containsString
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.nullValue
 import org.junit.Test
@@ -46,7 +48,7 @@ class CardBrowserSearchFeedbackTest : RobolectricTest() {
             val header = requireActivity().findViewById<TextView>(R.id.subtitle)
             assertThat(header?.isShown == true, equalTo(!useSearchView))
 
-            activityViewModel.setQuery("", fromUserSearch = true).join()
+            activityViewModel.setQuery("", feedbackMode = BrowserSearchFeedbackMode.SEARCH_RESULTS).join()
             awaitSearch()
 
             assertThat(snackbarText, equalTo(if (useSearchView) "1 card shown" else null))
@@ -91,6 +93,98 @@ class CardBrowserSearchFeedbackTest : RobolectricTest() {
         }
     }
 
+    @Test
+    fun `suspending a card updates the hidden search count - Issue 22384`() {
+        addBasicNote("cat", "meows")
+        addBasicNote("dog", "barks")
+        withBrowser {
+            submitSearch("-is:suspended")
+            assertThat(activityViewModel.rowCount, equalTo(2))
+            for ((count, message) in listOf(1 to "1 card shown", 0 to "0 cards shown")) {
+                activityViewModel.selectRowAtPosition(0)
+
+                activityViewModel.toggleSuspendCards().join()
+                awaitSearch()
+
+                assertThat(activityViewModel.rowCount, equalTo(count))
+                assertThat(snackbarText, equalTo(message))
+                assertThat(snackbarAction?.visibility, equalTo(View.GONE))
+            }
+        }
+    }
+
+    @Test
+    fun `tag edits update the hidden search count - Issue 22384`() {
+        addBasicNote("cat", "meows")
+        addBasicNote("dog", "barks")
+        withBrowser {
+            submitSearch("-tag:edited")
+            assertThat(activityViewModel.rowCount, equalTo(2))
+            activityViewModel.selectRowAtPosition(0)
+
+            activityViewModel.editSelectedCardsTags(listOf("edited"), emptyList())
+            awaitSearch()
+
+            assertThat(activityViewModel.rowCount, equalTo(1))
+            assertThat(snackbarText, equalTo("1 card shown"))
+            assertThat(snackbarAction?.visibility, equalTo(View.GONE))
+        }
+    }
+
+    @Test
+    fun `unfiltered suspend reports the count only when the header is hidden`() {
+        addBasicNote("cat", "meows")
+        addBasicNote("dog", "barks")
+        withBrowser {
+            activityViewModel.selectRowAtPosition(0)
+
+            activityViewModel.toggleSuspendCards().join()
+            awaitSearch()
+
+            assertThat("the count need not change", activityViewModel.rowCount, equalTo(2))
+            assertThat(snackbarText, equalTo(if (useSearchView) "2 cards shown" else null))
+        }
+    }
+
+    @Test
+    fun `bury retains its undo feedback after refreshing the results`() {
+        addBasicNote("cat", "meows")
+        withBrowser {
+            submitSearch("cat")
+            activityViewModel.selectRowAtPosition(0)
+
+            toggleBury().join()
+            awaitSearch()
+
+            assertThat(snackbarAction?.text?.toString(), equalTo("Undo"))
+            assertThat(snackbarAction?.visibility, equalTo(View.VISIBLE))
+
+            onUndo().join()
+            awaitSearch()
+            assertThat(snackbarText, containsString("undone"))
+
+            // A previous operation's message must not suppress feedback for the next edit.
+            activityViewModel.selectRowAtPosition(0)
+            activityViewModel.toggleSuspendCards().join()
+            awaitSearch()
+            assertThat(snackbarText, equalTo("1 card shown"))
+        }
+    }
+
+    @Test
+    fun `repositioning keeps its operation feedback after refreshing the results`() {
+        addBasicNote("cat", "meows")
+        withBrowser {
+            submitSearch("cat")
+            activityViewModel.selectRowAtPosition(0)
+
+            repositionCardsNoValidation(position = 10, step = 1, shuffle = false, shift = false).join()
+            awaitSearch()
+
+            assertThat(snackbarText, equalTo(TR.browsingChangedNewPosition(1)))
+        }
+    }
+
     @Test
     fun `sorting shows the sort description`() {
         addBasicNote("cat", "meows")
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserUserActionFeedbackTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserUserActionFeedbackTest.kt
new file mode 100644
index 000000000000..42793a1005f9
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserUserActionFeedbackTest.kt
@@ -0,0 +1,294 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.browser
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Looper
+import android.view.KeyEvent
+import androidx.core.net.toUri
+import androidx.lifecycle.Lifecycle
+import androidx.test.core.app.ActivityScenario
+import com.ichi2.anki.CardBrowser
+import com.ichi2.anki.CollectionManager.withCol
+import com.ichi2.anki.Flag
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.destinations.NoteEditorDestination
+import com.ichi2.anki.common.destinations.toBundle
+import com.ichi2.anki.common.ui.TransitionDirection.DEFAULT
+import com.ichi2.anki.model.CardsOrNotes
+import com.ichi2.anki.model.SelectableDeck
+import com.ichi2.anki.noteeditor.openNoteEditorWithArgs
+import com.ichi2.anki.observability.undoableOp
+import com.ichi2.anki.settings.Prefs
+import com.ichi2.testutils.ext.snackbarAction
+import com.ichi2.testutils.ext.snackbarText
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.Shadows.shadowOf
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+/** User actions which refresh the browser count (Issue 22384), in both browser UIs. */
+@RunWith(ParameterizedRobolectricTestRunner::class)
+class CardBrowserUserActionFeedbackTest : RobolectricTest() {
+    @ParameterizedRobolectricTestRunner.Parameter
+    @JvmField
+    var useSearchView: Boolean = false
+
+    @Test
+    fun `show marked menu shows the refreshed count`() {
+        addBasicNote("cat", "meows").apply {
+            addTag("marked")
+            flush()
+        }
+        addBasicNote("dog", "barks")
+        withBrowser {
+            activityViewModel.searchForMarkedNotes().join()
+            awaitSearch()
+            assertCount(1)
+        }
+    }
+
+    @Test
+    fun `show suspended menu shows the refreshed count`() {
+        val note = addBasicNote("cat", "meows")
+        col.sched.suspendCards(listOf(note.firstCard().id))
+        addBasicNote("dog", "barks")
+        withBrowser {
+            activityViewModel.searchForSuspendedCards().join()
+            awaitSearch()
+            assertCount(1)
+        }
+    }
+
+    @Test
+    fun `tag filter shows the refreshed count`() {
+        addBasicNote("cat", "meows").apply {
+            addTag("audit")
+            flush()
+        }
+        addBasicNote("dog", "barks")
+        withBrowser {
+            filterByTag("audit")
+            awaitSearch()
+            assertCount(1)
+        }
+    }
+
+    @Test
+    fun `legacy flag filter shows the refreshed count`() {
+        addBasicNote("cat", "meows")
+        withBrowser {
+            activityViewModel.setFlagFilter(Flag.RED)
+            awaitSearch()
+            assertCount(0)
+        }
+    }
+
+    @Test
+    fun `switching to notes shows the refreshed count`() {
+        addBasicAndReversedNote("cat", "meows")
+        withBrowser {
+            assertEquals(2, activityViewModel.rowCount)
+            activityViewModel.setCardsOrNotes(CardsOrNotes.NOTES).join()
+            awaitSearch()
+            assertEquals(1, activityViewModel.rowCount)
+            assertEquals("1 note shown", snackbarText)
+            assertEquals(CardsOrNotes.NOTES, activityViewModel.flowOfLastCompletedSearch.value?.cardsOrNotes)
+        }
+    }
+
+    @Test
+    fun `saving a note editor change shows the refreshed count`() {
+        val note = addBasicNote("cat", "meows")
+        withBrowser {
+            activityViewModel.setQuery("cat").join()
+            awaitSearch()
+            assertNull(snackbarText)
+            val args = NoteEditorDestination.EditSelection(listOf(note.firstCard().id), DEFAULT).toBundle()
+            val editor = openNoteEditorWithArgs(args)
+            editor.setFieldValueFromUi(0, "dog")
+            editor.saveNote()
+            awaitSearch()
+            assertEquals("dog", withCol { getNote(note.id).fields[0] })
+            assertCount(0)
+        }
+    }
+
+    @Test
+    fun `leaving the note editor without changes stays quiet`() {
+        val note = addBasicNote("cat", "meows")
+        withBrowser {
+            val args = NoteEditorDestination.EditSelection(listOf(note.firstCard().id), DEFAULT).toBundle()
+            val editor = openNoteEditorWithArgs(args)
+            editor.saveNote()
+            awaitSearch()
+            assertEquals(1, activityViewModel.rowCount)
+            assertNull(snackbarText)
+        }
+    }
+
+    @Test
+    fun `returning after adding a note shows the refreshed count`() {
+        addBasicNote("cat", "meows")
+        withBrowser {
+            val browser = requireActivity()
+            assertTrue(onKeyUp(KeyEvent.KEYCODE_E, KeyEvent(0, 0, KeyEvent.ACTION_UP, KeyEvent.KEYCODE_E, 0, KeyEvent.META_CTRL_ON)))
+            advanceRobolectricLooper()
+            val started = assertNotNull(shadowOf(browser).nextStartedActivityForResult)
+            addBasicNote("dog", "barks")
+            shadowOf(browser).receiveResult(started.intent, Activity.RESULT_OK, Intent())
+            awaitSearch()
+            assertCount(2)
+        }
+    }
+
+    @Test
+    fun `mark and flag changes remain silent without rerunning search`() {
+        val note = addBasicNote("cat", "meows")
+        withBrowser {
+            val completed = activityViewModel.flowOfLastCompletedSearch.value
+            activityViewModel.selectRowAtPosition(0)
+            activityViewModel.toggleMark()
+            activityViewModel.updateSelectedCardsFlag(Flag.RED)
+            advanceRobolectricLooper()
+            assertEquals(completed, activityViewModel.flowOfLastCompletedSearch.value)
+            assertNull(snackbarText)
+            assertEquals(true, withCol { getNote(note.id).hasTag(this, "marked") })
+        }
+    }
+
+    @Test
+    fun `unrelated collection update stays quiet`() {
+        val note = addBasicNote("cat", "meows")
+        withBrowser {
+            activityViewModel.setQuery("cat").join()
+            awaitSearch()
+            undoableOp {
+                val changed = getNote(note.id)
+                changed.setField(0, "dog")
+                updateNote(changed)
+            }
+            awaitSearch()
+            assertEquals(0, activityViewModel.rowCount)
+            assertNull(snackbarText)
+        }
+    }
+
+    @Test
+    fun `note editor feedback survives returning to the browser and is shown only once`() =
+        runTest {
+            val note = addBasicNote("cat", "meows")
+            try {
+                Prefs.devUsingCardBrowserSearchView = useSearchView
+                ActivityScenario.launch<CardBrowser>(Intent(targetContext, CardBrowser::class.java)).use { scenario ->
+                    lateinit var browser: CardBrowser
+                    scenario.onActivity { browser = it }
+                    browser.cardBrowserFragment.awaitSearch()
+                    browser.viewModel.setSelectedDeck(SelectableDeck.AllDecks)
+                    browser.cardBrowserFragment.awaitSearch()
+                    assertNull(browser.snackbarText)
+
+                    scenario.moveToState(Lifecycle.State.CREATED)
+                    val args = NoteEditorDestination.EditSelection(listOf(note.firstCard().id), DEFAULT).toBundle()
+                    val editor = openNoteEditorWithArgs(args)
+                    editor.setFieldValueFromUi(0, "dog")
+                    editor.saveNote()
+                    browser.cardBrowserFragment.awaitSearch()
+                    assertEquals("dog", withCol { getNote(note.id).fields[0] })
+                    assertEquals(1, browser.viewModel.rowCount)
+                    assertNull(browser.snackbarText)
+
+                    scenario.moveToState(Lifecycle.State.RESUMED)
+                    shadowOf(Looper.getMainLooper()).idle()
+                    assertEquals(if (useSearchView) "1 card shown" else null, browser.snackbarText)
+
+                    // Let the snackbar expire, then return again without another edit.
+                    repeat(3) { advanceRobolectricLooper() }
+                    scenario.moveToState(Lifecycle.State.CREATED)
+                    scenario.moveToState(Lifecycle.State.RESUMED)
+                    shadowOf(Looper.getMainLooper()).idle()
+                    assertNull(browser.snackbarText)
+                }
+            } finally {
+                Prefs.devUsingCardBrowserSearchView = false
+            }
+        }
+
+    @Test
+    fun `search all decks action shows the new count`() {
+        addBasicNote("cat", "meows")
+        val emptyDeck = addDeck("Empty")
+        withBrowser {
+            activityViewModel.setSelectedDeck(emptyDeck)
+            awaitSearch()
+            activityViewModel.setQuery("cat", feedbackMode = BrowserSearchFeedbackMode.SEARCH_RESULTS).join()
+            awaitSearch()
+            assertEquals(0, activityViewModel.rowCount)
+            val action = assertNotNull(snackbarAction)
+            assertEquals("Search all decks", action.text.toString())
+            action.performClick()
+            awaitSearch()
+            assertEquals(true, activityViewModel.hasSelectedAllDecks())
+            assertEquals("cat", activityViewModel.searchTerms)
+            assertCount(1)
+        }
+    }
+
+    @Test
+    fun `explicit deep link query shows search feedback`() =
+        runTest {
+            addBasicNote("cat", "meows")
+            addBasicNote("dog", "barks")
+            try {
+                Prefs.devUsingCardBrowserSearchView = useSearchView
+                val intent =
+                    Intent(targetContext, CardBrowser::class.java).apply {
+                        action = Intent.ACTION_VIEW
+                        data = "anki://x-callback-url/browser?search=cat".toUri()
+                    }
+                ActivityScenario.launch<CardBrowser>(intent).use { scenario ->
+                    lateinit var browser: CardBrowser
+                    scenario.onActivity { browser = it }
+                    browser.viewModel.searchJob?.join()
+                    shadowOf(Looper.getMainLooper()).idle()
+                    assertEquals("cat", browser.viewModel.searchTerms)
+                    assertEquals(1, browser.viewModel.rowCount)
+                    assertTrue(browser.snackbarText?.contains("1 card") == true)
+                }
+            } finally {
+                Prefs.devUsingCardBrowserSearchView = false
+            }
+        }
+
+    private fun withBrowser(block: suspend CardBrowserFragment.() -> Unit) =
+        withCardBrowserFragment(useSearchView = useSearchView) {
+            awaitSearch()
+            activityViewModel.setSelectedDeck(SelectableDeck.AllDecks)
+            awaitSearch()
+            searchItem?.expandActionView()
+            advanceRobolectricLooper()
+            assertNull(snackbarText)
+            block()
+        }
+
+    private suspend fun CardBrowserFragment.awaitSearch() {
+        activityViewModel.searchJob?.join()
+        advanceRobolectricLooper()
+    }
+
+    private fun CardBrowserFragment.assertCount(count: Int) {
+        assertEquals(count, activityViewModel.rowCount)
+        assertEquals("$count ${if (count == 1) "card" else "cards"} shown", snackbarText)
+    }
+
+    companion object {
+        @ParameterizedRobolectricTestRunner.Parameters(name = "useSearchView={0}")
+        @JvmStatic
+        fun parameters() = listOf(arrayOf(false), arrayOf(true))
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserViewModelTest.kt
index 1d8a64a56273..72e360729a13 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserViewModelTest.kt
@@ -1657,97 +1657,64 @@ class CardBrowserViewModelTest : JvmTest() {
         }
 
     @Test
-    fun `searchResultMessage - initial search provides rows without a message - Issue 21242`() =
+    fun `initial search does not request feedback - Issue 21242`() =
         runViewModelTest(notes = 2, initMode = InitMode.MANUAL) {
             flowOfSearchState.test {
                 manualInit()
                 val completed = awaitSearchCompleted()
                 assertThat(completed.rowCount, equalTo(2))
-                assertThat(completed.resultMessage, nullValue())
+                assertThat(completed.feedbackMode, equalTo(BrowserSearchFeedbackMode.NONE))
             }
         }
 
     @Test
-    fun `searchResultMessage - sorting and reversing do not produce count messages`() =
-        runViewModelTest(notes = 2) {
-            flowOfSearchState.test {
-                ignoreEventsDuringViewModelInit()
-                val sortOrders =
-                    listOf(
-                        SortType.CollectionOrdering(BrowserColumnKey("noteCrt"), reverse = false),
-                        SortType.CollectionOrdering(BrowserColumnKey("noteCrt"), reverse = true),
-                        SortType.NoOrdering,
-                    )
-                for (sort in sortOrders) {
-                    setSortType(sort).join()
-                    val completed = awaitSearchCompleted()
-                    assertThat("sorting retains the results", completed.rowCount, equalTo(2))
-                    assertThat("sorting has its own feedback", completed.resultMessage, nullValue())
-                }
-            }
-        }
-
-    @Test
-    fun `searchResultMessage - user search, all decks selected, with rows`() =
+    fun `completed search retains the feedback mode and deck scope`() =
         runViewModelTest(notes = 3) {
             flowOfSearchState.test {
                 ignoreEventsDuringViewModelInit()
                 setSelectedDeck(SelectableDeck.AllDecks)
                 awaitSearchCompleted()
-                setQuery("", fromUserSearch = true)
+                setQuery("", feedbackMode = BrowserSearchFeedbackMode.SEARCH_RESULTS)
                 val completed = awaitSearchCompleted()
-                val card = completed.resultMessage as CardBrowserViewModel.SearchResultMessage.CardCount
                 assertThat("count", completed.rowCount, equalTo(3))
                 assertThat("cardsOrNotes", completed.cardsOrNotes, equalTo(CardsOrNotes.CARDS))
-                assertThat("no all-decks action when already on all decks", card.includeSearchAllDecksAction, equalTo(false))
+                assertThat(completed.feedbackMode, equalTo(BrowserSearchFeedbackMode.SEARCH_RESULTS))
+                assertThat(completed.allDecksSelected, equalTo(true))
             }
         }
 
     @Test
-    fun `searchResultMessage - user search, specific deck with cards has all-decks action`() =
+    fun `deck change does not request search feedback`() =
         runViewModelTest {
             val deck = addDeck("Specific")
             addNoteToDeck(deck)
             flowOfSearchState.test {
                 ignoreEventsDuringViewModelInit()
                 setSelectedDeck(deck)
-                awaitSearchCompleted()
-                setQuery("", fromUserSearch = true)
-                val card = awaitSearchCompleted().resultMessage as CardBrowserViewModel.SearchResultMessage.CardCount
-                assertThat("includes all-decks action", card.includeSearchAllDecksAction, equalTo(true))
-            }
-        }
-
-    @Test
-    fun `searchResultMessage - user search, specific deck with no cards`() =
-        runViewModelTest {
-            val deck = addDeck("Empty")
-            flowOfSearchState.test {
-                ignoreEventsDuringViewModelInit()
-                setSelectedDeck(deck)
-                awaitSearchCompleted()
-                setQuery("", fromUserSearch = true)
-                assertThat(
-                    "empty deck → no-cards-in-selected-deck",
-                    awaitSearchCompleted().resultMessage,
-                    equalTo(CardBrowserViewModel.SearchResultMessage.NoCardsInSelectedDeck),
-                )
+                val completed = awaitSearchCompleted()
+                assertThat(completed.rowCount, equalTo(1))
+                assertThat(completed.feedbackMode, equalTo(BrowserSearchFeedbackMode.NONE))
+                assertThat(completed.allDecksSelected, equalTo(false))
             }
         }
 
     @Test
-    fun `searchResultMessage - no message on deck change`() =
-        runViewModelTest {
-            val deck = addDeck("Specific")
-            addNoteToDeck(deck)
+    fun `sorting and reversing do not request search feedback`() =
+        runViewModelTest(notes = 2) {
             flowOfSearchState.test {
                 ignoreEventsDuringViewModelInit()
-                setSelectedDeck(deck)
-                assertThat(
-                    "changing deck does not surface a result message",
-                    awaitSearchCompleted().resultMessage,
-                    nullValue(),
-                )
+                val sortOrders =
+                    listOf(
+                        SortType.CollectionOrdering(BrowserColumnKey("noteCrt"), reverse = false),
+                        SortType.CollectionOrdering(BrowserColumnKey("noteCrt"), reverse = true),
+                        SortType.NoOrdering,
+                    )
+                for (sort in sortOrders) {
+                    setSortType(sort).join()
+                    val completed = awaitSearchCompleted()
+                    assertThat("sorting retains the results", completed.rowCount, equalTo(2))
+                    assertThat("sorting has its own feedback", completed.feedbackMode, equalTo(BrowserSearchFeedbackMode.NONE))
+                }
             }
         }
 
@@ -2168,6 +2135,51 @@ class CardBrowserViewModelTest : JvmTest() {
         }
     }
 
+    @Test
+    fun `external search launches request feedback`() {
+        for (options in listOf(DeepLink("cat"), SystemContextMenu("cat"), CardBrowserLaunchOptions.SearchQueryJs("cat", allDecks = true))) {
+            runViewModelTest(options = options) {
+                waitForSearchResults()
+                assertEquals(BrowserSearchFeedbackMode.SEARCH_RESULTS, flowOfSearchFeedback.value?.feedbackMode)
+            }
+        }
+    }
+
+    @Test
+    fun `restoring notes mode on startup does not request feedback`() =
+        runViewModelNotesTest(notes = 1) {
+            waitForSearchResults()
+            assertEquals(CardsOrNotes.NOTES, cardsOrNotes)
+            assertNull(flowOfSearchFeedback.value)
+        }
+
+    @Test
+    fun `a newer automatic refresh discards unshown feedback`() =
+        runViewModelTest(notes = 1) {
+            setQuery("", feedbackMode = BrowserSearchFeedbackMode.SEARCH_RESULTS).join()
+            waitForSearchResults()
+            val feedback = assertNotNull(flowOfSearchFeedback.value)
+
+            launchSearchForCards()
+            waitForSearchResults()
+
+            assertNull(flowOfSearchFeedback.value)
+            assertEquals(false, consumeSearchFeedback(feedback))
+        }
+
+    @Test
+    fun `feedback is consumed once but identical later searches still request it`() =
+        runViewModelTest(notes = 1) {
+            repeat(2) {
+                setQuery("", feedbackMode = BrowserSearchFeedbackMode.SEARCH_RESULTS).join()
+                waitForSearchResults()
+                val feedback = assertNotNull(flowOfSearchFeedback.value)
+                assertEquals(true, consumeSearchFeedback(feedback))
+                assertEquals(false, consumeSearchFeedback(feedback))
+                assertNull(flowOfSearchFeedback.value)
+            }
+        }
+
     @Test
     fun `setDefaultSearchText round-trips through collection config`() {
         try {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/FindAndReplaceDialogFragmentTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/FindAndReplaceDialogFragmentTest.kt
index 9b13a756dd38..78caacb2a1c6 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/FindAndReplaceDialogFragmentTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/FindAndReplaceDialogFragmentTest.kt
@@ -32,6 +32,7 @@ import org.junit.runner.RunWith
 import org.robolectric.Robolectric
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class FindAndReplaceDialogFragmentTest : RobolectricTest() {
@@ -49,7 +50,7 @@ class FindAndReplaceDialogFragmentTest : RobolectricTest() {
                     arguments = Bundle().apply { putParcelable(FindAndReplaceDialogFragment.ARG_IDS, file) }
                 }
             Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
-                controller.get().setTheme(R.style.Theme_Light)
+                controller.get().setTheme(CommonR.style.Theme_Light)
                 val activity = controller.setup().get()
                 activity.setContentView(CoordinatorLayout(activity).apply { id = R.id.root_layout })
                 fragment.show(activity.supportFragmentManager, "find-replace")
@@ -109,7 +110,7 @@ class FindAndReplaceDialogFragmentTest : RobolectricTest() {
                 .launch(
                     fragmentClass = FindAndReplaceDialogFragment::class.java,
                     fragmentArgs = Bundle().apply { putParcelable(FindAndReplaceDialogFragment.ARG_IDS, file) },
-                    themeResId = R.style.Theme_Light,
+                    themeResId = CommonR.style.Theme_Light,
                 ).use { scenario ->
                     scenario.onFragment { fragment ->
                         advanceUntilIdle()
@@ -149,7 +150,7 @@ class FindAndReplaceDialogFragmentTest : RobolectricTest() {
             .launch(
                 fragmentClass = FindAndReplaceDialogFragment::class.java,
                 fragmentArgs = Bundle().apply { putParcelable(FindAndReplaceDialogFragment.ARG_IDS, file) },
-                themeResId = R.style.Theme_Light,
+                themeResId = CommonR.style.Theme_Light,
             ).use { scenario -> scenario.onFragment { fragment -> fragment.action() } }
     }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/CardStateTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/CardStateTest.kt
index e38f0d6940d7..25f3394097fa 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/CardStateTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/CardStateTest.kt
@@ -2,23 +2,17 @@
 
 package com.ichi2.anki.browser.search
 
-import com.ichi2.anki.EmptyApplicationCategory
-import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.libanki.testutils.AnkiTest
-import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.JvmTest
 import org.junit.Test
-import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
-import org.robolectric.ParameterizedRobolectricTestRunner
-import org.robolectric.annotation.Config
+import org.junit.runners.Parameterized
 import kotlin.test.assertEquals
 
 /** Test for [CardState] */
-@RunWith(ParameterizedRobolectricTestRunner::class)
-@Config(application = EmptyApplication::class)
-@Category(EmptyApplicationCategory::class)
-class CardStateTest : RobolectricTest() {
-    @ParameterizedRobolectricTestRunner.Parameter(0)
+@RunWith(Parameterized::class)
+class CardStateTest : JvmTest() {
+    @Parameterized.Parameter(0)
     @JvmField
     var stateParam: CardState? = null
 
@@ -53,7 +47,7 @@ class CardStateTest : RobolectricTest() {
 
     companion object {
         @JvmStatic
-        @ParameterizedRobolectricTestRunner.Parameters(name = "{0}")
+        @Parameterized.Parameters(name = "{0}")
         fun parameters(): Collection<Array<Any>> = CardState.entries.map { arrayOf(it) }
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/SavedSearchesTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/SavedSearchesTest.kt
index 168c48171b59..6d2f5384d0a5 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/SavedSearchesTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/SavedSearchesTest.kt
@@ -2,7 +2,6 @@
 
 package com.ichi2.anki.browser.search
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.testutils.JvmTest
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.empty
@@ -11,11 +10,9 @@ import org.hamcrest.Matchers.hasSize
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.junit.runner.RunWith
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 
-@RunWith(AndroidJUnit4::class)
 class SavedSearchesTest : JvmTest() {
     @Test
     fun `matches Anki Desktop ordering`() =
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/SearchRequestTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/SearchRequestTest.kt
index 98defeca7ec6..509809eeda8b 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/SearchRequestTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/SearchRequestTest.kt
@@ -2,29 +2,20 @@
 
 package com.ichi2.anki.browser.search
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.CollectionManager.withCol
-import com.ichi2.anki.EmptyApplicationCategory
 import com.ichi2.anki.Flag
 import com.ichi2.anki.browser.SearchHistory.SearchHistoryEntry
 import com.ichi2.anki.libanki.DeckNameId
 import com.ichi2.anki.libanki.NoteTypeNameID
 import com.ichi2.anki.libanki.exception.InvalidSearchException
 import com.ichi2.anki.libanki.testutils.AnkiTest
-import com.ichi2.testutils.EmptyApplication
 import com.ichi2.testutils.JvmTest
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
-import org.junit.experimental.categories.Category
-import org.junit.runner.RunWith
-import org.robolectric.annotation.Config
 import kotlin.test.assertFailsWith
 
 /** Tests for [SearchRequest] */
-@RunWith(AndroidJUnit4::class)
-@Config(application = EmptyApplication::class)
-@Category(EmptyApplicationCategory::class)
 class SearchRequestTest : JvmTest() {
     @Test
     fun `search string generation - empty`() {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/SearchStringTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/SearchStringTest.kt
index ec119fda0ace..3f50f7aa51bf 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/SearchStringTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/browser/search/SearchStringTest.kt
@@ -2,20 +2,17 @@
 
 package com.ichi2.anki.browser.search
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import anki.search.SearchNode
 import anki.search.searchNode
 import com.ichi2.anki.libanki.exception.InvalidSearchException
 import com.ichi2.anki.libanki.testutils.AnkiTest
 import com.ichi2.testutils.JvmTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import kotlin.test.assertContains
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 
 /** Tests for [SearchString] */
-@RunWith(AndroidJUnit4::class)
 class SearchStringTest : JvmTest() {
     @Test
     fun `valid searchString from string`() {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/CardMediaPlayerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/CardMediaPlayerTest.kt
index 00180ce26911..6e2546f8f40b 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/CardMediaPlayerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/CardMediaPlayerTest.kt
@@ -2,7 +2,6 @@
 
 package com.ichi2.anki.cardviewer
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.CardUtils
 import com.ichi2.anki.cardviewer.MediaErrorBehavior.CONTINUE_MEDIA
 import com.ichi2.anki.cardviewer.MediaErrorBehavior.RETRY_MEDIA
@@ -25,9 +24,7 @@ import io.mockk.verify
 import kotlinx.coroutines.CompletableDeferred
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
 class CardMediaPlayerTest : JvmTest() {
     internal val tagPlayer: SoundTagPlayer = mockk<SoundTagPlayer>()
     internal val ttsPlayer: TtsPlayer = mockk<TtsPlayer>()
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/CardSoundConfigTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/CardSoundConfigTest.kt
index 20f42271af97..f970a81b062b 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/CardSoundConfigTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/CardSoundConfigTest.kt
@@ -2,7 +2,6 @@
 
 package com.ichi2.anki.cardviewer
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.Reviewer.Companion.EXTRA_DECK_ID
 import com.ichi2.anki.libanki.Card
@@ -11,10 +10,7 @@ import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Ignore
 import org.junit.Test
-import org.junit.runner.RunWith
 
-// PERF: remove AndroidApplication
-@RunWith(AndroidJUnit4::class)
 class CardSoundConfigTest : JvmTest() {
     @Test
     fun `default values`() =
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/TypeAnswerAndroidTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/TypeAnswerAndroidTest.kt
new file mode 100644
index 000000000000..74a3bf9408bf
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/TypeAnswerAndroidTest.kt
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.cardviewer
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.JvmTest
+import com.ichi2.testutils.targetContext
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Element
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
+
+/** Uses application startup to register the custom `nosuggest` field filter. */
+@RunWith(AndroidJUnit4::class)
+class TypeAnswerAndroidTest :
+    JvmTest(),
+    AndroidTest {
+    @Test
+    fun `HTML answer marks nosuggest fields and requests a Done key`() =
+        runTest {
+            val field = htmlAnswerField("nosuggest:type")
+
+            assertEquals("true", field.attr("data-ankidroid-nosuggest"))
+            assertEquals("done", field.attr("enterkeyhint"))
+        }
+
+    @Test
+    fun `ordinary HTML answers keep their keyboard defaults`() =
+        runTest {
+            val field = htmlAnswerField("type")
+
+            assertFalse(field.hasAttr("data-ankidroid-nosuggest"))
+            assertFalse(field.hasAttr("enterkeyhint"))
+        }
+
+    private fun htmlAnswerField(filter: String): Element {
+        val card = addBasicWithTypingNote("front", "back").firstCard()
+        val noteType = card.noteType(col)
+        noteType.templates[0].qfmt = "{{Front}}{{$filter:Back}}"
+        col.notetypes.save(noteType)
+
+        val typeAnswer = TypeAnswer(useInputTag = true, autoFocus = true)
+        typeAnswer.updateInfo(col, card, targetContext.resources)
+        val html = typeAnswer.filterQuestion(card.question(col))
+        return assertNotNull(Jsoup.parseBodyFragment(html).selectFirst("input#typeans"))
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/TypeAnswerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/TypeAnswerTest.kt
index 2bba35d4343c..d3a5c985d9fb 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/TypeAnswerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/TypeAnswerTest.kt
@@ -2,55 +2,13 @@
 
 package com.ichi2.anki.cardviewer
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.cardviewer.TypeAnswer.Companion.contentForCloze
+import com.ichi2.testutils.JvmTest
 import org.intellij.lang.annotations.Language
-import org.jsoup.Jsoup
-import org.jsoup.nodes.Element
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import org.junit.runner.RunWith
-import kotlin.test.assertFalse
-import kotlin.test.assertNotNull
-
-@RunWith(AndroidJUnit4::class)
-class TypeAnswerTest : RobolectricTest() {
-    override fun setUp() {
-        super.setUp()
-        col
-    }
-
-    @Test
-    fun `HTML answer marks nosuggest fields and requests a Done key`() =
-        runTest {
-            val field = htmlAnswerField("nosuggest:type")
-
-            assertEquals("true", field.attr("data-ankidroid-nosuggest"))
-            assertEquals("done", field.attr("enterkeyhint"))
-        }
-
-    @Test
-    fun `ordinary HTML answers keep their keyboard defaults`() =
-        runTest {
-            val field = htmlAnswerField("type")
-
-            assertFalse(field.hasAttr("data-ankidroid-nosuggest"))
-            assertFalse(field.hasAttr("enterkeyhint"))
-        }
-
-    private fun htmlAnswerField(filter: String): Element {
-        val card = addBasicWithTypingNote("front", "back").firstCard()
-        val noteType = card.noteType(col)
-        noteType.templates[0].qfmt = "{{Front}}{{$filter:Back}}"
-        col.notetypes.save(noteType)
-
-        val typeAnswer = TypeAnswer(useInputTag = true, autoFocus = true)
-        typeAnswer.updateInfo(col, card, targetContext.resources)
-        val html = typeAnswer.filterQuestion(card.question(col))
-        return assertNotNull(Jsoup.parseBodyFragment(html).selectFirst("input#typeans"))
-    }
 
+class TypeAnswerTest : JvmTest() {
     @Test
     fun testTypeAnsAnswerFilterNormalCorrect() {
         @Language("HTML")
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/VideoPlayerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/VideoPlayerTest.kt
index 86b4111b446c..397b65a570d2 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/VideoPlayerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/cardviewer/VideoPlayerTest.kt
@@ -2,8 +2,6 @@
 
 package com.ichi2.anki.cardviewer
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.libanki.SoundOrVideoTag
 import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.CompletionHandler
@@ -13,14 +11,12 @@ import kotlinx.coroutines.InternalCoroutinesApi
 import kotlinx.coroutines.InternalForInheritanceCoroutinesApi
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
-import org.junit.runner.RunWith
 import kotlin.coroutines.CoroutineContext
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 
-@RunWith(AndroidJUnit4::class)
 @InternalForInheritanceCoroutinesApi
-class VideoPlayerTest : RobolectricTest() {
+class VideoPlayerTest {
     @Test
     fun `stops audio playback when paused`() {
         val v = VideoPlayer { JavascriptEvaluator { } }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/DeckPickerBackgroundTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/DeckPickerBackgroundTest.kt
new file mode 100644
index 000000000000..7f0528cc1bd0
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/DeckPickerBackgroundTest.kt
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.deckpicker
+
+import android.content.Intent
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.CommonString
+import com.ichi2.anki.DeckPicker
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.storage.CollectionHelper
+import com.ichi2.anki.setIntroductionSlidesShown
+import com.ichi2.anki.settings.Prefs
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.nullValue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.android.controller.ActivityController
+import org.robolectric.shadows.ShadowToast
+import java.awt.image.BufferedImage
+import java.io.File
+import javax.imageio.ImageIO
+
+@RunWith(AndroidJUnit4::class)
+class DeckPickerBackgroundTest : RobolectricTest() {
+    @Test
+    fun `background is released while the deck picker is stopped`() {
+        saveBackgroundImage(width = 10, height = 10)
+        val controller = startDeckPicker()
+        val background = controller.get().deckPickerBinding.background
+        advanceRobolectricLooperUntil { background.drawable != null }
+
+        controller.pause().stop()
+        assertThat(background.drawable, nullValue())
+
+        controller.start().resume()
+        advanceRobolectricLooperUntil { background.drawable != null }
+    }
+
+    @Test
+    fun `a background that is too large is reported once`() {
+        saveBackgroundImage(width = 6_000, height = 5_000)
+        val controller = startDeckPicker()
+        advanceRobolectricLooperUntil { ShadowToast.shownToastCount() > 0 }
+
+        controller.pause().stop()
+        controller.start().resume()
+        advanceRobolectricLooper()
+
+        assertThat(ShadowToast.shownToastCount(), equalTo(1))
+        assertThat(ShadowToast.getTextOfLatestToast(), equalTo(targetContext.getString(CommonString.background_image_too_large)))
+    }
+
+    private fun saveBackgroundImage(
+        width: Int,
+        height: Int,
+    ) {
+        val directory = CollectionHelper.getCurrentAnkiDroidDirectory(targetContext).apply { mkdirs() }
+        ImageIO.write(BufferedImage(width, height, BufferedImage.TYPE_BYTE_BINARY), "png", File(directory, BackgroundImage.FILENAME))
+        Prefs.isBackgroundEnabled = true
+    }
+
+    private fun startDeckPicker(): ActivityController<DeckPicker> {
+        setIntroductionSlidesShown(true)
+        return startActivityControllerNormallyOpenCollectionWithIntent(DeckPicker::class.java, Intent())
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/DeckPickerCollectionLockTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/DeckPickerCollectionLockTest.kt
new file mode 100644
index 000000000000..8cbb3ba400b4
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/DeckPickerCollectionLockTest.kt
@@ -0,0 +1,79 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.deckpicker
+
+import androidx.lifecycle.ViewModelStore
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.CollectionManager
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.deckpicker.DeckPickerViewModel.FlattenedDeckList
+import com.ichi2.anki.exception.CollectionLockedException
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.runCurrent
+import net.ankiweb.rsdroid.Backend
+import org.junit.After
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertFalse
+
+@RunWith(AndroidJUnit4::class)
+class DeckPickerCollectionLockTest : RobolectricTest() {
+    override fun getCollectionStorageMode() = CollectionStorageMode.ON_DISK
+
+    private val viewModels = ViewModelStore()
+    private val viewModel by lazy {
+        DeckPickerViewModel().also { viewModels.put("deckPicker", it) }
+    }
+
+    @After
+    fun clearViewModels() {
+        viewModels.clear()
+    }
+
+    @Test
+    fun `filtering a stale deck list does not reopen the collection`() =
+        runTest {
+            val deckId = addDeck("Kept")
+            viewModel.reloadDeckCounts().join()
+            viewModel.flowOfDeckList.first { list -> list.data.any { it.did == deckId } }
+
+            CollectionManager.ensureClosed()
+            viewModel.updateDeckFilter("Kept")
+            runCurrent()
+
+            assertFalse(CollectionManager.isOpenUnsafe())
+            assertEquals(FlattenedDeckList.empty, viewModel.flowOfDeckList.value)
+        }
+
+    /** Issue 20986: a display refresh must not reopen a collection held by another app. */
+    @Test
+    fun `deck list survives an external collection lock and can refresh afterwards`() =
+        runTest {
+            val kept = addDeck("Kept")
+            addDeck("Other")
+            viewModel.reloadDeckCounts().join()
+            viewModel.flowOfDeckList.first { list -> list.data.any { it.did == kept } }
+            val collectionPath = col.colDb.path
+
+            CollectionManager.ensureClosed()
+            Backend().use { conflictingBackend ->
+                conflictingBackend.openCollection(collectionPath)
+                assertFailsWith<CollectionLockedException> { CollectionManager.ensureOpen() }
+
+                viewModel.updateDeckFilter("Kept")
+                runCurrent()
+
+                assertFalse(CollectionManager.isOpenUnsafe())
+                assertEquals(FlattenedDeckList.empty, viewModel.flowOfDeckList.value)
+            }
+
+            CollectionManager.ensureOpen()
+            viewModel.reloadDeckCounts().join()
+            runCurrent()
+
+            val refreshed = viewModel.flowOfDeckList.value
+            assertEquals(listOf(kept), refreshed.data.map { it.did })
+        }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/DeckPickerViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/DeckPickerViewModelTest.kt
index 163734298c60..b8f927f936e3 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/DeckPickerViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/deckpicker/DeckPickerViewModelTest.kt
@@ -57,7 +57,7 @@ class DeckPickerViewModelTest : RobolectricTest() {
     private val viewModel: DeckPickerViewModel by lazy { DeckPickerViewModel() }
 
     @Test
-    fun `delete confirmation uses focused deck and includes cards in subdecks`() =
+    fun `delete confirmation includes cards in subdecks`() =
         runTest {
             val deckId = addDeck("Parent")
             val childDeckId = addDeck("Parent::Child")
@@ -66,7 +66,7 @@ class DeckPickerViewModelTest : RobolectricTest() {
             addBasicNote("Unrelated card")
             col.setDeck(listOf(parentCard.id), deckId)
             col.setDeck(listOf(childCard.id), childDeckId)
-            selectDefaultDeck()
+            col.decks.select(deckId)
             viewModel.focusedDeck = deckId
 
             viewModel.flowOfDeleteDeckConfirmation.test {
@@ -98,7 +98,7 @@ class DeckPickerViewModelTest : RobolectricTest() {
     @Test
     fun `delete confirmation supports an empty deck`() =
         runTest {
-            val deckId = addDeck("Empty")
+            val deckId = addDeck("Empty", setAsSelected = true)
             viewModel.focusedDeck = deckId
 
             viewModel.flowOfDeleteDeckConfirmation.test {
@@ -108,16 +108,6 @@ class DeckPickerViewModelTest : RobolectricTest() {
             }
         }
 
-    @Test
-    fun `delete confirmation without a focused deck emits nothing`() =
-        runTest {
-            viewModel.flowOfDeleteDeckConfirmation.test {
-                viewModel.requestDeleteDeckConfirmation().join()
-
-                expectNoEvents()
-            }
-        }
-
     @Test
     fun `rename and study requests use the resolved selection despite focus search and collapsed parents`() =
         runTest {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialogInsetsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialogInsetsTest.kt
index 56b23328cff0..6bd755434008 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialogInsetsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialogInsetsTest.kt
@@ -8,13 +8,13 @@ import androidx.core.view.WindowCompat
 import androidx.fragment.app.testing.launchFragment
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.dialogs.ChangeNoteTypeDialog.Companion.ARG_NOTE_IDS
 import com.ichi2.anki.settings.enums.DayTheme
 import com.ichi2.anki.settings.enums.NightTheme
 import com.ichi2.anki.settings.enums.Theme
 import com.ichi2.testutils.windowInsetsOf
 import com.ichi2.themes.Themes
-import com.ichi2.utils.dp
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialogScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialogScreenshotTest.kt
index 8d0443abc7bb..e3b1a475f8cb 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialogScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialogScreenshotTest.kt
@@ -11,6 +11,7 @@ import androidx.core.view.updateLayoutParams
 import com.google.testing.junit.testparameterinjector.TestParameter
 import com.ichi2.anki.ScreenshotTest
 import com.ichi2.anki.ScreenshotTest.DeviceConfig.DESKTOP
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.DialogChangeNoteTypeBinding
 import com.ichi2.anki.databinding.DialogFieldsBinding
 import com.ichi2.anki.databinding.DialogTemplatesBinding
@@ -19,7 +20,6 @@ import com.ichi2.anki.dialogs.ChangeNoteTypeViewModel.Tab
 import com.ichi2.anki.withCardBrowser
 import com.ichi2.testutils.simulateSystemBars
 import com.ichi2.testutils.windowInsetsOf
-import com.ichi2.utils.dp
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialogTest.kt
index a0a83af4c41f..ba30a95c83a4 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/ChangeNoteTypeDialogTest.kt
@@ -22,6 +22,7 @@ import org.hamcrest.Matchers.equalTo
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.Shadows.shadowOf
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class ChangeNoteTypeDialogTest : RobolectricTest() {
@@ -103,7 +104,7 @@ class ChangeNoteTypeDialogTest : RobolectricTest() {
     ) {
         launchFragment<ChangeNoteTypeDialog>(
             fragmentArgs = Bundle().apply { putLongArray(ARG_NOTE_IDS, longArrayOf(noteId)) },
-            themeResId = R.style.Theme_Light,
+            themeResId = CommonR.style.Theme_Light,
         ).use { scenario -> scenario.onFragment { action(it) } }
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CreateDeckDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CreateDeckDialogTest.kt
index 38fda0ddefc3..19c65878612a 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CreateDeckDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CreateDeckDialogTest.kt
@@ -45,7 +45,7 @@ class CreateDeckDialogTest : RobolectricTest() {
 
     override fun setUp() {
         super.setUp()
-        getPreferences().edit { putBoolean(IntroductionActivity.INTRODUCTION_SLIDES_SHOWN, true) }
+        getPreferences().edit { putBoolean(IntroductionActivity.PREF_INTRODUCTION_SLIDES_SHOWN, true) }
         ensureCollectionLoadIsSynchronous()
         activityScenario =
             ActivityScenario.launch(DeckPicker::class.java).apply {
@@ -78,7 +78,7 @@ class CreateDeckDialogTest : RobolectricTest() {
         ensureExecutionOfScenario(DeckDialogType.DECK) { createDeckDialog, assertionCalled ->
             createDeckDialog.onNewDeckCreated = { id: DeckId ->
                 // a deck was created
-                assertThat(id, equalTo(col.decks.byName(deckName)!!.getLong("id")))
+                assertThat(id, equalTo(col.decks.byName(deckName)!!.id))
                 assertionCalled()
             }
             createDeckDialog.createDeck(deckName)
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyDialogScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyDialogScreenshotTest.kt
new file mode 100644
index 000000000000..0242e42ad740
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyDialogScreenshotTest.kt
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.dialogs
+
+import com.ichi2.anki.ScreenshotTest
+import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog
+import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.ContextMenuOption
+import com.ichi2.anki.libanki.Consts
+import com.ichi2.testutils.launchFragment
+import com.ichi2.testutils.uninitializeField
+import org.junit.Test
+
+class CustomStudyDialogScreenshotTest : ScreenshotTest() {
+    @Test
+    fun extendNewLimit() =
+        withSubDialog(ContextMenuOption.EXTEND_NEW) {
+            captureScreen("extend_new_limit")
+        }
+
+    @Test
+    fun extendReviewLimit() =
+        withSubDialog(ContextMenuOption.EXTEND_REV) {
+            captureScreen("extend_review_limit")
+        }
+
+    @Test
+    fun previewWithCards() =
+        withSubDialog(ContextMenuOption.STUDY_PREVIEW) {
+            captureScreen("preview_with_cards")
+        }
+
+    @Test
+    fun previewNoCards() {
+        addNoteToDeck(Consts.DEFAULT_DECK_ID, count = 2)
+        col.db.execute(
+            "UPDATE cards SET id = id - ${40L * 24 * 60 * 60 * 1000} WHERE id > 0",
+        )
+
+        uninitializeField<CustomStudyDialog>("deferredInitialization")
+        launchFragment<CustomStudyDialog>(CustomStudyDialog.createInstance(Consts.DEFAULT_DECK_ID).arguments).use {
+            advanceRobolectricLooper()
+        }
+
+        val subDialogArgs = CustomStudyDialog.createSubDialog(Consts.DEFAULT_DECK_ID, ContextMenuOption.STUDY_PREVIEW).arguments
+        launchFragment<CustomStudyDialog>(subDialogArgs).use {
+            advanceRobolectricLooper()
+            captureScreen("preview_no_cards")
+        }
+    }
+
+    private fun withSubDialog(
+        option: ContextMenuOption,
+        action: () -> Unit,
+    ) {
+        addNoteToDeck(Consts.DEFAULT_DECK_ID, count = 5)
+
+        uninitializeField<CustomStudyDialog>("deferredInitialization")
+        launchFragment<CustomStudyDialog>(CustomStudyDialog.createInstance(Consts.DEFAULT_DECK_ID).arguments).use {
+            advanceRobolectricLooper()
+        }
+
+        val subDialogArgs = CustomStudyDialog.createSubDialog(Consts.DEFAULT_DECK_ID, option).arguments
+        launchFragment<CustomStudyDialog>(subDialogArgs).use {
+            advanceRobolectricLooper()
+            action()
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyDialogTest.kt
index e5d245ec0356..400a9510da68 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyDialogTest.kt
@@ -4,15 +4,29 @@ package com.ichi2.anki.dialogs
 
 import android.os.Bundle
 import android.os.Looper
+import android.view.View
 import android.widget.AdapterView
 import android.widget.ListView
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.children
+import androidx.core.view.isVisible
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.SavedStateHandle
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.replaceText
+import androidx.test.espresso.action.ViewActions.scrollTo
+import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.RootMatchers.isDialog
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isEnabled
+import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -21,15 +35,19 @@ import anki.scheduler.CustomStudyRequest.Cram.CramKind
 import anki.scheduler.customStudyDefaultsResponse
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.CollectionManager.TR
+import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.ContextMenuOption
+import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.CustomStudyAction
 import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.CustomStudyDefaults.Companion.toDomainModel
 import com.ichi2.anki.dialogs.customstudy.CustomStudyViewModel
-import com.ichi2.anki.dialogs.tags.TagsDialogListener.Companion.ON_SELECTED_TAGS_KEY
-import com.ichi2.anki.dialogs.tags.TagsDialogListener.Companion.ON_SELECTED_TAGS__SELECTED_TAGS
+import com.ichi2.anki.dialogs.tags.TagsDialogListener.Companion.REQUEST_SELECT_TAGS
+import com.ichi2.anki.dialogs.tags.TagsDialogListener.Companion.RESULT_SELECTED_TAGS
 import com.ichi2.anki.dialogs.utils.performPositiveClick
+import com.ichi2.anki.ioDispatcher
 import com.ichi2.anki.libanki.CardType
 import com.ichi2.anki.libanki.Collection
 import com.ichi2.anki.libanki.Consts
@@ -37,34 +55,420 @@ import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.libanki.Note
 import com.ichi2.anki.libanki.QueueType
 import com.ichi2.anki.libanki.sched.Scheduler
+import com.ichi2.anki.utils.ext.DIALOG_FRAGMENT_TAG
+import com.ichi2.anki.utils.ext.showDialogFragment
 import com.ichi2.testutils.AnkiFragmentScenario
-import com.ichi2.testutils.isJsonEqual
+import com.ichi2.testutils.EmptyAnkiActivity
+import com.ichi2.testutils.ext.snackbarText
+import com.ichi2.testutils.isJsonHolderEqual
+import com.ichi2.testutils.launchFragment
 import com.ichi2.testutils.uninitializeField
 import com.ichi2.utils.positiveButton
+import com.ichi2.utils.textAsIntOrNull
 import io.mockk.every
 import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.TestCoroutineScheduler
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.withContext
 import org.hamcrest.CoreMatchers.allOf
+import org.hamcrest.CoreMatchers.containsString
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.CoreMatchers.not
 import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.greaterThan
 import org.hamcrest.Matchers.greaterThanOrEqualTo
 import org.hamcrest.Matchers.lessThan
+import org.hamcrest.Matchers.nullValue
 import org.intellij.lang.annotations.Language
 import org.junit.Before
 import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.robolectric.Robolectric
 import org.robolectric.Shadows.shadowOf
 import org.robolectric.annotation.Config
+import java.util.concurrent.TimeUnit
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
+import kotlin.test.assertSame
+import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class CustomStudyDialogTest : RobolectricTest() {
     @Before
     override fun setUp() {
         super.setUp()
-        uninitializeField<CustomStudyDialog>("deferredDefaults")
+        uninitializeField<CustomStudyDialog>("deferredInitialization")
+    }
+
+    @Test
+    fun `cancelling a defaults read prevents late deck selection`() =
+        runTest {
+            val response = customStudyDefaultsResponse { availableNew = 1 }
+            val collection = mockCollectionWithSchedulerReturning(response)
+            val decks = collection.decks
+            val initialization = Job()
+            every { collection.sched.customStudyDefaults(Consts.DEFAULT_DECK_ID) } answers {
+                initialization.cancel()
+                response
+            }
+            CollectionManager.setColForTests(collection)
+            val viewModel = CustomStudyViewModel(SavedStateHandle(mapOf(CustomStudyViewModel.ARG_DECK_ID to Consts.DEFAULT_DECK_ID)))
+
+            assertFailsWith<CancellationException> {
+                withContext(initialization) { viewModel.initialize() }
+            }
+
+            verify(exactly = 0) { decks.select(Consts.DEFAULT_DECK_ID) }
+        }
+
+    @Test
+    fun `empty deck initialization does not block the dialog`() =
+        runTest {
+            val other = addDeck("Other")
+            col.setDeck(listOf(addBasicNote().firstCard().id), other)
+            val undoStatus = col.undoStatus()
+            val previousDispatcher = ioDispatcher
+            ioDispatcher = StandardTestDispatcher(testScheduler)
+            try {
+                createHostActivity().use { controller ->
+                    val activity = controller.get()
+                    val fragment = CustomStudyDialog.createInstance(Consts.DEFAULT_DECK_ID)
+                    activity.showDialogFragment(fragment)
+                    val dialog = fragment.requireDialog()
+                    assertTrue(assertNotNull(dialog.findViewById<View>(R.id.progress_bar)).isVisible)
+
+                    runCurrent()
+
+                    assertUnavailableMenu(fragment)
+                    assertEquals(Consts.DEFAULT_DECK_ID, col.decks.selected())
+                    assertEquals(undoStatus, col.undoStatus())
+                }
+            } finally {
+                ioDispatcher = previousDispatcher
+            }
+        }
+
+    @Test
+    fun `populated deck selection waits for initialization`() =
+        runTest {
+            val target = addDeck("Target")
+            col.setDeck(listOf(addBasicNote().firstCard().id), target)
+            val previousDispatcher = ioDispatcher
+            ioDispatcher = StandardTestDispatcher(testScheduler)
+            try {
+                AnkiFragmentScenario.launch(CustomStudyDialog::class.java, argumentsDisplayingMainScreen(target)).use { scenario ->
+                    assertEquals(Consts.DEFAULT_DECK_ID, col.decks.selected())
+
+                    runCurrent()
+
+                    assertEquals(target, col.decks.selected())
+                    scenario.onFragment { fragment ->
+                        assertFalse(assertNotNull(fragment.dialog?.findViewById<View>(R.id.progress_bar)).isVisible)
+                        onView(withText(TR.customStudyStudyByCardStateOrTag()))
+                            .inRoot(isDialog())
+                            .check(matches(isEnabled()))
+                    }
+                }
+            } finally {
+                ioDispatcher = previousDispatcher
+            }
+        }
+
+    @Test
+    fun `cancelling initialization does not select the deck`() =
+        runTest {
+            val target = addDeck("Target")
+            col.setDeck(listOf(addBasicNote().firstCard().id), target)
+            val undoStatus = col.undoStatus()
+            val previousDispatcher = ioDispatcher
+            ioDispatcher = StandardTestDispatcher(testScheduler)
+            try {
+                AnkiFragmentScenario.launch(CustomStudyDialog::class.java, argumentsDisplayingMainScreen(target)).use { scenario ->
+                    scenario.moveToState(Lifecycle.State.DESTROYED)
+
+                    runCurrent()
+
+                    assertEquals(Consts.DEFAULT_DECK_ID, col.decks.selected())
+                    assertEquals(undoStatus, col.undoStatus())
+                }
+            } finally {
+                ioDispatcher = previousDispatcher
+            }
+        }
+
+    @Test
+    fun `empty initialization waits for resume before showing feedback`() =
+        runTest {
+            val previousDispatcher = ioDispatcher
+            ioDispatcher = StandardTestDispatcher(testScheduler)
+            try {
+                createHostActivity().use { controller ->
+                    val activity = controller.get()
+                    val fragment = CustomStudyDialog.createInstance(Consts.DEFAULT_DECK_ID)
+                    activity.showDialogFragment(fragment)
+                    controller.pause().saveInstanceState(Bundle()).stop()
+
+                    runCurrent()
+
+                    assertTrue(fragment.isAdded)
+                    assertTrue(activity.supportFragmentManager.isStateSaved)
+                    assertNull(activity.snackbarText)
+
+                    controller.start().resume().visible()
+                    runCurrent()
+
+                    assertUnavailableMenu(fragment)
+                }
+            } finally {
+                ioDispatcher = previousDispatcher
+            }
+        }
+
+    @Test
+    fun `cancelled loading dialog does not show empty-deck feedback`() =
+        runTest {
+            val previousDispatcher = ioDispatcher
+            ioDispatcher = StandardTestDispatcher(testScheduler)
+            try {
+                createHostActivity().use { controller ->
+                    val activity = controller.get()
+                    val fragment = CustomStudyDialog.createInstance(Consts.DEFAULT_DECK_ID)
+                    activity.showDialogFragment(fragment)
+                    fragment.requireDialog().cancel()
+
+                    runCurrent()
+                    shadowOf(Looper.getMainLooper()).idleFor(300, TimeUnit.MILLISECONDS)
+                    activity.supportFragmentManager.executePendingTransactions()
+
+                    assertFalse(fragment.isAdded)
+                    assertNull(activity.snackbarText)
+                }
+            } finally {
+                ioDispatcher = previousDispatcher
+            }
+        }
+
+    @Test
+    fun `stale custom study menu explains that the deck is now empty`() =
+        runTest {
+            val card = addBasicNote().firstCard()
+            withCustomStudyFragment(argumentsDisplayingMainScreen()) { fragment ->
+                val fragmentManager = fragment.parentFragmentManager
+                col.removeNotes(cardIds = listOf(card.id))
+
+                onView(withText(TR.customStudyReviewAhead())).inRoot(isDialog()).perform(click())
+                advanceUntilIdle()
+
+                assertUnavailableMenu(fragment)
+                assertEquals(
+                    0,
+                    fragmentManager.fragments
+                        .filterIsInstance<CustomStudyDialog>()
+                        .size,
+                )
+            }
+        }
+
+    @Test
+    fun `stale menu becomes unavailable when its deck is deleted`() =
+        runTest {
+            val target = addDeck("Target")
+            col.setDeck(listOf(addBasicNote().firstCard().id), target)
+            withCustomStudyFragment(argumentsDisplayingMainScreen(target)) { fragment ->
+                val dialog = assertNotNull(fragment.dialog as? AlertDialog)
+                col.decks.remove(listOf(target))
+                val selectedDeck = col.decks.selected()
+                val undoStatus = col.undoStatus()
+
+                onView(withText(TR.customStudyReviewAhead())).inRoot(isDialog()).perform(click())
+                advanceUntilIdle()
+
+                assertFalse(dialog.isShowing)
+                assertUnavailableMenu(fragment)
+                assertEquals(selectedDeck, col.decks.selected())
+                assertEquals(undoStatus, col.undoStatus())
+            }
+        }
+
+    @Test
+    fun `deleted deck initialization explains why custom study is unavailable`() {
+        val target = addDeck("Target")
+        col.setDeck(listOf(addBasicNote().firstCard().id), target)
+        col.decks.remove(listOf(target))
+        val selectedDeck = col.decks.selected()
+        val undoStatus = col.undoStatus()
+
+        withCustomStudyFragment(argumentsDisplayingMainScreen(target)) { fragment ->
+            assertUnavailableMenu(fragment)
+        }
+
+        assertEquals(selectedDeck, col.decks.selected())
+        assertEquals(undoStatus, col.undoStatus())
+    }
+
+    @Test
+    fun `menu check does not navigate after state saving and can be retried on resume`() =
+        runTest {
+            addBasicNote()
+            val controller = Robolectric.buildActivity(EmptyAnkiActivity::class.java).setup()
+            saveControllerForCleanup(controller)
+            advanceUntilIdle()
+            advanceRobolectricLooper()
+            val activity = controller.get()
+            activity.showDialogFragment(CustomStudyDialog.createInstance(Consts.DEFAULT_DECK_ID))
+            val fragment = activity.supportFragmentManager.findFragmentByTag(DIALOG_FRAGMENT_TAG) as CustomStudyDialog
+            advanceRobolectricLooperUntil { fragment.dialog?.findViewById<View>(R.id.progress_bar)?.isVisible != true }
+
+            // Exercise the production queue's suspension instead of Robolectric's synchronous lock.
+            val previousIoDispatcher = ioDispatcher
+            ioDispatcher = StandardTestDispatcher(testScheduler)
+            val collectionScheduler = TestCoroutineScheduler()
+            val previousDispatcher =
+                CollectionManager.setTestDispatcher(StandardTestDispatcher(collectionScheduler), useReentrantLock = false)
+            try {
+                onView(withText(TR.customStudyReviewAhead())).inRoot(isDialog()).perform(click())
+                runCurrent()
+                assertSame(fragment, activity.supportFragmentManager.findFragmentByTag(DIALOG_FRAGMENT_TAG))
+                controller.pause().saveInstanceState(Bundle()).stop()
+
+                collectionScheduler.runCurrent()
+                runCurrent()
+                shadowOf(Looper.getMainLooper()).idle()
+
+                assertSame(fragment, activity.supportFragmentManager.findFragmentByTag(DIALOG_FRAGMENT_TAG))
+                controller.start().resume().visible()
+                advanceUntilIdle()
+                advanceRobolectricLooper()
+                assertSame(fragment, activity.supportFragmentManager.findFragmentByTag(DIALOG_FRAGMENT_TAG))
+
+                onView(withText(TR.customStudyReviewAhead())).inRoot(isDialog()).perform(click())
+                runCurrent()
+                collectionScheduler.runCurrent()
+                runCurrent()
+                shadowOf(Looper.getMainLooper()).idle()
+                collectionScheduler.runCurrent()
+                runCurrent()
+
+                onSubscreenEditText().check(matches(isDisplayed()))
+                assertEquals(
+                    1,
+                    activity.supportFragmentManager.fragments
+                        .filterIsInstance<CustomStudyDialog>()
+                        .size,
+                )
+            } finally {
+                CollectionManager.setTestDispatcher(previousDispatcher)
+                ioDispatcher = previousIoDispatcher
+            }
+        }
+
+    @Test
+    fun `hidden empty Default explains why custom study is unavailable and preserves redo`() {
+        val other = addDeck("Other")
+        col.setDeck(listOf(addBasicNote().firstCard().id), other)
+        addBasicNote()
+        col.undo()
+        assertNull(col.sched.deckDueTree().find(Consts.DEFAULT_DECK_ID))
+        val undoStatus = col.undoStatus()
+        assertNotNull(undoStatus.redo)
+
+        withCustomStudyFragment(argumentsDisplayingMainScreen()) { fragment ->
+            assertUnavailableMenu(fragment)
+        }
+
+        assertEquals(Consts.DEFAULT_DECK_ID, col.decks.selected())
+        assertEquals(undoStatus, col.undoStatus())
+        col.redo()
+        withCustomStudyFragment(argumentsDisplayingMainScreen()) {
+            onView(withText(TR.customStudyStudyByCardStateOrTag()))
+                .inRoot(isDialog())
+                .check(matches(isEnabled()))
+        }
+    }
+
+    @Test
+    fun `hidden Default with borrowed cards avoids loading defaults and preserves selection`() {
+        addBasicNote()
+        val filtered = addDynamicDeck("Filtered", "")
+        assertNull(col.sched.deckDueTree().find(Consts.DEFAULT_DECK_ID))
+        assertEquals(1, col.decks.cardCount(Consts.DEFAULT_DECK_ID, includeSubdecks = true))
+        val undoStatus = col.undoStatus()
+
+        withCustomStudyFragment(argumentsDisplayingMainScreen()) { fragment ->
+            assertUnavailableMenu(fragment)
+        }
+
+        assertEquals(filtered, col.decks.selected())
+        assertEquals(undoStatus, col.undoStatus())
+
+        col.sched.emptyFilteredDeck(filtered)
+        withCustomStudyFragment(argumentsDisplayingMainScreen()) {
+            onView(withText(TR.customStudyStudyByCardStateOrTag()))
+                .inRoot(isDialog())
+                .check(matches(isEnabled()))
+        }
+    }
+
+    @Test
+    fun `stale menu becomes unavailable when a filtered deck borrows all Default cards`() =
+        runTest {
+            addBasicNote()
+            withCustomStudyFragment(argumentsDisplayingMainScreen()) { fragment ->
+                val fragmentManager = fragment.parentFragmentManager
+                val filtered = addDynamicDeck("Filtered", "")
+                assertNull(col.sched.deckDueTree().find(Consts.DEFAULT_DECK_ID))
+                assertEquals(1, col.decks.cardCount(Consts.DEFAULT_DECK_ID, includeSubdecks = true))
+                val undoStatus = col.undoStatus()
+
+                onView(withText(TR.customStudyReviewAhead())).inRoot(isDialog()).perform(click())
+                advanceUntilIdle()
+
+                assertUnavailableMenu(fragment)
+                assertEquals(
+                    0,
+                    fragmentManager.fragments
+                        .filterIsInstance<CustomStudyDialog>()
+                        .size,
+                )
+                assertEquals(filtered, col.decks.selected())
+                assertEquals(undoStatus, col.undoStatus())
+            }
+        }
+
+    @Test
+    fun `empty deck explains why custom study is unavailable without selecting it`() {
+        addBasicNote()
+        val emptyDeck = addDeck("Empty")
+        val undoStatus = col.undoStatus()
+
+        withCustomStudyFragment(argumentsDisplayingMainScreen(emptyDeck)) { fragment ->
+            assertUnavailableMenu(fragment)
+        }
+
+        assertEquals(Consts.DEFAULT_DECK_ID, col.decks.selected())
+        assertEquals(undoStatus, col.undoStatus())
+    }
+
+    @Test
+    fun `custom study remains available when only a child deck has cards`() {
+        val child = addDeck("Default::Child")
+        col.setDeck(listOf(addBasicNote().firstCard().id), child)
+
+        withCustomStudyFragment(argumentsDisplayingMainScreen()) {
+            onView(withText(TR.customStudyStudyByCardStateOrTag()))
+                .inRoot(isDialog())
+                .check(matches(isEnabled()))
+        }
     }
 
     @Test
@@ -84,9 +488,9 @@ class CustomStudyDialogTest : RobolectricTest() {
             assertThat("Custom Study should be filtered", customStudy.isFiltered)
 
             // remove timestamps to allow us to compare JSON
-            customStudy.remove("id")
-            customStudy.remove("mod")
-            customStudy.remove("name")
+            customStudy.jsonObject.remove("id")
+            customStudy.jsonObject.remove("mod")
+            customStudy.jsonObject.remove("name")
 
             // compare JSON
             @Language("json")
@@ -114,7 +518,44 @@ class CustomStudyDialogTest : RobolectricTest() {
                     "usn": -1
                 }
                 """.trimIndent()
-            assertThat(customStudy, isJsonEqual(expected))
+            assertThat(customStudy, isJsonHolderEqual(expected))
+        }
+
+    /** Issue 22801: the activity owns the operation, so it can finish after the dialog is removed. */
+    @Test
+    fun `custom study completes after its dialog is dismissed`() =
+        runTest {
+            addBasicNote()
+            withCustomStudyFragment(argumentsDisplayingSubscreen(ContextMenuOption.STUDY_PREVIEW)) { fragment ->
+                val activity = fragment.requireActivity()
+                val manager = fragment.parentFragmentManager
+                val preferences = activity.sharedPrefs()
+                val collection = col
+                var result: CustomStudyAction? = null
+                manager.setFragmentResultListener(CustomStudyAction.REQUEST_KEY, activity) { _, bundle ->
+                    result = CustomStudyAction.fromBundle(bundle)
+                }
+                val collectionScheduler = TestCoroutineScheduler()
+                val previousDispatcher =
+                    CollectionManager.setTestDispatcher(StandardTestDispatcher(collectionScheduler), useReentrantLock = false)
+                try {
+                    fragment.submitSubscreenData()
+                    runCurrent()
+                    assertFalse(collection.decks.current().isFiltered)
+
+                    fragment.dismissNow()
+                    assertNull(fragment.activity)
+                    collectionScheduler.runCurrent()
+                    runCurrent()
+                    advanceRobolectricLooper()
+
+                    assertTrue(collection.decks.current().isFiltered)
+                    assertEquals(CustomStudyAction.CUSTOM_STUDY_SESSION, result)
+                    assertEquals(1, preferences.getInt("previewDays", -1))
+                } finally {
+                    CollectionManager.setTestDispatcher(previousDispatcher)
+                }
+            }
         }
 
     @Test
@@ -190,6 +631,144 @@ class CustomStudyDialogTest : RobolectricTest() {
             }
         }
 
+    @Test
+    @Config(qualifiers = "en")
+    fun `'extend limits' dialogs are titled 'Extend daily limits' and confirm with 'Increase'`() {
+        listOf(ContextMenuOption.EXTEND_NEW, ContextMenuOption.EXTEND_REV).forEach { option ->
+            withExtendLimitsDialog(option) { dialog ->
+                onView(withText("Extend daily limits"))
+                    .inRoot(isDialog())
+                    .check(matches(isDisplayed()))
+                assertThat("$option positive button", dialog.positiveButton.text.toString(), equalTo("Increase"))
+            }
+        }
+    }
+
+    @Test
+    @Config(qualifiers = "en")
+    fun `'extend limits' descriptions do not mention decreasing the limit`() {
+        listOf(ContextMenuOption.EXTEND_NEW, ContextMenuOption.EXTEND_REV).forEach { option ->
+            withExtendLimitsDialog(option) {
+                assertThat("$option description", binding.detailsText2.text.toString(), not(containsString("decrease")))
+            }
+        }
+    }
+
+    @Test
+    fun `'extend limits' dialogs show the available cards below the input`() {
+        mapOf(
+            ContextMenuOption.EXTEND_NEW to { defaultsOfDefaultDeck.labelForNewQueueAvailable() },
+            ContextMenuOption.EXTEND_REV to { defaultsOfDefaultDeck.labelForReviewQueueAvailable() },
+        ).forEach { (option, expectedLabel) ->
+            withExtendLimitsDialog(option) {
+                val root = binding.root
+                val availableCards =
+                    assertNotNull(
+                        root.children.firstOrNull { it is TextView && it.isVisible && it.text.toString() == expectedLabel() },
+                        "$option available cards label",
+                    )
+                val input =
+                    generateSequence<View>(binding.detailsEditText2Layout) { it.parent as? View }
+                        .first { it.parent == root }
+                assertThat(
+                    "$option available cards label is below the input",
+                    root.indexOfChild(availableCards),
+                    greaterThan(root.indexOfChild(input)),
+                )
+            }
+        }
+    }
+
+    @Test
+    fun `'extend limits' steppers change the value by 1`() {
+        listOf(ContextMenuOption.EXTEND_NEW, ContextMenuOption.EXTEND_REV).forEach { option ->
+            withExtendLimitsDialog(option) {
+                val initial = assertNotNull(binding.detailsEditText2.textAsIntOrNull(), "$option initial value")
+
+                onStepper(CommonString.plus_sign).perform(click())
+                assertThat("$option after +", binding.detailsEditText2.text.toString(), equalTo("${initial + 1}"))
+
+                onStepper(CommonString.minus_sign).perform(click())
+                onStepper(CommonString.minus_sign).perform(click())
+                assertThat("$option after -", binding.detailsEditText2.text.toString(), equalTo("${initial - 1}"))
+            }
+        }
+    }
+
+    @Test
+    fun `'extend limits' stepper treats an empty value as 0`() {
+        withExtendLimitsDialog(ContextMenuOption.EXTEND_NEW) {
+            onSubscreenEditText().perform(replaceText(""))
+            onStepper(CommonString.plus_sign).perform(click())
+            assertThat(binding.detailsEditText2.text.toString(), equalTo("1"))
+        }
+    }
+
+    @Test
+    fun `steppers are not shown outside of 'extend limits'`() {
+        withCustomStudyFragment(args = argumentsDisplayingSubscreen(ContextMenuOption.STUDY_FORGOT)) {
+            shadowOf(Looper.getMainLooper()).idle()
+            onView(allOf(withContentDescription(CommonString.plus_sign), isDisplayed()))
+                .inRoot(isDialog())
+                .check(doesNotExist())
+            onView(allOf(withContentDescription(CommonString.minus_sign), isDisplayed()))
+                .inRoot(isDialog())
+                .check(doesNotExist())
+        }
+    }
+
+    @Test
+    fun `boundary values validate correctly across study modes`() {
+        // STUDY_FORGOT boundary values: 0 (invalid), 1 (valid), 30 (valid), 31 (invalid)
+        withCustomStudyFragment(args = argumentsDisplayingSubscreen(ContextMenuOption.STUDY_FORGOT)) { fragment ->
+            val dialog = fragment.dialog as AlertDialog
+
+            onSubscreenEditText().perform(replaceText("0"))
+            assertThat("0 in STUDY_FORGOT is disabled", dialog.positiveButton.isEnabled, equalTo(false))
+            assertThat(
+                "0 error in STUDY_FORGOT",
+                fragment.binding.detailsEditText2Layout.error
+                    ?.toString(),
+                containsString("1"),
+            )
+
+            onSubscreenEditText().perform(replaceText("1"))
+            assertThat("1 in STUDY_FORGOT is enabled", dialog.positiveButton.isEnabled, equalTo(true))
+            assertThat("1 error in STUDY_FORGOT is null", fragment.binding.detailsEditText2Layout.error, nullValue())
+
+            onSubscreenEditText().perform(replaceText("30"))
+            assertThat("30 in STUDY_FORGOT is enabled", dialog.positiveButton.isEnabled, equalTo(true))
+            assertThat("30 error in STUDY_FORGOT is null", fragment.binding.detailsEditText2Layout.error, nullValue())
+
+            onSubscreenEditText().perform(replaceText("31"))
+            assertThat("31 in STUDY_FORGOT is disabled", dialog.positiveButton.isEnabled, equalTo(false))
+            assertThat(
+                "31 error in STUDY_FORGOT",
+                fragment.binding.detailsEditText2Layout.error
+                    ?.toString(),
+                containsString("30"),
+            )
+        }
+
+        // EXTEND_NEW boundary values: -99999 (valid), 0 (invalid), 99999 (valid), 100000 (invalid)
+        withExtendLimitsDialog(ContextMenuOption.EXTEND_NEW) { dialog ->
+            onSubscreenEditText().perform(replaceText("-99999"))
+            assertThat("-99999 in EXTEND_NEW is enabled", dialog.positiveButton.isEnabled, equalTo(true))
+            assertThat("-99999 error is null", binding.detailsEditText2Layout.error, nullValue())
+
+            onSubscreenEditText().perform(replaceText("0"))
+            assertThat("0 in EXTEND_NEW is disabled", dialog.positiveButton.isEnabled, equalTo(false))
+
+            onSubscreenEditText().perform(replaceText("99999"))
+            assertThat("99999 in EXTEND_NEW is enabled", dialog.positiveButton.isEnabled, equalTo(true))
+            assertThat("99999 error is null", binding.detailsEditText2Layout.error, nullValue())
+
+            onSubscreenEditText().perform(replaceText("100000"))
+            assertThat("100000 in EXTEND_NEW is disabled", dialog.positiveButton.isEnabled, equalTo(false))
+            assertThat("100000 error in EXTEND_NEW", binding.detailsEditText2Layout.error?.toString(), containsString("99999"))
+        }
+    }
+
     @Test
     fun `creating a tags custom session uses selected card state`() =
         runTest {
@@ -224,8 +803,8 @@ class CustomStudyDialogTest : RobolectricTest() {
                 val selectedTags = ArrayList<String>(1).apply { add("testTag") }
                 // simulate tag selection
                 studyDialog.parentFragmentManager.setFragmentResult(
-                    ON_SELECTED_TAGS_KEY,
-                    Bundle().apply { putStringArrayList(ON_SELECTED_TAGS__SELECTED_TAGS, selectedTags) },
+                    REQUEST_SELECT_TAGS,
+                    Bundle().apply { putStringArrayList(RESULT_SELECTED_TAGS, selectedTags) },
                 )
                 val customStudyDeck = col.decks.customStudySession
                 assertNotNull(customStudyDeck)
@@ -301,14 +880,40 @@ class CustomStudyDialogTest : RobolectricTest() {
 
     @Test
     fun `subscreens are ignored when restoring from process death`() {
+        addBasicNote()
         withCustomStudyFragment(args = argumentsDisplayingSubscreen(ContextMenuOption.EXTEND_REV, restoreFromProcessDeath = true)) {
             // ensure we're on the main screen
             onView(withText(TR.customStudyIncreaseTodaysReviewCardLimit()))
                 .inRoot(isDialog())
-                .check(matches(isEnabled()))
+                .check(matches(isDisplayed()))
         }
     }
 
+    @Test
+    fun `tags chosen after recreation start a custom study session`() =
+        runTest {
+            addBasicNote().update { addTag("testTag") }
+
+            launchFragment<Fragment>().use { scenario ->
+                scenario.onFragment {
+                    it.requireActivity().showDialogFragment(CustomStudyDialog.createInstance(Consts.DEFAULT_DECK_ID))
+                }
+                onView(withText(TR.customStudyStudyByCardStateOrTag()))
+                    .inRoot(isDialog())
+                    .perform(scrollTo(), click())
+
+                scenario.recreate()
+
+                scenario.onFragment {
+                    it.parentFragmentManager.setFragmentResult(
+                        REQUEST_SELECT_TAGS,
+                        Bundle().apply { putStringArrayList(RESULT_SELECTED_TAGS, arrayListOf("testTag")) },
+                    )
+                }
+                assertNotNull(col.decks.customStudySession)
+            }
+        }
+
     @Test
     fun `selectedKind maps selected card state index to cram kind`() {
         val viewModel = CustomStudyViewModel(SavedStateHandle())
@@ -331,6 +936,7 @@ class CustomStudyDialogTest : RobolectricTest() {
     @Test
     @Config(qualifiers = "en")
     fun `'review ahead' shows a day or days suffix`() {
+        addBasicNote()
         withStudyAheadDialog {
             val layout = binding.detailsEditText2Layout
             assertThat("default of 1 day", layout.suffixText.toString(), equalTo("day"))
@@ -345,6 +951,7 @@ class CustomStudyDialogTest : RobolectricTest() {
 
     @Test
     fun `'review ahead' rejects leading zeros and more than 5 digits`() {
+        addBasicNote()
         withStudyAheadDialog {
             val editText = binding.detailsEditText2
 
@@ -393,14 +1000,19 @@ class CustomStudyDialogTest : RobolectricTest() {
     fun `'review ahead' search does not treat the deck name as a pattern`() =
         runTest {
             // '_' is a single-character wildcard in a search: "A_B" must not match "AXB"
-            val emptyDeckId = addDeck("A_B")
+            val deckId = addDeck("A_B")
+            addBasicNote().update { moveToDeck("A_B", false) }.firstCard().update {
+                queue = QueueType.Rev
+                type = CardType.Rev
+                due = col.sched.today + 30
+            }
             addDeck("AXB")
             addNoteDueTomorrow(deckName = "AXB")
 
-            withStudyAheadDialog(deckId = emptyDeckId) { dialog ->
+            withStudyAheadDialog(deckId = deckId) { dialog ->
                 onSubscreenEditText().perform(replaceText("1"))
                 shadowOf(Looper.getMainLooper()).idle()
-                assertThat("A_B has no cards", dialog.positiveButton.isEnabled, equalTo(false))
+                assertThat("A_B has no cards due tomorrow", dialog.positiveButton.isEnabled, equalTo(false))
             }
         }
 
@@ -422,6 +1034,7 @@ class CustomStudyDialogTest : RobolectricTest() {
     @Config(qualifiers = "en")
     fun `'review ahead' warns when 0 days is entered`() =
         runTest {
+            addBasicNote()
             withStudyAheadDialog {
                 val layout = binding.detailsEditText2Layout
 
@@ -451,6 +1064,104 @@ class CustomStudyDialogTest : RobolectricTest() {
             }
         }
 
+    @Test
+    fun `typed value is kept after a dialog on top closes - issue 22731`() =
+        withTypedInputCoveredByAnotherDialog(ContextMenuOption.EXTEND_NEW, typed = "7") {
+            onSubscreenEditText().check(matches(withText("7")))
+        }
+
+    @Test
+    fun `'preview' positive button is disabled on open when no cards were added recently`() =
+        runTest {
+            addBasicNote()
+            col.db.execute(
+                "UPDATE cards SET id = id - ${40L * 24 * 60 * 60 * 1000} WHERE id > 0",
+            )
+
+            withStudyPreviewDialog { dialog ->
+                assertThat(
+                    "disabled on open when nothing matches",
+                    dialog.positiveButton.isEnabled,
+                    equalTo(false),
+                )
+                assertThat(
+                    binding.detailsEditText2Layout.error?.toString(),
+                    equalTo(TR.customStudyNoCardsMatchedTheCriteriaYou()),
+                )
+            }
+        }
+
+    @Test
+    @Config(qualifiers = "en")
+    fun `'review ahead' suffix matches the typed value after a dialog on top closes`() =
+        withTypedInputCoveredByAnotherDialog(ContextMenuOption.STUDY_AHEAD, typed = "2") {
+            assertThat(binding.detailsEditText2Layout.suffixText.toString(), equalTo("days"))
+        }
+
+    @Test
+    @Config(qualifiers = "en")
+    fun `'preview' shows a day or days suffix`() {
+        withStudyPreviewDialog {
+            val layout = binding.detailsEditText2Layout
+            assertThat("default of 1 day", layout.suffixText.toString(), equalTo("day"))
+
+            onSubscreenEditText().perform(replaceText("2"))
+            assertThat(layout.suffixText.toString(), equalTo("days"))
+
+            onSubscreenEditText().perform(replaceText("1"))
+            assertThat(layout.suffixText.toString(), equalTo("day"))
+        }
+    }
+
+    @Test
+    @Config(qualifiers = "en")
+    fun `'preview' positive button text is 'Create'`() {
+        withStudyPreviewDialog { dialog ->
+            assertThat(dialog.positiveButton.text.toString(), equalTo("Create"))
+        }
+    }
+
+    @Test
+    fun `'preview' and 'review ahead' hide the empty first label`() {
+        withStudyPreviewDialog {
+            assertThat("preview", binding.detailsText1.isVisible, equalTo(false))
+        }
+        withStudyAheadDialog {
+            assertThat("review ahead", binding.detailsText1.isVisible, equalTo(false))
+        }
+    }
+
+    @Test
+    fun `'preview' disables Create when no cards match the criteria`() =
+        runTest {
+            addBasicNote()
+
+            withStudyPreviewDialog { dialog ->
+                onSubscreenEditText().perform(replaceText("1"))
+                shadowOf(Looper.getMainLooper()).idle()
+                assertThat("enabled for a recently added card", dialog.positiveButton.isEnabled, equalTo(true))
+                assertThat(binding.detailsEditText2Layout.error, nullValue())
+
+                onSubscreenEditText().perform(replaceText("0"))
+                shadowOf(Looper.getMainLooper()).idle()
+                assertThat("disabled for 0 days", dialog.positiveButton.isEnabled, equalTo(false))
+            }
+        }
+
+    @Test
+    fun `'review ahead' validates the default value on open - shared path guard`() =
+        runTest {
+            addBasicNote().firstCard().update {
+                queue = QueueType.Rev
+                type = CardType.Rev
+                due = col.sched.today + 30
+            }
+
+            withStudyAheadDialog { dialog ->
+                assertThat("review-ahead: disabled when nothing matches", dialog.positiveButton.isEnabled, equalTo(false))
+            }
+        }
+
     /** Adds a note to [deckName] whose card is due tomorrow */
     private fun addNoteDueTomorrow(deckName: String) {
         addBasicNote().update { moveToDeck(deckName, false) }.firstCard().update {
@@ -467,10 +1178,17 @@ class CustomStudyDialogTest : RobolectricTest() {
         args: Bundle,
         block: (CustomStudyDialog) -> Unit,
     ) {
-        AnkiFragmentScenario.launch(CustomStudyDialog::class.java, args).use { scenario ->
-            scenario.onFragment { dialogFragment: CustomStudyDialog ->
-                block(dialogFragment)
+        createHostActivity().use { controller ->
+            val fragment = CustomStudyDialog().apply { arguments = args }
+            controller.get().showDialogFragment(fragment)
+            val start = System.nanoTime()
+            while (fragment.dialog?.findViewById<View>(R.id.progress_bar)?.isVisible == true) {
+                check(System.nanoTime() - start < TimeUnit.SECONDS.toNanos(10)) { "Custom Study did not finish loading" }
+                Thread.sleep(10)
+                shadowOf(Looper.getMainLooper()).idleFor(16, TimeUnit.MILLISECONDS)
             }
+            shadowOf(Looper.getMainLooper()).idleFor(300, TimeUnit.MILLISECONDS)
+            block(fragment)
         }
     }
 
@@ -483,13 +1201,62 @@ class CustomStudyDialogTest : RobolectricTest() {
         fragment.block(fragment.dialog as AlertDialog)
     }
 
-    private fun mockCollectionWithSchedulerReturning(response: CustomStudyDefaultsResponse) =
-        mockk<Collection>(relaxed = true) {
+    private fun withTypedInputCoveredByAnotherDialog(
+        option: ContextMenuOption,
+        typed: String,
+        block: CustomStudyDialog.() -> Unit,
+    ) {
+        addBasicNote()
+        val customStudy = CustomStudyDialog().apply { arguments = argumentsDisplayingSubscreen(option) }
+        Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
+            controller.get().setTheme(CommonR.style.Base_Theme_Light)
+            val activity = controller.setup().get()
+            activity.showDialogFragment(customStudy)
+            onSubscreenEditText().perform(replaceText(typed))
+
+            val dialogOnTop = DialogFragment()
+            activity.showDialogFragment(dialogOnTop)
+            shadowOf(Looper.getMainLooper()).idle()
+            dialogOnTop.dismiss()
+            shadowOf(Looper.getMainLooper()).idle()
+
+            customStudy.block()
+        }
+    }
+
+    /** Opens the 'preview' subscreen for [deckId] and runs [block] once the dialog is shown */
+    private fun withStudyPreviewDialog(
+        deckId: DeckId = Consts.DEFAULT_DECK_ID,
+        block: CustomStudyDialog.(dialog: AlertDialog) -> Unit,
+    ) = withCustomStudyFragment(args = argumentsDisplayingSubscreen(ContextMenuOption.STUDY_PREVIEW, deckId = deckId)) { fragment ->
+        shadowOf(Looper.getMainLooper()).idle()
+        fragment.block(fragment.dialog as AlertDialog)
+    }
+
+    private fun withExtendLimitsDialog(
+        option: ContextMenuOption,
+        block: CustomStudyDialog.(dialog: AlertDialog) -> Unit,
+    ) {
+        // Main dismisses custom study when the deck is empty. These dialogs need a card so the
+        // subscreen is shown instead of the empty-deck snackbar.
+        addBasicNote()
+        withCustomStudyFragment(args = argumentsDisplayingSubscreen(option)) { fragment ->
+            shadowOf(Looper.getMainLooper()).idle()
+            fragment.block(fragment.dialog as AlertDialog)
+        }
+    }
+
+    private fun mockCollectionWithSchedulerReturning(response: CustomStudyDefaultsResponse): Collection {
+        val tree = col.sched.deckTree(includeCounts = false)
+        return mockk<Collection>(relaxed = true) {
+            every { decks.cardCount(Consts.DEFAULT_DECK_ID, includeSubdecks = true) } returns 1
             every { sched } returns
                 mockk<Scheduler> {
+                    every { deckTree(includeCounts = false) } returns tree
                     every { customStudyDefaults(Consts.DEFAULT_DECK_ID) } returns response
                 }
         }
+    }
 
     private fun argumentsDisplayingSubscreen(
         subscreen: ContextMenuOption,
@@ -526,6 +1293,23 @@ class CustomStudyDialogTest : RobolectricTest() {
         onView(withId(R.id.details_edit_text_2))
             .inRoot(isDialog())
 
+    private fun createHostActivity() =
+        Robolectric.buildActivity(EmptyAnkiActivity::class.java).setup().apply {
+            val activity = get()
+            activity.setContentView(CoordinatorLayout(activity).apply { id = R.id.root_layout })
+        }
+
+    private fun assertUnavailableMenu(fragment: CustomStudyDialog) {
+        shadowOf(Looper.getMainLooper()).idleFor(300, TimeUnit.MILLISECONDS)
+        assertFalse(fragment.dialog?.isShowing == true)
+        onView(withId(com.google.android.material.R.id.snackbar_text))
+            .check(matches(allOf(isDisplayed(), withText(CommonString.empty_deck))))
+    }
+
+    private fun onStepper(contentDescription: Int) =
+        onView(withContentDescription(contentDescription))
+            .inRoot(isDialog())
+
     private fun CustomStudyDialog.submitSubscreenData() =
         assertNotNull(dialog as? AlertDialog?, "dialog").also { dialog ->
             dialog.performPositiveClick()
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyInitializationTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyInitializationTest.kt
new file mode 100644
index 000000000000..7e999ad6d62b
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyInitializationTest.kt
@@ -0,0 +1,100 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.dialogs
+
+import android.os.Looper
+import androidx.fragment.app.DialogFragment
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog
+import com.ichi2.anki.ioDispatcher
+import com.ichi2.anki.libanki.Consts.DEFAULT_DECK_ID
+import com.ichi2.anki.utils.ext.showDialogFragment
+import com.ichi2.testutils.EmptyAnkiActivity
+import com.ichi2.testutils.uninitializeField
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.runCurrent
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.Shadows.shadowOf
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+@RunWith(AndroidJUnit4::class)
+class CustomStudyInitializationTest : RobolectricTest() {
+    @Before
+    override fun setUp() {
+        super.setUp()
+        uninitializeField<CustomStudyDialog>("deferredInitialization")
+    }
+
+    @Test
+    fun `native cancellation prevents late deck selection`() =
+        assertNoLateSelection { _, fragment ->
+            fragment.requireDialog().cancel()
+            assertFalse(fragment.requireDialog().isShowing)
+        }
+
+    @Test
+    fun `fragment dismissal prevents late deck selection`() =
+        assertNoLateSelection { _, fragment ->
+            val dialog = fragment.requireDialog()
+            fragment.dismiss()
+            assertFalse(dialog.isShowing)
+        }
+
+    @Test
+    fun `finishing before pause prevents late deck selection`() =
+        assertNoLateSelection { activity, _ ->
+            activity.finish()
+            assertTrue(activity.isFinishing)
+        }
+
+    @Test
+    fun `replacing the loading menu cancels initialization`() =
+        assertNoLateSelection(expectResumed = false) { activity, fragment ->
+            activity.showDialogFragment(DialogFragment())
+            assertFalse(fragment.isAdded)
+        }
+
+    @Test
+    fun `native cancellation followed by teardown prevents late deck selection`() =
+        assertNoLateSelection(expectResumed = false) { activity, fragment ->
+            fragment.requireDialog().cancel()
+            shadowOf(Looper.getMainLooper()).idle()
+            activity.supportFragmentManager.executePendingTransactions()
+            assertFalse(fragment.isAdded)
+        }
+
+    private fun assertNoLateSelection(
+        expectResumed: Boolean = true,
+        close: (EmptyAnkiActivity, CustomStudyDialog) -> Unit,
+    ) = runTest {
+        val target = addDeck("Target")
+        col.setDeck(listOf(addBasicNote().firstCard().id), target)
+        val undoStatus = col.undoStatus()
+        assertEquals(DEFAULT_DECK_ID, col.decks.selected())
+        val previousIo = ioDispatcher
+        ioDispatcher = StandardTestDispatcher(testScheduler)
+        try {
+            Robolectric.buildActivity(EmptyAnkiActivity::class.java).setup().use { controller ->
+                val activity = controller.get()
+                val fragment = CustomStudyDialog.createInstance(target)
+                activity.showDialogFragment(fragment)
+                assertEquals(DEFAULT_DECK_ID, col.decks.selected())
+
+                close(activity, fragment)
+                assertEquals(expectResumed, fragment.isResumed)
+                runCurrent()
+
+                assertEquals(DEFAULT_DECK_ID, col.decks.selected(), "A closed Custom Study must not change deck selection")
+                assertEquals(undoStatus, col.undoStatus())
+            }
+        } finally {
+            ioDispatcher = previousIo
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyMenuNavigationTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyMenuNavigationTest.kt
new file mode 100644
index 000000000000..ab6b9a12d40e
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyMenuNavigationTest.kt
@@ -0,0 +1,242 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.dialogs
+
+import android.os.Looper
+import android.view.View
+import androidx.core.view.isVisible
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.Fragment
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.matcher.RootMatchers.isDialog
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.CollectionManager
+import com.ichi2.anki.CollectionManager.TR
+import com.ichi2.anki.R
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog
+import com.ichi2.anki.ioDispatcher
+import com.ichi2.anki.libanki.Consts
+import com.ichi2.anki.utils.ext.DIALOG_FRAGMENT_TAG
+import com.ichi2.anki.utils.ext.showDialogFragment
+import com.ichi2.testutils.EmptyAnkiActivity
+import com.ichi2.testutils.uninitializeField
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.TestCoroutineScheduler
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.setMain
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.Shadows.shadowOf
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertSame
+import kotlin.test.assertTrue
+
+@RunWith(AndroidJUnit4::class)
+class CustomStudyMenuNavigationTest : RobolectricTest() {
+    @Before
+    override fun setUp() {
+        super.setUp()
+        uninitializeField<CustomStudyDialog>("deferredInitialization")
+    }
+
+    @Test
+    fun `recreated menu rejects a selection from its previous dialog`() =
+        runTest {
+            val (activity, fragment) = openMenu()
+            val originalDialog = fragment.requireDialog()
+            withQueuedChecks(this) { collectionScheduler ->
+                onView(withText(TR.customStudyReviewAhead())).inRoot(isDialog()).perform(click())
+                runCurrent()
+
+                activity.showDialogFragment(DialogFragment())
+                assertFalse(originalDialog.isShowing)
+                assertFalse(fragment.isResumed)
+                assertTrue(activity.supportFragmentManager.popBackStackImmediate())
+                assertTrue(fragment.isResumed)
+                val recreatedDialog = fragment.requireDialog()
+                assertTrue(recreatedDialog !== originalDialog)
+
+                // The old dialog's result arrives before the recreated menu finishes loading.
+                collectionScheduler.runCurrent()
+                runCurrent()
+                shadowOf(Looper.getMainLooper()).idle()
+                collectionScheduler.runCurrent()
+                runCurrent()
+                shadowOf(Looper.getMainLooper()).idle()
+
+                assertSame(fragment, activity.supportFragmentManager.findFragmentByTag(DIALOG_FRAGMENT_TAG))
+                assertEquals(1, activity.supportFragmentManager.backStackEntryCount)
+                assertTrue(recreatedDialog.isShowing)
+                assertFalse(assertNotNull(recreatedDialog.findViewById<View>(R.id.progress_bar)).isVisible)
+
+                // Ignoring the old result must still allow a new selection from the recreated menu.
+                onView(withText(TR.customStudyReviewAhead())).inRoot(isDialog()).perform(click())
+                runCurrent()
+                collectionScheduler.runCurrent()
+                runCurrent()
+                shadowOf(Looper.getMainLooper()).idle()
+
+                val input = activity.supportFragmentManager.findFragmentByTag(DIALOG_FRAGMENT_TAG) as CustomStudyDialog
+                assertNotNull(input.requireDialog().findViewById<View>(R.id.details_edit_text_2))
+                assertEquals(2, activity.supportFragmentManager.backStackEntryCount)
+            }
+        }
+
+    @Test
+    fun `native cancellation must not reopen the menu as an input dialog`() =
+        runTest {
+            val (activity, fragment) = openMenu()
+            val originalDialog = fragment.requireDialog()
+            withQueuedChecks(this) { collectionScheduler ->
+                onView(withText(TR.customStudyReviewAhead())).inRoot(isDialog()).perform(click())
+                runCurrent()
+                collectionScheduler.runCurrent()
+
+                originalDialog.cancel()
+                assertFalse(originalDialog.isShowing)
+                assertTrue(fragment.isResumed, "The native dismissal callback is still queued")
+
+                runCurrent()
+                shadowOf(Looper.getMainLooper()).idle()
+                activity.supportFragmentManager.executePendingTransactions()
+
+                assertNull(activity.supportFragmentManager.findFragmentByTag(DIALOG_FRAGMENT_TAG))
+            }
+        }
+
+    @Test
+    fun `a queued menu result must not reopen a dismissed dialog`() =
+        runTest {
+            val (activity, fragment) = openMenu()
+            val originalDialog = fragment.requireDialog()
+            withQueuedChecks(this) { collectionScheduler ->
+                onView(withText(TR.customStudyReviewAhead())).inRoot(isDialog()).perform(click())
+                runCurrent()
+                assertSame(fragment, activity.supportFragmentManager.findFragmentByTag(DIALOG_FRAGMENT_TAG))
+
+                // Finish the backend read, leaving its UI continuation queued.
+                collectionScheduler.runCurrent()
+                fragment.dismiss()
+                assertFalse(originalDialog.isShowing)
+                assertTrue(fragment.isResumed, "The dismissal transaction has not executed yet")
+
+                // The read result arrives before FragmentManager processes the pending dismissal.
+                runCurrent()
+                activity.supportFragmentManager.executePendingTransactions()
+
+                assertNull(activity.supportFragmentManager.findFragmentByTag(DIALOG_FRAGMENT_TAG))
+            }
+        }
+
+    @Test
+    fun `a queued menu result must not open an input dialog when the activity is finishing`() =
+        runTest {
+            val (activity, fragment) = openMenu()
+            withQueuedChecks(this) { collectionScheduler ->
+                onView(withText(TR.customStudyReviewAhead())).inRoot(isDialog()).perform(click())
+                runCurrent()
+                collectionScheduler.runCurrent()
+
+                activity.finish()
+                assertTrue(activity.isFinishing)
+                assertTrue(fragment.isResumed, "The activity has not paused yet")
+                assertTrue(fragment.requireDialog().isShowing)
+                assertFalse(activity.supportFragmentManager.isStateSaved)
+
+                runCurrent()
+                shadowOf(Looper.getMainLooper()).idle()
+                activity.supportFragmentManager.executePendingTransactions()
+
+                assertSame(fragment, activity.supportFragmentManager.findFragmentByTag(DIALOG_FRAGMENT_TAG))
+                assertEquals(1, activity.supportFragmentManager.backStackEntryCount)
+            }
+        }
+
+    @Test
+    fun `two queued menu taps open exactly one input dialog`() = assertTwoQueuedTapsOpenOneInput(childHosted = false)
+
+    @Test
+    fun `two queued taps in a child-hosted menu open exactly one input dialog`() = assertTwoQueuedTapsOpenOneInput(childHosted = true)
+
+    private fun assertTwoQueuedTapsOpenOneInput(childHosted: Boolean) =
+        runTest {
+            val (activity, fragment) = openMenu(childHosted)
+            withQueuedChecks(this) { collectionScheduler ->
+                repeat(2) {
+                    onView(withText(TR.customStudyReviewAhead())).inRoot(isDialog()).perform(click())
+                    runCurrent()
+                    assertTrue(fragment.requireDialog().isShowing)
+                }
+                collectionScheduler.runCurrent()
+                runCurrent()
+                collectionScheduler.runCurrent()
+                runCurrent()
+                shadowOf(Looper.getMainLooper()).idle()
+
+                val dialogs = activity.supportFragmentManager.fragments.filterIsInstance<CustomStudyDialog>()
+                assertEquals(1, dialogs.size)
+                assertEquals(if (childHosted) 1 else 2, activity.supportFragmentManager.backStackEntryCount)
+                assertNotNull(dialogs.single().requireDialog().findViewById<View>(R.id.details_edit_text_2))
+            }
+        }
+
+    private fun openMenu(childHosted: Boolean = false): Pair<EmptyAnkiActivity, CustomStudyDialog> {
+        addBasicNote()
+        val controller = Robolectric.buildActivity(EmptyAnkiActivity::class.java).setup()
+        saveControllerForCleanup(controller)
+        advanceRobolectricLooper()
+        val activity = controller.get()
+        val fragment = CustomStudyDialog.createInstance(Consts.DEFAULT_DECK_ID)
+        if (childHosted) {
+            // CongratsPage hosts Custom Study in its child fragment manager.
+            val parent = Fragment()
+            activity.supportFragmentManager
+                .beginTransaction()
+                .add(parent, "host")
+                .commitNow()
+            fragment.show(parent.childFragmentManager, null)
+            parent.childFragmentManager.executePendingTransactions()
+        } else {
+            activity.showDialogFragment(fragment)
+        }
+        advanceRobolectricLooperUntil { fragment.dialog?.findViewById<View>(R.id.progress_bar)?.isVisible != true }
+        return activity to fragment
+    }
+
+    private fun withQueuedChecks(
+        scope: TestScope,
+        block: (TestCoroutineScheduler) -> Unit,
+    ) {
+        val previousIo = ioDispatcher
+        val mainDispatcher = StandardTestDispatcher(scope.testScheduler)
+        val collectionScheduler = TestCoroutineScheduler()
+        val previousCollection = CollectionManager.setTestDispatcher(StandardTestDispatcher(collectionScheduler), useReentrantLock = false)
+        Dispatchers.setMain(mainDispatcher)
+        ioDispatcher = mainDispatcher
+        try {
+            block(collectionScheduler)
+        } finally {
+            try {
+                repeat(3) {
+                    collectionScheduler.runCurrent()
+                    scope.runCurrent()
+                    shadowOf(Looper.getMainLooper()).idle()
+                }
+            } finally {
+                CollectionManager.setTestDispatcher(previousCollection)
+                ioDispatcher = previousIo
+                Dispatchers.setMain(previousIo)
+            }
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyScreenshotTest.kt
new file mode 100644
index 000000000000..8ba9753eb1b1
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/CustomStudyScreenshotTest.kt
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.dialogs
+
+import android.os.Looper
+import com.ichi2.anki.CommonString
+import com.ichi2.anki.ScreenshotTest
+import com.ichi2.anki.ScreenshotTest.DeviceConfig.TABLET
+import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog
+import com.ichi2.anki.libanki.Consts.DEFAULT_DECK_ID
+import com.ichi2.anki.utils.ext.DIALOG_FRAGMENT_TAG
+import com.ichi2.anki.utils.ext.showDialogFragment
+import com.ichi2.anki.withDeckPicker
+import com.ichi2.testutils.BackupManagerTestUtilities
+import com.ichi2.testutils.ext.snackbarText
+import org.junit.After
+import org.junit.Test
+import org.robolectric.Shadows.shadowOf
+import java.util.concurrent.TimeUnit
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+
+@ScreenshotTest.IncludeDevices(TABLET)
+class CustomStudyScreenshotTest : ScreenshotTest() {
+    @After
+    fun resetBackups() {
+        BackupManagerTestUtilities.reset()
+    }
+
+    @Test
+    fun `hidden Default`() =
+        runTest {
+            val other = addDeck("Other")
+            col.setDeck(listOf(addBasicNote().firstCard().id), other)
+            assertNull(col.sched.deckTree(includeCounts = false).find(DEFAULT_DECK_ID))
+
+            withDeckPicker(deckCount = 0) { activity ->
+                activity.showDialogFragment(CustomStudyDialog.createInstance(DEFAULT_DECK_ID))
+                // Complete the entrance animation without advancing through the snackbar timeout.
+                shadowOf(Looper.getMainLooper()).idleFor(300, TimeUnit.MILLISECONDS)
+                assertEquals(activity.getString(CommonString.empty_deck), activity.snackbarText)
+                activity.supportFragmentManager.executePendingTransactions()
+                assertNull(activity.supportFragmentManager.findFragmentByTag(DIALOG_FRAGMENT_TAG))
+
+                captureScreen("unavailable_deck")
+            }
+        }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/DeckPickerAnalyticsOptInDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/DeckPickerAnalyticsOptInDialogTest.kt
index c4a3c59d52c7..fb5dc169ccf5 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/DeckPickerAnalyticsOptInDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/DeckPickerAnalyticsOptInDialogTest.kt
@@ -21,6 +21,7 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class DeckPickerAnalyticsOptInDialogTest {
@@ -54,7 +55,7 @@ class DeckPickerAnalyticsOptInDialogTest {
     @Test
     fun `cancelling does not change the opt-in state`() {
         launchFragment<DeckPickerAnalyticsOptInDialog>(
-            themeResId = R.style.Theme_Light,
+            themeResId = CommonR.style.Theme_Light,
             initialState = Lifecycle.State.RESUMED,
         ).onFragment { fragment ->
             (fragment.dialog as AlertDialog).cancel()
@@ -65,7 +66,7 @@ class DeckPickerAnalyticsOptInDialogTest {
 
     private fun showDialog(optIn: Boolean) {
         launchFragment<DeckPickerAnalyticsOptInDialog>(
-            themeResId = R.style.Theme_Light,
+            themeResId = CommonR.style.Theme_Light,
             initialState = Lifecycle.State.RESUMED,
         )
         // the checkbox starts unticked, so only opting in needs a click
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/DeckPickerContextMenuTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/DeckPickerContextMenuTest.kt
index 9f9d114ea6d0..0d3fe0f747cf 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/DeckPickerContextMenuTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/DeckPickerContextMenuTest.kt
@@ -10,15 +10,16 @@ import androidx.fragment.app.testing.FragmentScenario.Companion.launch
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.AnkiDroidApp
+import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.IntroductionActivity
-import com.ichi2.anki.R
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.ui.internationalization.sentenceCase
 import com.ichi2.testutils.BackupManagerTestUtilities.setupSpaceForBackup
-import com.ichi2.testutils.JvmTest
+import kotlinx.coroutines.runBlocking
+import net.ankiweb.rsdroid.testing.RustBackendLoader
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert
 import org.junit.After
@@ -28,19 +29,18 @@ import org.junit.runner.RunWith
 import timber.log.Timber
 import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
-// JvmTest loads the rust backend. Without it this class only passes when it happens to run
-// after a test which loads it, which is filesystem order dependent (#14796)
-// TODO: PERF: JvmTest also opens a collection, which these tests never use. They only
-// need the backend for the menu's translated labels
 @RunWith(AndroidJUnit4::class)
-class DeckPickerContextMenuTest : JvmTest() {
+class DeckPickerContextMenuTest {
     private val scenariosForCleanup = ArrayList<FragmentScenario<*>>()
 
     @Before
     fun before() {
+        // The menu needs native translations, but does not need an open collection.
+        RustBackendLoader.ensureSetup()
         val context = ApplicationProvider.getApplicationContext<AnkiDroidApp>()
-        context.sharedPrefs().edit { putBoolean(IntroductionActivity.INTRODUCTION_SLIDES_SHOWN, true) }
+        context.sharedPrefs().edit { putBoolean(IntroductionActivity.PREF_INTRODUCTION_SLIDES_SHOWN, true) }
         setupSpaceForBackup(context)
     }
 
@@ -53,6 +53,7 @@ class DeckPickerContextMenuTest : JvmTest() {
                 Timber.e(e, "ignored")
             }
         }
+        runBlocking { CollectionManager.discardBackend() }
     }
 
     @Test
@@ -167,7 +168,7 @@ class DeckPickerContextMenuTest : JvmTest() {
     }
 
     private fun launch(arguments: Bundle) =
-        launch(DeckPickerContextMenu::class.java, arguments, R.style.Theme_Light).also {
+        launch(DeckPickerContextMenu::class.java, arguments, CommonR.style.Theme_Light).also {
             scenariosForCleanup.add(it)
         }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/EditDeckDescriptionDialogViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/EditDeckDescriptionDialogViewModelTest.kt
index 6b66e3998634..2578f0fa2d8c 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/EditDeckDescriptionDialogViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/EditDeckDescriptionDialogViewModelTest.kt
@@ -14,6 +14,7 @@ import com.ichi2.anki.dialogs.EditDeckDescriptionDialogViewModel.DismissType.Sav
 import com.ichi2.anki.libanki.Consts.DEFAULT_DECK_ID
 import com.ichi2.anki.libanki.testutils.AnkiTest
 import com.ichi2.testutils.JvmTest
+import com.ichi2.testutils.NeedsRobolectric
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
@@ -23,6 +24,9 @@ import org.junit.runner.RunWith
  * Tests [EditDeckDescriptionDialogViewModel]
  */
 @RunWith(AndroidJUnit4::class)
+@NeedsRobolectric(
+    "Schedule CollectionManager work on the test dispatcher before removing the Android runner; initialization currently races assertions.",
+)
 class EditDeckDescriptionDialogViewModelTest : JvmTest() {
     @Test
     fun `title is set`() =
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/EmptyCardsReportTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/EmptyCardsReportTest.kt
index 5ee469c88e34..85479d32622f 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/EmptyCardsReportTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/EmptyCardsReportTest.kt
@@ -2,16 +2,13 @@
 
 package com.ichi2.anki.dialogs
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.CollectionManager.withCol
-import com.ichi2.anki.RobolectricTest
+import com.ichi2.testutils.JvmTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
-@RunWith(AndroidJUnit4::class)
-class EmptyCardsReportTest : RobolectricTest() {
+class EmptyCardsReportTest : JvmTest() {
     @Test
     fun `backend report has expected html structure`() =
         runTest {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogInsetsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogInsetsTest.kt
index 3837f2959d5e..cf5732c6f881 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogInsetsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogInsetsTest.kt
@@ -9,13 +9,13 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.EmptyApplicationCategory
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.cardviewer.SingleCardSide
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.settings.enums.DayTheme
 import com.ichi2.anki.settings.enums.NightTheme
 import com.ichi2.anki.settings.enums.Theme
 import com.ichi2.testutils.EmptyApplication
 import com.ichi2.testutils.windowInsetsOf
 import com.ichi2.themes.Themes
-import com.ichi2.utils.dp
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogScreenshotTest.kt
index 2dec48df1f02..7223495cdba6 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogScreenshotTest.kt
@@ -7,13 +7,13 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.viewpager2.widget.ViewPager2
 import com.ichi2.anki.R
 import com.ichi2.anki.ScreenshotTest
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.dialogs.InsertFieldDialog.SelectSpecialFieldFragment
 import com.ichi2.anki.dialogs.InsertFieldDialogViewModel.Tab
 import com.ichi2.anki.withCardTemplateEditor
 import com.ichi2.testutils.scrollToEnd
 import com.ichi2.testutils.simulateSystemBars
 import com.ichi2.testutils.windowInsetsOf
-import com.ichi2.utils.dp
 import org.junit.Test
 import org.robolectric.RuntimeEnvironment
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogTest.kt
index 17fcae4aadff..f154467f0577 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogTest.kt
@@ -2,10 +2,15 @@
 
 package com.ichi2.anki.dialogs
 
+import androidx.fragment.app.commitNow
+import androidx.fragment.app.testing.launchFragment
+import androidx.lifecycle.ViewModelProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.EmptyApplicationCategory
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.cardviewer.SingleCardSide
+import com.ichi2.anki.dialogs.InsertFieldDialog.Companion.RESULT_INSERTED_FIELD
+import com.ichi2.anki.model.FieldName
 import com.ichi2.anki.model.SpecialField
 import com.ichi2.anki.model.SpecialFields
 import com.ichi2.testutils.EmptyApplication
@@ -18,6 +23,10 @@ import org.junit.Test
 import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNull
+import com.ichi2.anki.common.android.R as CommonR
 
 /** Tests for [InsertFieldDialog] */
 @RunWith(AndroidJUnit4::class)
@@ -35,6 +44,55 @@ class InsertFieldDialogTest : RobolectricTest() {
             flag = 0,
         )
 
+    @Test
+    fun `selection waits for the dialog view to be recreated`() =
+        withDialog { dialog, results ->
+            val manager = dialog.parentFragmentManager
+            val viewModel = ViewModelProvider(dialog)[InsertFieldDialogViewModel::class.java]
+            manager.commitNow { detach(dialog) }
+            assertNull(dialog.view)
+
+            viewModel.selectNamedField(FieldName("Front"))
+            advanceRobolectricLooper()
+            assertEquals(emptyList(), results, "A destroyed view must not deliver the selection")
+
+            manager.commitNow { attach(dialog) }
+            advanceRobolectricLooper()
+            assertEquals(listOf("{{Front}}"), results)
+            assertFalse(dialog.isAdded, "Selecting a field dismisses the dialog")
+        }
+
+    @Test
+    fun `recreated dialog delivers a special field selection once`() =
+        withDialog { dialog, results ->
+            val manager = dialog.parentFragmentManager
+            manager.commitNow { detach(dialog) }
+            manager.commitNow { attach(dialog) }
+            advanceRobolectricLooper()
+
+            ViewModelProvider(dialog)[InsertFieldDialogViewModel::class.java].selectSpecialField(SpecialFields.Tags)
+            advanceRobolectricLooper()
+
+            assertEquals(listOf("{{Tags}}"), results)
+            assertFalse(dialog.isAdded, "Selecting a field dismisses the dialog")
+        }
+
+    private fun withDialog(block: (InsertFieldDialog, MutableList<String>) -> Unit) {
+        val requestKey = "insert_field"
+        launchFragment<InsertFieldDialog>(
+            fragmentArgs = InsertFieldDialog.newInstance(listOf("Front", "Back"), metadata, requestKey).requireArguments(),
+            themeResId = CommonR.style.Theme_Light,
+        ).use { scenario ->
+            scenario.onFragment { dialog ->
+                val results = mutableListOf<String>()
+                dialog.parentFragmentManager.setFragmentResultListener(requestKey, dialog.requireActivity()) { _, result ->
+                    results.add(requireNotNull(result.getString(RESULT_INSERTED_FIELD)))
+                }
+                block(dialog, results)
+            }
+        }
+    }
+
     @Test
     fun `all special fields have a descriptions`() {
         val allSpecialFields = SpecialFields.ALL
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogViewModelTest.kt
index d6e5e12dea79..fdc6f19e5a36 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/InsertFieldDialogViewModelTest.kt
@@ -104,8 +104,8 @@ class InsertFieldDialogViewModelTest {
     ) {
         val savedStateHandle =
             SavedStateHandle().apply {
-                this[InsertFieldDialogViewModel.KEY_FIELD_ITEMS] = ArrayList(fieldList)
-                this[InsertFieldDialogViewModel.KEY_INSERT_FIELD_METADATA] =
+                this[InsertFieldDialogViewModel.ARG_FIELD_NAMES] = ArrayList(fieldList)
+                this[InsertFieldDialogViewModel.ARG_INSERT_FIELD_METADATA] =
                     InsertFieldMetadata(
                         side = side,
                         cardTemplateName = "Card Template",
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/TtsPlaybackErrorDialogScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/TtsPlaybackErrorDialogScreenshotTest.kt
new file mode 100644
index 000000000000..128b1bcb9efb
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/TtsPlaybackErrorDialogScreenshotTest.kt
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.dialogs
+
+import com.ichi2.anki.AnkiActivity
+import com.ichi2.anki.ScreenshotTest
+import com.ichi2.anki.libanki.TTSTag
+import org.junit.Test
+import org.robolectric.Robolectric.buildActivity
+import org.robolectric.RuntimeEnvironment
+
+class TtsPlaybackErrorDialogScreenshotTest : ScreenshotTest() {
+    @Test
+    fun noEngines() = captureMissingEngineDialog("no_engines")
+
+    @Test
+    fun noEnginesLandscape() {
+        RuntimeEnvironment.setQualifiers("+land")
+        captureMissingEngineDialog("no_engines_landscape")
+    }
+
+    private fun captureMissingEngineDialog(name: String) {
+        buildActivity(AnkiActivity::class.java).use { controller ->
+            val activity = controller.setup().get()
+            // No TTS services are installed in Robolectric, as on a stock Fire Stick.
+            val tag = TTSTag(fieldText = "Hello", lang = "en_US", voices = emptyList(), speed = null, otherArgs = emptyList())
+            TtsPlaybackErrorDialog.ttsPlaybackErrorDialog(activity, activity.supportFragmentManager, tag)
+            captureScreen(name)
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/TtsPlaybackErrorDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/TtsPlaybackErrorDialogTest.kt
new file mode 100644
index 000000000000..f664a00ed6b9
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/TtsPlaybackErrorDialogTest.kt
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.dialogs
+
+import android.content.ComponentName
+import android.content.Intent
+import android.content.IntentFilter
+import android.speech.tts.TextToSpeech
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isVisible
+import androidx.fragment.app.FragmentActivity
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.CommonString
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.dialogs.utils.message
+import com.ichi2.anki.dialogs.utils.title
+import com.ichi2.testutils.EmptyApplication
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric.buildActivity
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.annotation.Config
+import org.robolectric.shadows.ShadowDialog
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+@RunWith(AndroidJUnit4::class)
+@Config(application = EmptyApplication::class)
+class TtsPlaybackErrorDialogTest : RobolectricTest() {
+    @Test
+    fun `no engines explains how to install one instead of offering voice options`() {
+        buildActivity(FragmentActivity::class.java).use { controller ->
+            val activity = controller.setup().get()
+            TtsPlaybackErrorDialog.ttsPlaybackErrorDialog(activity, activity.supportFragmentManager, null)
+            val dialog = ShadowDialog.getLatestDialog() as AlertDialog
+
+            assertEquals("No text-to-speech engine installed", dialog.title)
+            assertEquals(activity.getString(CommonString.tts_no_engine_message), dialog.message)
+            assertEquals(activity.getString(CommonString.dialog_ok), dialog.getButton(AlertDialog.BUTTON_POSITIVE).text)
+            assertFalse(dialog.getButton(AlertDialog.BUTTON_NEGATIVE).isVisible)
+            assertEquals(activity.getString(CommonString.help), dialog.getButton(AlertDialog.BUTTON_NEUTRAL).text)
+        }
+    }
+
+    @Test
+    fun `an installed engine still offers language troubleshooting`() {
+        buildActivity(FragmentActivity::class.java).use { controller ->
+            val activity = controller.setup().get()
+            shadowOf(activity.packageManager).apply {
+                val engine = ComponentName("test.tts", "TestTtsService")
+                addServiceIfNotPresent(engine)
+                addIntentFilterForService(
+                    engine,
+                    IntentFilter(TextToSpeech.Engine.INTENT_ACTION_TTS_SERVICE).apply { addCategory(Intent.CATEGORY_DEFAULT) },
+                )
+            }
+            TtsPlaybackErrorDialog.ttsPlaybackErrorDialog(activity, activity.supportFragmentManager, null)
+            val dialog = ShadowDialog.getLatestDialog() as AlertDialog
+
+            assertEquals(activity.getString(CommonString.tts_error_dialog_title), dialog.title)
+            assertTrue(dialog.getButton(AlertDialog.BUTTON_NEGATIVE).isVisible)
+            assertEquals(
+                activity.getString(CommonString.tts_error_dialog_supported_voices_button_text),
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).text,
+            )
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/help/HelpDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/help/HelpDialogTest.kt
index f2e9c7d75ce5..ec0d236e22b5 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/help/HelpDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/help/HelpDialogTest.kt
@@ -26,6 +26,7 @@ import org.junit.runner.RunWith
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class HelpDialogTest {
@@ -212,7 +213,7 @@ class HelpDialogTest {
     private fun withHelpDialog(block: (FragmentScenario<HelpDialog>) -> Unit) {
         launchFragment<HelpDialog>(
             fragmentArgs = HelpDialog.newHelpInstance().arguments,
-            themeResId = R.style.Theme_Light,
+            themeResId = CommonR.style.Theme_Light,
         ).use(block)
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapterBindingTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapterBindingTest.kt
index a72a26fd4031..ca3b434258d3 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapterBindingTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapterBindingTest.kt
@@ -5,7 +5,6 @@ import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.testutils.RecyclerViewUtils
 import com.ichi2.ui.CheckBoxTriStates.State.CHECKED
@@ -16,6 +15,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.Robolectric
 import kotlin.test.assertNull
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class TagsArrayAdapterBindingTest : RobolectricTest() {
@@ -40,7 +40,7 @@ class TagsArrayAdapterBindingTest : RobolectricTest() {
         block: TagSelection.() -> Unit,
     ) {
         Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
-            controller.get().setTheme(R.style.Theme_Light)
+            controller.get().setTheme(CommonR.style.Theme_Light)
             val activity = controller.setup().get()
             val recycler = RecyclerView(activity)
             recycler.layoutManager = LinearLayoutManager(activity)
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapterSelectionTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapterSelectionTest.kt
index dcd3eb3bfdba..b60f79588c48 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapterSelectionTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsArrayAdapterSelectionTest.kt
@@ -5,7 +5,6 @@ import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.testutils.RecyclerViewUtils
 import com.ichi2.ui.CheckBoxTriStates.State.CHECKED
@@ -17,6 +16,7 @@ import org.junit.Assert.assertFalse
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.Robolectric
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class TagsArrayAdapterSelectionTest : RobolectricTest() {
@@ -54,7 +54,7 @@ class TagsArrayAdapterSelectionTest : RobolectricTest() {
         block: TagSelection.() -> Unit,
     ) {
         Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
-            controller.get().setTheme(R.style.Theme_Light)
+            controller.get().setTheme(CommonR.style.Theme_Light)
             val activity = controller.setup().get()
             val recycler = RecyclerView(activity)
             recycler.layoutManager = LinearLayoutManager(activity)
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogFactoryTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogFactoryTest.kt
index 60be504cb55f..b343bd4a3d40 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogFactoryTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogFactoryTest.kt
@@ -4,7 +4,6 @@ package com.ichi2.anki.dialogs.tags
 
 import androidx.fragment.app.FragmentActivity
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.dialogs.tags.TagsDialog.DialogType
 import com.ichi2.anki.utils.ext.DIALOG_FRAGMENT_TAG
@@ -18,6 +17,7 @@ import kotlin.test.assertIs
 import kotlin.test.assertNotSame
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class TagsDialogFactoryTest : RobolectricTest() {
@@ -67,7 +67,7 @@ class TagsDialogFactoryTest : RobolectricTest() {
         runTest {
             ensureCollectionLoadIsSynchronous()
             Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
-                controller.get().setTheme(R.style.Base_Theme_Light)
+                controller.get().setTheme(CommonR.style.Base_Theme_Light)
                 val activity = controller.setup().get()
                 val factory = TagsDialogFactory(mock()).attachToActivity<TagsDialogFactory>(activity)
                 block(activity, factory)
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt
index a2eeae507a49..184f3f33c1b4 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt
@@ -46,6 +46,7 @@ import timber.log.Timber
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class TagsDialogTest : RobolectricTest() {
@@ -82,7 +83,7 @@ class TagsDialogTest : RobolectricTest() {
             }
         val listener = Mockito.mock(TagsDialogListener::class.java)
         val args = TagsDialog().withArguments(targetContext, TagsDialog.DialogType.EDIT_TAGS, ids).requireArguments()
-        FragmentScenario.launch(TagsDialog::class.java, args, R.style.Theme_Light, TagsDialogFactory(listener)).use { scenario ->
+        FragmentScenario.launch(TagsDialog::class.java, args, CommonR.style.Theme_Light, TagsDialogFactory(listener)).use { scenario ->
             scenario.moveToState(Lifecycle.State.STARTED)
             scenario.onFragment { fragment ->
                 advanceRobolectricLooperUntil { fragment.binding.tagsList.adapter != null }
@@ -112,7 +113,7 @@ class TagsDialogTest : RobolectricTest() {
         val fragment = TagsDialog(listener).withArguments(targetContext, TagsDialog.DialogType.EDIT_TAGS, listOf(addBasicNote().id))
         fragment.requireArguments().requireParcelable<IdsFile>(TagsDialog.ARG_TAGS_FILE).changeFile()
         Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
-            controller.get().setTheme(R.style.Theme_Light)
+            controller.get().setTheme(CommonR.style.Theme_Light)
             val activity = controller.setup().get()
             fragment.show(activity.supportFragmentManager, "tags")
             advanceRobolectricLooper()
@@ -128,7 +129,7 @@ class TagsDialogTest : RobolectricTest() {
         val file = fragment.requireArguments().requireParcelable<IdsFile>(TagsDialog.ARG_TAGS_FILE)
         val savedState =
             Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
-                controller.get().setTheme(R.style.Theme_Light)
+                controller.get().setTheme(CommonR.style.Theme_Light)
                 val activity = controller.setup().get()
                 fragment.show(activity.supportFragmentManager, "tags")
                 advanceRobolectricLooper()
@@ -137,7 +138,7 @@ class TagsDialogTest : RobolectricTest() {
         assertTrue(file.delete())
         ShadowToast.reset()
         Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
-            controller.get().setTheme(R.style.Theme_Light)
+            controller.get().setTheme(CommonR.style.Theme_Light)
             val activity = controller.setup(savedState).get()
             advanceRobolectricLooper()
             assertNull(activity.supportFragmentManager.findFragmentByTag("tags"))
@@ -796,7 +797,7 @@ class TagsDialogTest : RobolectricTest() {
                 .arguments
         val mockListener = Mockito.mock(TagsDialogListener::class.java)
         val factory = TagsDialogFactory(mockListener)
-        FragmentScenario.launch(TagsDialog::class.java, args, R.style.Theme_Light, factory).use { scenario ->
+        FragmentScenario.launch(TagsDialog::class.java, args, CommonR.style.Theme_Light, factory).use { scenario ->
             scenario.moveToState(Lifecycle.State.STARTED)
             scenario.onFragment { Timber.d("Dialog successfully opened") }
         }
@@ -918,7 +919,7 @@ class TagsDialogTest : RobolectricTest() {
         factory: TagsDialogFactory? = null,
         block: (TagsDialog) -> Unit,
     ) {
-        FragmentScenario.launch(TagsDialog::class.java, args, R.style.Theme_Light, factory).use { scenario ->
+        FragmentScenario.launch(TagsDialog::class.java, args, CommonR.style.Theme_Light, factory).use { scenario ->
             scenario.moveToState(Lifecycle.State.STARTED)
             scenario.onFragment { tagsDialog: TagsDialog ->
                 advanceRobolectricLooperUntil { tagsDialog.binding.tagsList.adapter != null }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogViewModelTest.kt
index 7c086e847c4f..6a1be37bbeb8 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogViewModelTest.kt
@@ -3,10 +3,9 @@
 
 package com.ichi2.anki.dialogs.tags
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.libanki.NoteId
 import com.ichi2.anki.libanki.testutils.ext.newNote
+import com.ichi2.testutils.JvmTest
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.StandardTestDispatcher
 import org.junit.Assert.assertEquals
@@ -14,12 +13,10 @@ import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import kotlin.properties.Delegates
 
 @OptIn(ExperimentalCoroutinesApi::class)
-@RunWith(AndroidJUnit4::class)
-class TagsDialogViewModelTest : RobolectricTest() {
+class TagsDialogViewModelTest : JvmTest() {
     private var note1 by Delegates.notNull<NoteId>()
     private var note2 by Delegates.notNull<NoteId>()
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/export/ExportDialogFragmentTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/export/ExportDialogFragmentTest.kt
index c6a38848bdde..c36af8f5d4b7 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/export/ExportDialogFragmentTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/export/ExportDialogFragmentTest.kt
@@ -32,6 +32,7 @@ import org.robolectric.shadows.ShadowToast
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class ExportDialogFragmentTest : RobolectricTest() {
@@ -48,7 +49,7 @@ class ExportDialogFragmentTest : RobolectricTest() {
                 // APKG, notes as text, and cards as text all need the original selection.
                 for (exportFormat in 1..3) {
                     val args = ExportDialogFragment.newInstance(targetContext.cacheDir, type, listOf(1L)).requireArguments()
-                    launchFragment<ExportDialogFragment>(fragmentArgs = args, themeResId = R.style.Theme_Light).use { scenario ->
+                    launchFragment<ExportDialogFragment>(fragmentArgs = args, themeResId = CommonR.style.Theme_Light).use { scenario ->
                         advanceRobolectricLooper()
                         scenario.onFragment { fragment ->
                             fragment.binding.exportTypeSelector.setSelection(exportFormat)
@@ -207,7 +208,7 @@ class ExportDialogFragmentTest : RobolectricTest() {
 
         launchFragment<ExportDialogFragment>(
             fragmentArgs = fragment.arguments,
-            themeResId = R.style.Theme_Light,
+            themeResId = CommonR.style.Theme_Light,
         ).use { scenario ->
             scenario.recreate()
             assertTrue(idsFile.exists(), "ids file must survive a configuration change")
@@ -217,7 +218,7 @@ class ExportDialogFragmentTest : RobolectricTest() {
     /** Launches [ExportDialogFragment] and executes [action] on the fragment. */
     private fun onExportDialog(action: ExportDialogFragment.() -> Unit) =
         launchFragment<ExportDialogFragment>(
-            themeResId = R.style.Theme_Light,
+            themeResId = CommonR.style.Theme_Light,
         ).use { scenario -> scenario.onFragment { action(it) } }
 
     companion object {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/filtered/FilteredDeckOptionsScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/filtered/FilteredDeckOptionsScreenshotTest.kt
index 592388bee321..d21d8ca95e7c 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/filtered/FilteredDeckOptionsScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/filtered/FilteredDeckOptionsScreenshotTest.kt
@@ -5,11 +5,11 @@ package com.ichi2.anki.filtered
 import androidx.core.view.isVisible
 import anki.decks.copy
 import com.ichi2.anki.ScreenshotTest
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.FragmentFilteredDeckOptionsBinding
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.utils.ConfigAwareSingleFragmentActivity
 import com.ichi2.testutils.simulateSystemBars
-import com.ichi2.utils.dp
 import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.unmockkObject
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/jsaddons/AddonModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/jsaddons/AddonModelTest.kt
index cb0e9afa8517..f04855667a6c 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/jsaddons/AddonModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/jsaddons/AddonModelTest.kt
@@ -3,9 +3,7 @@
 
 package com.ichi2.anki.jsaddons
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.AnkiDroidJsAPIConstants.CURRENT_JS_API_VERSION
-import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.jsaddons.AddonsConst.ANKIDROID_JS_ADDON_KEYWORDS
 import com.ichi2.anki.jsaddons.AddonsConst.REVIEWER_ADDON
 import com.ichi2.utils.FileOperation
@@ -15,21 +13,17 @@ import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.core.StringEndsWith.endsWith
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import java.io.File
 import java.io.IOException
 import kotlin.test.assertIs
 
-@RunWith(AndroidJUnit4::class)
-class AddonModelTest : RobolectricTest() {
+class AddonModelTest {
     private lateinit var validNpmPackageJson: File
     private lateinit var notValidNpmPackageJson: File
     private lateinit var addonsPackageListTestJson: String
 
     @Before
-    override fun setUp() {
-        super.setUp()
-
+    fun setUp() {
         validNpmPackageJson = File(FileOperation.getFileResource("valid-ankidroid-js-addon-test.json"))
         notValidNpmPackageJson = File(FileOperation.getFileResource("not-valid-ankidroid-js-addon-test.json"))
         addonsPackageListTestJson = FileOperation.getFileResource("test-js-addon.json")
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/jsaddons/NpmUtilsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/jsaddons/NpmUtilsTest.kt
index 75fa36ebcc3f..4f57ec55aecd 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/jsaddons/NpmUtilsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/jsaddons/NpmUtilsTest.kt
@@ -3,16 +3,12 @@
 
 package com.ichi2.anki.jsaddons
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.jsaddons.NpmUtils.validateName
 import junit.framework.TestCase.assertFalse
 import junit.framework.TestCase.assertTrue
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
-class NpmUtilsTest : RobolectricTest() {
+class NpmUtilsTest {
     @Test
     fun validateNameTest() {
         // test case taken from
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/libanki/NoteTypeTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/libanki/NoteTypeTest.kt
index a81a4a8991c5..acfaae64191e 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/libanki/NoteTypeTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/libanki/NoteTypeTest.kt
@@ -3,7 +3,6 @@
 
 package com.ichi2.anki.libanki
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import anki.notetypes.copy
 import com.ichi2.anki.backend.stripHTML
 import com.ichi2.anki.common.utils.annotation.KotlinCleanup
@@ -19,9 +18,7 @@ import org.hamcrest.Matchers.not
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
 @KotlinCleanup("improve kotlin code where possible")
 class NoteTypeTest : JvmTest() {
     @Test
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/libanki/SoundOrVideoTagTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/libanki/SoundOrVideoTagTest.kt
index 3bed4e692874..37598deb3558 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/libanki/SoundOrVideoTagTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/libanki/SoundOrVideoTagTest.kt
@@ -2,24 +2,23 @@
 
 package com.ichi2.anki.libanki
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.libanki.SoundOrVideoTag.Type
 import com.ichi2.anki.libanki.SoundOrVideoTag.Type.VIDEO
 import com.ichi2.anki.multimedia.getTagType
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
+import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
+import org.junit.rules.TemporaryFolder
 
-@RunWith(AndroidJUnit4::class)
-class SoundOrVideoTagTest : RobolectricTest() {
-    override fun getCollectionStorageMode() = CollectionStorageMode.IN_MEMORY_WITH_MEDIA
+class SoundOrVideoTagTest {
+    @get:Rule
+    val mediaDirectory = TemporaryFolder()
 
     @Test
     fun mp3IsAudio() {
         val tag = SoundOrVideoTag("test.mp3")
-        assertThat(tag.getTagType(col.media.dir), equalTo(Type.AUDIO))
+        assertThat(tag.getTagType(mediaDirectory.root), equalTo(Type.AUDIO))
     }
 
     @Test
@@ -28,13 +27,13 @@ class SoundOrVideoTagTest : RobolectricTest() {
         // When we want to play a tag, the audio player (Android) can handle a failure
         // better than the video player (HTML)
         val tag = SoundOrVideoTag("test.txt")
-        assertThat(tag.getTagType(col.media.dir), equalTo(Type.AUDIO))
+        assertThat(tag.getTagType(mediaDirectory.root), equalTo(Type.AUDIO))
     }
 
     @Test
     fun mp4IsVideo() {
         // Note: This will go out to the filesystem. As it doesn't exist, assume it's a video
         val tag = SoundOrVideoTag("test.mp4")
-        assertThat(tag.getTagType(col.media.dir), equalTo(VIDEO))
+        assertThat(tag.getTagType(mediaDirectory.root), equalTo(VIDEO))
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/mediacheck/MediaCheckFragmentTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/mediacheck/MediaCheckFragmentTest.kt
index 07fd7a308094..51ac896a18c8 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/mediacheck/MediaCheckFragmentTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/mediacheck/MediaCheckFragmentTest.kt
@@ -2,7 +2,11 @@
 // SPDX-FileCopyrightText: Copyright (c) 2026 Ashish Yadav <mailtoashish693@gmail.com>
 package com.ichi2.anki.mediacheck
 
+import android.webkit.WebView
 import android.widget.Button
+import androidx.core.view.isVisible
+import androidx.fragment.app.commitNow
+import androidx.lifecycle.ViewModelProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import anki.backend.BackendError
 import anki.backend.backendError
@@ -12,6 +16,7 @@ import com.ichi2.anki.CommonPlurals
 import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.SingleFragmentActivity
+import com.ichi2.anki.workarounds.SafeWebViewLayout
 import com.ichi2.testutils.rules.BackendOverrideRule
 import com.ichi2.utils.positiveButton
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -22,10 +27,14 @@ import net.ankiweb.rsdroid.exceptions.BackendIoException
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.robolectric.Shadows.shadowOf
 import org.robolectric.android.controller.ActivityController
 import org.robolectric.shadows.ShadowDialog
 import java.io.File
+import kotlin.test.assertContains
 import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
 import kotlin.test.assertNotSame
 import kotlin.test.assertNull
 import kotlin.test.assertSame
@@ -61,6 +70,78 @@ class MediaCheckFragmentTest : RobolectricTest() {
             assertEquals(failure.localizedMessage, getAlertDialogText(checkDismissed = true))
         }
 
+    @Test
+    fun `onRenderProcessGone recovers webview and reloads content`() =
+        runTest {
+            val mediaCheck = startMediaCheck()
+            advanceUntilIdle()
+            advanceRobolectricLooper()
+
+            val layout = mediaCheck.get().findViewById<SafeWebViewLayout>(R.id.web_view)
+            val initialWebView = assertNotNull(layout.getChildAt(0) as? WebView)
+
+            layout.onRenderProcessGone(initialWebView)
+            advanceRobolectricLooper()
+
+            assertTrue(shadowOf(initialWebView).wasDestroyCalled(), "Dead WebView should be destroyed")
+            assertNull(initialWebView.parent, "Dead WebView should be removed from parent")
+
+            val recoveredWebView = assertNotNull(layout.getChildAt(0) as? WebView)
+            assertNotSame(initialWebView, recoveredWebView, "A new WebView instance should be created")
+            assertFalse(shadowOf(recoveredWebView).wasDestroyCalled(), "Recovered WebView should not be destroyed")
+        }
+
+    @Test
+    fun `onRenderProcessGone after fragment view is destroyed cleans up dead webview without recreating`() =
+        runTest {
+            val mediaCheck = startMediaCheck()
+            advanceUntilIdle()
+            advanceRobolectricLooper()
+
+            val layout = mediaCheck.get().findViewById<SafeWebViewLayout>(R.id.web_view)
+            val initialWebView = assertNotNull(layout.getChildAt(0) as? WebView)
+
+            val fragment = mediaCheck.get().supportFragmentManager.findFragmentById(R.id.fragment_container) as MediaCheckFragment
+            mediaCheck.get().supportFragmentManager.commitNow { detach(fragment) }
+            assertNull(fragment.view, "Fragment view should be null after detach")
+
+            layout.onRenderProcessGone(initialWebView)
+
+            assertTrue(shadowOf(initialWebView).wasDestroyCalled(), "Dead WebView should be destroyed")
+            assertNull(initialWebView.parent, "Dead WebView should be removed from parent")
+            assertEquals(0, layout.childCount, "No new WebView should be created when fragment view is gone")
+        }
+
+    @Test
+    fun `media check result after view destruction is displayed after reattachment`() =
+        runTest {
+            val mediaCheck = startMediaCheck()
+            advanceUntilIdle()
+            advanceRobolectricLooper()
+            val manager = mediaCheck.get().supportFragmentManager
+            val fragment = manager.findFragmentById(R.id.fragment_container) as MediaCheckFragment
+            val viewModel = ViewModelProvider(fragment)[MediaCheckViewModel::class.java]
+            val oldView = fragment.requireView()
+
+            manager.commitNow { detach(fragment) }
+            addUnusedMedia()
+            viewModel.checkMedia().join()
+            advanceUntilIdle()
+            advanceRobolectricLooper()
+            assertNull(fragment.view)
+
+            manager.commitNow { attach(fragment) }
+            advanceUntilIdle()
+            advanceRobolectricLooper()
+
+            val newView = fragment.requireView()
+            assertNotSame(oldView, newView)
+            assertTrue(newView.findViewById<Button>(R.id.delete_used_media_button).isVisible)
+            val layout = newView.findViewById<SafeWebViewLayout>(R.id.web_view)
+            val webView = assertNotNull(layout.getChildAt(0) as? WebView)
+            assertContains(shadowOf(webView).lastLoadDataWithBaseURL.data, "unused.png")
+        }
+
     @Test
     fun `deleting unused media shows the result`() =
         runTest {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ExternalImageEditorResultTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ExternalImageEditorResultTest.kt
new file mode 100644
index 000000000000..171d59477175
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ExternalImageEditorResultTest.kt
@@ -0,0 +1,185 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.multimedia
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.os.Looper
+import androidx.activity.result.ActivityResult
+import androidx.core.content.FileProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.testutils.ShadowFileProviderPathStrategy
+import kotlinx.coroutines.runBlocking
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.GraphicsMode
+import java.io.File
+import java.io.IOException
+import kotlin.test.assertContentEquals
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertNotEquals
+import kotlin.test.assertNotNull
+
+@RunWith(AndroidJUnit4::class)
+@Config(shadows = [ShadowFileProviderPathStrategy::class])
+@GraphicsMode(GraphicsMode.Mode.NATIVE)
+class ExternalImageEditorResultTest : RobolectricTest(loadBackend = false) {
+    private val editedImage = editorResultImageBytes()
+    private lateinit var editor: ExternalImageEditor
+    private lateinit var resultProvider: EditorResultProvider
+    private lateinit var cacheDirectory: File
+    private lateinit var original: File
+    private lateinit var copy: File
+
+    @Before
+    fun setUpEditor() {
+        clearFileProviderRoots()
+        cacheDirectory = File(targetContext.cacheDir, "external-editor").apply { mkdirs() }
+        original = File(cacheDirectory, "original.png").apply { writeText("original") }
+        copy = File(cacheDirectory, "working.png").apply { writeText("original") }
+        editor = ExternalImageEditor(targetContext.applicationContext, cacheDirectory)
+        resultProvider = EditorResultProvider.register()
+    }
+
+    @Test
+    fun `a returned file uri is rejected`() =
+        runBlocking {
+            assertRejectedResult(Uri.fromFile(original))
+        }
+
+    @Test
+    fun `an empty working copy is rejected`() =
+        runBlocking {
+            copy.writeText("")
+            assertRejectedResult()
+        }
+
+    @Test
+    fun `rejecting a same-name empty result preserves original bytes`() =
+        runBlocking {
+            val result = File(targetContext.cacheDir, "empty.png").apply { writeText("") }
+            assertRejectedResult(resultProvider.result(result, displayName = original.name))
+        }
+
+    @Test
+    fun `returned display name cannot escape image cache`() =
+        runBlocking {
+            val existing = File(targetContext.filesDir, "existing.png").apply { writeText("untouched") }
+            val result = File(targetContext.cacheDir, "edited.png").apply { writeBytes(editedImage) }
+            val accepted = assertNotNull(readResult(resultProvider.result(result, "../../files/existing.png")))
+            assertEquals("untouched", existing.readText())
+            assertContentEquals(editedImage, accepted.readBytes())
+            assertEquals(cacheDirectory, accepted.parentFile)
+        }
+
+    @Test
+    fun `returned image keeps its mime type when the editor changes formats`() =
+        runBlocking {
+            val result = File(targetContext.cacheDir, "edited.jpg").apply { writeBytes(editorResultImageBytes("jpeg")) }
+            val accepted = assertNotNull(readResult(resultProvider.result(result)))
+            assertEquals("image/jpeg", targetContext.contentResolver.getType(uriForFile(accepted)))
+            assertContentEquals(result.readBytes(), accepted.readBytes())
+        }
+
+    @Test
+    fun `a non-image result is rejected`() =
+        runBlocking {
+            val result = File(targetContext.cacheDir, "edited.html").apply { writeText("<html>not an image</html>") }
+            assertRejectedResult(resultProvider.result(result, mimeType = "text/html"))
+        }
+
+    @Test
+    fun `an invalid result claiming an image mime type is rejected`() =
+        runBlocking {
+            val result = File(targetContext.cacheDir, "edited.png").apply { writeText("not an image") }
+            assertRejectedResult(resultProvider.result(result))
+        }
+
+    @Test
+    fun `an invalid in-place result is rejected`() =
+        runBlocking {
+            copy.writeText("not an image")
+            assertRejectedResult()
+        }
+
+    @Test
+    fun `image headers override a non-image provider mime type`() =
+        runBlocking {
+            val result = File(targetContext.cacheDir, "edited.html").apply { writeBytes(editedImage) }
+            val accepted = assertNotNull(readResult(resultProvider.result(result, mimeType = "text/html")))
+            assertEquals("image/png", targetContext.contentResolver.getType(uriForFile(accepted)))
+            assertContentEquals(editedImage, accepted.readBytes())
+        }
+
+    @Test
+    fun `image headers supply a missing provider mime type`() =
+        runBlocking {
+            val result = File(targetContext.cacheDir, "edited.bin").apply { writeBytes(editorResultImageBytes("jpeg")) }
+            val accepted = assertNotNull(readResult(resultProvider.result(result, mimeType = null)))
+            assertEquals("image/jpeg", targetContext.contentResolver.getType(uriForFile(accepted)))
+            assertContentEquals(result.readBytes(), accepted.readBytes())
+        }
+
+    @Test
+    fun `image headers override an incorrect image provider mime type`() =
+        runBlocking {
+            val result = File(targetContext.cacheDir, "edited.jpg").apply { writeBytes(editedImage) }
+            val accepted = assertNotNull(readResult(resultProvider.result(result)))
+            assertEquals("image/png", targetContext.contentResolver.getType(uriForFile(accepted)))
+            assertContentEquals(editedImage, accepted.readBytes())
+        }
+
+    @Test
+    fun `an in-place result can change image formats`() =
+        runBlocking {
+            val jpeg = editorResultImageBytes("jpeg")
+            copy.writeBytes(jpeg)
+            val accepted = assertNotNull(readResult())
+            assertEquals("image/jpeg", targetContext.contentResolver.getType(uriForFile(accepted)))
+            assertContentEquals(jpeg, accepted.readBytes())
+        }
+
+    @Test
+    fun `an unshared private cache file is rejected`() =
+        runBlocking {
+            val secret = File(targetContext.cacheDir, "private.png").apply { writeText("private data") }
+            assertRejectedResult(uriForFile(secret))
+            assertEquals("private data", secret.readText())
+        }
+
+    @Test
+    fun `the supplied working uri is accepted`() =
+        runBlocking {
+            copy.writeBytes(editedImage)
+            val accepted = assertNotNull(readResult(uriForFile(copy)))
+            assertContentEquals(editedImage, accepted.readBytes())
+            assertNotEquals(copy, accepted)
+            assertEquals("original", original.readText())
+        }
+
+    @Test
+    fun `external result is imported off the main thread`() =
+        runBlocking {
+            val result = File(targetContext.cacheDir, "edited.png").apply { writeBytes(editedImage) }
+            val accepted = assertNotNull(readResult(resultProvider.result(result)))
+            assertContentEquals(editedImage, accepted.readBytes())
+            assertNotEquals(Looper.getMainLooper().thread, assertNotNull(resultProvider.openThread))
+        }
+
+    private suspend fun readResult(uri: Uri? = null): File? =
+        editor.readResult(original, copy, ActivityResult(Activity.RESULT_OK, uri?.let { Intent().setData(it) }))
+
+    private suspend fun assertRejectedResult(uri: Uri? = null) {
+        assertFailsWith<IOException> { readResult(uri) }
+        assertEquals("original", original.readText())
+        assertEquals(setOf(original, copy), cacheDirectory.listFiles()!!.toSet())
+    }
+
+    private fun uriForFile(file: File): Uri =
+        FileProvider.getUriForFile(targetContext, "${targetContext.packageName}.apkgfileprovider", file)
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ExternalImageEditorTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ExternalImageEditorTest.kt
new file mode 100644
index 000000000000..953b0cd61846
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ExternalImageEditorTest.kt
@@ -0,0 +1,150 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.multimedia
+
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.net.Uri
+import android.provider.MediaStore
+import androidx.core.graphics.createBitmap
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.utils.ext.getParcelableExtraCompat
+import com.ichi2.testutils.ShadowFileProviderPathStrategy
+import io.mockk.every
+import io.mockk.mockkStatic
+import io.mockk.unmockkStatic
+import kotlinx.coroutines.runBlocking
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.GraphicsMode
+import java.io.File
+
+@RunWith(AndroidJUnit4::class)
+@Config(shadows = [ShadowFileProviderPathStrategy::class])
+class ExternalImageEditorTest : RobolectricTest(loadBackend = false) {
+    private lateinit var editor: ExternalImageEditor
+
+    @Before
+    fun setUpEditor() {
+        clearFileProviderRoots()
+        editor = ExternalImageEditor(targetContext.applicationContext, targetContext.cacheDir)
+        targetContext.registerExternalImageEditor()
+    }
+
+    @Test
+    fun `preparation shares a writable copy through a chooser`() =
+        runBlocking {
+            val original = File(targetContext.cacheDir, "original.png").apply { writeText("original") }
+            val prepared = editor.prepare(original)
+            try {
+                assertThat(prepared.intent.action, equalTo(Intent.ACTION_CHOOSER))
+                val edit = requireNotNull(prepared.intent.getParcelableExtraCompat<Intent>(Intent.EXTRA_INTENT))
+                assertThat(edit.action, equalTo(Intent.ACTION_EDIT))
+                assertThat(edit.type, equalTo("image/png"))
+                assertThat(edit.data?.scheme, equalTo("content"))
+                assertThat(edit.clipData!!.getItemAt(0).uri, equalTo(edit.data))
+                val grants = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                assertThat(edit.flags and grants, equalTo(grants))
+                targetContext.contentResolver.openOutputStream(edit.data!!, "wt")!!.use { it.write("edited".toByteArray()) }
+                assertThat(original.readText(), equalTo("original"))
+            } finally {
+                editor.clear(prepared.file)
+            }
+        }
+
+    @Test
+    fun `preparation provides Google Photos with a writable output URI`() =
+        runBlocking {
+            val original = File(targetContext.cacheDir, "original.png").apply { writeText("original") }
+            val prepared = editor.prepare(original)
+            try {
+                val edit = requireNotNull(prepared.intent.getParcelableExtraCompat<Intent>(Intent.EXTRA_INTENT))
+                val output = requireNotNull(edit.getParcelableExtraCompat<Uri>(MediaStore.EXTRA_OUTPUT))
+                assertThat(output, equalTo(edit.data))
+                targetContext.contentResolver.openOutputStream(output, "wt")!!.use { it.write("edited".toByteArray()) }
+                assertThat(prepared.file.readText(), equalTo("edited"))
+                assertThat(original.readText(), equalTo("original"))
+            } finally {
+                editor.clear(prepared.file)
+            }
+        }
+
+    @Test
+    fun `an unshareable source does not report an available editor`() =
+        runBlocking {
+            val source = File(targetContext.filesDir, "private.png").apply { writeText("original") }
+            assertThat(editor.canEdit(source), equalTo(false))
+        }
+
+    @Test
+    fun `preparation detects the extension before sharing the copy`() =
+        runBlocking {
+            val source = File(targetContext.filesDir, "private.png").apply { writeText("original") }
+            assertPreparedType(source, "image/png")
+        }
+
+    @Test
+    @GraphicsMode(GraphicsMode.Mode.NATIVE)
+    fun `preparation detects image headers before sharing the copy`() =
+        runBlocking {
+            val source = File(targetContext.filesDir, "private.bin")
+            source.outputStream().use { createBitmap(1, 1).compress(Bitmap.CompressFormat.PNG, 100, it) }
+            assertPreparedType(source, "image/png")
+        }
+
+    @Test
+    fun `preparation falls back when the image type is unknown`() =
+        runBlocking {
+            val source = File(targetContext.filesDir, "private").apply { writeText("unknown format") }
+            assertPreparedType(source, "image/*")
+        }
+
+    @Test
+    fun `preparation falls back when decoding image headers runs out of memory`() =
+        runBlocking {
+            val source = File(targetContext.filesDir, "private.bin").apply { writeText("original") }
+            mockkStatic(BitmapFactory::class)
+            try {
+                every { BitmapFactory.decodeStream(any(), null, any()) } throws OutOfMemoryError("Image header decoding failed")
+
+                assertPreparedType(source, "image/*")
+            } finally {
+                unmockkStatic(BitmapFactory::class)
+            }
+        }
+
+    @Test
+    fun `editor discovery falls back when decoding image headers runs out of memory`() =
+        runBlocking {
+            val source = File(targetContext.cacheDir, "image.bin").apply { writeText("original") }
+            mockkStatic(BitmapFactory::class)
+            try {
+                every { BitmapFactory.decodeStream(any(), null, any()) } throws OutOfMemoryError("Image header decoding failed")
+
+                assertThat(editor.canEdit(source), equalTo(true))
+            } finally {
+                unmockkStatic(BitmapFactory::class)
+            }
+        }
+
+    private suspend fun assertPreparedType(
+        source: File,
+        mimeType: String,
+    ) {
+        val prepared = editor.prepare(source)
+        try {
+            val intent = requireNotNull(prepared.intent.getParcelableExtraCompat<Intent>(Intent.EXTRA_INTENT))
+            assertThat(intent.type, equalTo(mimeType))
+            assertThat(prepared.file.parentFile, equalTo(targetContext.cacheDir))
+            assertThat(prepared.file.readBytes().toList(), equalTo(source.readBytes().toList()))
+        } finally {
+            editor.clear(prepared.file)
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ExternalImageEditorTestUtils.kt b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ExternalImageEditorTestUtils.kt
new file mode 100644
index 000000000000..ebb7dd670128
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ExternalImageEditorTestUtils.kt
@@ -0,0 +1,123 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.multimedia
+
+import android.content.ComponentName
+import android.content.ContentProvider
+import android.content.ContentValues
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.pm.ProviderInfo
+import android.database.MatrixCursor
+import android.net.Uri
+import android.os.ParcelFileDescriptor
+import android.provider.OpenableColumns
+import androidx.core.content.FileProvider
+import androidx.core.net.toUri
+import org.robolectric.Robolectric
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.util.ReflectionHelpers
+import java.awt.image.BufferedImage
+import java.io.ByteArrayOutputStream
+import java.io.File
+import javax.imageio.ImageIO
+
+internal fun editorResultImageBytes(format: String = "png"): ByteArray =
+    ByteArrayOutputStream().use { output ->
+        check(ImageIO.write(BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB), format, output))
+        output.toByteArray()
+    }
+
+internal fun clearFileProviderRoots() {
+    // Robolectric gives each test a new cache directory, but AndroidX retains the old roots.
+    ReflectionHelpers.getStaticField<MutableMap<String, Any>>(FileProvider::class.java, "sCache").clear()
+}
+
+internal fun Context.registerExternalImageEditor(): ComponentName {
+    val editor = ComponentName("com.ichi2.testutils.editor", "ImageEditorActivity")
+    shadowOf(packageManager).apply {
+        addActivityIfNotPresent(editor).exported = true
+        addIntentFilterForActivity(
+            editor,
+            IntentFilter(Intent.ACTION_EDIT).apply {
+                addCategory(Intent.CATEGORY_DEFAULT)
+                addDataScheme("content")
+                addDataType("image/png")
+            },
+        )
+    }
+    return editor
+}
+
+/** Models an editor's output using a separate authority from AnkiDroid's FileProvider. */
+class EditorResultProvider : ContentProvider() {
+    private lateinit var file: File
+    private lateinit var displayName: String
+    private var mimeType: String? = null
+    var openThread: Thread? = null
+    var beforeOpen: () -> Unit = {}
+
+    fun result(
+        file: File,
+        displayName: String = file.name,
+        mimeType: String? = if (file.extension == "jpg") "image/jpeg" else "image/png",
+    ): Uri {
+        this.file = file
+        this.displayName = displayName
+        this.mimeType = mimeType
+        return "content://com.ichi2.testutils.editor.results/result".toUri()
+    }
+
+    override fun onCreate() = true
+
+    override fun getType(uri: Uri): String? = mimeType
+
+    override fun openFile(
+        uri: Uri,
+        mode: String,
+    ): ParcelFileDescriptor {
+        openThread = Thread.currentThread()
+        beforeOpen()
+        return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY)
+    }
+
+    override fun query(
+        uri: Uri,
+        projection: Array<out String>?,
+        selection: String?,
+        selectionArgs: Array<out String>?,
+        sortOrder: String?,
+    ) = MatrixCursor(arrayOf(OpenableColumns.DISPLAY_NAME)).apply { addRow(arrayOf(displayName)) }
+
+    override fun insert(
+        uri: Uri,
+        values: ContentValues?,
+    ): Uri? = throw UnsupportedOperationException()
+
+    override fun update(
+        uri: Uri,
+        values: ContentValues?,
+        selection: String?,
+        selectionArgs: Array<out String>?,
+    ) = throw UnsupportedOperationException()
+
+    override fun delete(
+        uri: Uri,
+        selection: String?,
+        selectionArgs: Array<out String>?,
+    ) = throw UnsupportedOperationException()
+
+    companion object {
+        fun register(): EditorResultProvider =
+            Robolectric
+                .buildContentProvider(EditorResultProvider::class.java)
+                .create(
+                    ProviderInfo().apply {
+                        authority = "com.ichi2.testutils.editor.results"
+                        packageName = "com.ichi2.testutils.editor"
+                        exported = true
+                    },
+                ).get()
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ExternalImageEditorViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ExternalImageEditorViewModelTest.kt
new file mode 100644
index 000000000000..635467f90699
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ExternalImageEditorViewModelTest.kt
@@ -0,0 +1,130 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.multimedia
+
+import android.app.Activity
+import android.os.Bundle
+import android.os.Parcel
+import androidx.activity.result.ActivityResult
+import androidx.core.os.BundleCompat
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModelStore
+import androidx.lifecycle.viewModelScope
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.testutils.ShadowFileProviderPathStrategy
+import kotlinx.coroutines.job
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+import java.io.File
+import kotlin.test.assertContentEquals
+
+@RunWith(AndroidJUnit4::class)
+@Config(shadows = [ShadowFileProviderPathStrategy::class])
+class ExternalImageEditorViewModelTest : RobolectricTest(loadBackend = false) {
+    private val editedImage = editorResultImageBytes()
+
+    @Before
+    fun resetFileProviderRoots() {
+        clearFileProviderRoots()
+    }
+
+    @Test
+    fun `a delivered result is imported after process state restoration`() {
+        val original = File(targetContext.cacheDir, "original.png").apply { writeText("original") }
+        val working = File(targetContext.cacheDir, "working.png").apply { writeBytes(editedImage) }
+        val edit = ExternalImageEditorViewModel.Edit.Importing(original.path, working.path, ActivityResult(Activity.RESULT_OK, null))
+        withRestoredEditor(edit) { viewModel ->
+            advanceRobolectricLooperUntil { viewModel.state.value is ExternalImageEditorViewModel.Edit.Finished }
+            val finished = viewModel.state.value as ExternalImageEditorViewModel.Edit.Finished
+            val accepted = File(requireNotNull(finished.acceptedPath))
+            assertContentEquals(editedImage, accepted.readBytes())
+            viewModel.consumed()
+            advanceRobolectricLooperUntil { !working.exists() }
+            assertThat(original.readText(), equalTo("original"))
+            assertContentEquals(editedImage, accepted.readBytes())
+        }
+    }
+
+    @Test
+    fun `preparation resumes after process state restoration`() {
+        val original = File(targetContext.cacheDir, "original.png").apply { writeText("original") }
+        withRestoredEditor(ExternalImageEditorViewModel.Edit.Preparing(original.path)) { viewModel ->
+            advanceRobolectricLooperUntil { viewModel.state.value is ExternalImageEditorViewModel.Edit.Ready }
+            val ready = viewModel.state.value as ExternalImageEditorViewModel.Edit.Ready
+            val working = File(ready.workingPath)
+            assertThat(working.readText(), equalTo("original"))
+            viewModel.launched()
+            viewModel.readResult(ActivityResult(Activity.RESULT_CANCELED, null))
+            advanceRobolectricLooperUntil { viewModel.state.value is ExternalImageEditorViewModel.Edit.Finished }
+            viewModel.consumed()
+            advanceRobolectricLooperUntil { !working.exists() }
+            assertThat(original.readText(), equalTo("original"))
+        }
+    }
+
+    @Test
+    fun `clearing a stopped editor preserves its working copy for restoration`() {
+        val original = File(targetContext.cacheDir, "original.png").apply { writeText("original") }
+        val working = File(targetContext.cacheDir, "working.png").apply { writeBytes(editedImage) }
+        withRestoredEditor(ExternalImageEditorViewModel.Edit.Editing(original.path, working.path)) { }
+        assertContentEquals(editedImage, working.readBytes())
+        assertThat(original.readText(), equalTo("original"))
+    }
+
+    @Test
+    fun `closing with an unconsumed result removes both copies`() {
+        val original = File(targetContext.cacheDir, "original.png").apply { writeText("original") }
+        val working = File(targetContext.cacheDir, "working.png").apply { writeBytes(editedImage) }
+        lateinit var accepted: File
+        val viewModel =
+            withRestoredEditor(
+                ExternalImageEditorViewModel.Edit.Importing(original.path, working.path, ActivityResult(Activity.RESULT_OK, null)),
+            ) { model ->
+                advanceRobolectricLooperUntil { model.state.value is ExternalImageEditorViewModel.Edit.Finished }
+                accepted = File(requireNotNull((model.state.value as ExternalImageEditorViewModel.Edit.Finished).acceptedPath))
+                model
+            }
+        assertContentEquals(editedImage, working.readBytes())
+        assertContentEquals(editedImage, accepted.readBytes())
+        viewModel.discard()
+        advanceRobolectricLooperUntil { !working.exists() && !accepted.exists() }
+        assertThat(original.readText(), equalTo("original"))
+    }
+
+    private fun <T> withRestoredEditor(
+        edit: ExternalImageEditorViewModel.Edit,
+        block: (ExternalImageEditorViewModel) -> T,
+    ): T {
+        val parcel = Parcel.obtain()
+        val restored =
+            try {
+                parcel.writeBundle(Bundle().apply { putParcelable("edit", edit) })
+                parcel.setDataPosition(0)
+                BundleCompat.getParcelable(
+                    parcel.readBundle(edit.javaClass.classLoader)!!,
+                    "edit",
+                    ExternalImageEditorViewModel.Edit::class.java,
+                )!!
+            } finally {
+                parcel.recycle()
+            }
+        val store = ViewModelStore()
+        val model =
+            ExternalImageEditorViewModel(
+                SavedStateHandle(mapOf("externalEdit" to restored)),
+                ExternalImageEditor(targetContext.applicationContext, targetContext.cacheDir),
+            )
+        store.put("editor", model)
+        return try {
+            block(model)
+        } finally {
+            store.clear()
+            advanceRobolectricLooperUntil { model.viewModelScope.coroutineContext.job.isCompleted }
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ImageEditorTestHelper.kt b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ImageEditorTestHelper.kt
new file mode 100644
index 000000000000..c40c4ca86aed
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ImageEditorTestHelper.kt
@@ -0,0 +1,114 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.multimedia
+
+import android.app.Activity
+import android.content.Intent
+import android.graphics.Bitmap
+import android.net.Uri
+import androidx.annotation.StringRes
+import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.core.content.FileProvider
+import androidx.core.graphics.createBitmap
+import com.ichi2.anki.CommonString
+import com.ichi2.anki.R
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.RobolectricTest.Companion.advanceRobolectricLooper
+import com.ichi2.anki.multimediacard.fields.ImageField
+import com.ichi2.anki.multimediacard.impl.MultimediaEditableNote
+import com.ichi2.imagecropper.ImageCropper
+import org.junit.rules.ExternalResource
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.android.controller.ActivityController
+import org.robolectric.util.ReflectionHelpers
+import java.io.File
+import kotlin.test.assertIs
+import kotlin.test.assertNotNull
+
+/** Launches the image editor and supplies results from its cropper and picker. */
+class ImageEditorTestHelper(
+    private val test: RobolectricTest,
+    private val compose: SemanticsNodeInteractionsProvider,
+) : ExternalResource() {
+    private val context get() = test.targetContext
+    private lateinit var controller: ActivityController<MultimediaActivity>
+
+    val fragment: MultimediaImageFragment
+        get() = controller.get().supportFragmentManager.findFragmentById(R.id.fragment_container) as MultimediaImageFragment
+
+    override fun before() = clearFileProviderRoots()
+
+    override fun after() = clearFileProviderRoots()
+
+    private fun clearFileProviderRoots() {
+        // Each Robolectric test has its own cache directory; discard AndroidX's cached roots.
+        ReflectionHelpers.getStaticField<MutableMap<String, Any>>(FileProvider::class.java, "sCache").clear()
+    }
+
+    fun open(uri: Uri) {
+        val field = ImageField()
+        val note =
+            MultimediaEditableNote().apply {
+                setNumFields(1)
+                setField(0, field)
+                freezeInitialFieldValues()
+            }
+        val intent =
+            MultimediaImageFragment.getIntent(
+                context,
+                MultimediaActivityExtra(0, field, note, uri.toString()),
+                MultimediaImageFragment.ImageOptions.GALLERY,
+            )
+        controller = test.startActivityControllerNormallyOpenCollectionWithIntent(MultimediaActivity::class.java, intent)
+    }
+
+    fun cropTo(image: File) {
+        val result =
+            Intent().putExtra(
+                ImageCropper.EXTRA_CROP_IMAGE_RESULT,
+                ImageCropper.CropResultData(contentUri(image), image.absolutePath),
+            )
+        returnImage(CommonString.crop_button, result)
+    }
+
+    fun replaceWith(image: File) = returnImage(CommonString.dialog_positive_replace, Intent().setData(contentUri(image)))
+
+    private fun returnImage(
+        @StringRes button: Int,
+        result: Intent,
+    ) {
+        compose.onNodeWithText(context.getString(button)).performClick()
+        val activity = shadowOf(controller.get())
+        val request = assertNotNull(activity.nextStartedActivityForResult)
+        activity.receiveResult(request.intent, Activity.RESULT_OK, result)
+        advanceRobolectricLooper()
+    }
+
+    fun recreate() {
+        controller.recreate()
+        advanceRobolectricLooper()
+    }
+
+    fun finish(): File {
+        fragment.onDone()
+        val activity = shadowOf(controller.get())
+        val result = assertIs<MultimediaResult.Success>(MultimediaResultContract().parseResult(activity.resultCode, activity.resultIntent))
+        return assertNotNull(result.field.mediaFile)
+    }
+
+    fun createImage(
+        name: String,
+        color: Int,
+    ): File {
+        val image = File(context.cacheDir, name)
+        val bitmap = createBitmap(8, 8)
+        bitmap.eraseColor(color)
+        image.outputStream().use { bitmap.compress(Bitmap.CompressFormat.PNG, 100, it) }
+        bitmap.recycle()
+        return image
+    }
+
+    fun contentUri(file: File): Uri = FileProvider.getUriForFile(context, context.packageName + ".apkgfileprovider", file)
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ImageEditorToolbarTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ImageEditorToolbarTest.kt
index 1c5135b5afb0..50f9718c6691 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ImageEditorToolbarTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/ImageEditorToolbarTest.kt
@@ -9,6 +9,7 @@ import androidx.compose.ui.test.junit4.v2.createComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
@@ -30,28 +31,64 @@ class ImageEditorToolbarTest : RobolectricTest() {
             AnkiDroidTheme {
                 ImageEditorToolbar(
                     hasImage = true,
+                    hasExternalEditor = true,
                     replaceIcon = R.drawable.ic_photo_library,
                     onReplace = { actions.add("replace") },
                     onCrop = { actions.add("crop") },
+                    onEditExternally = { actions.add("external") },
                 )
             }
         }
         composeRule.onNodeWithText(targetContext.getString(CommonString.dialog_positive_replace)).performClick()
         composeRule.onNodeWithText(targetContext.getString(CommonString.crop_button)).performClick()
-        assertEquals(listOf("replace", "crop"), actions)
+        composeRule.onNodeWithText(TR.studyingEdit()).performClick()
+        assertEquals(listOf("replace", "crop", "external"), actions)
     }
 
     @Test
-    fun `crop becomes available when an image is selected`() {
+    fun `editing actions become available when an image is selected`() {
         val hasImage = mutableStateOf(false)
         composeRule.setContent {
             AnkiDroidTheme {
-                ImageEditorToolbar(hasImage.value, replaceIcon = R.drawable.ic_photo_library, onReplace = {}, onCrop = {})
+                ImageEditorToolbar(
+                    hasImage = hasImage.value,
+                    hasExternalEditor = true,
+                    replaceIcon = R.drawable.ic_photo_library,
+                    onReplace = {},
+                    onCrop = {},
+                    onEditExternally = {},
+                )
             }
         }
         composeRule.onNodeWithText(targetContext.getString(CommonString.dialog_positive_replace)).assertIsEnabled()
         composeRule.onNodeWithText(targetContext.getString(CommonString.crop_button)).assertIsNotEnabled()
+        composeRule.onNodeWithText(TR.studyingEdit()).assertIsNotEnabled()
         composeRule.runOnIdle { hasImage.value = true }
         composeRule.onNodeWithText(targetContext.getString(CommonString.crop_button)).assertIsEnabled()
+        composeRule.onNodeWithText(TR.studyingEdit()).assertIsEnabled()
+    }
+
+    @Test
+    fun `edit is hidden when no external editor is available`() {
+        val hasExternalEditor = mutableStateOf(false)
+        composeRule.setContent {
+            AnkiDroidTheme {
+                ImageEditorToolbar(
+                    hasImage = true,
+                    hasExternalEditor = hasExternalEditor.value,
+                    replaceIcon = R.drawable.ic_photo_library,
+                    onReplace = {},
+                    onCrop = {},
+                    onEditExternally = {},
+                )
+            }
+        }
+        composeRule.onNodeWithText(targetContext.getString(CommonString.dialog_positive_replace)).assertIsEnabled()
+        composeRule.onNodeWithText(targetContext.getString(CommonString.crop_button)).assertIsEnabled()
+        composeRule.onNodeWithText(TR.studyingEdit()).assertDoesNotExist()
+        composeRule.runOnIdle { hasExternalEditor.value = true }
+        composeRule.onNodeWithText(TR.studyingEdit()).assertIsEnabled()
+        composeRule.runOnIdle { hasExternalEditor.value = false }
+        composeRule.onNodeWithText(TR.studyingEdit()).assertDoesNotExist()
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/MultimediaImageFragmentCameraTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/MultimediaImageFragmentCameraTest.kt
new file mode 100644
index 000000000000..dec3e87f0fd0
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/MultimediaImageFragmentCameraTest.kt
@@ -0,0 +1,90 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.multimedia
+
+import android.app.Activity
+import android.content.Context
+import android.os.Bundle
+import androidx.compose.ui.test.junit4.v2.createEmptyComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.CommonString
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.multimedia.MultimediaActivity.Companion.EXTRA_MEDIA_OPTIONS
+import com.ichi2.anki.multimedia.MultimediaUtils.createImageFile
+import com.ichi2.testutils.AnkiFragmentScenario
+import com.ichi2.testutils.ShadowFileProviderPathStrategy
+import com.ichi2.testutils.launchFragmentInContainer
+import com.ichi2.testutils.withFragment
+import io.mockk.every
+import io.mockk.mockkObject
+import io.mockk.unmockkObject
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.annotation.Config
+import org.robolectric.shadows.ShadowDialog
+import java.io.File
+
+@RunWith(AndroidJUnit4::class)
+@Config(shadows = [ShadowFileProviderPathStrategy::class])
+class MultimediaImageFragmentCameraTest : RobolectricTest(loadBackend = false) {
+    @get:Rule
+    val composeRule = createEmptyComposeRule()
+
+    @Test
+    fun `cancelling a replacement photo after recreation restores the original size`() =
+        withCameraScenario { scenario ->
+            val original = scenario.withFragment { completePhotoCapture("original") }
+            val replacementRequest =
+                scenario.withFragment {
+                    assertThat(viewModel.selectedMediaFileSize, equalTo(original.length()))
+
+                    composeRule.onNodeWithText(getString(CommonString.dialog_positive_replace)).performClick()
+                    assertThat(viewModel.currentMultimediaPath.value!!.length(), equalTo(0L))
+                    shadowOf(requireActivity()).nextStartedActivityForResult.requestCode
+                }
+
+            scenario.recreate()
+            scenario.withFragment {
+                deliverCameraResult(replacementRequest, Activity.RESULT_CANCELED)
+                assertThat(viewModel.currentMultimediaPath.value, equalTo(original))
+                assertThat(viewModel.selectedMediaFileSize, equalTo(original.length()))
+                assertThat(binding.imageFileSize.text.toString(), equalTo(original.toHumanReadableSize()))
+                assertThat(original.readText(), equalTo("original"))
+            }
+        }
+
+    private fun MultimediaImageFragment.completePhotoCapture(contents: String): File {
+        val capture = shadowOf(requireActivity()).nextStartedActivityForResult
+        val image = requireNotNull(viewModel.currentMultimediaPath.value).apply { writeText(contents) }
+        deliverCameraResult(capture.requestCode, Activity.RESULT_OK)
+        ShadowDialog.getLatestDialog().dismiss()
+        return image
+    }
+
+    private fun MultimediaImageFragment.deliverCameraResult(
+        requestCode: Int,
+        resultCode: Int,
+    ) {
+        requireActivity().activityResultRegistry.dispatchResult(requestCode, resultCode, null)
+    }
+
+    private fun withCameraScenario(block: (AnkiFragmentScenario<MultimediaImageFragment>) -> Unit) {
+        clearFileProviderRoots()
+        // Robolectric's external pictures directory is outside the FileProvider's simulated storage root.
+        mockkObject(MultimediaUtils)
+        try {
+            every { any<Context>().createImageFile() } answers { File.createTempFile("camera", ".jpg", targetContext.cacheDir) }
+            launchFragmentInContainer<MultimediaImageFragment>(
+                Bundle().apply { putSerializable(EXTRA_MEDIA_OPTIONS, MultimediaImageFragment.ImageOptions.CAMERA) },
+            ).use(block)
+        } finally {
+            unmockkObject(MultimediaUtils)
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/MultimediaImageFragmentExternalEditorTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/MultimediaImageFragmentExternalEditorTest.kt
new file mode 100644
index 000000000000..903ecc15ced2
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/MultimediaImageFragmentExternalEditorTest.kt
@@ -0,0 +1,456 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: 2026 Ashish Yadav <mailtoashish693@gmail.com>
+
+package com.ichi2.anki.multimedia
+
+import android.app.Activity
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.graphics.Bitmap
+import android.net.Uri
+import android.os.Bundle
+import android.os.Looper
+import android.view.View
+import android.widget.TextView
+import androidx.annotation.StringRes
+import androidx.compose.ui.test.assertIsEnabled
+import androidx.compose.ui.test.assertIsNotEnabled
+import androidx.compose.ui.test.junit4.v2.createEmptyComposeRule
+import androidx.compose.ui.test.onAllNodesWithText
+import androidx.compose.ui.test.onNodeWithText
+import androidx.core.graphics.createBitmap
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import anki.i18n.PreviewTranslations
+import com.ichi2.anki.CommonString
+import com.ichi2.anki.R
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.utils.ext.getParcelableExtraCompat
+import com.ichi2.anki.multimedia.MultimediaActivity.Companion.EXTRA_MEDIA_OPTIONS
+import com.ichi2.testutils.ShadowFileProviderPathStrategy
+import com.ichi2.testutils.ShadowPreviewTranslations
+import com.ichi2.testutils.launchFragmentInContainer
+import com.ichi2.testutils.parcelledCopy
+import com.ichi2.testutils.saveState
+import com.ichi2.testutils.withFragment
+import kotlinx.coroutines.job
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.not
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.GraphicsMode
+import org.robolectric.shadows.ShadowActivity.IntentForResult
+import java.io.File
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import kotlin.test.assertContentEquals
+
+@RunWith(AndroidJUnit4::class)
+@Config(shadows = [ShadowFileProviderPathStrategy::class, ShadowPreviewTranslations::class])
+class MultimediaImageFragmentExternalEditorTest : RobolectricTest(loadBackend = false) {
+    @get:Rule
+    val composeRule = createEmptyComposeRule()
+
+    private val editedImage = editorResultImageBytes()
+    private lateinit var resultProvider: EditorResultProvider
+
+    @Before
+    fun setUpEditor() {
+        clearFileProviderRoots()
+        resultProvider = EditorResultProvider.register()
+    }
+
+    @Test
+    fun `edit is hidden without a compatible external editor`() =
+        withImageFragment {
+            selectImage()
+            composeRule.onNodeWithText(PreviewTranslations.studyingEdit()).assertDoesNotExist()
+        }
+
+    @Test
+    fun `edit availability follows the selected image type`() {
+        targetContext.registerExternalImageEditor()
+        withImageFragment {
+            assertEditAvailable(false)
+            selectImage()
+            assertEditAvailable(true)
+            selectImage(extension = "svg")
+            assertEditAvailable(false)
+            selectImage()
+            assertEditAvailable(true)
+        }
+    }
+
+    @Test
+    fun `edit availability is refreshed on resume`() {
+        imageScenario().use { scenario ->
+            scenario.withFragment { selectImage() }
+            assertEditAvailable(false)
+            scenario.moveToState(Lifecycle.State.STARTED)
+            val editor = targetContext.registerExternalImageEditor()
+            scenario.moveToState(Lifecycle.State.RESUMED)
+            assertEditAvailable(true)
+            scenario.moveToState(Lifecycle.State.STARTED)
+            targetContext.packageManager.setComponentEnabledSetting(
+                editor,
+                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                PackageManager.DONT_KILL_APP,
+            )
+            scenario.moveToState(Lifecycle.State.RESUMED)
+            assertEditAvailable(false)
+        }
+    }
+
+    @Test
+    @GraphicsMode(GraphicsMode.Mode.NATIVE)
+    fun `a picked image without a filename extension can be edited`() = assertPickedPngCanBeEdited("extensionless")
+
+    @Test
+    @GraphicsMode(GraphicsMode.Mode.NATIVE)
+    fun `a picked image with an unrecognized filename extension can be edited`() = assertPickedPngCanBeEdited("image.bin")
+
+    private fun assertPickedPngCanBeEdited(displayName: String) {
+        targetContext.registerExternalImageEditor()
+        withImageFragment {
+            requireView().id = R.id.root_layout
+            val gallery = shadowOf(requireActivity()).nextStartedActivityForResult.intent
+            val source = File(requireContext().cacheDir, "provider-source.png")
+            source.outputStream().use {
+                createBitmap(1, 1).compress(Bitmap.CompressFormat.PNG, 100, it)
+            }
+            val uri = resultProvider.result(source, displayName)
+            shadowOf(requireActivity()).receiveResult(gallery, Activity.RESULT_OK, Intent().setData(uri))
+            val selected = requireNotNull(viewModel.currentMultimediaPath.value)
+            assertThat(selected.name, equalTo(displayName))
+            assertThat(selected.readBytes().toList(), equalTo(source.readBytes().toList()))
+            assertEditAvailable(true)
+            val edit = launchExternalEditor()
+            assertThat(edit.imageIntent.type, equalTo("image/png"))
+            assertThat(requireContext().contentResolver.getType(edit.imageIntent.data!!), equalTo("image/png"))
+        }
+    }
+
+    @Test
+    fun `cancelling external editing preserves the original image`() =
+        withImageFragment {
+            val original = selectImage()
+            val edit = launchExternalEditor()
+            requireContext().contentResolver.openOutputStream(edit.imageIntent.data!!, "wt")!!.use { it.write(editedImage) }
+            deliverEditorResult(edit, resultCode = Activity.RESULT_CANCELED)
+            advanceRobolectricLooperUntil { !isExternalEditPending }
+            assertThat(viewModel.currentMultimediaPath.value, equalTo(original))
+            assertThat(original.readText(), equalTo("original"))
+        }
+
+    @Test
+    fun `a failed import displays an error and preserves the original`() =
+        withImageFragment {
+            val original = selectImage()
+            val edit = launchExternalEditor()
+            requireContext().contentResolver.openOutputStream(edit.imageIntent.data!!, "wt")!!.close()
+            deliverEditorResult(edit)
+            assertOriginalPreserved(original, CommonString.multimedia_editor_something_wrong)
+        }
+
+    @Test
+    @Config(sdk = [24, 25, 36])
+    fun `external editing accepts an in-place result without result data`() =
+        withImageFragment {
+            val original = selectImage()
+            val edit = launchExternalEditor()
+            requireContext().contentResolver.openOutputStream(edit.imageIntent.data!!, "wt")!!.use { it.write(editedImage) }
+            deliverEditorResult(edit)
+            advanceRobolectricLooperUntil { !isExternalEditPending }
+            assertContentEquals(editedImage, viewModel.currentMultimediaPath.value!!.readBytes())
+            assertThat(viewModel.currentMultimediaPath.value, not(equalTo(original)))
+            assertThat(viewModel.selectedMediaFileSize, equalTo(editedImage.size.toLong()))
+            assertThat(original.readText(), equalTo("original"))
+        }
+
+    @Test
+    @Config(sdk = [24, 25, 36])
+    fun `external editing accepts a new content uri`() =
+        withImageFragment {
+            selectImage()
+            val edit = launchExternalEditor()
+            val result = File(requireContext().cacheDir, "edited.png").apply { writeBytes(editedImage) }
+            val uri = resultProvider.result(result)
+            deliverEditorResult(edit, uri = uri)
+            advanceRobolectricLooperUntil { !isExternalEditPending }
+            assertContentEquals(editedImage, viewModel.currentMultimediaPath.value!!.readBytes())
+            assertThat(viewModel.selectedMediaFileSize, equalTo(result.length()))
+        }
+
+    @Test
+    @Config(sdk = [24, 25, 36])
+    fun `external editing survives fragment recreation`() {
+        imageScenario().use { scenario ->
+            val edit =
+                scenario.withFragment {
+                    selectImage()
+                    launchExternalEditor().also {
+                        requireContext().contentResolver.openOutputStream(it.imageIntent.data!!, "wt")!!.use { output ->
+                            output.write(editedImage)
+                        }
+                    }
+                }
+            scenario.recreate()
+            scenario.withFragment {
+                deliverEditorResult(edit)
+                advanceRobolectricLooperUntil { !isExternalEditPending }
+                assertContentEquals(editedImage, viewModel.currentMultimediaPath.value!!.readBytes())
+            }
+            scenario.recreate()
+            scenario.withFragment {
+                assertContentEquals(editedImage, viewModel.currentMultimediaPath.value!!.readBytes())
+            }
+        }
+    }
+
+    @Test
+    fun `external editing survives destruction of a stopped activity`() {
+        val controller = startImageActivity()
+        val activity = controller.get()
+        val fragment = activity.supportFragmentManager.findFragmentById(R.id.fragment_container) as MultimediaImageFragment
+        val original = fragment.selectImage()
+        val edit = fragment.launchExternalEditor()
+        val model = ViewModelProvider(fragment)[ExternalImageEditorViewModel::class.java]
+        val working = File((model.state.value as ExternalImageEditorViewModel.Edit.Editing).workingPath)
+        val savedState = controller.saveState().parcelledCopy(MultimediaActivity::class.java.classLoader)
+        assertThat(activity.isFinishing, equalTo(false))
+        assertThat(activity.isChangingConfigurations, equalTo(false))
+        controller.destroy()
+        advanceRobolectricLooperUntil { model.viewModelScope.coroutineContext.job.isCompleted }
+
+        // "Don't keep activities" destroys the caller before the external editor finishes.
+        assertThat(working.readText(), equalTo("original"))
+        targetContext.contentResolver.openOutputStream(edit.imageIntent.data!!, "wt")!!.use { it.write(editedImage) }
+        val restored =
+            Robolectric
+                .buildActivity(MultimediaActivity::class.java, activity.intent)
+                .create(savedState)
+                .start()
+                .restoreInstanceState(savedState)
+                .postCreate(savedState)
+                .resume()
+                .visible()
+        saveControllerForCleanup(restored)
+        val restoredFragment = restored.get().supportFragmentManager.findFragmentById(R.id.fragment_container) as MultimediaImageFragment
+        with(restoredFragment) {
+            deliverEditorResult(edit)
+            advanceRobolectricLooperUntil { !isExternalEditPending }
+            assertContentEquals(editedImage, viewModel.currentMultimediaPath.value!!.readBytes())
+            assertThat(viewModel.selectedMediaFileSize, equalTo(editedImage.size.toLong()))
+        }
+        advanceRobolectricLooperUntil { !working.exists() }
+        assertThat(original.readText(), equalTo("original"))
+    }
+
+    @Test
+    fun `finishing the activity releases the external editor working copy`() {
+        val controller = startImageActivity()
+        val fragment = controller.get().supportFragmentManager.findFragmentById(R.id.fragment_container) as MultimediaImageFragment
+        val original = fragment.selectImage()
+        fragment.launchExternalEditor()
+        controller.get().finish()
+        controller.pause().stop().destroy()
+        advanceRobolectricLooperUntil { File(targetContext.cacheDir, "temp-photos").listFiles()!!.isEmpty() }
+        assertThat(original.readText(), equalTo("original"))
+    }
+
+    @Test
+    fun `import continues across recreation while the provider is blocked`() =
+        withBlockedImport { awaitImport, finishImport ->
+            imageScenario().use { scenario ->
+                scenario.withFragment {
+                    selectImage()
+                    val edit = launchExternalEditor()
+                    val result = File(requireContext().cacheDir, "edited.png").apply { writeBytes(editedImage) }
+                    deliverEditorResult(edit, uri = resultProvider.result(result))
+                }
+                awaitImport()
+                scenario.recreate()
+                scenario.withFragment {
+                    assertThat(isExternalEditPending, equalTo(true))
+                    composeRule.onNodeWithText(getString(CommonString.dialog_positive_replace)).assertIsNotEnabled()
+                    composeRule.onNodeWithText(getString(CommonString.crop_button)).assertIsNotEnabled()
+                    onDone() // A pending import must not finish with the original image.
+                }
+                finishImport()
+                scenario.withFragment {
+                    advanceRobolectricLooperUntil { !isExternalEditPending }
+                    assertContentEquals(editedImage, viewModel.currentMultimediaPath.value!!.readBytes())
+                }
+            }
+        }
+
+    @Test
+    fun `closing the screen during import cleans up temporary files`() =
+        withBlockedImport { awaitImport, finishImport ->
+            imageScenario().use { scenario ->
+                scenario.withFragment {
+                    selectImage()
+                    val edit = launchExternalEditor()
+                    val result = File(requireContext().cacheDir, "edited.png").apply { writeBytes(editedImage) }
+                    deliverEditorResult(edit, uri = resultProvider.result(result))
+                }
+                awaitImport()
+                scenario.moveToState(Lifecycle.State.DESTROYED)
+                finishImport()
+                advanceRobolectricLooperUntil {
+                    File(targetContext.cacheDir, "temp-photos").listFiles()!!.isEmpty()
+                }
+                assertThat(File(targetContext.cacheDir, "original.png").readText(), equalTo("original"))
+            }
+        }
+
+    @Test
+    fun `done is disabled during external editing and import across recreation`() =
+        withBlockedImport { awaitImport, finishImport ->
+            val controller = startImageActivity()
+            val fragment = controller.get().supportFragmentManager.findFragmentById(R.id.fragment_container) as MultimediaImageFragment
+            val done = composeRule.onNodeWithText(targetContext.getString(CommonString.multimedia_editor_field_editing_done))
+            done.assertIsEnabled()
+            with(fragment) {
+                selectImage()
+                val edit = launchExternalEditor()
+                done.assertIsNotEnabled()
+                val result = File(requireContext().cacheDir, "edited.png").apply { writeBytes(editedImage) }
+                deliverEditorResult(edit, uri = resultProvider.result(result))
+            }
+            awaitImport()
+            controller.recreate()
+            done.assertIsNotEnabled()
+            finishImport()
+            val restored = controller.get().supportFragmentManager.findFragmentById(R.id.fragment_container) as MultimediaImageFragment
+            advanceRobolectricLooperUntil { !restored.isExternalEditPending }
+            done.assertIsEnabled()
+            with(restored) {
+                val edit = launchExternalEditor()
+                done.assertIsNotEnabled()
+                deliverEditorResult(edit, resultCode = Activity.RESULT_CANCELED)
+                advanceRobolectricLooperUntil { !isExternalEditPending }
+            }
+            done.assertIsEnabled()
+        }
+
+    @Test
+    fun `unchanged in-place result preserves the original without offering selection`() =
+        withImageFragment {
+            val original = selectImage()
+            val edit = launchExternalEditor()
+            deliverEditorResult(edit)
+            assertOriginalPreserved(original)
+        }
+
+    @Test
+    fun `unchanged returned working uri preserves the original without offering selection`() =
+        withImageFragment {
+            val original = selectImage()
+            val edit = launchExternalEditor()
+            deliverEditorResult(edit, uri = edit.imageIntent.data)
+            assertOriginalPreserved(original)
+        }
+
+    private fun MultimediaImageFragment.assertOriginalPreserved(
+        original: File,
+        @StringRes expectedMessage: Int = CommonString.external_image_editor_no_changes,
+    ) {
+        // Running all future looper tasks would dismiss the snackbar before we can inspect it.
+        composeRule.waitUntil(timeoutMillis = 10_000) {
+            shadowOf(Looper.getMainLooper()).idle()
+            !isExternalEditPending
+        }
+        assertThat(viewModel.currentMultimediaPath.value, equalTo(original))
+        assertThat(original.readText(), equalTo("original"))
+        val message = requireActivity().findViewById<TextView>(com.google.android.material.R.id.snackbar_text)
+        assertThat(message.text.toString(), equalTo(getString(expectedMessage)))
+        val action = requireActivity().findViewById<TextView>(com.google.android.material.R.id.snackbar_action)
+        assertThat(action.visibility, equalTo(View.GONE))
+        advanceRobolectricLooperUntil { File(requireContext().cacheDir, "temp-photos").listFiles()!!.isEmpty() }
+    }
+
+    private fun MultimediaImageFragment.selectImage(extension: String = "png"): File {
+        val file = File(requireContext().cacheDir, "original.$extension").apply { writeText("original") }
+        viewModel.updateCurrentMultimediaPath(file)
+        viewModel.updateCurrentMultimediaUri(Uri.fromFile(file))
+        return file
+    }
+
+    private fun MultimediaImageFragment.launchExternalEditor(): IntentForResult {
+        requireView().id = R.id.root_layout
+        val activity = shadowOf(requireActivity())
+        // Discard the gallery request made when the empty fragment starts.
+        while (activity.nextStartedActivityForResult != null) { /* drain */ }
+        advanceRobolectricLooper()
+        requestExternalEdit()
+        var launch: IntentForResult? = null
+        advanceRobolectricLooperUntil {
+            launch = activity.nextStartedActivityForResult
+            launch != null
+        }
+        return requireNotNull(launch).also { assertThat(it.intent.action, equalTo(Intent.ACTION_CHOOSER)) }
+    }
+
+    private val IntentForResult.imageIntent: Intent
+        get() = requireNotNull(intent.getParcelableExtraCompat<Intent>(Intent.EXTRA_INTENT))
+
+    private fun MultimediaImageFragment.deliverEditorResult(
+        edit: IntentForResult,
+        uri: Uri? = null,
+        resultCode: Int = Activity.RESULT_OK,
+    ) {
+        requireActivity().activityResultRegistry.dispatchResult(edit.requestCode, resultCode, uri?.let { Intent().setData(it) })
+    }
+
+    private fun assertEditAvailable(available: Boolean) {
+        val label = PreviewTranslations.studyingEdit()
+        composeRule.waitUntil(timeoutMillis = 10_000) {
+            composeRule.onAllNodesWithText(label).fetchSemanticsNodes().isNotEmpty() == available
+        }
+        val edit = composeRule.onNodeWithText(label)
+        if (available) edit.assertIsEnabled() else edit.assertDoesNotExist()
+    }
+
+    private fun withBlockedImport(block: (awaitImport: () -> Unit, finishImport: () -> Unit) -> Unit) {
+        val entered = CountDownLatch(1)
+        val release = CountDownLatch(1)
+        resultProvider.beforeOpen = {
+            entered.countDown()
+            check(release.await(10, TimeUnit.SECONDS))
+        }
+        try {
+            block(
+                { assertThat("provider was opened on a worker", entered.await(10, TimeUnit.SECONDS), equalTo(true)) },
+                { release.countDown() },
+            )
+        } finally {
+            release.countDown()
+        }
+    }
+
+    private fun imageScenario() =
+        launchFragmentInContainer<MultimediaImageFragment>(
+            Bundle().apply { putSerializable(EXTRA_MEDIA_OPTIONS, MultimediaImageFragment.ImageOptions.GALLERY) },
+        )
+
+    private fun startImageActivity() =
+        startActivityControllerNormallyOpenCollectionWithIntent(
+            MultimediaActivity::class.java,
+            MultimediaActivity.getIntent(
+                targetContext,
+                MultimediaImageFragment::class,
+                mediaOptions = MultimediaImageFragment.ImageOptions.GALLERY,
+            ),
+        )
+
+    private fun withImageFragment(block: MultimediaImageFragment.() -> Unit) = imageScenario().use { it.withFragment(block) }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/MultimediaImageRecreationTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/MultimediaImageRecreationTest.kt
new file mode 100644
index 000000000000..9ff627a33d23
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/MultimediaImageRecreationTest.kt
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.multimedia
+
+import android.graphics.Color
+import android.net.Uri
+import android.text.format.Formatter
+import android.webkit.WebView
+import androidx.compose.ui.test.junit4.v2.createComposeRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.testutils.ShadowFileProviderPathStrategy
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.annotation.Config
+import java.io.File
+import kotlin.test.assertContains
+import kotlin.test.assertContentEquals
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+
+@RunWith(AndroidJUnit4::class)
+@Config(shadows = [ShadowFileProviderPathStrategy::class])
+class MultimediaImageRecreationTest : RobolectricTest(loadBackend = false) {
+    @get:Rule
+    val composeRule = createComposeRule()
+
+    @get:Rule
+    val editor = ImageEditorTestHelper(this, composeRule)
+
+    @Test
+    fun `cropped gallery image survives recreation`() {
+        val original = editor.createImage("original.png", Color.RED)
+        assertCropSurvivesRecreation(editor.contentUri(original))
+    }
+
+    @Test
+    fun `cropped shared image survives recreation`() {
+        val original = editor.createImage("original.png", Color.RED)
+        assertCropSurvivesRecreation(Uri.fromFile(original))
+    }
+
+    @Test
+    fun `replacement image survives recreation`() {
+        editor.open(editor.contentUri(editor.createImage("original.png", Color.RED)))
+        val replacement = editor.createImage("replacement.png", Color.BLUE)
+        editor.replaceWith(replacement)
+
+        assertEditSurvivesRecreation(replacement)
+    }
+
+    private fun assertCropSurvivesRecreation(original: Uri) {
+        editor.open(original)
+        val cropped = editor.createImage("cropped.png", Color.GREEN)
+        editor.cropTo(cropped)
+
+        assertEditSurvivesRecreation(cropped)
+    }
+
+    private fun assertEditSurvivesRecreation(expectedImage: File) {
+        val editedFile = assertNotNull(editor.fragment.viewModel.currentMultimediaPath.value)
+        val expectedUri = editor.contentUri(expectedImage)
+        assertEquals(expectedUri, editor.fragment.viewModel.currentMultimediaUri.value)
+
+        editor.recreate()
+
+        val fragment = editor.fragment
+        assertEquals(editedFile, fragment.viewModel.currentMultimediaPath.value)
+        assertEquals(expectedUri, fragment.viewModel.currentMultimediaUri.value)
+        assertEquals(expectedImage.length(), fragment.viewModel.selectedMediaFileSize)
+        assertEquals(
+            Formatter.formatFileSize(targetContext, expectedImage.length()),
+            fragment.binding.imageFileSize.text
+                .toString(),
+        )
+        val webView = fragment.binding.multimediaWebView.getChildAt(0) as WebView
+        assertContains(shadowOf(webView).lastLoadDataWithBaseURL.data, editedFile.name)
+        assertNull(shadowOf(fragment.requireActivity()).nextStartedActivityForResult)
+
+        val result = editor.finish()
+        assertEquals(editedFile, result)
+        assertContentEquals(expectedImage.readBytes(), result.readBytes())
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/MultimediaInsetsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/MultimediaInsetsTest.kt
index 390286ce85bb..36af924346ec 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/MultimediaInsetsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/MultimediaInsetsTest.kt
@@ -7,13 +7,13 @@ import android.view.View
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.ActivityMultimediaBinding
 import com.ichi2.anki.multimediacard.fields.AudioRecordingField
 import com.ichi2.anki.multimediacard.fields.TextField
 import com.ichi2.anki.multimediacard.impl.MultimediaEditableNote
 import com.ichi2.testutils.dispatchInsets
 import com.ichi2.testutils.grantPermissions
-import com.ichi2.utils.dp
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/MultimediaScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/MultimediaScreenshotTest.kt
index d488f983a6c2..5f21104ef40b 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/MultimediaScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/multimedia/MultimediaScreenshotTest.kt
@@ -11,6 +11,11 @@ import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsEnabled
+import androidx.compose.ui.test.junit4.v2.createEmptyComposeRule
+import androidx.compose.ui.test.onAllNodesWithText
+import androidx.compose.ui.test.onNodeWithText
 import androidx.core.content.FileProvider
 import androidx.core.graphics.createBitmap
 import androidx.core.view.RoundedCornerCompat
@@ -20,9 +25,11 @@ import androidx.core.view.WindowInsetsCompat.Type.displayCutout
 import androidx.core.view.WindowInsetsCompat.Type.navigationBars
 import androidx.core.view.WindowInsetsCompat.Type.statusBars
 import com.google.android.material.snackbar.Snackbar
+import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
 import com.ichi2.anki.ScreenshotTest
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.multimediacard.fields.AudioRecordingField
 import com.ichi2.anki.multimediacard.fields.ImageField
 import com.ichi2.anki.multimediacard.fields.TextField
@@ -30,7 +37,7 @@ import com.ichi2.anki.multimediacard.impl.MultimediaEditableNote
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.testutils.grantPermissions
 import com.ichi2.testutils.insetsOf
-import com.ichi2.utils.dp
+import org.junit.Rule
 import org.junit.Test
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.util.ReflectionHelpers
@@ -46,7 +53,9 @@ import kotlin.test.assertTrue
  * `./gradlew :AnkiDroid:verifyRoborazziPlayDebug -Pscreenshot --tests "com.ichi2.anki.multimedia.MultimediaScreenshotTest"`
  */
 class MultimediaScreenshotTest : ScreenshotTest() {
-    /** Captures the existing image controls as a baseline for their Compose migration. */
+    @get:Rule
+    val composeRule = createEmptyComposeRule()
+
     @Test
     fun imageEditorToolbar() =
         withImage { activity ->
@@ -96,6 +105,7 @@ class MultimediaScreenshotTest : ScreenshotTest() {
     ) {
         // Each Robolectric test has its own cache directory; discard AndroidX's cached roots.
         ReflectionHelpers.getStaticField<MutableMap<String, Any>>(FileProvider::class.java, "sCache").clear()
+        targetContext.registerExternalImageEditor()
         val image = File(targetContext.cacheDir, "image_editor_test.png")
         val bitmap = createBitmap(600, 400)
         bitmap.eraseColor(Color.rgb(100, 149, 237))
@@ -115,6 +125,11 @@ class MultimediaScreenshotTest : ScreenshotTest() {
                 MultimediaImageFragment.getIntent(targetContext, extra, imageOptions),
             )
         advanceRobolectricLooper()
+        val editLabel = TR.studyingEdit()
+        composeRule.waitUntil(timeoutMillis = 10_000) {
+            composeRule.onAllNodesWithText(editLabel).fetchSemanticsNodes().isNotEmpty()
+        }
+        composeRule.onNodeWithText(editLabel).assertIsDisplayed().assertIsEnabled()
         block(activity)
     }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/multiprofile/ProfileIdTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/multiprofile/ProfileIdTest.kt
index ba1a7974bb94..0fb8f1dd1c3f 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/multiprofile/ProfileIdTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/multiprofile/ProfileIdTest.kt
@@ -16,7 +16,7 @@ class ProfileIdTest {
     }
 
     @Test
-    fun `generate creates unique IDs using the purely random portion of a UUID`() {
+    fun `generate uses the purely random portion of a UUID`() {
         val iterations = 1000
         val generatedIds = List(iterations) { ProfileId.generate().value }
 
@@ -25,9 +25,6 @@ class ProfileIdTest {
             assertEquals("ID length should be 10 (p_ + 8 hex chars)", 10, id.length)
         }
 
-        val uniqueIds = generatedIds.toSet()
-        assertEquals("All $iterations generated IDs should be unique", iterations, uniqueIds.size)
-
         val prefixLength = 2
         val hexLength = 8
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/multiprofile/ProfileManagerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/multiprofile/ProfileManagerTest.kt
index 0bfb264d80c9..ca161146afa1 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/multiprofile/ProfileManagerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/multiprofile/ProfileManagerTest.kt
@@ -7,6 +7,7 @@ import android.content.Context
 import android.content.ContextWrapper
 import android.content.SharedPreferences
 import android.os.Build
+import android.os.Environment
 import android.webkit.CookieManager
 import android.webkit.ValueCallback
 import android.webkit.WebView
@@ -15,8 +16,8 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.common.storage.CollectionHelper.PREF_COLLECTION_PATH
-import com.ichi2.anki.multiprofile.ProfileManager.Companion.KEY_LAST_ACTIVE_PROFILE_ID
-import com.ichi2.anki.multiprofile.ProfileManager.Companion.KEY_WEBVIEW_PROFILE_ID
+import com.ichi2.anki.multiprofile.ProfileManager.Companion.PREF_LAST_ACTIVE_PROFILE_ID
+import com.ichi2.anki.multiprofile.ProfileManager.Companion.PREF_WEBVIEW_PROFILE_ID
 import com.ichi2.anki.multiprofile.ProfileManager.Companion.PROFILE_REGISTRY_FILENAME
 import io.mockk.every
 import io.mockk.just
@@ -34,7 +35,10 @@ import org.junit.Test
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
+import org.robolectric.shadows.ShadowEnvironment
+import timber.log.Timber
 import java.io.File
+import java.util.UUID
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 
@@ -62,7 +66,7 @@ class ProfileManagerTest {
     fun `initialize sets up Default profile if none exists`() {
         ProfileManager.create(context)
 
-        assertEquals("default", prefs.getString(KEY_LAST_ACTIVE_PROFILE_ID, null))
+        assertEquals("default", prefs.getString(PREF_LAST_ACTIVE_PROFILE_ID, null))
     }
 
     @Test
@@ -78,7 +82,7 @@ class ProfileManagerTest {
     fun `createOrNull initializes the Default profile on first run`() {
         ProfileManager.createOrNull(context)
 
-        assertEquals("default", prefs.getString(KEY_LAST_ACTIVE_PROFILE_ID, null))
+        assertEquals("default", prefs.getString(PREF_LAST_ACTIVE_PROFILE_ID, null))
     }
 
     @Test
@@ -108,7 +112,7 @@ class ProfileManagerTest {
 
         val manager = ProfileManager.create(duringAttachBaseContext)
 
-        assertEquals("default", prefs.getString(KEY_LAST_ACTIVE_PROFILE_ID, null))
+        assertEquals("default", prefs.getString(PREF_LAST_ACTIVE_PROFILE_ID, null))
         assertEquals(context.filesDir.absolutePath, manager.activeProfileContext.filesDir.absolutePath)
     }
 
@@ -118,7 +122,7 @@ class ProfileManagerTest {
 
         val manager = ProfileManager.create(context)
 
-        assertEquals("default", prefs.getString(KEY_LAST_ACTIVE_PROFILE_ID, null))
+        assertEquals("default", prefs.getString(PREF_LAST_ACTIVE_PROFILE_ID, null))
 
         val activeContext = manager.activeProfileContext as ProfileContextWrapper
         val currentFile = File(activeContext.filesDir, "old_user_data.txt")
@@ -133,7 +137,7 @@ class ProfileManagerTest {
         val aliceId = "p_alice"
 
         prefs.edit(commit = true) {
-            putString(KEY_LAST_ACTIVE_PROFILE_ID, aliceId)
+            putString(PREF_LAST_ACTIVE_PROFILE_ID, aliceId)
             putString(aliceId, "Alice")
         }
 
@@ -147,7 +151,7 @@ class ProfileManagerTest {
     @Config(minSdk = Build.VERSION_CODES.P)
     fun `New profile sets WebView directory suffix (API 28+)`() {
         val newId = "p_webview_test"
-        prefs.edit(commit = true) { putString(KEY_LAST_ACTIVE_PROFILE_ID, newId) }
+        prefs.edit(commit = true) { putString(PREF_LAST_ACTIVE_PROFILE_ID, newId) }
 
         mockkStatic(WebView::class)
         every { WebView.setDataDirectorySuffix(any()) } just runs
@@ -172,7 +176,7 @@ class ProfileManagerTest {
     @Config(minSdk = Build.VERSION_CODES.P)
     fun `Swallows exception if WebView is already initialized`() {
         val newId = "p_error_test"
-        prefs.edit(commit = true) { putString(KEY_LAST_ACTIVE_PROFILE_ID, newId) }
+        prefs.edit(commit = true) { putString(PREF_LAST_ACTIVE_PROFILE_ID, newId) }
 
         mockkStatic(WebView::class)
         every { WebView.setDataDirectorySuffix(any()) } throws IllegalStateException("Already initialized")
@@ -190,20 +194,20 @@ class ProfileManagerTest {
     @Config(sdk = [Build.VERSION_CODES.O_MR1])
     fun `Legacy device keeps cookies on first run as the WebView data is already Default's (Pre-API 28)`() {
         val cookieManager = mockCookieManager()
-        assertNull(prefs.getString(KEY_WEBVIEW_PROFILE_ID, null), "no WebView owner is recorded before the first run")
+        assertNull(prefs.getString(PREF_WEBVIEW_PROFILE_ID, null), "no WebView owner is recorded before the first run")
 
         ProfileManager.create(context)
 
         verify(exactly = 0) { cookieManager.removeAllCookies(any()) }
         verify(exactly = 0) { CookieManager.getInstance() }
-        assertEquals(ProfileId.DEFAULT.value, prefs.getString(KEY_WEBVIEW_PROFILE_ID, null))
+        assertEquals(ProfileId.DEFAULT.value, prefs.getString(PREF_WEBVIEW_PROFILE_ID, null))
     }
 
     @Test
     @Config(sdk = [Build.VERSION_CODES.O_MR1])
     fun `Legacy device does not clear cookies for the same profile repeatedly (Pre-API 28)`() {
         val cookieManager = mockCookieManager()
-        prefs.edit(commit = true) { putString(KEY_LAST_ACTIVE_PROFILE_ID, "p_bob") }
+        prefs.edit(commit = true) { putString(PREF_LAST_ACTIVE_PROFILE_ID, "p_bob") }
 
         // the first launch clears the cookies as p_bob takes ownership of the WebView data
         ProfileManager.create(context)
@@ -212,7 +216,7 @@ class ProfileManagerTest {
 
         verify(exactly = 1) { cookieManager.removeAllCookies(any()) }
         verify(exactly = 1) { cookieManager.flush() }
-        assertEquals("p_bob", prefs.getString(KEY_WEBVIEW_PROFILE_ID, null))
+        assertEquals("p_bob", prefs.getString(PREF_WEBVIEW_PROFILE_ID, null))
     }
 
     @Test
@@ -221,11 +225,11 @@ class ProfileManagerTest {
         val cookieManager = mockCookieManager()
 
         ProfileManager.create(context)
-        prefs.edit(commit = true) { putString(KEY_LAST_ACTIVE_PROFILE_ID, "p_bob") }
+        prefs.edit(commit = true) { putString(PREF_LAST_ACTIVE_PROFILE_ID, "p_bob") }
         ProfileManager.create(context)
 
         verify(exactly = 1) { cookieManager.removeAllCookies(any()) }
-        assertEquals("p_bob", prefs.getString(KEY_WEBVIEW_PROFILE_ID, null))
+        assertEquals("p_bob", prefs.getString(PREF_WEBVIEW_PROFILE_ID, null))
     }
 
     @Test
@@ -234,25 +238,25 @@ class ProfileManagerTest {
         val cookieManager = mockCookieManager()
         val manager = ProfileManager.create(context)
         manager.createNewProfile(ProfileName.fromTrustedSource("Bob"))
-        prefs.edit(commit = true) { remove(KEY_WEBVIEW_PROFILE_ID) }
+        prefs.edit(commit = true) { remove(PREF_WEBVIEW_PROFILE_ID) }
 
         ProfileManager.create(context)
 
         verify(exactly = 1) { cookieManager.removeAllCookies(any()) }
-        assertEquals(ProfileId.DEFAULT.value, prefs.getString(KEY_WEBVIEW_PROFILE_ID, null))
+        assertEquals(ProfileId.DEFAULT.value, prefs.getString(PREF_WEBVIEW_PROFILE_ID, null))
     }
 
     @Test
     @Config(sdk = [Build.VERSION_CODES.O_MR1])
     fun `Legacy device clears cookies again if the removal never completed (Pre-API 28)`() {
         val cookieManager = mockCookieManager(completesRemoval = false)
-        prefs.edit(commit = true) { putString(KEY_LAST_ACTIVE_PROFILE_ID, "p_bob") }
+        prefs.edit(commit = true) { putString(PREF_LAST_ACTIVE_PROFILE_ID, "p_bob") }
 
         ProfileManager.create(context)
         ProfileManager.create(context)
 
         verify(exactly = 2) { cookieManager.removeAllCookies(any()) }
-        assertNull(prefs.getString(KEY_WEBVIEW_PROFILE_ID, null))
+        assertNull(prefs.getString(PREF_WEBVIEW_PROFILE_ID, null))
     }
 
     @Test
@@ -263,11 +267,11 @@ class ProfileManagerTest {
                 .ProfileMetadata(displayName = ProfileName.fromTrustedSource("Not a profile"))
                 .toJson()
 
-        prefs.edit(commit = true) { putString(KEY_WEBVIEW_PROFILE_ID, metadataJson) }
+        prefs.edit(commit = true) { putString(PREF_WEBVIEW_PROFILE_ID, metadataJson) }
 
         assertFalse(
             "Bookkeeping keys must never surface as profiles",
-            manager.getAllProfiles().containsKey(ProfileId(KEY_WEBVIEW_PROFILE_ID)),
+            manager.getAllProfiles().containsKey(ProfileId(PREF_WEBVIEW_PROFILE_ID)),
         )
     }
 
@@ -340,6 +344,45 @@ class ProfileManagerTest {
         assertTrue(allProfiles.containsKey(ProfileId.DEFAULT))
     }
 
+    @Test
+    fun `a new profile ID that matches an existing profile is generated again`() {
+        val manager = ProfileManager.create(context)
+        mockkStatic(UUID::class)
+        every { UUID.randomUUID() } returnsMany
+            listOf(
+                UUID.fromString("aaaaaaaa-0000-4000-8000-000000000000"),
+                UUID.fromString("aaaaaaaa-1111-4111-8111-111111111111"),
+                UUID.fromString("bbbbbbbb-0000-4000-8000-000000000000"),
+            )
+
+        val first = manager.createNewProfile(ProfileName.fromTrustedSource("Work"))
+        val second = manager.createNewProfile(ProfileName.fromTrustedSource("Personal"))
+
+        assertEquals(ProfileId("p_aaaaaaaa"), first)
+        assertEquals(ProfileId("p_bbbbbbbb"), second)
+    }
+
+    @Test
+    fun `createNewProfile rejects a name already in use, ignoring case`() {
+        val manager = ProfileManager.create(context)
+        manager.createNewProfile(ProfileName.fromTrustedSource("Work"))
+
+        assertThrows(IllegalArgumentException::class.java) {
+            manager.createNewProfile(ProfileName.fromTrustedSource("work"))
+        }
+        assertEquals(2, manager.getAllProfiles().size)
+    }
+
+    @Test
+    fun `createNewProfile does not log the profile name`() {
+        val manager = ProfileManager.create(context)
+
+        val logs = captureLogs { manager.createNewProfile(ProfileName.fromTrustedSource("Alice")) }
+
+        assertTrue("Expected createNewProfile to log", logs.isNotEmpty())
+        assertFalse("Profile name was logged: $logs", logs.any { it.contains("Alice") })
+    }
+
     @Test
     fun `renameProfile updates displayName in registry`() {
         val manager = ProfileManager.create(context)
@@ -400,6 +443,22 @@ class ProfileManagerTest {
         assertTrue("deckPath directory must exist after profile load", File(deckPath).isDirectory)
     }
 
+    @Test
+    fun `loading a non-default profile keeps deckPath in app storage when Default uses legacy storage`() {
+        ShadowEnvironment.setIsExternalStorageLegacy(true)
+        context.sharedPrefs().edit(commit = true) {
+            putString(PREF_COLLECTION_PATH, File(Environment.getExternalStorageDirectory(), "AnkiDroid").absolutePath)
+        }
+        val manager = ProfileManager.create(context)
+        val ashishId = manager.createNewProfile(ProfileName.fromTrustedSource("Ashish"))
+        with(ProfileManager.ProfileSwitchContext) { manager.switchActiveProfile(ashishId) }
+
+        val reloaded = ProfileManager.create(context)
+        val deckPath = reloaded.activeProfileContext.sharedPrefs().getString(PREF_COLLECTION_PATH, null)
+
+        assertEquals(File(context.getExternalFilesDir(null), ashishId.value).absolutePath, deckPath)
+    }
+
     @Test
     fun `renameProfile does not write to disk if name is identical`() {
         val manager = ProfileManager.create(context)
@@ -427,6 +486,28 @@ class ProfileManagerTest {
         assertTrue(exception.message!!.contains("not found"))
     }
 
+    @Test
+    fun `renameProfile rejects a name used by another profile, ignoring case`() {
+        val manager = ProfileManager.create(context)
+        manager.createNewProfile(ProfileName.fromTrustedSource("Work"))
+        val home = manager.createNewProfile(ProfileName.fromTrustedSource("Home"))
+
+        assertThrows(IllegalArgumentException::class.java) {
+            manager.renameProfile(home, ProfileName.fromTrustedSource("work"))
+        }
+        assertEquals("Home", manager.getAllProfiles()[home]?.displayName?.value)
+    }
+
+    @Test
+    fun `renameProfile can change the case of the profile's own name`() {
+        val manager = ProfileManager.create(context)
+        val work = manager.createNewProfile(ProfileName.fromTrustedSource("work"))
+
+        manager.renameProfile(work, ProfileName.fromTrustedSource("Work"))
+
+        assertEquals("Work", manager.getAllProfiles()[work]?.displayName?.value)
+    }
+
     @Test
     fun `reloading an existing profile does not overwrite a pre-existing deckPath`() {
         val manager = ProfileManager.create(context)
@@ -484,7 +565,7 @@ class ProfileManagerTest {
         val other = manager.createNewProfile(ProfileName.fromTrustedSource("Other"))
 
         prefs.edit(commit = true) {
-            putString(KEY_LAST_ACTIVE_PROFILE_ID, other.value)
+            putString(PREF_LAST_ACTIVE_PROFILE_ID, other.value)
         }
 
         val freshManager = ProfileManager.create(context)
@@ -499,7 +580,7 @@ class ProfileManagerTest {
         val profileId = manager.createNewProfile(ProfileName.fromTrustedSource("Active"))
 
         prefs.edit(commit = true) {
-            putString(KEY_LAST_ACTIVE_PROFILE_ID, profileId.value)
+            putString(PREF_LAST_ACTIVE_PROFILE_ID, profileId.value)
         }
 
         val freshManager = ProfileManager.create(context)
@@ -713,4 +794,26 @@ class ProfileManagerTest {
             .getSharedPreferences(prefsName, Context.MODE_PRIVATE)
             .edit(commit = true) { putString(PREF_COLLECTION_PATH, dir.absolutePath) }
     }
+
+    private fun captureLogs(block: () -> Unit): List<String> {
+        val messages = mutableListOf<String>()
+        val tree =
+            object : Timber.Tree() {
+                override fun log(
+                    priority: Int,
+                    tag: String?,
+                    message: String,
+                    t: Throwable?,
+                ) {
+                    messages += message
+                }
+            }
+        Timber.plant(tree)
+        try {
+            block()
+        } finally {
+            Timber.uproot(tree)
+        }
+        return messages
+    }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/multiprofile/ProfileNameTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/multiprofile/ProfileNameTest.kt
index fd22c21640fb..553b75168cd5 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/multiprofile/ProfileNameTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/multiprofile/ProfileNameTest.kt
@@ -128,4 +128,9 @@ class ProfileNameTest {
         val untouched = "  weird!! value  "
         assertEquals(untouched, ProfileName.fromTrustedSource(untouched).value)
     }
+
+    @Test
+    fun `existsIn ignores the case of non-ASCII letters, unlike Anki Desktop`() {
+        assertTrue(ProfileName.fromTrustedSource("Ä").existsIn(listOf("ä")))
+    }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/noteeditor/AudioRecordingViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/noteeditor/AudioRecordingViewModelTest.kt
index dc53d9d81a56..ad48c5a5e461 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/noteeditor/AudioRecordingViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/noteeditor/AudioRecordingViewModelTest.kt
@@ -3,6 +3,7 @@
 
 package com.ichi2.anki.noteeditor
 
+import android.content.Context
 import android.net.Uri
 import androidx.lifecycle.ViewModelStore
 import androidx.media3.common.MediaItem
@@ -14,10 +15,12 @@ import com.ichi2.anki.recorder.MediaRecorderStub
 import com.ichi2.anki.recorder.PlayerState
 import com.ichi2.anki.recorder.PlayerStub
 import com.ichi2.anki.recorder.RecorderState
-import com.ichi2.testutils.JvmTest
+import com.ichi2.anki.recorder.VoiceRecorder
+import com.ichi2.testutils.rules.MainDispatcherRule
 import io.mockk.every
 import io.mockk.verify
 import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runTest
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -34,7 +37,10 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
 @RunWith(AndroidJUnit4::class)
-class AudioRecordingViewModelTest : JvmTest() {
+class AudioRecordingViewModelTest {
+    @get:Rule
+    val mainDispatcherRule = MainDispatcherRule()
+
     @get:Rule
     val recordingsFolder = TemporaryFolder()
 
@@ -333,6 +339,22 @@ class AudioRecordingViewModelTest : JvmTest() {
             assertEquals(RecorderState.Recorded(recording), viewModel.recorderState.value, "the recording can still be inserted")
         }
 
+    @Test
+    fun `recordings are stored outside the cache`() =
+        runTest {
+            val context = ApplicationProvider.getApplicationContext<Context>()
+            val viewModel =
+                AudioRecordingViewModel(AudioRecorder(context), playerStub.factory)
+                    .also { viewModelStore.put(VIEW_MODEL_KEY, it) }
+            try {
+                val recording = viewModel.record()
+
+                assertEquals(File(context.noBackupFilesDir, VoiceRecorder.RECORDINGS_DIRECTORY), recording.parentFile)
+            } finally {
+                viewModelStore.clear()
+            }
+        }
+
     private fun runViewModelTest(testBody: suspend TestScope.(AudioRecordingViewModel) -> Unit) =
         runTest {
             val viewModel =
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/noteeditor/NoteEditorMultimediaControllerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/noteeditor/NoteEditorMultimediaControllerTest.kt
index d867beaf7c11..21b09bc0149c 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/noteeditor/NoteEditorMultimediaControllerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/noteeditor/NoteEditorMultimediaControllerTest.kt
@@ -3,11 +3,19 @@
 
 package com.ichi2.anki.noteeditor
 
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
+import android.provider.MediaStore
+import androidx.core.net.toUri
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.NoteEditorActivity
 import com.ichi2.anki.NoteEditorFragment
 import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.destinations.NoteEditorDestination
 import com.ichi2.anki.compat.CompatHelper.Companion.getSerializableCompat
+import com.ichi2.anki.multimedia.MultimediaActivity
 import com.ichi2.anki.multimedia.MultimediaArgsStorage
 import com.ichi2.anki.multimedia.MultimediaBottomSheet
 import com.ichi2.anki.multimedia.MultimediaResult
@@ -21,6 +29,7 @@ import kotlinx.coroutines.test.advanceUntilIdle
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.notNullValue
+import org.hamcrest.Matchers.nullValue
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.Shadows.shadowOf
@@ -30,6 +39,84 @@ import java.io.IOException
 
 @RunWith(AndroidJUnit4::class)
 class NoteEditorMultimediaControllerTest : RobolectricTest() {
+    @Test
+    fun `cancelling gallery returns directly to the unchanged note editor`() {
+        val noteEditor = openNoteEditor()
+        val field = noteEditor.getFieldForTest(1)
+        field.setText("back")
+        field.requestFocus()
+        field.setSelection(1, 3)
+        selectGallery(noteEditor, 1)
+        val activity = shadowOf(noteEditor.requireActivity())
+        val picker = activity.nextStartedActivityForResult.intent
+
+        assertThat(picker.action, equalTo(Intent.ACTION_PICK))
+        assertThat(picker.data, equalTo(MediaStore.Images.Media.EXTERNAL_CONTENT_URI))
+        assertThat("no intermediate editor", picker.component, nullValue())
+        activity.receiveResult(picker, Activity.RESULT_CANCELED, null)
+        advanceRobolectricLooper()
+
+        assertThat(activity.nextStartedActivityForResult, nullValue())
+        assertThat(noteEditor.requireActivity().isFinishing, equalTo(false))
+        assertThat(field.text.toString(), equalTo("back"))
+        assertThat(field.selectionStart, equalTo(1))
+        assertThat(field.selectionEnd, equalTo(3))
+
+        selectGallery(noteEditor, 1)
+        assertThat(activity.nextStartedActivityForResult.intent.action, equalTo(Intent.ACTION_PICK))
+    }
+
+    @Test
+    fun `gallery selection opens the image editor for the selected field with read access`() {
+        val noteEditor = openNoteEditor()
+        noteEditor.setField(0, "front")
+        noteEditor.setField(1, "back")
+        selectGallery(noteEditor, 1)
+        val activity = shadowOf(noteEditor.requireActivity())
+        val picker = activity.nextStartedActivityForResult.intent
+        val imageUri = "content://media/external/images/media/1".toUri()
+
+        activity.receiveResult(picker, Activity.RESULT_OK, Intent().setData(imageUri))
+        advanceRobolectricLooper()
+
+        assertGalleryEditor(activity.nextStartedActivityForResult.intent, imageUri, 1)
+        assertThat(noteEditor.editFieldAt(0)!!.text.toString(), equalTo("front"))
+        assertThat(noteEditor.editFieldAt(1)!!.text.toString(), equalTo("back"))
+    }
+
+    @Test
+    fun `gallery result retains its target field after note editor recreation`() {
+        ensureCollectionLoadIsSynchronous()
+        val controller =
+            startActivityControllerNormallyOpenCollectionWithIntent(
+                NoteEditorActivity::class.java,
+                NoteEditorDestination.PassArguments(NoteEditorFragment.addNoteArgs()).toIntent(targetContext),
+            )
+        selectGallery(controller.get().getNoteEditorFragment(), 1)
+        val picker = shadowOf(controller.get()).nextStartedActivityForResult
+
+        controller.recreate()
+        advanceRobolectricLooper()
+        val imageUri = "content://media/external/images/media/2".toUri()
+        controller.get().activityResultRegistry.dispatchResult(picker.requestCode, Activity.RESULT_OK, Intent().setData(imageUri))
+        advanceRobolectricLooper()
+
+        assertGalleryEditor(shadowOf(controller.get()).nextStartedActivityForResult.intent, imageUri, 1)
+    }
+
+    @Test
+    fun `gallery file uri result cannot open the image editor`() {
+        val noteEditor = openNoteEditor()
+        selectGallery(noteEditor, 0)
+        val activity = shadowOf(noteEditor.requireActivity())
+        val picker = activity.nextStartedActivityForResult.intent
+
+        activity.receiveResult(picker, Activity.RESULT_OK, Intent().setData(Uri.fromFile(File("/private/image.png"))))
+        advanceRobolectricLooper()
+
+        assertThat(activity.nextStartedActivityForResult, nullValue())
+    }
+
     @Test
     fun `controller is reachable from the hosted fragment`() {
         val noteEditor = openNoteEditor()
@@ -129,6 +216,30 @@ class NoteEditorMultimediaControllerTest : RobolectricTest() {
             assertThat(editText.selectionEnd, equalTo(5))
         }
 
+    private fun selectGallery(
+        noteEditor: NoteEditorFragment,
+        fieldIndex: Int,
+    ) {
+        noteEditor.multimediaController.handleActions(fieldIndex)
+        advanceRobolectricLooper()
+        noteEditor.multimediaViewModel.setMultimediaAction(MultimediaBottomSheet.MultimediaAction.SELECT_IMAGE_FILE)
+        advanceRobolectricLooper()
+    }
+
+    private fun assertGalleryEditor(
+        intent: Intent,
+        imageUri: Uri,
+        fieldIndex: Int,
+    ) {
+        assertThat(intent.component!!.className, equalTo(MultimediaActivity::class.java.name))
+        assertThat(intent.data, equalTo(imageUri))
+        assertThat(intent.flags and Intent.FLAG_GRANT_READ_URI_PERMISSION, equalTo(Intent.FLAG_GRANT_READ_URI_PERMISSION))
+        val argsFile = intent.extras!!.getSerializableCompat<File>(MultimediaActivity.EXTRA_FRAGMENT_ARGS)!!
+        val args = MultimediaArgsStorage.create(targetContext).read(argsFile)
+        assertThat(args.index, equalTo(fieldIndex))
+        assertThat(args.imageUri, equalTo(imageUri.toString()))
+    }
+
     private fun openNoteEditor(): NoteEditorFragment {
         ensureCollectionLoadIsSynchronous()
         return openNoteEditorWithArgs(NoteEditorFragment.addNoteArgs())
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/noteeditor/NoteEditorToolbarTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/noteeditor/NoteEditorToolbarTest.kt
new file mode 100644
index 000000000000..c20eb9ec81bb
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/noteeditor/NoteEditorToolbarTest.kt
@@ -0,0 +1,111 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.noteeditor
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
+import androidx.core.content.edit
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.NoteEditorActivity
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.destinations.NoteEditorDestination
+import com.ichi2.anki.common.destinations.toIntent
+import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.anki.databinding.DialogNoteEditorToolbarEditCustomItemBinding
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.annotation.GraphicsMode
+import org.robolectric.shadows.ShadowDialog
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+@RunWith(AndroidJUnit4::class)
+@GraphicsMode(GraphicsMode.Mode.NATIVE)
+class NoteEditorToolbarTest : RobolectricTest() {
+    @Test
+    fun `clearing the text before the cursor saves a button that inserts after the cursor`() {
+        checkEditedButton(prefix = "", suffix = "<br>", expectedCursor = 0)
+    }
+
+    @Test
+    fun `clearing the text after the cursor saves a button that inserts before the cursor`() {
+        checkEditedButton(prefix = "<br>", suffix = "", expectedCursor = 4)
+    }
+
+    @Test
+    fun `editing requires text on at least one side of the cursor`() {
+        val toolbar = createToolbar()
+        toolbar.findViewWithTag<View>("1").performLongClick()
+        val dialog = ShadowDialog.getLatestDialog() as AlertDialog
+        val binding = dialog.binding
+        val before = binding.noteEditorToolbarBefore
+        val after = binding.noteEditorToolbarAfter
+        val save = dialog.getButton(AlertDialog.BUTTON_POSITIVE)
+
+        assertTrue(save.isEnabled)
+        before.setText("")
+        assertTrue(save.isEnabled)
+        after.setText("")
+        assertFalse(save.isEnabled, "Both fields empty must disable Save")
+
+        after.setText("<br>")
+        assertTrue(save.isEnabled)
+        after.setText(" ")
+        assertFalse(save.isEnabled, "Whitespace alone must not enable Save")
+        before.setText("<br>")
+        assertTrue(save.isEnabled)
+        dialog.dismiss()
+    }
+
+    private fun checkEditedButton(
+        prefix: String,
+        suffix: String,
+        expectedCursor: Int,
+    ) {
+        val toolbar = createToolbar()
+        toolbar.findViewWithTag<View>("1").performLongClick()
+        val dialog = ShadowDialog.getLatestDialog() as AlertDialog
+        val binding = dialog.binding
+        binding.noteEditorToolbarBefore.setText(prefix)
+        binding.noteEditorToolbarAfter.setText(suffix)
+        clickAlertDialogButton { getButton(AlertDialog.BUTTON_POSITIVE) }
+
+        var formatted: Toolbar.StringFormat? = null
+        toolbar.formatListener = Toolbar.TextFormatListener { formatted = it.format("") }
+        toolbar.findViewWithTag<View>("1").performClick()
+        val result = assertNotNull(formatted)
+        assertEquals("<br>", result.result)
+        assertEquals(expectedCursor, result.selectionStart)
+        assertEquals(expectedCursor, result.selectionEnd)
+
+        // Reopening reads the saved button from preferences.
+        toolbar.findViewWithTag<View>("1").performLongClick()
+        val reopened = ShadowDialog.getLatestDialog() as AlertDialog
+        val reopenedBinding = reopened.binding
+        assertEquals(prefix, reopenedBinding.noteEditorToolbarBefore.text.toString())
+        assertEquals(suffix, reopenedBinding.noteEditorToolbarAfter.text.toString())
+        reopened.dismiss()
+    }
+
+    private fun createToolbar(): Toolbar {
+        // Start with both fields populated so saving must clear an existing value.
+        targetContext.sharedPrefs().edit {
+            putStringSet(
+                "note_editor_custom_buttons",
+                CustomToolbarButton.toStringSet(arrayListOf(CustomToolbarButton(0, "BR", "<b>", "</b>"))),
+            )
+        }
+        val editor =
+            startRegularActivity<NoteEditorActivity>(NoteEditorDestination.AddNote().toIntent()).getNoteEditorFragment()
+        return editor.binding.editorToolbar
+    }
+
+    private val AlertDialog.binding: DialogNoteEditorToolbarEditCustomItemBinding
+        get() {
+            val customPanel = assertNotNull(findViewById<ViewGroup>(androidx.appcompat.R.id.custom))
+            return DialogNoteEditorToolbarEditCustomItemBinding.bind(customPanel.getChildAt(0))
+        }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialogThemeScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialogThemeScreenshotTest.kt
new file mode 100644
index 000000000000..9b8016d2acfb
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialogThemeScreenshotTest.kt
@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.noteeditor
+
+import android.content.Context
+import androidx.compose.ui.platform.ViewRootForTest
+import androidx.compose.ui.semantics.SemanticsActions
+import androidx.compose.ui.test.assertIsFocused
+import androidx.compose.ui.test.isDialog
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performSemanticsAction
+import androidx.test.core.app.ApplicationProvider
+import com.google.testing.junit.testparameterinjector.TestParameter
+import com.ichi2.anki.ComposeScreenshotTest
+import com.ichi2.anki.noteeditor.presentation.ToolbarLayoutMode
+import com.ichi2.anki.settings.enums.DayTheme
+import com.ichi2.anki.settings.enums.Theme
+import org.junit.Test
+import org.robolectric.annotation.Config
+
+/**
+ * Covers selection and keyboard focus with every theme, plus vertical layout and large text once.
+ *
+ * Record: `./gradlew :AnkiDroid:recordRoborazziPlayDebug -Pscreenshot --tests '*.ToolbarLayoutDialogThemeScreenshotTest'`
+ * Verify: `./gradlew :AnkiDroid:verifyRoborazziPlayDebug -Pscreenshot --tests '*.ToolbarLayoutDialogThemeScreenshotTest'`
+ */
+class ToolbarLayoutDialogThemeScreenshotTest : ComposeScreenshotTest() {
+    @Test
+    fun scrollWithStackFocused(
+        @TestParameter(valuesProvider = ThemeProvider::class) theme: Theme,
+    ) = captureLayout("scroll_stack_focused", ToolbarLayoutMode.SCROLL, focused = ToolbarLayoutMode.STACK, theme = theme)
+
+    @Test
+    @Config(qualifiers = "w300dp-h640dp-mdpi")
+    fun vertical() = captureLayout("stack_vertical", ToolbarLayoutMode.STACK)
+
+    @Test
+    @Config(qualifiers = "w320dp-h640dp-mdpi")
+    fun hiddenLargeText() = captureLayout("hidden_large_text", ToolbarLayoutMode.HIDDEN, fontScale = 2f)
+
+    private fun captureLayout(
+        name: String,
+        selected: ToolbarLayoutMode,
+        fontScale: Float = 1f,
+        focused: ToolbarLayoutMode? = null,
+        theme: Theme = DayTheme.LIGHT,
+    ) {
+        capture(
+            name,
+            node = isDialog(),
+            fontScale = fontScale,
+            theme = theme,
+            beforeCapture = {
+                if (focused != null) {
+                    val label = ApplicationProvider.getApplicationContext<Context>().getString(focused.label())
+                    val choice = composeRule.onNodeWithText(label)
+                    val view = (choice.fetchSemanticsNode().root as ViewRootForTest).view
+                    // Switch the dialog's own Compose root to keyboard mode.
+                    composeRule.runOnIdle { view.requestFocusFromTouch() }
+                    choice.performSemanticsAction(SemanticsActions.RequestFocus) { it() }
+                    choice.assertIsFocused()
+                    composeRule.mainClock.advanceTimeBy(200)
+                }
+            },
+        ) {
+            ToolbarLayoutDialog(
+                selected = selected,
+                onSelect = {},
+                onDismiss = {},
+                showSelectionBackground = theme != DayTheme.EINK,
+            )
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/notetype/ManageNoteTypesViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/notetype/ManageNoteTypesViewModelTest.kt
index 4a13001ba6b5..19817b6ec2de 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/notetype/ManageNoteTypesViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/notetype/ManageNoteTypesViewModelTest.kt
@@ -3,13 +3,22 @@
 package com.ichi2.anki.notetype
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import app.cash.turbine.test
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.exception.CombinedException
 import com.ichi2.anki.libanki.Collection
+import com.ichi2.anki.libanki.getNotetypeNameIdUseCount
 import com.ichi2.anki.libanki.removeNotetype
+import com.ichi2.anki.notetype.ManageNoteTypesState.UserMessage
+import com.ichi2.anki.progress.ViewModelProgress
+import com.ichi2.testutils.NeedsRobolectric
 import io.mockk.every
 import io.mockk.mockkStatic
 import io.mockk.unmockkStatic
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.setMain
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.CoreMatchers.hasItems
 import org.hamcrest.CoreMatchers.not
@@ -23,10 +32,14 @@ import org.junit.runner.RunWith
 import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
+import kotlin.test.assertIs
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
 
 @RunWith(AndroidJUnit4::class)
+@NeedsRobolectric(
+    "Preserve RobolectricTest's scoped CollectionManager dispatcher when switching to JvmTest; initialization and progress updates currently race assertions.",
+)
 class ManageNoteTypesViewModelTest : RobolectricTest() {
     @Test
     fun `multiple selection with one entry works as expected`() =
@@ -191,6 +204,68 @@ class ManageNoteTypesViewModelTest : RobolectricTest() {
             unmockkStatic(Collection::removeNotetype)
         }
 
+    @Test
+    fun `refreshNoteTypes reports progress`() =
+        runProgressTest {
+            assertProgressAround { refreshNoteTypes() }
+        }
+
+    @Test
+    fun `rename reports progress`() =
+        runProgressTest {
+            assertProgressAround { rename(noteTypeForName(TEST_NAME_1).id, TEST_NAME_2) }
+        }
+
+    @Test
+    fun `delete reports progress`() =
+        runProgressTest {
+            assertProgressAround { delete(noteTypeForName(TEST_NAME_1).id) }
+        }
+
+    @Test
+    fun `deleteSelectedNoteTypes reports progress`() =
+        runProgressTest {
+            onItemLongClick(noteTypeForName(TEST_NAME_1))
+
+            assertProgressAround { deleteSelectedNoteTypes() }
+        }
+
+    @Test
+    fun `deleting the last note type reports no progress`() =
+        runTest {
+            Dispatchers.setMain(StandardTestDispatcher(testScheduler))
+            col.getNotetypeNameIdUseCount().drop(1).forEach { col.removeNotetype(it.id) }
+            val viewModel = ManageNoteTypesViewModel()
+            advanceUntilIdle()
+
+            viewModel.progressManager.progress.test {
+                assertIs<ViewModelProgress.Idle>(awaitItem())
+                viewModel.delete(viewModel.noteTypes.single().id)
+                advanceUntilIdle()
+                expectNoEvents()
+            }
+            assertEquals(UserMessage.DeletingLastModel, viewModel.state.value.message)
+        }
+
+    private fun runProgressTest(testBody: suspend ManageNoteTypesViewModel.() -> Unit) =
+        runTest {
+            Dispatchers.setMain(StandardTestDispatcher(testScheduler))
+            addStandardNoteType(TEST_NAME_1, arrayOf("front", "back"), "", "")
+            val viewModel = ManageNoteTypesViewModel()
+            advanceUntilIdle()
+            viewModel.testBody()
+        }
+
+    private suspend fun ManageNoteTypesViewModel.assertProgressAround(op: () -> Unit) {
+        progressManager.progress.test {
+            assertIs<ViewModelProgress.Idle>(awaitItem())
+            op()
+            assertIs<ViewModelProgress.Active<Nothing>>(awaitItem())
+            assertIs<ViewModelProgress.Idle>(awaitItem())
+            expectNoEvents()
+        }
+    }
+
     /** Returns the current list of [NoteTypeItemState] */
     private val ManageNoteTypesViewModel.noteTypes: List<NoteTypeItemState>
         get() = state.value.noteTypes
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/notetype/ManageNotetypesScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/notetype/ManageNotetypesScreenshotTest.kt
index 4a793e453df1..06f0a1d6b8c1 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/notetype/ManageNotetypesScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/notetype/ManageNotetypesScreenshotTest.kt
@@ -7,8 +7,23 @@ import com.ichi2.anki.ScreenshotTest
 import com.ichi2.testutils.scrollToEnd
 import com.ichi2.testutils.simulateKeyboard
 import org.junit.Test
+import org.robolectric.RuntimeEnvironment
 
 class ManageNotetypesScreenshotTest : ScreenshotTest() {
+    @Test
+    fun eight_note_types() =
+        runTest {
+            // #22609: FAB covered the last item
+            RuntimeEnvironment.setQualifiers("+h740dp")
+            ensureCollectionLoadIsSynchronous()
+            repeat(8 - col.notetypes.count()) { addStandardNoteType("Note type $it", arrayOf("front", "back"), "", "") }
+            withManageNoteTypes { activity ->
+                captureScreen("eight_note_types")
+                activity.binding.noteTypesList.scrollToEnd()
+                captureScreen("eight_note_types_scrolled_to_bottom")
+            }
+        }
+
     @Test
     fun keyboard_scrolled_to_bottom() =
         runTest {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/notetype/ManageNotetypesTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/notetype/ManageNotetypesTest.kt
index 7ab41a336f70..0c9661ad655a 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/notetype/ManageNotetypesTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/notetype/ManageNotetypesTest.kt
@@ -3,17 +3,25 @@
 
 package com.ichi2.anki.notetype
 
+import android.view.WindowManager
 import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.R
+import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.dialogs.LoadingDialogFragment
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.advanceUntilIdle
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.shadows.ShadowDialog
 import org.robolectric.shadows.ShadowLooper
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class ManageNotetypesTest : RobolectricTest() {
@@ -32,7 +40,7 @@ class ManageNotetypesTest : RobolectricTest() {
             ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
 
             val dialog = ShadowDialog.getLatestDialog() as AlertDialog
-            val nameInput = dialog.findViewById<EditText>(R.id.dialog_text_input)!!
+            val nameInput = dialog.findViewById<EditText>(CommonR.id.dialog_text_input)!!
             val positiveButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE)
 
             // whitespace-only should disable the Rename button
@@ -48,6 +56,70 @@ class ManageNotetypesTest : RobolectricTest() {
             assertThat("Rename button disabled for empty name", positiveButton.isEnabled, equalTo(false))
         }
 
+    @Test
+    fun `deleting a note type blocks touches until it finishes`() =
+        runTest {
+            ensureCollectionLoadIsSynchronous()
+            addStandardNoteType(TEST_NOTE_TYPE_NAME, arrayOf("front", "back"), "", "")
+            val activity = startRegularActivity<ManageNotetypes>()
+            val noteType =
+                activity.viewModel.state.value.noteTypes
+                    .first { it.name == TEST_NOTE_TYPE_NAME }
+
+            withQueuedCollectionAccess {
+                activity.viewModel.delete(noteType.id)
+                assertTrue("touches blocked while deleting", activity.touchesBlocked())
+            }
+            advanceUntilIdle()
+
+            assertFalse("touches restored after deleting", activity.touchesBlocked())
+            assertTrue(
+                "note type deleted",
+                activity.viewModel.state.value.noteTypes
+                    .none { it.id == noteType.id },
+            )
+        }
+
+    @Test
+    fun `back during the progress delay does not finish an activity deleting note types`() =
+        runTest {
+            ensureCollectionLoadIsSynchronous()
+            addStandardNoteType(TEST_NOTE_TYPE_NAME, arrayOf("front", "back"), "", "")
+            val activity = startRegularActivity<ManageNotetypes>()
+            val noteType =
+                activity.viewModel.state.value.noteTypes
+                    .first { it.name == TEST_NOTE_TYPE_NAME }
+            activity.viewModel.onItemLongClick(noteType)
+
+            try {
+                withQueuedCollectionAccess {
+                    activity.viewModel.deleteSelectedNoteTypes()
+                    assertTrue("deletion is still in progress", activity.touchesBlocked())
+                    assertFalse(
+                        "the progress dialog has not appeared yet",
+                        activity.supportFragmentManager.fragments.any { it is LoadingDialogFragment },
+                    )
+
+                    activity.onBackPressedDispatcher.onBackPressed()
+
+                    assertFalse("Back must not finish the activity during deletion", activity.isFinishing)
+                }
+            } finally {
+                advanceUntilIdle()
+            }
+        }
+
+    private suspend fun <T> TestScope.withQueuedCollectionAccess(block: suspend () -> T): T {
+        val previousQueue = CollectionManager.setTestDispatcher(StandardTestDispatcher(testScheduler), useReentrantLock = false)
+        try {
+            return block()
+        } finally {
+            CollectionManager.setTestDispatcher(previousQueue)
+        }
+    }
+
+    private fun ManageNotetypes.touchesBlocked() = window.attributes.flags and WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE != 0
+
     companion object {
         private const val TEST_NOTE_TYPE_NAME = "BasicTestNoteType1"
     }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/notetype/RepositionCardTemplateDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/notetype/RepositionCardTemplateDialogTest.kt
new file mode 100644
index 000000000000..5b852fdc6a29
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/notetype/RepositionCardTemplateDialogTest.kt
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.notetype
+
+import androidx.appcompat.app.AlertDialog
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.AnkiActivity
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.utils.getInputField
+import com.ichi2.utils.negativeButton
+import com.ichi2.utils.positiveButton
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.shadows.ShadowDialog
+
+@RunWith(AndroidJUnit4::class)
+class RepositionCardTemplateDialogTest : RobolectricTest() {
+    @Test
+    fun `only positions in the displayed range are accepted`() {
+        var selectedPosition: Int? = null
+        RepositionCardTemplateDialog.showInstance(startRegularActivity<AnkiActivity>(), 3) { selectedPosition = it }
+        val dialog = ShadowDialog.getLatestDialog() as AlertDialog
+        assertFalse(dialog.positiveButton.isEnabled)
+        for (input in listOf("0", "4", "2147483648", "")) {
+            dialog.getInputField().setText(input)
+            assertFalse("Invalid input: $input", dialog.positiveButton.isEnabled)
+        }
+        for (input in listOf("1", "3")) {
+            dialog.getInputField().setText(input)
+            assertTrue(dialog.positiveButton.isEnabled)
+        }
+        dialog.positiveButton.performClick()
+        advanceRobolectricLooper()
+        assertEquals(3, selectedPosition)
+    }
+
+    @Test
+    fun `cancel does not reposition the template`() {
+        RepositionCardTemplateDialog.showInstance(startRegularActivity<AnkiActivity>(), 3) {
+            error("Cancel must not reposition the template")
+        }
+        val dialog = ShadowDialog.getLatestDialog() as AlertDialog
+        dialog.getInputField().setText("2")
+        dialog.negativeButton.performClick()
+        advanceRobolectricLooper()
+        assertFalse(dialog.isShowing)
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/pages/CongratsPageTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/pages/CongratsPageTest.kt
index 9436e7c531e2..c71b822f3c7c 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/pages/CongratsPageTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/pages/CongratsPageTest.kt
@@ -1,20 +1,43 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 package com.ichi2.anki.pages
 
+import android.os.Looper
+import androidx.fragment.app.commitNow
 import androidx.lifecycle.Lifecycle
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.scrollTo
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.RootMatchers.isDialog
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import anki.scheduler.CongratsInfoResponse
+import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CollectionManager.withCol
+import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.StudyOptionsActivity
+import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog
+import com.ichi2.anki.ioDispatcher
+import com.ichi2.anki.libanki.Consts
 import com.ichi2.anki.observability.undoableOp
+import com.ichi2.testutils.EmptyAnkiActivity
 import com.ichi2.testutils.launchFragmentInContainer
+import com.ichi2.testutils.saveState
+import com.ichi2.testutils.uninitializeField
+import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.advanceUntilIdle
+import org.hamcrest.Matchers.allOf
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.robolectric.Robolectric
 import org.robolectric.Shadows.shadowOf
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 
 @RunWith(AndroidJUnit4::class)
@@ -70,4 +93,74 @@ class CongratsPageTest : RobolectricTest() {
                 }
             }
         }
+
+    @Test
+    fun `custom study input dialog survives activity recreation`() =
+        runTest {
+            updateDeckConfig(Consts.DEFAULT_DECK_ID) { new.perDay = 0 }
+            addBasicNote()
+            ioDispatcher = StandardTestDispatcher(testScheduler)
+
+            launchFragmentInContainer<CongratsPage>().use { scenario ->
+                scenario.onFragment { it.bridgeCommands.getValue("customStudy").invoke() }
+                shadowOf(Looper.getMainLooper()).idle()
+                advanceUntilIdle()
+                onView(withText(TR.customStudyIncreaseTodaysNewCardLimit()))
+                    .inRoot(isDialog())
+                    .perform(click())
+                advanceUntilIdle()
+
+                scenario.recreate()
+
+                onView(withId(R.id.details_edit_text_2))
+                    .inRoot(isDialog())
+                    .check(matches(isDisplayed()))
+            }
+        }
+
+    @Test
+    fun `custom study tag selection survives process death`() =
+        runTest {
+            // Keep the deck finished so the Congrats page stays open.
+            updateDeckConfig(Consts.DEFAULT_DECK_ID) { new.perDay = 0 }
+            val selectedNote = addBasicNote().update { addTag("selected") }
+            val otherNote = addBasicNote().update { addTag("other") }
+
+            val savedState =
+                Robolectric.buildActivity(EmptyAnkiActivity::class.java).use { controller ->
+                    val activity = controller.setup().get()
+                    val page = CongratsPage()
+                    activity.supportFragmentManager.commitNow { add(android.R.id.content, page) }
+                    page.bridgeCommands.getValue("customStudy").invoke()
+                    shadowOf(Looper.getMainLooper()).idle()
+                    onView(withText(TR.customStudyStudyByCardStateOrTag()))
+                        .inRoot(isDialog())
+                        .perform(scrollTo(), click())
+                    clickDialogPositiveButton()
+                    controller.saveState()
+                }
+
+            // recreate() retains ViewModels and process-local defaults. Restore a fresh activity
+            // from saved state and clear the defaults to model process death with the picker open.
+            uninitializeField<CustomStudyDialog>("deferredInitialization")
+            Robolectric.buildActivity(EmptyAnkiActivity::class.java).use { controller ->
+                controller.setup(savedState)
+                shadowOf(Looper.getMainLooper()).idle()
+                // Submit through the real picker and FragmentResult listener, without injecting a result.
+                onView(allOf(withId(R.id.tags_dialog_tag_item), hasDescendant(withText("selected"))))
+                    .inRoot(isDialog())
+                    .perform(click())
+                clickDialogPositiveButton()
+            }
+
+            assertEquals(assertNotNull(col.decks.customStudySession).id, selectedNote.firstCard().did)
+            assertEquals(Consts.DEFAULT_DECK_ID, otherNote.firstCard().did)
+        }
+
+    private fun clickDialogPositiveButton() {
+        onView(withId(android.R.id.button1))
+            .inRoot(isDialog())
+            .perform(click())
+        shadowOf(Looper.getMainLooper()).idle()
+    }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/pages/CongratsViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/pages/CongratsViewModelTest.kt
index 0649a05d0679..e0f2a7ae19f1 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/pages/CongratsViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/pages/CongratsViewModelTest.kt
@@ -1,17 +1,14 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 package com.ichi2.anki.pages
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import app.cash.turbine.test
 import com.ichi2.anki.CollectionManager.withCol
-import com.ichi2.anki.RobolectricTest
+import com.ichi2.testutils.JvmTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import kotlin.test.assertEquals
 
 // https://github.com/ankidroid/Anki-Android/issues/21393
-@RunWith(AndroidJUnit4::class)
-class CongratsViewModelTest : RobolectricTest() {
+class CongratsViewModelTest : JvmTest() {
     private val viewModel = CongratsViewModel()
 
     @Test
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/pages/PageChromeClientTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/pages/PageChromeClientTest.kt
index b570c4ccbe6f..c4b2011b6566 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/pages/PageChromeClientTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/pages/PageChromeClientTest.kt
@@ -7,12 +7,16 @@ import android.webkit.JsResult
 import android.webkit.WebView
 import androidx.appcompat.app.AlertDialog
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.EmptyApplicationCategory
 import com.ichi2.anki.common.crashreporting.CrashReportService
 import com.ichi2.anki.common.crashreporting.CrashReporter
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.targetContext
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
+import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
 import org.mockito.Answers.RETURNS_SELF
 import org.mockito.Mockito.mockConstruction
@@ -22,10 +26,13 @@ import org.mockito.kotlin.verify
 import org.mockito.kotlin.verifyNoInteractions
 import org.mockito.kotlin.verifyNoMoreInteractions
 import org.mockito.kotlin.whenever
+import org.robolectric.annotation.Config
 import kotlin.test.assertTrue
 
 @RunWith(AndroidJUnit4::class)
-class PageChromeClientTest : RobolectricTest() {
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class PageChromeClientTest : AndroidTest {
     private lateinit var originalCrashReporter: CrashReporter
     private val crashReporter = mock<CrashReporter>()
     private val client = PageChromeClient()
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/pages/PageWebViewClientAssetTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/pages/PageWebViewClientAssetTest.kt
index 1e4af6597aa2..85aeaf23fe67 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/pages/PageWebViewClientAssetTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/pages/PageWebViewClientAssetTest.kt
@@ -24,11 +24,13 @@ class PageWebViewClientAssetTest : PageWebViewClientTestBase() {
         val policies = Jsoup.parse(bundledHtml).select("meta[http-equiv=content-security-policy]").map { it.attr("content") }
 
         // Pin the entire declaration, including the bootstrap script hash, to require review on backend updates.
-        val expectedPolicy = "script-src 'self' 'sha256-XS3vJEMX35yHnfJK0xeyGQsaLeoAMxwE7I43asI/SmY='"
+        // Backend updates are expected to change this hash and fail this test until the new declaration is reviewed.
+        val expectedPolicy = "script-src 'self' 'sha256-1eO5v3fJDmbaWxUNa8DWv729RR8kpfPqIe0VFTiVNds='"
         assertEquals(
             listOf(expectedPolicy),
             policies,
-            "Bundled SvelteKit CSP changed. Review the policy and the congrats exemption before updating this expectation.",
+            "Bundled SvelteKit CSP changed. This is expected after a backend update changes the bootstrap script hash. " +
+                "Review the policy and the congrats exemption before updating this expectation.",
         )
     }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/preferences/PreferencesScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/PreferencesScreenshotTest.kt
index 16965374c0e9..1ebebaab9e9f 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/preferences/PreferencesScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/PreferencesScreenshotTest.kt
@@ -12,8 +12,10 @@ import com.google.android.material.appbar.CollapsingToolbarLayout
 import com.ichi2.anki.R
 import com.ichi2.anki.ScreenshotTest
 import com.ichi2.anki.common.storage.CollectionHelper
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.preferences.reviewer.ReviewerMenuSettingsFragment
 import com.ichi2.anki.settings.Prefs
+import com.ichi2.anki.utils.CollectionPreferences
 import com.ichi2.testutils.HIDDEN_GESTURE_BAR
 import com.ichi2.testutils.dispatchInsets
 import com.ichi2.testutils.ext.clear
@@ -21,11 +23,13 @@ import com.ichi2.testutils.launchForFullHeightScreenshot
 import com.ichi2.testutils.scrollToEnd
 import com.ichi2.testutils.simulateSystemBars
 import com.ichi2.testutils.withWritePermissions
-import com.ichi2.utils.dp
+import kotlinx.coroutines.test.runTest
 import org.junit.After
 import org.junit.Test
 import org.robolectric.RuntimeEnvironment
 import kotlin.reflect.KClass
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 class PreferencesScreenshotTest : ScreenshotTest() {
     @After
@@ -115,6 +119,26 @@ class PreferencesScreenshotTest : ScreenshotTest() {
             captureScreen("HeaderFragment_gesture_bar_scrolled_to_bottom")
         }
 
+    @Test
+    fun timeboxSettingsFragmentDisabled() =
+        runTest {
+            CollectionPreferences.setTimeboxTimeLimit(0.toDuration(DurationUnit.MINUTES))
+            withPreferencesActivity(TimeboxSettingsFragment::class) { activity ->
+                activity.simulateSystemBars()
+                captureScreen("TimeboxSettingsFragment_disabled")
+            }
+        }
+
+    @Test
+    fun timeboxSettingsFragmentEnabled() =
+        runTest {
+            CollectionPreferences.setTimeboxTimeLimit(20.toDuration(DurationUnit.MINUTES))
+            withPreferencesActivity(TimeboxSettingsFragment::class) { activity ->
+                activity.simulateSystemBars()
+                captureScreen("TimeboxSettingsFragment_enabled")
+            }
+        }
+
     @Test
     fun `capture all preference fragments`() {
         Prefs.isNewStudyScreenEnabled = true
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/preferences/TimeboxSettingsViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/TimeboxSettingsViewModelTest.kt
new file mode 100644
index 000000000000..a48c2fec66c4
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/TimeboxSettingsViewModelTest.kt
@@ -0,0 +1,119 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.preferences
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.utils.CollectionPreferences
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
+
+@RunWith(AndroidJUnit4::class)
+class TimeboxSettingsViewModelTest : RobolectricTest() {
+    @Test
+    fun `TimeboxUiState defaults to loading`() {
+        val defaultState = TimeboxUiState()
+        assertThat("Should default to loading", defaultState.isLoading, equalTo(true))
+    }
+
+    @Test
+    fun `initializes disabled when time limit is zero`() =
+        runTest {
+            CollectionPreferences.setTimeboxTimeLimit(0.toDuration(DurationUnit.MINUTES))
+
+            val viewModel = TimeboxSettingsViewModel()
+            advanceRobolectricLooper()
+
+            val state = viewModel.uiState.value
+            assertThat("Should not be loading", state.isLoading, equalTo(false))
+            assertThat("Should be disabled", state.isEnabled, equalTo(false))
+            assertThat(
+                "Default minutes should be 20",
+                state.minutes,
+                equalTo(TimeboxSettingsViewModel.DEFAULT_TIMEBOX_MINUTES),
+            )
+        }
+
+    @Test
+    fun `initializes enabled when time limit is greater than zero`() =
+        runTest {
+            CollectionPreferences.setTimeboxTimeLimit(15.toDuration(DurationUnit.MINUTES))
+
+            val viewModel = TimeboxSettingsViewModel()
+            advanceRobolectricLooper()
+
+            val state = viewModel.uiState.value
+            assertThat("Should be enabled", state.isEnabled, equalTo(true))
+            assertThat("Minutes should match configured value", state.minutes, equalTo(15))
+        }
+
+    @Test
+    fun `toggling enabled on saves minutes to collection`() =
+        runTest {
+            CollectionPreferences.setTimeboxTimeLimit(0.toDuration(DurationUnit.MINUTES))
+
+            val viewModel = TimeboxSettingsViewModel()
+            advanceRobolectricLooper()
+
+            viewModel.toggleEnabled(true)
+            advanceRobolectricLooper()
+
+            assertThat("UI state should be enabled", viewModel.uiState.value.isEnabled, equalTo(true))
+            val savedMinutes = CollectionPreferences.getTimeboxTimeLimit().toInt(DurationUnit.MINUTES)
+            assertThat("Collection limit should be 20 minutes", savedMinutes, equalTo(20))
+        }
+
+    @Test
+    fun `toggling enabled off sets collection limit to zero`() =
+        runTest {
+            CollectionPreferences.setTimeboxTimeLimit(15.toDuration(DurationUnit.MINUTES))
+
+            val viewModel = TimeboxSettingsViewModel()
+            advanceRobolectricLooper()
+
+            viewModel.toggleEnabled(false)
+            advanceRobolectricLooper()
+
+            assertThat("UI state should be disabled", viewModel.uiState.value.isEnabled, equalTo(false))
+            val savedMinutes = CollectionPreferences.getTimeboxTimeLimit().toInt(DurationUnit.MINUTES)
+            assertThat("Collection limit should be 0", savedMinutes, equalTo(0))
+        }
+
+    @Test
+    fun `increment and decrement updates state and saves when enabled`() =
+        runTest {
+            CollectionPreferences.setTimeboxTimeLimit(10.toDuration(DurationUnit.MINUTES))
+
+            val viewModel = TimeboxSettingsViewModel()
+            advanceRobolectricLooper()
+
+            viewModel.increment()
+            advanceRobolectricLooper()
+            assertThat(viewModel.uiState.value.minutes, equalTo(11))
+            assertThat(CollectionPreferences.getTimeboxTimeLimit().toInt(DurationUnit.MINUTES), equalTo(11))
+
+            viewModel.decrement()
+            advanceRobolectricLooper()
+            assertThat(viewModel.uiState.value.minutes, equalTo(10))
+            assertThat(CollectionPreferences.getTimeboxTimeLimit().toInt(DurationUnit.MINUTES), equalTo(10))
+        }
+
+    @Test
+    fun `clamping enforces bounds between 1 and 999`() =
+        runTest {
+            CollectionPreferences.setTimeboxTimeLimit(10.toDuration(DurationUnit.MINUTES))
+
+            val viewModel = TimeboxSettingsViewModel()
+            advanceRobolectricLooper()
+
+            viewModel.setMinutes(0)
+            assertThat(viewModel.uiState.value.minutes, equalTo(TimeboxSettingsViewModel.MIN_TIMEBOX_MINUTES))
+
+            viewModel.setMinutes(1000)
+            assertThat(viewModel.uiState.value.minutes, equalTo(TimeboxSettingsViewModel.MAX_TIMEBOX_MINUTES))
+        }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/preferences/profiles/AddProfileDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/profiles/AddProfileDialogTest.kt
new file mode 100644
index 000000000000..cc7ca62d24cd
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/profiles/AddProfileDialogTest.kt
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: 2026 Ashish Yadav <mailtoashish693@gmail.com>
+
+package com.ichi2.anki.preferences.profiles
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsNotEnabled
+import androidx.compose.ui.test.hasSetTextAction
+import androidx.compose.ui.test.junit4.v2.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performTextInput
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.CommonString
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.multiprofile.ProfileName
+import com.ichi2.compose.theme.AnkiDroidTheme
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class AddProfileDialogTest : RobolectricTest() {
+    @get:Rule
+    val composeRule = createComposeRule()
+
+    @Test
+    fun `a name already in use cannot be added, ignoring case`() {
+        composeRule.setContent {
+            AnkiDroidTheme {
+                AddProfileDialog(existingNames = listOf("Work"), onDismissRequest = {}, onConfirm = {})
+            }
+        }
+
+        composeRule.onNode(hasSetTextAction()).performTextInput("work")
+
+        composeRule.onNodeWithText(targetContext.getString(CommonString.error_name_exists)).assertIsDisplayed()
+        composeRule.onNodeWithText(targetContext.getString(CommonString.dialog_add)).assertIsNotEnabled()
+    }
+
+    @Test
+    fun `the length counter ignores spaces around the name`() {
+        composeRule.setContent {
+            AnkiDroidTheme {
+                AddProfileDialog(existingNames = emptyList(), onDismissRequest = {}, onConfirm = {})
+            }
+        }
+
+        composeRule.onNode(hasSetTextAction()).performTextInput(" Work ")
+
+        composeRule.onNodeWithText("4/${ProfileName.MAX_LENGTH}").assertIsDisplayed()
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/preferences/profiles/SwitchProfilesFragmentTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/profiles/SwitchProfilesFragmentTest.kt
index a091cd36d9eb..2b1fc478194c 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/preferences/profiles/SwitchProfilesFragmentTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/profiles/SwitchProfilesFragmentTest.kt
@@ -13,8 +13,6 @@ import com.ichi2.anki.preferences.HeaderFragment
 import com.ichi2.anki.preferences.PreferencesActivity
 import com.ichi2.anki.preferences.PreferencesFragment
 import com.ichi2.anki.preferences.requirePreference
-import io.mockk.every
-import io.mockk.mockkObject
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
@@ -44,18 +42,20 @@ class SwitchProfilesFragmentTest : RobolectricTest() {
 
     private fun openSwitchProfilesWhenProfilesFailedToLoad(): PreferencesActivity {
         val app = AnkiDroidApp.instance
-        lateinit var activity: PreferencesActivity
-        mockkObject(app) {
-            every { app.profileManager } returns null
-            activity = startRegularActivity<PreferencesActivity>(PreferencesActivity.getIntent(targetContext))
+        val profileManager = app.profileManager
+        app.profileManager = null
+        try {
+            val activity = startRegularActivity<PreferencesActivity>(PreferencesActivity.getIntent(targetContext))
             activity.settings.fragments
                 .filterIsInstance<HeaderFragment>()
                 .single()
                 .requirePreference<Preference>(R.string.pref_switch_profile_screen_key)
                 .performClick()
             advanceRobolectricLooper()
+            return activity
+        } finally {
+            app.profileManager = profileManager
         }
-        return activity
     }
 
     private val PreferencesActivity.settings
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/preferences/profiles/SwitchProfilesScreenTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/profiles/SwitchProfilesScreenTest.kt
new file mode 100644
index 000000000000..f0ebec799745
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/profiles/SwitchProfilesScreenTest.kt
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: 2026 Ashish Yadav <mailtoashish693@gmail.com>
+
+package com.ichi2.anki.preferences.profiles
+
+import androidx.compose.ui.test.hasSetTextAction
+import androidx.compose.ui.test.junit4.v2.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performTextReplacement
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.CommonString
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.multiprofile.ProfileId
+import com.ichi2.anki.multiprofile.ProfileName
+import com.ichi2.compose.theme.AnkiDroidTheme
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class SwitchProfilesScreenTest : RobolectricTest() {
+    @get:Rule
+    val composeRule = createComposeRule()
+
+    @Test
+    fun `a profile can be renamed to a different case of its own name`() {
+        val work = ProfileItem(id = ProfileId("p_work"), name = "work")
+        var renamedTo: ProfileName? = null
+        composeRule.setContent {
+            AnkiDroidTheme {
+                SwitchProfilesScreen(
+                    profiles = listOf(ProfileItem(id = ProfileId.DEFAULT, name = "Default"), work),
+                    isAddProfileDialogVisible = false,
+                    profileBeingRenamed = work,
+                    onNavigateUp = {},
+                    onAddProfileClick = {},
+                    onAddProfileConfirm = {},
+                    onAddProfileDismiss = {},
+                    onEditProfile = {},
+                    onRenameProfileConfirm = { renamedTo = it },
+                    onRenameProfileDismiss = {},
+                    onDeleteProfile = {},
+                )
+            }
+        }
+
+        composeRule.onNode(hasSetTextAction()).performTextReplacement("Work")
+        composeRule.onNodeWithText(targetContext.getString(CommonString.rename)).performClick()
+
+        assertEquals("Work", renamedTo?.value)
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/preferences/profiles/SwitchProfilesViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/profiles/SwitchProfilesViewModelTest.kt
index 34180e41cdc9..79a6b653a266 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/preferences/profiles/SwitchProfilesViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/preferences/profiles/SwitchProfilesViewModelTest.kt
@@ -19,6 +19,7 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import kotlin.test.assertEquals
+import kotlin.test.assertNull
 
 @RunWith(AndroidJUnit4::class)
 class SwitchProfilesViewModelTest {
@@ -77,6 +78,47 @@ class SwitchProfilesViewModelTest {
         assertFalse(viewModel.isAddProfileDialogVisible.value)
     }
 
+    @Test
+    fun `addProfile lists the new profile`() {
+        val viewModel = viewModel()
+
+        viewModel.addProfile(nameOf("Work"))
+
+        assertEquals(listOf("Default", "Work"), viewModel.profiles.value.map { it.name })
+    }
+
+    @Test
+    fun `showRenameProfileDialog opens the dialog for that profile`() {
+        val viewModel = viewModel()
+        val default = viewModel.profiles.value.single()
+
+        viewModel.showRenameProfileDialog(default)
+
+        assertEquals(default, viewModel.profileBeingRenamed.value)
+    }
+
+    @Test
+    fun `dismissRenameProfileDialog hides the dialog`() {
+        val viewModel = viewModel()
+        viewModel.showRenameProfileDialog(viewModel.profiles.value.single())
+
+        viewModel.dismissRenameProfileDialog()
+
+        assertNull(viewModel.profileBeingRenamed.value)
+    }
+
+    @Test
+    fun `renameProfile lists the new name and closes the dialog`() {
+        createProfile("Work")
+        val viewModel = viewModel()
+        viewModel.showRenameProfileDialog(viewModel.profiles.value.single { it.name == "Work" })
+
+        viewModel.renameProfile(nameOf("Office"))
+
+        assertEquals(listOf("Default", "Office"), viewModel.profiles.value.map { it.name })
+        assertNull(viewModel.profileBeingRenamed.value)
+    }
+
     @Test
     fun `the list starts with the Default profile`() {
         assertEquals(listOf(ProfileId.DEFAULT), viewModel().profiles.value.map { it.id })
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/previewer/CardViewerFragmentTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/previewer/CardViewerFragmentTest.kt
index 583a4a0e1a41..7db4941185d0 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/previewer/CardViewerFragmentTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/previewer/CardViewerFragmentTest.kt
@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import android.webkit.PermissionRequest
 import android.webkit.WebChromeClient
 import android.webkit.WebView
+import androidx.core.net.toUri
 import androidx.lifecycle.Lifecycle
 import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -15,7 +16,11 @@ import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.browser.IdsFile
 import com.ichi2.anki.settings.Prefs
+import com.ichi2.testutils.assertNoActivityStarted
+import com.ichi2.testutils.assertOpenedUrl
 import com.ichi2.testutils.createTransientDirectory
+import com.ichi2.testutils.mockWebResourceRequest
+import com.ichi2.testutils.registerWebBrowser
 import com.ichi2.utils.negativeButton
 import com.ichi2.utils.positiveButton
 import org.hamcrest.MatcherAssert.assertThat
@@ -34,6 +39,37 @@ import org.robolectric.shadows.ShadowDialog
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.O) // WebChromeClient
 @RunWith(AndroidJUnit4::class)
 class CardViewerFragmentTest : RobolectricTest() {
+    @Test
+    fun `web links open with external app permission disabled`() {
+        editPreferences { putBoolean(targetContext.getString(R.string.pref_allow_card_external_launch_key), false) }
+        targetContext.registerWebBrowser()
+        withCardViewerWebView { webView ->
+            for (scheme in listOf("http", "https")) {
+                val url = "$scheme://github.com/ankidroid/Anki-Android/releases"
+                shadowOf(webView).webViewClient.shouldOverrideUrlLoading(webView, mockWebResourceRequest(url))
+                targetContext.assertOpenedUrl(url.toUri())
+            }
+        }
+    }
+
+    @Test
+    fun `custom schemes and parsed intents still require external app permission`() {
+        editPreferences { putBoolean(targetContext.getString(R.string.pref_allow_card_external_launch_key), false) }
+        targetContext.registerWebBrowser()
+        withCardViewerWebView { webView ->
+            val urls =
+                listOf(
+                    "market://details?id=com.example",
+                    "intent://example.org/#Intent;scheme=https;end",
+                    "android-app://com.example/https/example.org",
+                )
+            for (url in urls) {
+                shadowOf(webView).webViewClient.shouldOverrideUrlLoading(webView, mockWebResourceRequest(url))
+                targetContext.assertNoActivityStarted(url)
+            }
+        }
+    }
+
     @Test
     fun `dismissing the opt-in dialog denies the audio capture request`() {
         grantRecordAudioPermission()
@@ -115,7 +151,12 @@ class CardViewerFragmentTest : RobolectricTest() {
         }
 
     /** Runs [block] on the [WebChromeClient] attached to an open previewer's WebView */
-    private fun withCardViewerChromeClient(block: (WebChromeClient) -> Unit) {
+    private fun withCardViewerChromeClient(block: (WebChromeClient) -> Unit) =
+        withCardViewerWebView { webView ->
+            block(requireNotNull(webView.webChromeClient) { "no WebChromeClient attached" })
+        }
+
+    private fun withCardViewerWebView(block: (WebView) -> Unit) {
         val note = addBasicAndReversedNote()
         val intent =
             PreviewerFragment.getIntent(
@@ -133,7 +174,7 @@ class CardViewerFragmentTest : RobolectricTest() {
                         .map { webViewLayout.getChildAt(it) }
                         .filterIsInstance<WebView>()
                         .single()
-                block(requireNotNull(webView.webChromeClient) { "no WebChromeClient attached" })
+                block(webView)
             }
         }
     }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/previewer/PreviewerViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/previewer/PreviewerViewModelTest.kt
index 30ae3ef122ae..44c4a53ce563 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/previewer/PreviewerViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/previewer/PreviewerViewModelTest.kt
@@ -11,6 +11,7 @@ import com.ichi2.anki.utils.ext.flag
 import com.ichi2.testutils.JvmTest
 import io.mockk.coEvery
 import io.mockk.spyk
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
@@ -58,6 +59,7 @@ class PreviewerViewModelTest : JvmTest() {
                 val note = addBasicNote()
                 note.cards().map { it.id }
             }
+        updateDeckConfig(col.decks.selected()) { autoplay = false }
         viewModel = spyk(PreviewerViewModel(SavedStateHandle(), cardIds, initialIndex = 0))
         // the default implementation requires the Collection media directory,
         // which needs Robolectric with CollectionStorageMode.IN_MEMORY_WITH_MEDIA or ON_DISK
@@ -254,4 +256,52 @@ class PreviewerViewModelTest : JvmTest() {
             onSliderChange(sliderPosition = 2)
             assertEquals("Index should update for valid input", 1, viewModel.currentIndex.value)
         }
+
+    @Test
+    fun `showing the answer stops the question audio`() =
+        runTest {
+            viewModel.onPageFinished(false)
+            val audio = audioPlaying()
+
+            onNextButtonClick()
+
+            assertTrue("question audio should stop", audio.isCancelled)
+        }
+
+    @Test
+    fun `going back to the question stops the answer audio`() =
+        runTest {
+            viewModel.onPageFinished(false)
+            onNextButtonClick()
+            val audio = audioPlaying()
+
+            onPreviousButtonClick()
+
+            assertTrue("answer audio should stop", audio.isCancelled)
+        }
+
+    @Test
+    fun `showing only the back side stops the question audio`() =
+        runTest {
+            viewModel.onPageFinished(false)
+            val audio = audioPlaying()
+
+            toggleBackSideOnly()
+
+            assertTrue("question audio should stop", audio.isCancelled)
+        }
+
+    @Test
+    fun `audio keeps playing after a configuration change`() =
+        runTest {
+            viewModel.onPageFinished(false)
+            val audio = audioPlaying()
+
+            viewModel.onPageFinished(isAfterRecreation = true)
+            advanceUntilIdle()
+
+            assertFalse("audio should keep playing", audio.isCancelled)
+        }
+
+    private fun audioPlaying() = Job().also { viewModel.cardMediaPlayer.playAvTagsJob = it }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/previewer/TypeAnswerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/previewer/TypeAnswerTest.kt
index 38ffabf6ce7c..78f6bc2bb6fd 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/previewer/TypeAnswerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/previewer/TypeAnswerTest.kt
@@ -2,7 +2,6 @@
 
 package com.ichi2.anki.previewer
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.libanki.Card
 import com.ichi2.testutils.JvmTest
 import org.hamcrest.MatcherAssert.assertThat
@@ -11,10 +10,8 @@ import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.not
 import org.junit.Test
 import org.junit.jupiter.api.assertDoesNotThrow
-import org.junit.runner.RunWith
 import kotlin.test.assertNotNull
 
-@RunWith(AndroidJUnit4::class)
 class TypeAnswerTest : JvmTest() {
     /** [Issue #20575](https://github.com/ankidroid/Anki-Android/issues/20575) */
     @Test
@@ -65,6 +62,62 @@ class TypeAnswerTest : JvmTest() {
             assertThat(typeAnswer.noSuggest, equalTo(true))
         }
 
+    @Test
+    fun `combining is true when nc modifier is absent`() =
+        runTest {
+            val card = addBasicWithTypingNote("front", "back").firstCard()
+            val typeAnswer = requireNotNull(TypeAnswer.getInstance(card, "[[type:Back]]"))
+            assertThat(typeAnswer.combining, equalTo(true))
+        }
+
+    @Test
+    fun `combining is false when nc modifier is present`() =
+        runTest {
+            val card = addBasicWithTypingNote("front", "back").firstCard()
+            val typeAnswer = requireNotNull(TypeAnswer.getInstance(card, "[[type:nc:Back]]"))
+            assertThat(typeAnswer.combining, equalTo(false))
+        }
+
+    @Test
+    fun `nosuggest composes with cloze modifier`() =
+        runTest {
+            val card = addClozeNote("{{c1::hello}} world").firstCard()
+            val typeAnswer = requireNotNull(TypeAnswer.getInstance(card, "[[type:nosuggest:cloze:Text]]"))
+            assertThat(typeAnswer.noSuggest, equalTo(true))
+            assertThat(typeAnswer.expectedAnswer, equalTo("hello"))
+        }
+
+    @Test
+    fun `nosuggest composes with cloze and nc modifiers`() =
+        runTest {
+            val card = addClozeNote("{{c1::hello}} world").firstCard()
+            val typeAnswer = requireNotNull(TypeAnswer.getInstance(card, "[[type:nosuggest:cloze:nc:Text]]"))
+            assertThat(typeAnswer.noSuggest, equalTo(true))
+            assertThat(typeAnswer.combining, equalTo(false))
+            assertThat(typeAnswer.expectedAnswer, equalTo("hello"))
+        }
+
+    @Test
+    fun `cloze type-in-answer extracts expected answer for each card ordinal`() =
+        runTest {
+            val note = addClozeNote("{{c1::alpha}} and {{c2::beta}}")
+            val (card1, card2) = note.cards()
+
+            val typeAnswerCard1 = requireNotNull(TypeAnswer.getInstance(card1, "[[type:cloze:Text]]"))
+            assertThat(typeAnswerCard1.expectedAnswer, equalTo("alpha"))
+
+            val typeAnswerCard2 = requireNotNull(TypeAnswer.getInstance(card2, "[[type:cloze:Text]]"))
+            assertThat(typeAnswerCard2.expectedAnswer, equalTo("beta"))
+        }
+
+    @Test
+    fun `cloze type-in-answer extracts expected answer with hint`() =
+        runTest {
+            val card = addClozeNote("{{c1::alpha::hint for alpha}}").firstCard()
+            val typeAnswer = requireNotNull(TypeAnswer.getInstance(card, "[[type:cloze:Text]]"))
+            assertThat(typeAnswer.expectedAnswer, equalTo("alpha"))
+        }
+
     companion object {
         suspend fun TypeAnswer.Companion.createInstance(card: Card) = requireNotNull(TypeAnswer.getInstance(card, VALID_CARD_TEXT))
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/progress/ProgressObserverReviewTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/progress/ProgressObserverReviewTest.kt
new file mode 100644
index 000000000000..57d428d9b317
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/progress/ProgressObserverReviewTest.kt
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.progress
+
+import android.os.Looper
+import androidx.fragment.app.commitNow
+import androidx.lifecycle.Lifecycle
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.dialogs.LoadingDialogFragment
+import com.ichi2.testutils.EmptyAnkiActivity
+import kotlinx.coroutines.CompletableDeferred
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.Shadows.shadowOf
+import java.time.Duration
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+@RunWith(AndroidJUnit4::class)
+class ProgressObserverReviewTest : RobolectricTest() {
+    @Test
+    fun `completed progress disappears when its owner remains stopped on foreground`() {
+        val controller = Robolectric.buildActivity(EmptyAnkiActivity::class.java).setup()
+        saveControllerForCleanup(controller)
+        val activity = controller.get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, "owner") }
+        val gate = CompletableDeferred<Unit>()
+        fragment.viewModel.runOp(gate)
+        idle()
+        assertNotNull(activity.loadingDialog())
+
+        controller.pause().stop()
+        activity.supportFragmentManager.commitNow(allowStateLoss = true) {
+            setMaxLifecycle(fragment, Lifecycle.State.CREATED)
+        }
+        gate.complete(Unit)
+        idle()
+        controller.start().resume()
+        idle()
+
+        assertEquals(Lifecycle.State.CREATED, fragment.lifecycle.currentState)
+        assertEquals(ViewModelProgress.Idle, fragment.viewModel.progressManager.progress.value)
+        assertNull(activity.loadingDialog(), "completed operation must not block the foreground screen")
+    }
+
+    @Test
+    fun `backgrounded holder cannot retain a completed shared dialog`() {
+        val controller = Robolectric.buildActivity(EmptyAnkiActivity::class.java).setup()
+        saveControllerForCleanup(controller)
+        val activity = controller.get()
+        val first = ProgressObservingFragment()
+        val second = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow {
+            add(first, "first")
+            add(second, "second")
+        }
+        val firstGate = CompletableDeferred<Unit>()
+        val secondGate = CompletableDeferred<Unit>()
+        first.viewModel.runOp(firstGate)
+        second.viewModel.runOp(secondGate)
+        idle()
+        assertNotNull(activity.loadingDialog())
+
+        controller.pause().stop()
+        activity.supportFragmentManager.commitNow(allowStateLoss = true) {
+            setMaxLifecycle(first, Lifecycle.State.CREATED)
+        }
+        firstGate.complete(Unit)
+        controller.start().resume()
+        idle()
+        assertTrue(assertNotNull(activity.loadingDialog()).requireDialog().isShowing)
+
+        secondGate.complete(Unit)
+        idle()
+        assertNull(activity.loadingDialog(), "a stopped former holder must not retain another owner's completed dialog")
+    }
+
+    private fun EmptyAnkiActivity.loadingDialog() =
+        supportFragmentManager.fragments.filterIsInstance<LoadingDialogFragment>().singleOrNull()
+
+    private fun idle() = shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(1200))
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/progress/ProgressObserverTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/progress/ProgressObserverTest.kt
index 7878223d6175..7f166b86b514 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/progress/ProgressObserverTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/progress/ProgressObserverTest.kt
@@ -2,11 +2,18 @@
 // SPDX-FileCopyrightText: Copyright (c) 2026 Ashish Yadav <mailtoashish693@gmail.com>
 package com.ichi2.anki.progress
 
+import android.os.Bundle
 import android.os.Looper
 import android.view.WindowManager
 import android.widget.TextView
 import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.commitNow
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.viewModelScope
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
@@ -17,6 +24,7 @@ import com.ichi2.testutils.EmptyAnkiActivity
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -27,6 +35,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
+import kotlin.test.assertSame
 import kotlin.test.assertTrue
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
@@ -80,6 +89,26 @@ class ProgressObserverTest : RobolectricTest() {
         op.cancel()
     }
 
+    @Test
+    fun `a later operation waits for the delay again`() {
+        val activity = startActivity().get()
+        activity.observeProgress(viewModel, delayMillis = SHOW_DELAY) { it }
+        val gate = CompletableDeferred<Unit>()
+        val op = launchOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        gate.complete(Unit)
+        idleMainLooper(SHOW_DELAY)
+
+        val laterGate = CompletableDeferred<Unit>()
+        val laterOp = launchOp(laterGate)
+        idleMainLooper(SHOW_DELAY / 2)
+
+        assertNull(activity.loadingDialog(), "a quick later op must not flash a dialog")
+        laterGate.complete(Unit)
+        op.cancel()
+        laterOp.cancel()
+    }
+
     @Test
     fun `dialog is shown when the activity is stopped and restarted during the show delay`() {
         val controller = startActivity()
@@ -232,6 +261,23 @@ class ProgressObserverTest : RobolectricTest() {
         op.cancel()
     }
 
+    @Test
+    fun `back is blocked as soon as an op starts and restored when it ends`() {
+        val activity = startActivity().get()
+        activity.observeProgress(viewModel, delayMillis = SHOW_DELAY) { it }
+
+        val gate = CompletableDeferred<Unit>()
+        val op = launchOp(gate)
+        activity.onBackPressedDispatcher.onBackPressed()
+        assertFalse(activity.isFinishing, "back must be blocked before the dialog shows")
+
+        gate.complete(Unit)
+        idleMainLooper(SHOW_DELAY)
+        activity.onBackPressedDispatcher.onBackPressed()
+        assertTrue(activity.isFinishing, "back must work again once the op ends")
+        op.cancel()
+    }
+
     @Test
     fun `an observer whose op ends does not restore touches while another op runs`() {
         val activity = startActivity().get()
@@ -307,6 +353,391 @@ class ProgressObserverTest : RobolectricTest() {
         legacyOp.cancel()
     }
 
+    @Test
+    fun `a fragment's observer stops when the fragment is destroyed`() {
+        val activity = startActivity().get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, null) }
+        val progress = fragment.viewModel.progressManager.progress as MutableStateFlow<*>
+        assertEquals(1, progress.subscriptionCount.value)
+
+        activity.supportFragmentManager.commitNow { remove(fragment) }
+        shadowOf(Looper.getMainLooper()).idle()
+
+        assertEquals(0, progress.subscriptionCount.value, "the observer must not outlive its fragment")
+    }
+
+    @Test
+    fun `a stopped fragment gives back the touches its op blocked`() {
+        val activity = startActivity().get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, null) }
+        val op = fragment.viewModel.runOp(CompletableDeferred())
+        assertTrue(activity.touchesBlocked(), "touches must be blocked while the op runs")
+
+        activity.supportFragmentManager.commitNow { setMaxLifecycle(fragment, Lifecycle.State.CREATED) }
+        assertFalse(activity.touchesBlocked(), "a stopped fragment must not keep the window blocked")
+
+        activity.supportFragmentManager.commitNow { setMaxLifecycle(fragment, Lifecycle.State.RESUMED) }
+        assertTrue(activity.touchesBlocked(), "touches must be blocked again while the op still runs")
+        op.cancel()
+    }
+
+    @Test
+    fun `an operation completing while its fragment is stopped leaves no dialog`() {
+        val activity = startActivity().get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, null) }
+        val gate = CompletableDeferred<Unit>()
+        val op = fragment.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertTrue(assertNotNull(activity.loadingDialog()).requireDialog().isShowing)
+
+        activity.supportFragmentManager.commitNow { setMaxLifecycle(fragment, Lifecycle.State.CREATED) }
+        gate.complete(Unit)
+        idleMainLooper(SHOW_DELAY)
+        assertFalse(activity.touchesBlocked())
+        assertNull(activity.loadingDialog(), "completed operation must not leave a modal dialog over the host")
+        op.cancel()
+    }
+
+    @Test
+    fun `destroying a fragment removes its visible progress dialog`() {
+        val activity = startActivity().get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, null) }
+        fragment.viewModel.runOp(CompletableDeferred())
+        idleMainLooper(SHOW_DELAY * 2)
+        assertTrue(assertNotNull(activity.loadingDialog()).requireDialog().isShowing)
+
+        activity.supportFragmentManager.commitNow { remove(fragment) }
+        idleMainLooper(SHOW_DELAY)
+        assertNull(activity.loadingDialog(), "destroyed fragment must not leave a modal dialog over the host")
+    }
+
+    @Test
+    fun `restarting a fragment after its operation completes dismisses visible progress`() {
+        val activity = startActivity().get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, null) }
+        val gate = CompletableDeferred<Unit>()
+        fragment.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertTrue(assertNotNull(activity.loadingDialog()).requireDialog().isShowing)
+        activity.supportFragmentManager.commitNow { setMaxLifecycle(fragment, Lifecycle.State.CREATED) }
+        gate.complete(Unit)
+        idleMainLooper(SHOW_DELAY)
+        activity.supportFragmentManager.commitNow { setMaxLifecycle(fragment, Lifecycle.State.RESUMED) }
+        idleMainLooper(SHOW_DELAY)
+        assertNull(activity.loadingDialog())
+    }
+
+    @Test
+    fun `recreating the activity during visible fragment progress is safe`() {
+        val controller = startActivity()
+        val activity = controller.get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, "progress-owner") }
+        val gate = CompletableDeferred<Unit>()
+        fragment.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertTrue(assertNotNull(activity.loadingDialog()).requireDialog().isShowing)
+
+        controller.recreate()
+        idleMainLooper(SHOW_DELAY)
+        gate.complete(Unit)
+        idleMainLooper(SHOW_DELAY)
+        assertNull(controller.get().loadingDialog())
+    }
+
+    @Test
+    fun `recreating the activity keeps a fragment's visible dialog`() {
+        val controller = startActivity()
+        val fragment = ProgressObservingFragment()
+        controller.get().supportFragmentManager.commitNow { add(fragment, "progress-owner") }
+        fragment.viewModel.runOp(CompletableDeferred())
+        idleMainLooper(SHOW_DELAY * 2)
+
+        controller.recreate()
+        idleMainLooper(Duration.ZERO)
+
+        assertNotNull(controller.get().loadingDialog())
+    }
+
+    @Test
+    fun `an operation completing right after the activity is recreated leaves no dialog`() {
+        val controller = startActivity()
+        val fragment = ProgressObservingFragment()
+        controller.get().supportFragmentManager.commitNow { add(fragment, "progress-owner") }
+        val gate = CompletableDeferred<Unit>()
+        fragment.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+
+        controller.recreate()
+        gate.complete(Unit)
+        idleMainLooper(SHOW_DELAY)
+
+        assertNull(controller.get().loadingDialog())
+    }
+
+    @Test
+    fun `an operation completing while the activity is stopped leaves no dialog on return`() {
+        val controller = startActivity()
+        val activity = controller.get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, null) }
+        val gate = CompletableDeferred<Unit>()
+        fragment.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertNotNull(activity.loadingDialog())
+
+        controller.pause().stop()
+        gate.complete(Unit)
+        controller.start().resume()
+        idleMainLooper(SHOW_DELAY)
+
+        assertNull(activity.loadingDialog())
+    }
+
+    @Test
+    fun `removing a fragment while the activity is stopped leaves no dialog on return`() {
+        val controller = startActivity()
+        val activity = controller.get()
+        val fragment = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(fragment, null) }
+        fragment.viewModel.runOp(CompletableDeferred())
+        idleMainLooper(SHOW_DELAY * 2)
+        assertNotNull(activity.loadingDialog())
+
+        controller.pause().stop()
+        activity.supportFragmentManager.commitNow(allowStateLoss = true) { remove(fragment) }
+        controller.start().resume()
+        idleMainLooper(SHOW_DELAY)
+
+        assertNull(activity.loadingDialog())
+    }
+
+    @Test
+    fun `destroying an idle fragment does not dismiss a different instance's progress`() {
+        val activity = startActivity().get()
+        val idle = ProgressObservingFragment()
+        val active = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow {
+            add(idle, "idle")
+            add(active, "active")
+        }
+        val gate = CompletableDeferred<Unit>()
+        active.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertNotNull(activity.loadingDialog())
+
+        activity.supportFragmentManager.commitNow { remove(idle) }
+        idleMainLooper(SHOW_DELAY * 2)
+        assertTrue(activity.touchesBlocked())
+        assertNotNull(activity.loadingDialog(), "another fragment still owns active progress")
+        gate.complete(Unit)
+    }
+
+    @Test
+    fun `restarting an idle fragment does not dismiss a different instance's progress`() {
+        val activity = startActivity().get()
+        val idle = ProgressObservingFragment()
+        val active = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow {
+            add(idle, "idle")
+            add(active, "active")
+        }
+        val gate = CompletableDeferred<Unit>()
+        active.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+
+        activity.supportFragmentManager.commitNow { setMaxLifecycle(idle, Lifecycle.State.CREATED) }
+        activity.supportFragmentManager.commitNow { setMaxLifecycle(idle, Lifecycle.State.RESUMED) }
+        idleMainLooper(SHOW_DELAY * 2)
+
+        assertNotNull(activity.loadingDialog())
+        gate.complete(Unit)
+    }
+
+    @Test
+    fun `adding an idle fragment does not dismiss a different instance's progress`() {
+        val activity = startActivity().get()
+        val active = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(active, "active") }
+        val gate = CompletableDeferred<Unit>()
+        active.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        val dialog = assertNotNull(activity.loadingDialog())
+
+        activity.supportFragmentManager.commitNow { add(ProgressObservingFragment(), "idle") }
+        idleMainLooper(SHOW_DELAY * 2)
+
+        assertSame(dialog, activity.loadingDialog())
+        gate.complete(Unit)
+    }
+
+    @Test
+    fun `destroying a stopped former owner does not dismiss another fragments progress`() {
+        val activity = startActivity().get()
+        val former = ProgressObservingFragment()
+        val current = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(former, "former") }
+        val formerGate = CompletableDeferred<Unit>()
+        former.viewModel.runOp(formerGate)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertNotNull(activity.loadingDialog())
+        activity.supportFragmentManager.commitNow { setMaxLifecycle(former, Lifecycle.State.CREATED) }
+        idleMainLooper(SHOW_DELAY)
+        assertNull(activity.loadingDialog())
+        formerGate.complete(Unit)
+        activity.supportFragmentManager.commitNow { add(current, "current") }
+        val currentGate = CompletableDeferred<Unit>()
+        current.viewModel.runOp(currentGate)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertNotNull(activity.loadingDialog())
+        activity.supportFragmentManager.commitNow { remove(former) }
+        idleMainLooper(SHOW_DELAY)
+        assertTrue(activity.touchesBlocked())
+        assertNotNull(activity.loadingDialog(), "former owner must not dismiss the current operation")
+        currentGate.complete(Unit)
+    }
+
+    @Test
+    fun `an operation ending does not dismiss the dialog another instance showed after it`() {
+        val activity = startActivity().get()
+        val first = ProgressObservingFragment()
+        val second = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow {
+            add(first, "first")
+            add(second, "second")
+        }
+        val firstGate = CompletableDeferred<Unit>()
+        first.viewModel.runOp(firstGate)
+        idleMainLooper(SHOW_DELAY * 2)
+        val secondGate = CompletableDeferred<Unit>()
+        second.viewModel.runOp(secondGate)
+        idleMainLooper(SHOW_DELAY * 2)
+
+        firstGate.complete(Unit)
+        idleMainLooper(SHOW_DELAY)
+
+        assertNotNull(activity.loadingDialog())
+        secondGate.complete(Unit)
+    }
+
+    @Test
+    fun `review - later operation ends while earlier operation still runs`() {
+        val activity = startActivity().get()
+        val first = ProgressObservingFragment()
+        val second = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow {
+            add(first, "first")
+            add(second, "second")
+        }
+        val firstGate = CompletableDeferred<Unit>()
+        first.viewModel.runOp(firstGate)
+        idleMainLooper(SHOW_DELAY * 2)
+        val secondGate = CompletableDeferred<Unit>()
+        second.viewModel.runOp(secondGate)
+        idleMainLooper(SHOW_DELAY * 2)
+        secondGate.complete(Unit)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertTrue(activity.touchesBlocked())
+        assertNotNull(activity.loadingDialog(), "earlier operation still needs visible progress")
+        firstGate.complete(Unit)
+    }
+
+    @Test
+    fun `review - created idle fragment must not retain completed dialog`() {
+        val activity = startActivity().get()
+        val active = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow { add(active, "active") }
+        val gate = CompletableDeferred<Unit>()
+        active.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        val idle = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow {
+            add(idle, "idle")
+            setMaxLifecycle(idle, Lifecycle.State.CREATED)
+        }
+        gate.complete(Unit)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertFalse(activity.touchesBlocked())
+        assertNull(activity.loadingDialog(), "an idle CREATED fragment must not retain a completed operation's dialog")
+    }
+
+    @Test
+    fun `review - remaining owner restores its message and cancel listener`() {
+        val activity = startActivity().get()
+        val first = ProgressObservingFragment()
+        val second = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow {
+            add(first, "first")
+            add(second, "second")
+        }
+        val firstGate = CompletableDeferred<Unit>()
+        var cancelled = false
+        val firstOp = launchOp(firstGate, message = "first", onCancel = { cancelled = true }, manager = first.viewModel.progressManager)
+        idleMainLooper(SHOW_DELAY * 2)
+        val secondGate = CompletableDeferred<Unit>()
+        val secondOp = launchOp(secondGate, message = "second", onCancel = {}, manager = second.viewModel.progressManager)
+        idleMainLooper(SHOW_DELAY * 2)
+        secondGate.complete(Unit)
+        idleMainLooper(SHOW_DELAY * 2)
+        activity.loadingDialog()!!.requireDialog().cancel()
+        idleMainLooper(Duration.ZERO)
+        assertTrue(cancelled, "cancel must reach the remaining active owner")
+        firstGate.complete(Unit)
+        firstOp.cancel()
+        secondOp.cancel()
+    }
+
+    @Test
+    fun `review - recreation with idle created fragment leaves no orphan dialog`() {
+        val controller = startActivity()
+        val idle = ProgressObservingFragment()
+        val active = ProgressObservingFragment()
+        controller.get().supportFragmentManager.commitNow {
+            add(idle, "idle")
+            setMaxLifecycle(idle, Lifecycle.State.CREATED)
+            add(active, "active")
+        }
+        val gate = CompletableDeferred<Unit>()
+        active.viewModel.runOp(gate)
+        idleMainLooper(SHOW_DELAY * 2)
+        controller.recreate()
+        idleMainLooper(SHOW_DELAY * 2)
+        gate.complete(Unit)
+        idleMainLooper(SHOW_DELAY * 2)
+        assertFalse(controller.get().touchesBlocked())
+        assertNull(controller.get().loadingDialog(), "restored idle fragment must not retain completed dialog")
+    }
+
+    @Test
+    fun `a holder leaving while the activity is stopped is safe`() {
+        val controller = startActivity()
+        val activity = controller.get()
+        val first = ProgressObservingFragment()
+        val second = ProgressObservingFragment()
+        activity.supportFragmentManager.commitNow {
+            add(first, "first")
+            add(second, "second")
+        }
+        val firstGate = CompletableDeferred<Unit>()
+        first.viewModel.runOp(firstGate)
+        second.viewModel.runOp(CompletableDeferred())
+        idleMainLooper(SHOW_DELAY * 2)
+
+        controller.pause().stop()
+        activity.supportFragmentManager.commitNow(allowStateLoss = true) { remove(second) }
+        idleMainLooper(SHOW_DELAY)
+        controller.start().resume()
+        idleMainLooper(SHOW_DELAY)
+
+        assertNotNull(activity.loadingDialog())
+        firstGate.complete(Unit)
+    }
+
     private fun launchOp(
         gate: CompletableDeferred<Unit>,
         message: String = "op",
@@ -340,3 +771,20 @@ class ProgressObserverTest : RobolectricTest() {
         private val SHOW_DELAY = 600.milliseconds
     }
 }
+
+class ProgressObservingFragment : Fragment() {
+    val viewModel: ProgressTestViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        observeProgress(viewModel) { it }
+    }
+}
+
+class ProgressTestViewModel :
+    ViewModel(),
+    HasProgress<String> {
+    override val progressManager = ProgressManager<String>()
+
+    fun runOp(gate: CompletableDeferred<Unit>) = viewModelScope.launch { progressManager.withProgress(message = "op") { gate.await() } }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/provider/CardContentProviderTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/provider/CardContentProviderTest.kt
new file mode 100644
index 000000000000..15ffa8eadfb0
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/provider/CardContentProviderTest.kt
@@ -0,0 +1,85 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.provider
+
+import android.content.ContentValues
+import android.os.Process
+import androidx.core.net.toUri
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.BuildConfig
+import com.ichi2.anki.CollectionManager
+import com.ichi2.anki.EmptyApplicationCategory
+import com.ichi2.anki.FlashCardsContract
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.libanki.Utils
+import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.grantPermissions
+import org.junit.Before
+import org.junit.Test
+import org.junit.experimental.categories.Category
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.annotation.Config
+import org.robolectric.shadows.ShadowBinder
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+/**
+ * Run on a parallel build to check an authority that differs from the API library's default:
+ * `TEST_RELEASE_BUILD=true ./gradlew testFullReleaseUnitTest -PcustomSuffix=a --tests '*CardContentProviderTest'`
+ */
+@RunWith(AndroidJUnit4::class)
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class CardContentProviderTest : RobolectricTest() {
+    private lateinit var provider: CardContentProvider
+    private val authority = "${BuildConfig.APPLICATION_ID}.flashcards"
+
+    @Before
+    fun setUpProvider() {
+        CollectionManager.setColForTests(col)
+        grantPermissions("${BuildConfig.APPLICATION_ID}.permission.READ_WRITE_DATABASE")
+        provider = Robolectric.buildContentProvider(CardContentProvider::class.java).create(authority).get()
+        // Release providers require a call from another process, even when the permission is granted.
+        ShadowBinder.setCallingPid(Process.myPid() + 1)
+    }
+
+    @Test
+    fun `inserted note can be queried through the returned URI`() {
+        val values =
+            ContentValues().apply {
+                put(FlashCardsContract.Note.MID, col.notetypes.basic.id)
+                put(FlashCardsContract.Note.FLDS, Utils.joinFields(arrayOf("front", "back")))
+            }
+        assertInsertReturnsProviderUri("notes", values)
+    }
+
+    @Test
+    fun `inserted model can be queried through the returned URI`() {
+        val values =
+            ContentValues().apply {
+                put(FlashCardsContract.Model.NAME, "Parallel model")
+                put(FlashCardsContract.Model.FIELD_NAMES, Utils.joinFields(arrayOf("Front", "Back")))
+                put(FlashCardsContract.Model.NUM_CARDS, 1)
+            }
+        assertInsertReturnsProviderUri("models", values)
+    }
+
+    @Test
+    fun `inserted deck can be queried through the returned URI`() {
+        val values = ContentValues().apply { put(FlashCardsContract.Deck.DECK_NAME, "Parallel deck") }
+        assertInsertReturnsProviderUri("decks", values)
+    }
+
+    private fun assertInsertReturnsProviderUri(
+        path: String,
+        values: ContentValues,
+    ) {
+        val requestUri = "content://$authority/$path".toUri()
+        val insertedUri = assertNotNull(provider.insert(requestUri, values))
+        assertEquals(requestUri.authority, insertedUri.authority)
+        assertNotNull(provider.query(insertedUri, null, null, null, null)).use { cursor ->
+            assertEquals(1, cursor.count)
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/recorder/AudioRecorderTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/recorder/AudioRecorderTest.kt
index 753ac0308ed5..73ec74e7bc3e 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/recorder/AudioRecorderTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/recorder/AudioRecorderTest.kt
@@ -6,9 +6,10 @@ package com.ichi2.anki.recorder
 import android.media.MediaRecorder
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.EmptyApplicationCategory
-import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.compat.CompatHelper
+import com.ichi2.testutils.AndroidTest
 import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.targetContext
 import io.mockk.clearAllMocks
 import io.mockk.every
 import io.mockk.mockk
@@ -31,7 +32,7 @@ import kotlin.test.junit5.JUnit5Asserter.assertNotNull
 @RunWith(AndroidJUnit4::class)
 @Config(application = EmptyApplication::class)
 @Category(EmptyApplicationCategory::class)
-class AudioRecorderTest : RobolectricTest() {
+class AudioRecorderTest : AndroidTest {
     private val mockMediaRecorder = mockk<MediaRecorder>(relaxed = true)
 
     private fun createRecorder(): AudioRecorder {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/recorder/RemoveExpiredRecordingsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/recorder/RemoveExpiredRecordingsTest.kt
new file mode 100644
index 000000000000..f431a2c42583
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/recorder/RemoveExpiredRecordingsTest.kt
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: 2026 Ashish Yadav <mailtoashish693@gmail.com>
+
+package com.ichi2.anki.recorder
+
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+import java.io.File
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.seconds
+
+class RemoveExpiredRecordingsTest {
+    @get:Rule
+    val temporaryFolder = TemporaryFolder()
+
+    private val now = 1_800_000_000_000L
+
+    @Test
+    fun `cleanup removes only recordings older than seven days`() {
+        val expired = createFile("ankidroid_audiorec1.3gp", 7.days + 1.seconds)
+        val atCutoff = createFile("ankidroid_audiorec2.3gp", 7.days)
+        val recent = createFile("ankidroid_audiorec3.3gp", 1.days)
+
+        VoiceRecorder.removeExpiredRecordings(temporaryFolder.root, now)
+
+        assertFalse(expired.exists(), "expired recording")
+        assertTrue(atCutoff.exists(), "recording at the cutoff")
+        assertTrue(recent.exists(), "recent recording")
+    }
+
+    @Test
+    fun `cleanup keeps other files and folders`() {
+        val unrelated = createFile("notes.txt", 8.days)
+        val folder = temporaryFolder.newFolder("ankidroid_audiorec_folder.3gp")
+        assertTrue(folder.setLastModified(now - 8.days.inWholeMilliseconds))
+
+        VoiceRecorder.removeExpiredRecordings(temporaryFolder.root, now)
+
+        assertTrue(unrelated.exists(), "unrelated file")
+        assertTrue(folder.exists(), "folder")
+    }
+
+    @Test
+    fun `cleanup ignores a missing recordings folder`() {
+        VoiceRecorder.removeExpiredRecordings(File(temporaryFolder.root, "missing"), now)
+    }
+
+    private fun createFile(
+        name: String,
+        age: Duration,
+    ): File =
+        temporaryFolder.newFile(name).apply {
+            assertTrue(setLastModified(now - age.inWholeMilliseconds))
+        }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/recorder/VoicePlayerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/recorder/VoicePlayerTest.kt
index f3161fc235b9..a43edb47704b 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/recorder/VoicePlayerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/recorder/VoicePlayerTest.kt
@@ -7,7 +7,6 @@ import android.net.Uri
 import androidx.media3.common.MediaItem
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.EmptyApplicationCategory
-import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.recorder.PlayerState.Empty
 import com.ichi2.anki.recorder.PlayerState.Failed
 import com.ichi2.anki.recorder.PlayerState.Loading
@@ -19,12 +18,15 @@ import kotlinx.coroutines.job
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceTimeBy
 import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.greaterThan
 import org.hamcrest.Matchers.hasSize
+import org.junit.Rule
 import org.junit.Test
 import org.junit.experimental.categories.Category
+import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import java.io.File
@@ -35,7 +37,10 @@ import kotlin.time.Duration.Companion.seconds
 @RunWith(AndroidJUnit4::class)
 @Config(application = EmptyApplication::class)
 @Category(EmptyApplicationCategory::class)
-class VoicePlayerTest : RobolectricTest() {
+class VoicePlayerTest {
+    @get:Rule
+    val tempFolder = TemporaryFolder()
+
     private val playerStub = PlayerStub()
     private val recording by lazy { File(tempFolder.root, "recording.3gp") }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/recorder/VoiceRecorderTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/recorder/VoiceRecorderTest.kt
index 918139957d1c..7bc25b8c8a89 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/recorder/VoiceRecorderTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/recorder/VoiceRecorderTest.kt
@@ -5,12 +5,13 @@ package com.ichi2.anki.recorder
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.EmptyApplicationCategory
-import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.recorder.RecorderState.Idle
 import com.ichi2.anki.recorder.RecorderState.Paused
 import com.ichi2.anki.recorder.RecorderState.Recorded
 import com.ichi2.anki.recorder.RecorderState.Recording
+import com.ichi2.testutils.AndroidTest
 import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.targetContext
 import io.mockk.every
 import io.mockk.verify
 import io.mockk.verifyOrder
@@ -20,6 +21,7 @@ import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.advanceTimeBy
 import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.both
 import org.hamcrest.Matchers.empty
@@ -33,8 +35,10 @@ import org.hamcrest.Matchers.nullValue
 import org.hamcrest.Matchers.startsWith
 import org.junit.After
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.experimental.categories.Category
+import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import java.io.File
@@ -45,7 +49,10 @@ import kotlin.time.Duration.Companion.milliseconds
 @RunWith(AndroidJUnit4::class)
 @Config(application = EmptyApplication::class)
 @Category(EmptyApplicationCategory::class)
-class VoiceRecorderTest : RobolectricTest() {
+class VoiceRecorderTest : AndroidTest {
+    @get:Rule
+    val tempFolder = TemporaryFolder()
+
     private val mediaRecorderStub = MediaRecorderStub()
     private val mediaRecorder get() = mediaRecorderStub.mediaRecorder
     private val recordingsDirectory by lazy { File(tempFolder.root, "recordings") }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/ActionButtonStatusTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/ActionButtonStatusTest.kt
index 158b120a7d53..59769b175202 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/ActionButtonStatusTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/ActionButtonStatusTest.kt
@@ -4,20 +4,27 @@ package com.ichi2.anki.reviewer
 
 import android.content.SharedPreferences
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.EmptyApplicationCategory
 import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.preferences.PreferenceTestUtils
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.targetContext
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.containsInAnyOrder
 import org.junit.Test
+import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
 import org.mockito.Mockito.any
 import org.mockito.Mockito.mock
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.kotlin.whenever
+import org.robolectric.annotation.Config
 
 @RunWith(AndroidJUnit4::class)
-class ActionButtonStatusTest : RobolectricTest() {
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class ActionButtonStatusTest : AndroidTest {
     @Test
     fun allCustomButtonsCanBeDisabled() {
         val reviewerExpectedKeys = customButtonsExpectedKeys
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/AutomaticAnswerAndroidTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/AutomaticAnswerAndroidTest.kt
index a659e00ae5f4..bc619945805d 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/AutomaticAnswerAndroidTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/AutomaticAnswerAndroidTest.kt
@@ -3,16 +3,22 @@
 package com.ichi2.anki.reviewer
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.EmptyApplicationCategory
 import com.ichi2.anki.reviewer.AutomaticAnswerAction.Companion.answerAction
+import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.JvmTest
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
+import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
 import org.mockito.kotlin.mock
+import org.robolectric.annotation.Config
 
 @RunWith(AndroidJUnit4::class)
-class AutomaticAnswerAndroidTest : RobolectricTest() {
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class AutomaticAnswerAndroidTest : JvmTest() {
     @Test
     fun default_is_bury() {
         assertThat("no value", createInstance().settings.answerAction, equalTo(AutomaticAnswerAction.BURY_CARD))
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/AutomaticAnswerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/AutomaticAnswerTest.kt
index 1069f397dab2..043cfe1ca54a 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/AutomaticAnswerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/AutomaticAnswerTest.kt
@@ -6,7 +6,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.EmptyApplicationCategory
 import com.ichi2.anki.reviewer.AutomaticAnswer.AutomaticallyAnswered
 import com.ichi2.testutils.EmptyApplication
-import com.ichi2.testutils.JvmTest
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
@@ -19,7 +18,7 @@ import org.robolectric.shadows.ShadowLooper.runUiThreadTasksIncludingDelayedTask
 @RunWith(AndroidJUnit4::class)
 @Config(application = EmptyApplication::class)
 @Category(EmptyApplicationCategory::class)
-class AutomaticAnswerTest : JvmTest() {
+class AutomaticAnswerTest {
     @Test
     fun disableWorks() {
         val answer = validAnswer(automaticallyAnsweredMock())
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingAndroidTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingAndroidTest.kt
index e604aa084340..8d7059258de2 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingAndroidTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingAndroidTest.kt
@@ -4,52 +4,74 @@ package com.ichi2.anki.reviewer
 
 import android.view.KeyEvent
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.EmptyApplicationCategory
 import com.ichi2.anki.cardviewer.Gesture
+import com.ichi2.anki.reviewer.Binding.KeyCode
 import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.alt
 import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.ctrl
 import com.ichi2.anki.reviewer.Binding.ModifierKeys.Companion.shift
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.targetContext
 import org.junit.Assert.assertEquals
 import org.junit.Test
+import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
+import kotlin.test.assertNull
 
 @RunWith(AndroidJUnit4::class)
-class BindingAndroidTest : RobolectricTest() {
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class BindingAndroidTest : AndroidTest {
     @Test
     fun testKeycodeToString() {
         // These use native functions. We may need KeyEvent.keyCodeToString
-        assertEquals(BindingTest.KEY_PREFIX + "87", Binding.keyCode(KeyEvent.KEYCODE_MEDIA_NEXT).toString())
-        assertEquals(BindingTest.KEY_PREFIX + "Ctrl+88", Binding.keyCode(KeyEvent.KEYCODE_MEDIA_PREVIOUS, ctrl()).toString())
-        assertEquals(BindingTest.KEY_PREFIX + "Shift+25", Binding.keyCode(KeyEvent.KEYCODE_VOLUME_DOWN, shift()).toString())
-        assertEquals(BindingTest.KEY_PREFIX + "Alt+24", Binding.keyCode(KeyEvent.KEYCODE_VOLUME_UP, alt()).toString())
+        assertEquals(BindingTest.KEY_PREFIX + "87", KeyCode(KeyEvent.KEYCODE_MEDIA_NEXT).toString())
+        assertEquals(BindingTest.KEY_PREFIX + "Ctrl+88", KeyCode(KeyEvent.KEYCODE_MEDIA_PREVIOUS, ctrl()).toString())
+        assertEquals(BindingTest.KEY_PREFIX + "Shift+25", KeyCode(KeyEvent.KEYCODE_VOLUME_DOWN, shift()).toString())
+        assertEquals(BindingTest.KEY_PREFIX + "Alt+24", KeyCode(KeyEvent.KEYCODE_VOLUME_UP, alt()).toString())
     }
 
     @Test
     fun testFromString() {
-        assertEquals(Binding.unicode('Ä'), Binding.fromString(BindingTest.UNICODE_PREFIX + "Ä"))
-        assertEquals(Binding.unicode('Ä', ctrl()), Binding.fromString(BindingTest.UNICODE_PREFIX + "Ctrl+Ä"))
-        assertEquals(Binding.unicode('Ä', shift()), Binding.fromString(BindingTest.UNICODE_PREFIX + "Shift+Ä"))
-        assertEquals(Binding.unicode('Ä', alt()), Binding.fromString(BindingTest.UNICODE_PREFIX + "Alt+Ä"))
+        val character = BindingUnicodeCharacter('Ä')
+        assertEquals(Binding.unicode(character), Binding.fromString(BindingTest.UNICODE_PREFIX + "Ä"))
+        assertEquals(Binding.unicode(character, ctrl()), Binding.fromString(BindingTest.UNICODE_PREFIX + "Ctrl+Ä"))
+        assertEquals(Binding.unicode(character, shift()), Binding.fromString(BindingTest.UNICODE_PREFIX + "Shift+Ä"))
+        assertEquals(Binding.unicode(character, alt()), Binding.fromString(BindingTest.UNICODE_PREFIX + "Alt+Ä"))
         assertEquals(
-            Binding.keyCode(KeyEvent.KEYCODE_MEDIA_NEXT),
+            KeyCode(KeyEvent.KEYCODE_MEDIA_NEXT),
             Binding.fromString(BindingTest.KEY_PREFIX + KeyEvent.keyCodeToString(KeyEvent.KEYCODE_MEDIA_NEXT)),
         )
         assertEquals(
-            Binding.keyCode(KeyEvent.KEYCODE_MEDIA_PREVIOUS, ctrl()),
+            KeyCode(KeyEvent.KEYCODE_MEDIA_PREVIOUS, ctrl()),
             Binding.fromString(BindingTest.KEY_PREFIX + "Ctrl+" + KeyEvent.keyCodeToString(KeyEvent.KEYCODE_MEDIA_PREVIOUS)),
         )
         assertEquals(
-            Binding.keyCode(KeyEvent.KEYCODE_VOLUME_DOWN, shift()),
+            KeyCode(KeyEvent.KEYCODE_VOLUME_DOWN, shift()),
             Binding.fromString(BindingTest.KEY_PREFIX + "Shift+" + KeyEvent.keyCodeToString(KeyEvent.KEYCODE_VOLUME_DOWN)),
         )
         assertEquals(
-            Binding.keyCode(KeyEvent.KEYCODE_VOLUME_UP, alt()),
+            KeyCode(KeyEvent.KEYCODE_VOLUME_UP, alt()),
             Binding.fromString(BindingTest.KEY_PREFIX + "Alt+" + KeyEvent.keyCodeToString(KeyEvent.KEYCODE_VOLUME_UP)),
         )
         assertEquals(Binding.gesture(Gesture.TAP_TOP), Binding.fromString(BindingTest.GESTURE_PREFIX + Gesture.TAP_TOP.name))
     }
 
+    @Test
+    fun `deserialization rejects the preference separator`() {
+        assertNull(Binding.fromString("✅|"))
+        assertNull(Binding.fromString("✅Ctrl+|"))
+    }
+
+    @Test
+    fun `unicode display unwraps the character`() {
+        val binding = Binding.UnicodeCharacter(BindingUnicodeCharacter('Ä'), BindingTest.allModifierKeys())
+
+        assertEquals("⌨ Ctrl+Alt+Shift+Ä", binding.toDisplayString())
+    }
+
     @Test
     fun `motion event serde`() {
         assertEquals(axis(Axis.X, 1.0f), axisBindingFromString("0 1.0"))
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingTest.kt
index 636460e0969c..a71df9765830 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingTest.kt
@@ -4,6 +4,7 @@ package com.ichi2.anki.reviewer
 
 import android.view.KeyEvent
 import com.ichi2.anki.cardviewer.Gesture
+import com.ichi2.anki.reviewer.Binding.KeyCode
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Assert.assertEquals
@@ -29,7 +30,42 @@ class BindingTest {
     fun unicodeKeyIsLoaded() {
         val binding = unicodeCharacter('a')
 
-        assertThat(binding.unicodeCharacter, equalTo('a'))
+        assertThat(binding.unicodeCharacter, equalTo(BindingUnicodeCharacter('a')))
+    }
+
+    @Test
+    fun `valid unicode input retains modifiers`() {
+        val event =
+            mock<KeyEvent> {
+                on { keyCode } doReturn KeyEvent.KEYCODE_8
+                on { getUnicodeChar(anyInt()) } doReturn '*'.code
+                on { isShiftPressed } doReturn true
+                on { isCtrlPressed } doReturn true
+                on { isAltPressed } doReturn true
+            }
+        val binding = Binding.possibleKeyBindings(event).filterIsInstance<Binding.UnicodeCharacter>().single()
+
+        assertEquals(BindingUnicodeCharacter('*'), binding.unicodeCharacter)
+        assertTrue(binding.modifierKeys.shift)
+        assertTrue(binding.modifierKeys.ctrl)
+        assertTrue(binding.modifierKeys.alt)
+    }
+
+    @Test
+    fun `forbidden unicode input retains the keycode binding and modifiers`() {
+        val event =
+            mock<KeyEvent> {
+                on { keyCode } doReturn KeyEvent.KEYCODE_BACKSLASH
+                on { getUnicodeChar(anyInt()) } doReturn MappableBinding.PREF_SEPARATOR.code
+                on { isShiftPressed } doReturn true
+                on { isCtrlPressed } doReturn true
+                on { isAltPressed } doReturn true
+            }
+
+        assertEquals(
+            listOf(KeyCode(KeyEvent.KEYCODE_BACKSLASH, allModifierKeys())),
+            Binding.possibleKeyBindings(event),
+        )
     }
 
     @Test
@@ -41,22 +77,37 @@ class BindingTest {
 
     @Test
     fun testUnicodeToString() {
-        assertEquals(UNICODE_PREFIX + "Ä", Binding.unicode('Ä').toString())
-        assertEquals(UNICODE_PREFIX + "Ctrl+Ä", Binding.unicode('Ä', Binding.ModifierKeys.ctrl()).toString())
-        assertEquals(UNICODE_PREFIX + "Shift+Ä", Binding.unicode('Ä', Binding.ModifierKeys.shift()).toString())
-        assertEquals(UNICODE_PREFIX + "Alt+Ä", Binding.unicode('Ä', Binding.ModifierKeys.alt()).toString())
-        assertEquals(UNICODE_PREFIX + "Ctrl+Alt+Shift+Ä", Binding.unicode('Ä', allModifierKeys()).toString())
+        val character = BindingUnicodeCharacter('Ä')
+        assertEquals(UNICODE_PREFIX + "Ä", Binding.unicode(character).toString())
+        assertEquals(UNICODE_PREFIX + "Ctrl+Ä", Binding.unicode(character, Binding.ModifierKeys.ctrl()).toString())
+        assertEquals(UNICODE_PREFIX + "Shift+Ä", Binding.unicode(character, Binding.ModifierKeys.shift()).toString())
+        assertEquals(UNICODE_PREFIX + "Alt+Ä", Binding.unicode(character, Binding.ModifierKeys.alt()).toString())
+        assertEquals(UNICODE_PREFIX + "Ctrl+Alt+Shift+Ä", Binding.unicode(character, allModifierKeys()).toString())
     }
 
     @Test
-    fun testGestureToString() {
-        assertEquals(GESTURE_PREFIX + "TAP_TOP", Binding.gesture(Gesture.TAP_TOP).toString())
+    fun `plus unicode binding roundtrips with every modifier combination`() {
+        val modifiers =
+            listOf(
+                Binding.ModifierKeys.none(),
+                Binding.ModifierKeys.ctrl(),
+                Binding.ModifierKeys.alt(),
+                Binding.ModifierKeys.shift(),
+                Binding.ModifierKeys(ctrl = true, alt = true),
+                Binding.ModifierKeys(ctrl = true, shift = true),
+                Binding.ModifierKeys(alt = true, shift = true),
+                allModifierKeys(),
+            )
+        for (modifierKeys in modifiers) {
+            val binding = Binding.unicode(BindingUnicodeCharacter('+'), modifierKeys)
+
+            assertEquals(binding.toString(), binding, Binding.fromString(binding.toString()))
+        }
     }
 
     @Test
-    fun testUnknownToString() {
-        // This seems sensible - serialising an unknown will mean that nothing is saved.
-        assertThat(Binding.unknown().toString(), equalTo(""))
+    fun testGestureToString() {
+        assertEquals(GESTURE_PREFIX + "TAP_TOP", Binding.gesture(Gesture.TAP_TOP).toString())
     }
 
     @Test
@@ -122,13 +173,13 @@ class BindingTest {
             return Binding.possibleKeyBindings(mock).filterIsInstance<Binding.UnicodeCharacter>().first()
         }
 
-        fun keyCode(keyCode: Int): Binding.KeyCode {
+        fun keyCode(keyCode: Int): KeyCode {
             val mock =
                 mock<KeyEvent> {
                     on { getKeyCode() } doReturn keyCode
                 }
 
-            return Binding.possibleKeyBindings(mock).filterIsInstance<Binding.KeyCode>().first()
+            return Binding.possibleKeyBindings(mock).filterIsInstance<KeyCode>().first()
         }
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingUnicodeCharacterTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingUnicodeCharacterTest.kt
new file mode 100644
index 000000000000..5836e66a38fe
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingUnicodeCharacterTest.kt
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.reviewer
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertThrows
+import org.junit.Test
+import kotlin.test.assertNull
+
+class BindingUnicodeCharacterTest {
+    @Test
+    fun `preference separator cannot be constructed`() {
+        assertThrows(IllegalArgumentException::class.java) {
+            BindingUnicodeCharacter(MappableBinding.PREF_SEPARATOR)
+        }
+    }
+
+    @Test
+    fun `preference separator is rejected without throwing`() {
+        assertNull(BindingUnicodeCharacter.fromCharOrNull(MappableBinding.PREF_SEPARATOR))
+    }
+
+    @Test
+    fun `supported characters retain their values`() {
+        for (character in listOf('a', 'Ä', ' ', '*')) {
+            assertEquals(character, BindingUnicodeCharacter(character).value)
+            assertEquals(BindingUnicodeCharacter(character), BindingUnicodeCharacter.fromCharOrNull(character))
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/MappableBindingTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/MappableBindingTest.kt
index f11eba985039..7de681dd8c0c 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/MappableBindingTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/MappableBindingTest.kt
@@ -5,12 +5,15 @@ package com.ichi2.anki.reviewer
 import android.view.KeyEvent
 import com.ichi2.anki.cardviewer.ViewerCommand
 import com.ichi2.anki.cardviewer.ViewerCommand.entries
+import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.hasItem
 import org.hamcrest.Matchers.not
 import org.junit.Test
 import java.util.Arrays
 import java.util.stream.Collectors
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 
 class MappableBindingTest {
     @Test
@@ -29,6 +32,42 @@ class MappableBindingTest {
         assertThat(allBindings, not(hasItem(keyCode(KeyEvent.KEYCODE_L))))
     }
 
+    @Test
+    fun `preference parsing drops invalid bindings and preserves valid bindings in order`() {
+        val bindings = MappableBinding.fromPreferenceString("1/unknown|⌨Ctrl+66|⌨not-a-number|✅Ä|⍝SWIPE_UP|✅")
+
+        assertEquals(listOf("⌨Ctrl+66", "✅Ä", "⍝SWIPE_UP"), bindings.map { it.toPreferenceString() })
+    }
+
+    @Test
+    fun `preference parsing returns no bindings when all entries are invalid`() {
+        assertTrue(MappableBinding.fromPreferenceString("1/unknown|⌨not-a-number|✅").isEmpty())
+    }
+
+    @Test
+    fun `plus unicode bindings roundtrip through preferences`() {
+        val bindings =
+            listOf(
+                MappableBinding(Binding.unicode(BindingUnicodeCharacter('+'), Binding.ModifierKeys.none())),
+                MappableBinding(Binding.unicode(BindingUnicodeCharacter('+'), BindingTest.allModifierKeys())),
+                MappableBinding(Binding.unicode(BindingUnicodeCharacter('Ä'), Binding.ModifierKeys.ctrl())),
+            )
+
+        assertEquals(bindings, MappableBinding.fromPreferenceString(bindings.toPreferenceString()))
+    }
+
+    @Test
+    fun `plus unicode reviewer bindings preserve card sides through preferences`() {
+        val bindings =
+            CardSide.entries.map { side ->
+                ReviewerBinding(Binding.unicode(BindingUnicodeCharacter('+'), BindingTest.allModifierKeys()), side)
+            }
+        val restored = ReviewerBinding.fromPreferenceString(bindings.toPreferenceString())
+
+        assertEquals(bindings.map { it.binding }, restored.map { it.binding })
+        assertEquals(bindings.map { it.side }, restored.map { it.side })
+    }
+
     private fun getAllBindings() =
         Arrays
             .stream(entries.toTypedArray())
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReminderLogTreeTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReminderLogTreeTest.kt
index 7907dcf9f848..7198adc4aa68 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReminderLogTreeTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReminderLogTreeTest.kt
@@ -4,10 +4,13 @@
 package com.ichi2.anki.reviewreminders
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.EmptyApplicationCategory
 import com.ichi2.anki.reviewreminders.ReminderLogTree.Companion.MAX_LINE_LENGTH
 import com.ichi2.anki.reviewreminders.ReminderLogTree.Companion.TRIM_TARGET_BYTES
 import com.ichi2.anki.reviewreminders.ReminderLogTree.Companion.TRIM_TRIGGER_BYTES
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.targetContext
 import kotlinx.coroutines.runBlocking
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.endsWith
@@ -17,21 +20,25 @@ import org.hamcrest.Matchers.lessThan
 import org.hamcrest.Matchers.not
 import org.hamcrest.Matchers.nullValue
 import org.hamcrest.Matchers.startsWith
+import org.junit.After
 import org.junit.Before
 import org.junit.Test
+import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
 import timber.log.Timber
 import java.io.File
 
 @RunWith(AndroidJUnit4::class)
-class ReminderLogTreeTest : RobolectricTest() {
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class ReminderLogTreeTest : AndroidTest {
     private lateinit var tree: ReminderLogTree
     private val temporaryFile: File
         get() = File(tree.logFile.parentFile, "${tree.logFile.name}.tmp")
 
     @Before
-    override fun setUp() {
-        super.setUp()
+    fun setUp() {
         // Own the tree: application initialization may have planted zero or multiple reminder trees.
         Timber.forest().filterIsInstance<ReminderLogTree>().forEach(Timber::uproot)
         tree = ReminderLogTree(targetContext).also { Timber.plant(it) }
@@ -39,6 +46,12 @@ class ReminderLogTreeTest : RobolectricTest() {
         temporaryFile.delete()
     }
 
+    @After
+    fun tearDown() {
+        Timber.uproot(tree)
+        awaitLogWrites()
+    }
+
     @Test
     fun `reminderLogPrefix identifies the reminder a log is about`() {
         assertThat("a log about no reminder in particular", reminderLogPrefix(), equalTo("[Reminders]"))
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReminderTroubleshootingLayoutTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReminderTroubleshootingLayoutTest.kt
index f099af6f7d16..7fa0202ce14b 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReminderTroubleshootingLayoutTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReminderTroubleshootingLayoutTest.kt
@@ -5,7 +5,7 @@ package com.ichi2.anki.reviewreminders
 import androidx.recyclerview.widget.ListAdapter
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.RobolectricTest
-import com.ichi2.utils.dp
+import com.ichi2.anki.common.utils.dp
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.greaterThanOrEqualTo
@@ -38,11 +38,15 @@ class ReminderTroubleshootingLayoutTest : RobolectricTest() {
 
         withTroubleshootingFragment {
             val checksList = binding.checksList
+
             @Suppress("UNCHECKED_CAST")
-            (checksList.adapter as ListAdapter<TroubleshootingCheck, *>).submitList(checks)
-            advanceRobolectricLooper()
+            val adapter = checksList.adapter as ListAdapter<TroubleshootingCheck, *>
+            adapter.submitList(checks)
+            // ListAdapter computes the diff on a background thread before posting the layout.
+            advanceRobolectricLooperUntil { adapter.currentList == checks && !checksList.isLayoutRequested }
 
-            val itemCount = checksList.adapter!!.itemCount
+            assertThat("the submitted checks are displayed", adapter.currentList, equalTo(checks))
+            val itemCount = checks.size
             assertThat(
                 "sanity: enough checks to overflow the landscape viewport",
                 itemCount,
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReviewRemindersDatabaseTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReviewRemindersDatabaseTest.kt
index 4d01a5bddb04..555d73ce1d93 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReviewRemindersDatabaseTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReviewRemindersDatabaseTest.kt
@@ -10,32 +10,33 @@ import com.ichi2.anki.common.time.MockTime
 import com.ichi2.anki.common.time.TimeManager
 import com.ichi2.anki.libanki.EpochMilliseconds
 import com.ichi2.anki.settings.Prefs
-import kotlinx.serialization.InternalSerializationApi
-import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.MapSerializer
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.serializer
-import org.hamcrest.Description
-import org.hamcrest.Matcher
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
+import kotlinx.serialization.json.put
 import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.containsString
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.hasItem
 import org.hamcrest.Matchers.not
 import org.hamcrest.Matchers.notNullValue
 import org.hamcrest.Matchers.nullValue
-import org.hamcrest.TypeSafeMatcher
+import org.hamcrest.Matchers.sameInstance
 import org.intellij.lang.annotations.Language
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import kotlin.reflect.full.declaredMemberFunctions
 import kotlin.reflect.full.memberProperties
 import kotlin.time.Duration.Companion.days
 
 /**
  * If tests in this file have failed, it may be because you have updated [ReviewReminder]!
  * Please read the documentation of [ReviewReminder] carefully and ensure you have implemented
- * a proper migration method to the new schema. See [TestingReviewReminderMigrationSettings] for examples.
+ * a proper migration method to the new schema. See the past schema migrations for examples.
  */
 @RunWith(AndroidJUnit4::class)
 class ReviewRemindersDatabaseTest : RobolectricTest() {
@@ -51,43 +52,49 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
     private val appScope = ReviewReminderScope.Global
 
     private val emptyReminderGroup = ReviewReminderGroup()
-    private val reviewReminderOne =
+    private val reviewReminderOne by lazy {
         ReviewReminder.createReviewReminder(
             ReviewReminderTime(9, 0),
             ReviewReminderCardTriggerThreshold(5),
             scope1,
             false,
         )
-    private val reviewReminderTwo =
+    }
+    private val reviewReminderTwo by lazy {
         ReviewReminder.createReviewReminder(
             ReviewReminderTime(10, 30),
             ReviewReminderCardTriggerThreshold(10),
             scope1,
         )
-    private val reviewReminderThree =
+    }
+    private val reviewReminderThree by lazy {
         ReviewReminder.createReviewReminder(
             ReviewReminderTime(10, 30),
             ReviewReminderCardTriggerThreshold(10),
             scope2,
             true,
         )
-    private val reviewReminderFour =
+    }
+    private val reviewReminderFour by lazy {
         ReviewReminder.createReviewReminder(
             ReviewReminderTime(12, 30),
             ReviewReminderCardTriggerThreshold(20),
             scope2,
         )
-    private val reviewReminderFive =
+    }
+    private val reviewReminderFive by lazy {
         ReviewReminder.createReviewReminder(
             ReviewReminderTime(9, 0),
             ReviewReminderCardTriggerThreshold(5),
         )
-    private val reviewReminderSix =
+    }
+    private val reviewReminderSix by lazy {
         ReviewReminder.createReviewReminder(
             ReviewReminderTime(10, 30),
             ReviewReminderCardTriggerThreshold(10),
         )
-    private val allTestReminders =
+    }
+    private val allTestReminders by lazy {
         listOf(
             reviewReminderOne,
             reviewReminderTwo,
@@ -96,16 +103,19 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
             reviewReminderFive,
             reviewReminderSix,
         )
+    }
 
     @Before
     override fun setUp() {
         super.setUp()
+        TimeManager.resetWith(today)
         clearRemindersState()
     }
 
     @After
     override fun tearDown() {
         super.tearDown()
+        TimeManager.reset()
         clearRemindersState()
     }
 
@@ -265,9 +275,9 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
         expectedDeletedKeys: Set<String>,
         inputKeys: Set<String> =
             setOf(
-                ReviewRemindersDatabase.DECK_SPECIFIC_KEY + did1,
-                ReviewRemindersDatabase.DECK_SPECIFIC_KEY + did2,
-                ReviewRemindersDatabase.APP_WIDE_KEY,
+                ReviewRemindersDatabase.PREF_DECK_SPECIFIC_REMINDERS + did1,
+                ReviewRemindersDatabase.PREF_DECK_SPECIFIC_REMINDERS + did2,
+                ReviewRemindersDatabase.PREF_APP_WIDE_REMINDERS,
             ),
         access: suspend () -> ReviewReminderGroup,
     ) {
@@ -287,7 +297,7 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
         runTest {
             corruptedRemindersTest(
                 corruptedValue = "corrupted_and_invalid_json_string",
-                expectedDeletedKeys = setOf(ReviewRemindersDatabase.DECK_SPECIFIC_KEY + did1),
+                expectedDeletedKeys = setOf(ReviewRemindersDatabase.PREF_DECK_SPECIFIC_REMINDERS + did1),
             ) {
                 ReviewRemindersDatabase.getRemindersForScope(scope1)
             }
@@ -298,7 +308,7 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
         runTest {
             corruptedRemindersTest(
                 corruptedValue = Json.encodeToString(Pair("not a group of", "review reminders")),
-                expectedDeletedKeys = setOf(ReviewRemindersDatabase.DECK_SPECIFIC_KEY + did2),
+                expectedDeletedKeys = setOf(ReviewRemindersDatabase.PREF_DECK_SPECIFIC_REMINDERS + did2),
             ) {
                 ReviewRemindersDatabase.getRemindersForScope(scope2)
             }
@@ -315,7 +325,7 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
                             "corrupted_and_invalid_json_string",
                         ),
                     ),
-                expectedDeletedKeys = setOf(ReviewRemindersDatabase.APP_WIDE_KEY),
+                expectedDeletedKeys = setOf(ReviewRemindersDatabase.PREF_APP_WIDE_REMINDERS),
             ) {
                 ReviewRemindersDatabase.getRemindersForScope(appScope)
             }
@@ -328,9 +338,9 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
                 corruptedValue = "corrupted_and_invalid_json_string",
                 expectedDeletedKeys =
                     setOf(
-                        ReviewRemindersDatabase.DECK_SPECIFIC_KEY + did1,
-                        ReviewRemindersDatabase.DECK_SPECIFIC_KEY + did2,
-                        ReviewRemindersDatabase.APP_WIDE_KEY,
+                        ReviewRemindersDatabase.PREF_DECK_SPECIFIC_REMINDERS + did1,
+                        ReviewRemindersDatabase.PREF_DECK_SPECIFIC_REMINDERS + did2,
+                        ReviewRemindersDatabase.PREF_APP_WIDE_REMINDERS,
                     ),
             ) {
                 ReviewRemindersDatabase.getAllReminders()
@@ -344,9 +354,9 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
                 corruptedValue = Json.encodeToString(Pair("not a group of", "review reminders")),
                 expectedDeletedKeys =
                     setOf(
-                        ReviewRemindersDatabase.DECK_SPECIFIC_KEY + did1,
-                        ReviewRemindersDatabase.DECK_SPECIFIC_KEY + did2,
-                        ReviewRemindersDatabase.APP_WIDE_KEY,
+                        ReviewRemindersDatabase.PREF_DECK_SPECIFIC_REMINDERS + did1,
+                        ReviewRemindersDatabase.PREF_DECK_SPECIFIC_REMINDERS + did2,
+                        ReviewRemindersDatabase.PREF_APP_WIDE_REMINDERS,
                     ),
             ) {
                 ReviewRemindersDatabase.getAllReminders()
@@ -366,9 +376,9 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
                     ),
                 expectedDeletedKeys =
                     setOf(
-                        ReviewRemindersDatabase.DECK_SPECIFIC_KEY + did1,
-                        ReviewRemindersDatabase.DECK_SPECIFIC_KEY + did2,
-                        ReviewRemindersDatabase.APP_WIDE_KEY,
+                        ReviewRemindersDatabase.PREF_DECK_SPECIFIC_REMINDERS + did1,
+                        ReviewRemindersDatabase.PREF_DECK_SPECIFIC_REMINDERS + did2,
+                        ReviewRemindersDatabase.PREF_APP_WIDE_REMINDERS,
                     ),
             ) {
                 ReviewRemindersDatabase.getAllReminders()
@@ -386,46 +396,36 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
             assertThat(attemptedRetrieval, equalTo(emptyReminderGroup))
             assertThat(
                 ReviewRemindersDatabase.remindersSharedPrefs.all.keys,
-                not(hasItem(ReviewRemindersDatabase.DECK_SPECIFIC_KEY + did1)),
+                not(hasItem(ReviewRemindersDatabase.PREF_DECK_SPECIFIC_REMINDERS + did1)),
             )
         }
 
-    /**
-     * When review reminders are migrated to the new schema, the reminders' IDs and latestNotifTimes will be recreated from scratch.
-     * Thus, validation that our tests succeeded should ignore these fields.
-     * This custom Hamcrest matcher performs this validation using reflection.
-     */
-    private fun containsEqualReviewRemindersExcludingVolatileFields(
-        expected: Collection<ReviewReminder>,
-    ): Matcher<Iterable<ReviewReminder>> =
-        object : TypeSafeMatcher<Iterable<ReviewReminder>>() {
-            override fun describeTo(description: Description) {
-                description.appendValue(expected)
-            }
+    @Test
+    fun `scope cachedDeckName is not persisted`() =
+        runTest {
+            val did = addDeck("Original")
+            val scope = ReviewReminderScope.DeckSpecific(did)
+            scope.getDeckName() // fill cache
+            ReviewRemindersDatabase.insertReminder(
+                ReviewReminder.createReviewReminder(
+                    time = ReviewReminderTime(9, 0),
+                    scope = scope,
+                ),
+            )
 
-            override fun matchesSafely(actual: Iterable<ReviewReminder>): Boolean {
-                val volatileFields = setOf("id", "latestNotifTime")
-
-                val expectedSet =
-                    expected
-                        .map { e ->
-                            ReviewReminder::class
-                                .memberProperties
-                                .filterNot { it.name in volatileFields }
-                                .associateWith { it.get(e) }
-                        }.toSet()
-
-                val actualSet =
-                    actual
-                        .map { a ->
-                            ReviewReminder::class
-                                .memberProperties
-                                .filterNot { it.name in volatileFields }
-                                .associateWith { it.get(a) }
-                        }.toSet()
-
-                return expectedSet == actualSet
-            }
+            // Preference should not contain cachedDeckName
+            val rawPref =
+                ReviewRemindersDatabase.remindersSharedPrefs.getString(
+                    ReviewRemindersDatabase.PREF_DECK_SPECIFIC_REMINDERS + did,
+                    null,
+                )!!
+            assertThat(rawPref, not(containsString("cachedDeckName")))
+
+            // Should not persist after retrieval
+            col.decks.rename(col.decks.get(did)!!, "Renamed")
+            val retrievedReminder = ReviewRemindersDatabase.getRemindersForScope(scope)
+            val retrievedScope = retrievedReminder.getRemindersList().single().scope as ReviewReminderScope.DeckSpecific
+            assertThat(retrievedScope.getDeckName(), equalTo("Renamed"))
         }
 
     /**
@@ -438,14 +438,14 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
      */
     @Test
     fun `current schema version points to ReviewReminder`() {
-        assertThat(ReviewRemindersDatabase.schemaVersion.value, equalTo(3))
+        assertThat(ReviewRemindersDatabase.schemaVersion.value, equalTo(5))
         assertThat(
             ReviewRemindersDatabase
                 .oldReviewReminderSchemasForMigration
                 .keys
                 .last()
                 .value,
-            equalTo(3),
+            equalTo(5),
         )
         assertThat(
             ReviewRemindersDatabase
@@ -456,6 +456,49 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
         )
     }
 
+    /**
+     * If this test has failed, a [ReviewReminderSchema.migrate] method does not return the next schema
+     * in [ReviewRemindersDatabase.oldReviewReminderSchemasForMigration]. Each schema must migrate to exactly
+     * the next version, and must declare that version as the narrowed return type of its [ReviewReminderSchema.migrate].
+     * When adding a new schema, remember to repoint the previous schema's [ReviewReminderSchema.migrate] to it.
+     */
+    @Test
+    fun `each schema migrates to the next schema in the chain`() {
+        val chain = ReviewRemindersDatabase.oldReviewReminderSchemasForMigration
+        assertThat(
+            chain.keys.map { it.value },
+            equalTo((1..ReviewRemindersDatabase.schemaVersion.value).toList()),
+        )
+        chain.values.zipWithNext().forEach { (schema, nextSchema) ->
+            val migrateReturnType =
+                schema.declaredMemberFunctions
+                    .single { it.name == "migrate" }
+                    .returnType
+                    .classifier
+            assertThat(
+                "${schema.simpleName}.migrate() should return ${nextSchema.simpleName}",
+                migrateReturnType,
+                equalTo(nextSchema),
+            )
+        }
+    }
+
+    /**
+     * [ReviewReminder] is the latest schema, so its [ReviewReminder.migrate] should declare [ReviewReminder]
+     * as its return type and return the same instance unchanged.
+     */
+    @Test
+    fun `ReviewReminder migrates to itself`() {
+        val migrateReturnType =
+            ReviewReminder::class
+                .declaredMemberFunctions
+                .single { it.name == "migrate" }
+                .returnType
+                .classifier
+        assertThat(migrateReturnType, equalTo(ReviewReminder::class))
+        assertThat(reviewReminderOne.migrate(), sameInstance(reviewReminderOne))
+    }
+
     /**
      * If this test has failed, you have likely updated [ReviewReminder] without writing a migration!
      * Please write a migration (see [ReviewReminder] and the tests in this file for more information),
@@ -470,15 +513,34 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
     @Test
     fun `raw ReviewReminder string can be deserialized without throwing`() {
         @Language("JSON")
-        val rawString =
+        val remindersMapJson =
             """
             {
-            "version":3,
-            "remindersMapJson":"{\"22\":{\"id\":22,\"time\":{\"hour\":14,\"minute\":16},\"cardTriggerThreshold\":1,\"scope\":{\"type\":\"com.ichi2.anki.reviewreminders.ReviewReminderScope.Global\"},\"enabled\":true,\"latestNotifTime\":1771193761002,\"profileID\":\"\",\"onlyNotifyIfNoReviews\":false}}"
+              "24": {
+                "id": 24,
+                "time": { "hour": 23, "minute": 38 },
+                "cardTriggerThreshold": 1,
+                "scope": {
+                  "type": "com.ichi2.anki.reviewreminders.ReviewReminderScope.DeckSpecific",
+                  "did": 1788806653166
+                },
+                "enabled": false,
+                "latestNotifTime": 1790927620897,
+                "profileID": "",
+                "onlyNotifyIfNoReviews": false,
+                "thresholdFilter": {}
+              }
             }
             """.trimIndent()
 
+        val rawString =
+            buildJsonObject {
+                put("version", 5)
+                put("remindersMapJson", remindersMapJson)
+            }.toString()
+
         val storedReviewReminderGroup = Json.decodeFromString<ReviewRemindersDatabase.StoredReviewReminderGroup>(rawString)
+        assertThat(storedReviewReminderGroup.version, equalTo(ReviewRemindersDatabase.schemaVersion))
         val mapSerializer = MapSerializer(ReviewReminderId.serializer(), ReviewReminder.serializer())
         Json.decodeFromString(mapSerializer, storedReviewReminderGroup.remindersMapJson)
     }
@@ -502,6 +564,7 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
                 "latestNotifTime" to EpochMilliseconds::class,
                 "profileID" to String::class,
                 "onlyNotifyIfNoReviews" to Boolean::class,
+                "thresholdFilter" to ReviewReminderThresholdFilter::class,
             )
 
         val actualPropertiesWithTypes =
@@ -514,22 +577,20 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
 
     /**
      * A single test case for migration testing.
+     *
+     * @param inputVersion the version of the schema that the input JSON string represents.
+     * @param inputJson the JSON string representing a [ReviewReminder] in the exact format that it
+     * was persisted in SharedPreferences for the given [inputVersion].
+     * @param expectedOutput the expected [ReviewReminder] object after migration to the latest schema version.
+     *
      * @see assertMigrationsWork
      */
     private data class MigrationTestCase(
         val inputVersion: ReviewReminderSchemaVersion,
-        val input: ReviewReminderSchema,
+        val inputJson: String,
         val expectedOutput: ReviewReminder,
     )
 
-    /**
-     * Helper function for performing migrations and asserting they work as expected.
-     *
-     * In order to create a unified helper function for doing this which can accept arbitrary subclasses
-     * of [ReviewReminderSchema] and get their serializers at runtime, we need to opt into
-     * the internal serialization API. Since this is a test-only function, this should be acceptable.
-     */
-    @OptIn(InternalSerializationApi::class)
     private suspend fun assertMigrationsWork(vararg testCases: MigrationTestCase) {
         // Group
         val groupedByScope =
@@ -544,28 +605,38 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
         groupedByScope.forEach { (did, casesInScope) ->
             // Reading and writing is done per scope, so all test cases in a scope will have the same input version
             if (casesInScope.map { it.inputVersion }.toSet().size != 1) {
-                throw IllegalArgumentException("All test cases in a scope must have the same input version and type")
+                throw IllegalArgumentException("All test cases in a scope must have the same input version")
             }
             val version = casesInScope.first().inputVersion
-            val inputType = ReviewRemindersDatabase.oldReviewReminderSchemasForMigration[version]!!
-
-            // We need an unchecked runtime cast to allow this helper to operate on arbitrary subclasses of ReviewReminderSchema
-            @Suppress("UNCHECKED_CAST")
-            val inputSerializer = inputType.serializer() as KSerializer<Any>
-            val mapSerializer = MapSerializer(ReviewReminderId.serializer(), inputSerializer)
 
-            val inputMap = casesInScope.associate { it.input.id to it.input }
+            val inputJsonForScope =
+                buildString {
+                    append("{")
+                    casesInScope.forEachIndexed { index, testCase ->
+                        val inputId =
+                            Json
+                                .parseToJsonElement(testCase.inputJson)
+                                .jsonObject
+                                .getValue("id")
+                                .jsonPrimitive.content
+                        append("\"$inputId\":${testCase.inputJson}")
+                        if (index < casesInScope.size - 1) {
+                            append(",")
+                        }
+                    }
+                    append("}")
+                }
             val packagedInput =
                 ReviewRemindersDatabase.StoredReviewReminderGroup(
                     version,
-                    Json.encodeToString(mapSerializer, inputMap),
+                    remindersMapJson = inputJsonForScope,
                 )
 
             val key =
                 if (did != null) {
-                    ReviewRemindersDatabase.DECK_SPECIFIC_KEY + did
+                    ReviewRemindersDatabase.PREF_DECK_SPECIFIC_REMINDERS + did
                 } else {
-                    ReviewRemindersDatabase.APP_WIDE_KEY
+                    ReviewRemindersDatabase.PREF_APP_WIDE_REMINDERS
                 }
             ReviewRemindersDatabase.remindersSharedPrefs.edit(commit = true) {
                 putString(key, Json.encodeToString(packagedInput))
@@ -581,16 +652,13 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
                     ReviewRemindersDatabase.getRemindersForScope(ReviewReminderScope.Global)
                 }
 
-            // We ignore ID because the migration process will generate new review reminders from scratch during the migration
-            // ID is a private, inaccessible property
-            // Instead, we only check that the ID matches the key in the map; all other properties can be compared normally
             retrievedReminders.forEach { (id, reminder) ->
                 assertThat(id, equalTo(reminder.id))
             }
             assertThat(
-                retrievedReminders.getRemindersList(),
-                containsEqualReviewRemindersExcludingVolatileFields(
-                    casesInScope.map { it.expectedOutput },
+                retrievedReminders.getRemindersList().toSet(),
+                equalTo(
+                    casesInScope.map { it.expectedOutput }.toSet(),
                 ),
             )
         }
@@ -600,123 +668,19 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
             ReviewRemindersDatabase.remindersSharedPrefs.all.size,
             equalTo(groupedByScope.size),
         )
+        assertThat(Prefs.reviewReminderDeserializationErrors, equalTo(""))
     }
 
-    @Test
-    fun `review reminder schema migration works`() =
-        runTest {
-            // Save existing mocks
-            val savedOldReviewReminderSchemasForMigration = ReviewRemindersDatabase.oldReviewReminderSchemasForMigration
-            val savedSchemaVersion = ReviewRemindersDatabase.schemaVersion
-            // Inject mocks
-            ReviewRemindersDatabase.schemaVersion = ReviewReminderSchemaVersion(3)
-            ReviewRemindersDatabase.oldReviewReminderSchemasForMigration =
-                mapOf(
-                    ReviewReminderSchemaVersion(1) to TestingReviewReminderMigrationSettings.ReviewReminderTestSchemaVersionOne::class,
-                    ReviewReminderSchemaVersion(2) to TestingReviewReminderMigrationSettings.ReviewReminderTestSchemaVersionTwo::class,
-                    ReviewReminderSchemaVersion(3) to ReviewReminder::class,
-                )
-
-            assertMigrationsWork(
-                // To spice things up, some will be version one...
-                MigrationTestCase(
-                    inputVersion = ReviewReminderSchemaVersion(1),
-                    input =
-                        TestingReviewReminderMigrationSettings.ReviewReminderTestSchemaVersionOne(
-                            id = ReviewReminderId(0),
-                            hour = 9,
-                            minute = 0,
-                            cardTriggerThreshold = 5,
-                            did = did1,
-                            enabled = false,
-                        ),
-                    expectedOutput = reviewReminderOne,
-                ),
-                MigrationTestCase(
-                    inputVersion = ReviewReminderSchemaVersion(1),
-                    input =
-                        TestingReviewReminderMigrationSettings.ReviewReminderTestSchemaVersionOne(
-                            id = ReviewReminderId(1),
-                            hour = 10,
-                            minute = 30,
-                            cardTriggerThreshold = 10,
-                            did = did1,
-                        ),
-                    expectedOutput = reviewReminderTwo,
-                ),
-                // ...and some will be version two...
-                MigrationTestCase(
-                    inputVersion = ReviewReminderSchemaVersion(2),
-                    input =
-                        TestingReviewReminderMigrationSettings.ReviewReminderTestSchemaVersionTwo(
-                            id = ReviewReminderId(2),
-                            time = TestingReviewReminderMigrationSettings.VersionTwoDataClasses.ReviewReminderTime(10, 30),
-                            snoozeAmount = 1,
-                            cardTriggerThreshold = 10,
-                            did = did2,
-                            enabled = true,
-                        ),
-                    expectedOutput = reviewReminderThree,
-                ),
-                MigrationTestCase(
-                    inputVersion = ReviewReminderSchemaVersion(2),
-                    input =
-                        TestingReviewReminderMigrationSettings.ReviewReminderTestSchemaVersionTwo(
-                            id = ReviewReminderId(3),
-                            time = TestingReviewReminderMigrationSettings.VersionTwoDataClasses.ReviewReminderTime(12, 30),
-                            snoozeAmount = 1,
-                            cardTriggerThreshold = 20,
-                            did = did2,
-                        ),
-                    expectedOutput = reviewReminderFour,
-                ),
-                // ...and some will be app-wide for good measure
-                MigrationTestCase(
-                    inputVersion = ReviewReminderSchemaVersion(1),
-                    input =
-                        TestingReviewReminderMigrationSettings.ReviewReminderTestSchemaVersionOne(
-                            id = ReviewReminderId(4),
-                            hour = 9,
-                            minute = 0,
-                            cardTriggerThreshold = 5,
-                            did = -1L,
-                        ),
-                    expectedOutput = reviewReminderFive,
-                ),
-                MigrationTestCase(
-                    inputVersion = ReviewReminderSchemaVersion(1),
-                    input =
-                        TestingReviewReminderMigrationSettings.ReviewReminderTestSchemaVersionOne(
-                            id = ReviewReminderId(5),
-                            hour = 10,
-                            minute = 30,
-                            cardTriggerThreshold = 10,
-                            did = -1L,
-                        ),
-                    expectedOutput = reviewReminderSix,
-                ),
-            )
-
-            // Reset mocks
-            ReviewRemindersDatabase.schemaVersion = savedSchemaVersion
-            ReviewRemindersDatabase.oldReviewReminderSchemasForMigration = savedOldReviewReminderSchemasForMigration
-        }
-
     @Test
     fun `review reminder v1 to v2 migration works`() =
         runTest {
             assertMigrationsWork(
                 MigrationTestCase(
                     inputVersion = ReviewReminderSchemaVersion(1),
-                    input =
-                        ReviewReminderSchemaV1(
-                            id = ReviewReminderId(0),
-                            time = ReviewReminderTime(9, 0),
-                            cardTriggerThreshold = ReviewReminderCardTriggerThreshold(5),
-                            scope = scope1,
-                            enabled = true,
-                            profileID = "",
-                        ),
+                    inputJson =
+                        """
+                        {"id":0,"time":{"hour":9,"minute":0},"cardTriggerThreshold":5,"scope":{"type":"com.ichi2.anki.reviewreminders.ReviewReminderScope.DeckSpecific","did":$did1},"enabled":true,"profileID":""}
+                        """.trimIndent(),
                     expectedOutput =
                         ReviewReminder.createReviewReminder(
                             time = ReviewReminderTime(9, 0),
@@ -729,16 +693,10 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
                 ),
                 MigrationTestCase(
                     inputVersion = ReviewReminderSchemaVersion(1),
-                    input =
-                        ReviewReminderSchemaV1(
-                            id = ReviewReminderId(1),
-                            time = ReviewReminderTime(10, 30),
-                            cardTriggerThreshold = ReviewReminderCardTriggerThreshold(10),
-                            scope = ReviewReminderScope.Global,
-                            enabled = false,
-                            profileID = "",
-                            onlyNotifyIfNoReviews = true,
-                        ),
+                    inputJson =
+                        """
+                        {"id":1,"time":{"hour":10,"minute":30},"cardTriggerThreshold":10,"scope":{"type":"com.ichi2.anki.reviewreminders.ReviewReminderScope.Global"},"enabled":false,"profileID":"","onlyNotifyIfNoReviews":true}
+                        """.trimIndent(),
                     expectedOutput =
                         ReviewReminder.createReviewReminder(
                             time = ReviewReminderTime(10, 30),
@@ -758,16 +716,10 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
             assertMigrationsWork(
                 MigrationTestCase(
                     inputVersion = ReviewReminderSchemaVersion(2),
-                    input =
-                        ReviewReminderSchemaV2(
-                            id = ReviewReminderId(0),
-                            time = ReviewReminderTime(10, 30),
-                            cardTriggerThreshold = ReviewReminderCardTriggerThreshold(10),
-                            scope = ReviewReminderScope.Global,
-                            enabled = true,
-                            profileID = "",
-                            onlyNotifyIfNoReviews = false,
-                        ),
+                    inputJson =
+                        """
+                        {"id":0,"time":{"hour":10,"minute":30},"cardTriggerThreshold":10,"scope":{"type":"com.ichi2.anki.reviewreminders.ReviewReminderScope.Global"},"enabled":true,"profileID":"","onlyNotifyIfNoReviews":false}
+                        """.trimIndent(),
                     expectedOutput =
                         ReviewReminder.createReviewReminder(
                             time = ReviewReminderTime(10, 30),
@@ -780,16 +732,10 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
                 ),
                 MigrationTestCase(
                     inputVersion = ReviewReminderSchemaVersion(2),
-                    input =
-                        ReviewReminderSchemaV2(
-                            id = ReviewReminderId(1),
-                            time = ReviewReminderTime(12, 0),
-                            cardTriggerThreshold = ReviewReminderCardTriggerThreshold(20),
-                            scope = scope2,
-                            enabled = false,
-                            profileID = "",
-                            onlyNotifyIfNoReviews = true,
-                        ),
+                    inputJson =
+                        """
+                        {"id":1,"time":{"hour":12,"minute":0},"cardTriggerThreshold":20,"scope":{"type":"com.ichi2.anki.reviewreminders.ReviewReminderScope.DeckSpecific","did":$did2},"enabled":false,"profileID":"","onlyNotifyIfNoReviews":true}
+                        """.trimIndent(),
                     expectedOutput =
                         ReviewReminder.createReviewReminder(
                             time = ReviewReminderTime(12, 0),
@@ -802,4 +748,109 @@ class ReviewRemindersDatabaseTest : RobolectricTest() {
                 ),
             )
         }
+
+    @Test
+    fun `review reminder v3 to v4 migration works`() =
+        runTest {
+            assertMigrationsWork(
+                MigrationTestCase(
+                    inputVersion = ReviewReminderSchemaVersion(3),
+                    inputJson =
+                        """
+                        {"id":0,"time":{"hour":9,"minute":15},"cardTriggerThreshold":3,"scope":{"type":"com.ichi2.anki.reviewreminders.ReviewReminderScope.DeckSpecific","did":$did1,"cachedDeckName":"Old Name"},"enabled":true,"latestNotifTime":1771193761002,"profileID":"","onlyNotifyIfNoReviews":true}
+                        """.trimIndent(),
+                    expectedOutput =
+                        ReviewReminder
+                            .createReviewReminder(
+                                time = ReviewReminderTime(9, 15),
+                                cardTriggerThreshold = ReviewReminderCardTriggerThreshold(3),
+                                scope = scope1,
+                                enabled = true,
+                                profileID = "",
+                                onlyNotifyIfNoReviews = true,
+                            ).apply { latestNotifTime = 1771193761002 },
+                ),
+                MigrationTestCase(
+                    inputVersion = ReviewReminderSchemaVersion(3),
+                    inputJson =
+                        """
+                        {"id":1,"time":{"hour":21,"minute":0},"cardTriggerThreshold":0,"scope":{"type":"com.ichi2.anki.reviewreminders.ReviewReminderScope.Global"},"enabled":false,"latestNotifTime":1771193762000,"profileID":"","onlyNotifyIfNoReviews":false}
+                        """.trimIndent(),
+                    expectedOutput =
+                        ReviewReminder
+                            .createReviewReminder(
+                                time = ReviewReminderTime(21, 0),
+                                cardTriggerThreshold = ReviewReminderCardTriggerThreshold(0),
+                                scope = ReviewReminderScope.Global,
+                                enabled = false,
+                                profileID = "",
+                                onlyNotifyIfNoReviews = false,
+                            ).apply { latestNotifTime = 1771193762000 },
+                ),
+            )
+
+            // Ensure the private cached deck name is gone
+            val rewrittenDeckSpecific =
+                Json.decodeFromString<ReviewRemindersDatabase.StoredReviewReminderGroup>(
+                    ReviewRemindersDatabase.remindersSharedPrefs.getString(
+                        ReviewRemindersDatabase.PREF_DECK_SPECIFIC_REMINDERS + did1,
+                        null,
+                    )!!,
+                )
+            assertThat(rewrittenDeckSpecific.version, equalTo(ReviewRemindersDatabase.schemaVersion))
+            assertThat(rewrittenDeckSpecific.remindersMapJson, not(containsString("cachedDeckName")))
+        }
+
+    @Test
+    fun `review reminder v4 to v5 migration works`() =
+        runTest {
+            assertMigrationsWork(
+                MigrationTestCase(
+                    inputVersion = ReviewReminderSchemaVersion(4),
+                    inputJson =
+                        """
+                        {"id":0,"time":{"hour":9,"minute":15},"cardTriggerThreshold":3,"scope":{"type":"com.ichi2.anki.reviewreminders.ReviewReminderScope.DeckSpecific","did":$did1},"enabled":true,"latestNotifTime":1771193761002,"profileID":"","onlyNotifyIfNoReviews":true}
+                        """.trimIndent(),
+                    expectedOutput =
+                        ReviewReminder
+                            .createReviewReminder(
+                                time = ReviewReminderTime(9, 15),
+                                cardTriggerThreshold = ReviewReminderCardTriggerThreshold(3),
+                                scope = scope1,
+                                enabled = true,
+                                profileID = "",
+                                onlyNotifyIfNoReviews = true,
+                                thresholdFilter =
+                                    ReviewReminderThresholdFilter(
+                                        countNew = true,
+                                        countLrn = true,
+                                        countRev = true,
+                                    ),
+                            ).apply { latestNotifTime = 1771193761002 },
+                ),
+                MigrationTestCase(
+                    inputVersion = ReviewReminderSchemaVersion(4),
+                    inputJson =
+                        """
+                        {"id":1,"time":{"hour":21,"minute":0},"cardTriggerThreshold":0,"scope":{"type":"com.ichi2.anki.reviewreminders.ReviewReminderScope.Global"},"enabled":false,"latestNotifTime":1771193762000,"profileID":"","onlyNotifyIfNoReviews":false}
+                        """.trimIndent(),
+                    expectedOutput =
+                        ReviewReminder
+                            .createReviewReminder(
+                                time = ReviewReminderTime(21, 0),
+                                cardTriggerThreshold = ReviewReminderCardTriggerThreshold(0),
+                                scope = ReviewReminderScope.Global,
+                                enabled = false,
+                                profileID = "",
+                                onlyNotifyIfNoReviews = false,
+                                thresholdFilter =
+                                    ReviewReminderThresholdFilter(
+                                        countNew = true,
+                                        countLrn = true,
+                                        countRev = true,
+                                    ),
+                            ).apply { latestNotifTime = 1771193762000 },
+                ),
+            )
+        }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReviewRemindersInsetsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReviewRemindersInsetsTest.kt
index 462a40fe171e..0ddcb25cfa5e 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReviewRemindersInsetsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReviewRemindersInsetsTest.kt
@@ -18,8 +18,11 @@ import androidx.lifecycle.Lifecycle
 import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
+import com.ichi2.anki.InitialActivity
 import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.utils.Dp
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.FragmentReminderTroubleshootingBinding
 import com.ichi2.anki.databinding.FragmentScheduleRemindersBinding
 import com.ichi2.anki.preferences.PreferencesActivity
@@ -28,8 +31,6 @@ import com.ichi2.anki.reviewreminders.ScheduleRemindersFragment.FragmentHost
 import com.ichi2.anki.utils.ConfigAwareSingleFragmentActivity
 import com.ichi2.testutils.windowInsetsOf
 import com.ichi2.testutils.withWritePermissions
-import com.ichi2.utils.Dp
-import com.ichi2.utils.dp
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
@@ -130,6 +131,7 @@ class ReviewRemindersInsetsTest : RobolectricTest() {
     @Suppress("DEPRECATION") // systemUiVisibility: how WindowCompat un-fits the window below API 30
     fun `standalone host - the window stays edge to edge after pausing`() =
         withWritePermissions {
+            InitialActivity.decideStorageIfUndecided(targetContext)
             val intent = ScheduleRemindersFragment.getIntent(targetContext, ReviewReminderScope.Global)
             ActivityScenario.launch<ConfigAwareSingleFragmentActivity>(intent).use { scenario ->
                 advanceRobolectricLooper()
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReviewRemindersScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReviewRemindersScreenshotTest.kt
index 4c12f5f4970b..dc25c0679522 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReviewRemindersScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/reviewreminders/ReviewRemindersScreenshotTest.kt
@@ -17,6 +17,7 @@ import com.ichi2.anki.ScreenshotTest
 import com.ichi2.anki.StudyOptionsActivity
 import com.ichi2.anki.common.destinations.StudyOptionsDestination
 import com.ichi2.anki.common.destinations.launchActivity
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.FragmentReminderTroubleshootingBinding
 import com.ichi2.anki.databinding.FragmentScheduleRemindersBinding
 import com.ichi2.anki.preferences.PreferencesActivity
@@ -30,7 +31,6 @@ import com.ichi2.testutils.BackupManagerTestUtilities
 import com.ichi2.testutils.positiveButton
 import com.ichi2.testutils.scrollToLastPosition
 import com.ichi2.testutils.simulateSystemBars
-import com.ichi2.utils.dp
 import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/scheduling/SetDueDateDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/scheduling/SetDueDateDialogTest.kt
index 1a69c871cfcb..27bdb259287d 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/scheduling/SetDueDateDialogTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/scheduling/SetDueDateDialogTest.kt
@@ -46,6 +46,7 @@ import kotlin.test.assertNotNull
 import kotlin.test.assertNotSame
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class SetDueDateDialogTest : RobolectricTest() {
@@ -154,7 +155,7 @@ class SetDueDateDialogTest : RobolectricTest() {
         runTest {
             val cardIds = List(2) { addBasicNote().firstCard().id }
             launchFragment<SetDueDateDialog>(
-                themeResId = R.style.Base_Theme_Light,
+                themeResId = CommonR.style.Base_Theme_Light,
                 fragmentArgs = setDueDateArgs(cardIds),
             ).use { scenario ->
                 advanceRobolectricLooper()
@@ -174,7 +175,7 @@ class SetDueDateDialogTest : RobolectricTest() {
             val idsFile = args.requireParcelable<IdsFile>(SetDueDateDialog.ARG_IDS_FILE)
 
             launchFragment<SetDueDateDialog>(
-                themeResId = R.style.Base_Theme_Light,
+                themeResId = CommonR.style.Base_Theme_Light,
                 fragmentArgs = args,
             ).use { scenario ->
                 advanceRobolectricLooper()
@@ -212,7 +213,7 @@ class SetDueDateDialogTest : RobolectricTest() {
             args.requireParcelable<IdsFile>(SetDueDateDialog.ARG_IDS_FILE).writeBytes(ByteArray(0))
 
             launchFragment<SetDueDateDialog>(
-                themeResId = R.style.Base_Theme_Light,
+                themeResId = CommonR.style.Base_Theme_Light,
                 fragmentArgs = args,
             ).use {
                 advanceRobolectricLooper()
@@ -330,7 +331,7 @@ class SetDueDateDialogTest : RobolectricTest() {
     private fun withActivity(block: suspend TestScope.(FragmentActivity) -> Unit) =
         runTest {
             Robolectric.buildActivity(FragmentActivity::class.java).use { controller ->
-                controller.get().setTheme(R.style.Base_Theme_Light)
+                controller.get().setTheme(CommonR.style.Base_Theme_Light)
                 block(controller.setup().get())
             }
         }
@@ -364,7 +365,7 @@ class SetDueDateDialogTest : RobolectricTest() {
         val cardIds = List(cardCount) { addBasicNote().firstCard().id }
         val dialog = SetDueDateDialog.newInstance(targetContext.externalCacheDir ?: targetContext.cacheDir, cardIds)
         launchFragment(
-            themeResId = R.style.Base_Theme_Light,
+            themeResId = CommonR.style.Base_Theme_Light,
             fragmentArgs = dialog.arguments,
         ) {
             return@launchFragment dialog
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/scheduling/SetDueDateViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/scheduling/SetDueDateViewModelTest.kt
index cbb3a33cb2d7..85ba43ca6813 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/scheduling/SetDueDateViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/scheduling/SetDueDateViewModelTest.kt
@@ -8,6 +8,7 @@ import com.ichi2.anki.libanki.sched.SetDueDateDays
 import com.ichi2.anki.scheduling.SetDueDateViewModel.DateRange
 import com.ichi2.anki.scheduling.SetDueDateViewModel.Tab
 import com.ichi2.testutils.JvmTest
+import com.ichi2.testutils.NeedsRobolectric
 import com.ichi2.testutils.common.assertThrows
 import kotlinx.coroutines.test.advanceUntilIdle
 import org.hamcrest.MatcherAssert.assertThat
@@ -18,6 +19,9 @@ import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
 @RunWith(AndroidJUnit4::class)
+@NeedsRobolectric(
+    "Schedule CollectionManager work on the test dispatcher before removing the Android runner; advanceUntilIdle must await initialization.",
+)
 class SetDueDateViewModelTest : JvmTest() {
     @Test
     fun `initial values`() =
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/security/AppPermissionsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/security/AppPermissionsTest.kt
index 9a37eeca09b9..d3c8fb5c9908 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/security/AppPermissionsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/security/AppPermissionsTest.kt
@@ -2,7 +2,9 @@
 
 package com.ichi2.anki.security
 
+import android.content.Intent
 import androidx.core.content.edit
+import androidx.core.net.toUri
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
@@ -18,6 +20,8 @@ import org.junit.jupiter.api.assertDoesNotThrow
 import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import kotlin.test.assertFailsWith
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
 
 @RunWith(AndroidJUnit4::class)
 @Config(application = EmptyApplication::class)
@@ -77,6 +81,46 @@ class AppPermissionsTest : RobolectricTest() {
         assertThat(snackbars.size, equalTo(2))
     }
 
+    @Test
+    fun `web URLs are allowed without external app permission or a warning`() {
+        allowCardExternalLaunch = false
+        for (scheme in listOf("http", "https")) {
+            val url = "$scheme://example.org/path?query=value#fragment".toUri()
+            val intent = assertNotNull(permissions.createUrlIntent(url))
+            assertThat(intent.action, equalTo(Intent.ACTION_VIEW))
+            assertThat(intent.data, equalTo(url))
+            assertThat(intent.categories, equalTo(setOf(Intent.CATEGORY_BROWSABLE)))
+            assertNull(intent.selector)
+        }
+        assertThat(snackbars.size, equalTo(0))
+    }
+
+    @Test
+    fun `non-web URLs are denied without external app permission`() {
+        allowCardExternalLaunch = false
+        val urls =
+            listOf(
+                "market://details?id=com.example",
+                "intent://example.org/#Intent;scheme=https;end",
+                "android-app://com.example/https/example.org",
+            )
+        for (url in urls) {
+            assertNull(permissions.createUrlIntent(url.toUri()), url)
+        }
+        assertThat(snackbars.size, equalTo(2))
+    }
+
+    @Test
+    fun `non-web URLs are allowed with external app permission`() {
+        allowCardExternalLaunch = true
+        val url = "market://details?id=com.example".toUri()
+        val intent = assertNotNull(permissions.createUrlIntent(url))
+        assertThat(intent.action, equalTo(Intent.ACTION_VIEW))
+        assertThat(intent.data, equalTo(url))
+        assertNull(intent.categories)
+        assertThat(snackbars.size, equalTo(0))
+    }
+
     @Test
     fun launchExternalApps_defaultsToDenied() {
         assertThat(permissions.checkCanLaunchExternalApps(), equalTo(false))
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/security/CardLinkNavigationTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/security/CardLinkNavigationTest.kt
new file mode 100644
index 000000000000..89a1cb345f6d
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/security/CardLinkNavigationTest.kt
@@ -0,0 +1,194 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.security
+
+import android.app.Application
+import android.content.ComponentName
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.pm.PackageManager
+import android.webkit.WebView
+import androidx.core.net.toUri
+import androidx.test.core.app.ActivityScenario
+import com.ichi2.anki.AbstractFlashcardViewerTest.NonAbstractFlashcardViewer
+import com.ichi2.anki.R
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.browser.IdsFile
+import com.ichi2.anki.loadInitialCard
+import com.ichi2.anki.previewer.CardViewerActivity
+import com.ichi2.anki.previewer.PreviewerFragment
+import com.ichi2.anki.ui.windows.reviewer.ReviewerFragment
+import com.ichi2.anki.workarounds.SafeWebViewLayout
+import com.ichi2.testutils.assertNoActivityStarted
+import com.ichi2.testutils.assertOpenedUrl
+import com.ichi2.testutils.createTransientDirectory
+import com.ichi2.testutils.mockWebResourceRequest
+import com.ichi2.testutils.registerWebBrowser
+import com.ichi2.testutils.webView
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.Robolectric
+import org.robolectric.Shadows.shadowOf
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+@RunWith(ParameterizedRobolectricTestRunner::class)
+class CardLinkNavigationTest(
+    private val viewerType: ViewerType,
+) : RobolectricTest() {
+    override fun getCollectionStorageMode() = CollectionStorageMode.IN_MEMORY_WITH_MEDIA
+
+    @Before
+    fun disableExternalApps() {
+        editPreferences { putBoolean(targetContext.getString(R.string.pref_allow_card_external_launch_key), false) }
+    }
+
+    @Test
+    fun `web links resolve to browsers and browsable native apps without external app permission`() {
+        targetContext.registerWebBrowser()
+        val nativeHandler = registerNativeHandler(browsable = true)
+        registerNativeHandler(browsable = false)
+        withWebView { webView ->
+            val requests = listOf("http" to true, "https" to true, "http" to false, "https" to false)
+            for ((scheme, mainFrame) in requests) {
+                val url = "$scheme://native.example.org/action?value=1#fragment"
+                val request = mockWebResourceRequest(url, mainFrame = mainFrame)
+                assertTrue(shadowOf(webView).webViewClient.shouldOverrideUrlLoading(webView, request))
+                val intent = assertNotNull(shadowOf(targetContext.applicationContext as Application).nextStartedActivity)
+                assertEquals(Intent.ACTION_VIEW, intent.action)
+                assertEquals(url.toUri(), intent.data)
+                assertNull(intent.selector)
+                val handlers =
+                    targetContext.packageManager.queryIntentActivities(
+                        intent,
+                        PackageManager.MATCH_DEFAULT_ONLY,
+                    )
+                assertEquals(
+                    setOf(ComponentName("com.ichi2.testutils.browser", "BrowserActivity"), nativeHandler),
+                    handlers.map { ComponentName(it.activityInfo.packageName, it.activityInfo.name) }.toSet(),
+                )
+                targetContext.assertNoActivityStarted()
+            }
+        }
+    }
+
+    @Test
+    fun `web links can open a native app without a browser or external app permission`() {
+        registerNativeHandler(browsable = true)
+        withWebView { webView ->
+            shadowOf(targetContext.applicationContext as Application).checkActivities(true)
+            val url = "https://native.example.org/action?value=1#fragment"
+            assertTrue(shadowOf(webView).webViewClient.shouldOverrideUrlLoading(webView, mockWebResourceRequest(url)))
+            targetContext.assertOpenedUrl(url.toUri())
+        }
+    }
+
+    @Test
+    fun `missing browsable handler does not load an external page in the card`() {
+        registerNativeHandler(browsable = false)
+        withWebView { webView ->
+            shadowOf(targetContext.applicationContext as Application).checkActivities(true)
+            val request = mockWebResourceRequest("https://native.example.org/action")
+            assertTrue(shadowOf(webView).webViewClient.shouldOverrideUrlLoading(webView, request))
+            targetContext.assertNoActivityStarted()
+        }
+    }
+
+    @Test
+    fun `parsed intents with web data still require permission`() {
+        targetContext.registerWebBrowser()
+        withWebView { webView ->
+            for (url in listOf(
+                "intent://example.org/#Intent;scheme=https;end",
+                "android-app://com.ichi2.testutils.browser/https/example.org",
+            )) {
+                val request = mockWebResourceRequest(url)
+                assertTrue(shadowOf(webView).webViewClient.shouldOverrideUrlLoading(webView, request))
+                targetContext.assertNoActivityStarted(url)
+            }
+        }
+    }
+
+    @Test
+    fun `opted-in intents still reject dangerous data and strip URI grants`() {
+        editPreferences { putBoolean(targetContext.getString(R.string.pref_allow_card_external_launch_key), true) }
+        targetContext.registerWebBrowser()
+        withWebView { webView ->
+            val client = shadowOf(webView).webViewClient
+            for (scheme in listOf("file", "content", "javascript", "data")) {
+                val request = mockWebResourceRequest("intent://example.org/#Intent;scheme=$scheme;end")
+                assertTrue(client.shouldOverrideUrlLoading(webView, request))
+                targetContext.assertNoActivityStarted()
+            }
+            val request = mockWebResourceRequest("intent://example.org/#Intent;scheme=https;launchFlags=0xc3;end")
+            assertTrue(client.shouldOverrideUrlLoading(webView, request))
+            val intent = assertNotNull(shadowOf(targetContext.applicationContext as Application).nextStartedActivity)
+            assertEquals("https://example.org/".toUri(), intent.data)
+            val grantFlags =
+                Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION or
+                    Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION or Intent.FLAG_GRANT_PREFIX_URI_PERMISSION
+            assertEquals(0, intent.flags and grantFlags)
+            targetContext.assertNoActivityStarted()
+        }
+    }
+
+    private fun registerNativeHandler(browsable: Boolean): ComponentName {
+        val component = ComponentName("com.example.native", "Handler$browsable")
+        shadowOf(targetContext.packageManager).apply {
+            addActivityIfNotPresent(component).exported = true
+            addIntentFilterForActivity(
+                component,
+                IntentFilter(Intent.ACTION_VIEW).apply {
+                    addCategory(Intent.CATEGORY_DEFAULT)
+                    if (browsable) addCategory(Intent.CATEGORY_BROWSABLE)
+                    addDataScheme("http")
+                    addDataScheme("https")
+                    if (browsable) addDataAuthority("native.example.org", null)
+                },
+            )
+        }
+        return component
+    }
+
+    private fun withWebView(block: (WebView) -> Unit) {
+        val note = addBasicAndReversedNote()
+        if (viewerType != ViewerType.LEGACY) {
+            val intent =
+                if (viewerType == ViewerType.PREVIEWER) {
+                    PreviewerFragment.getIntent(
+                        targetContext,
+                        idsFile = IdsFile(createTransientDirectory(), note.cardIds(col), IdsFile.Purpose.PREVIEW),
+                        currentIndex = 0,
+                    )
+                } else {
+                    ReviewerFragment.getIntent(targetContext)
+                }
+            ActivityScenario.launch<CardViewerActivity>(intent).use { scenario ->
+                scenario.onActivity { activity ->
+                    block(activity.findViewById<SafeWebViewLayout>(R.id.web_view_layout).webView)
+                }
+            }
+        } else {
+            val controller = Robolectric.buildActivity(NonAbstractFlashcardViewer::class.java).setup()
+            saveControllerForCleanup(controller)
+            val viewer = controller.get()
+            viewer.onCollectionLoaded(col)
+            viewer.loadInitialCard()
+            advanceRobolectricLooper()
+            advanceRobolectricLooper()
+            block(assertNotNull(viewer.webView))
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        @ParameterizedRobolectricTestRunner.Parameters(name = "{0}")
+        fun viewers() = ViewerType.entries.map { arrayOf(it) }
+    }
+
+    enum class ViewerType { LEGACY, PREVIEWER, STUDY }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/PreferenceUpgradeServiceTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/PreferenceUpgradeServiceTest.kt
index a2189a1ac061..8de297640638 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/PreferenceUpgradeServiceTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/PreferenceUpgradeServiceTest.kt
@@ -5,14 +5,14 @@ package com.ichi2.anki.servicemodel
 import android.content.SharedPreferences
 import androidx.core.content.edit
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.R
-import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.EmptyApplicationCategory
 import com.ichi2.anki.cardviewer.Gesture
 import com.ichi2.anki.common.android.getCurrentLocaleTag
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.common.utils.HashUtil
 import com.ichi2.anki.libanki.Consts
 import com.ichi2.anki.noteeditor.CustomToolbarButton
+import com.ichi2.anki.preferences.reviewer.ViewerAction
 import com.ichi2.anki.reviewer.Binding
 import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
@@ -21,6 +21,9 @@ import com.ichi2.anki.servicelayer.PreferenceUpgradeService
 import com.ichi2.anki.servicelayer.PreferenceUpgradeService.PreferenceUpgrade
 import com.ichi2.anki.servicelayer.PreferenceUpgradeService.PreferenceUpgrade.UpgradeThemes
 import com.ichi2.anki.servicelayer.RemovedPreferences
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.targetContext
 import com.ichi2.utils.LanguageUtil
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
@@ -28,17 +31,22 @@ import org.hamcrest.Matchers.lessThan
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
+import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
 import java.util.Locale
 import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
-class PreferenceUpgradeServiceTest : RobolectricTest() {
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class PreferenceUpgradeServiceTest : AndroidTest {
     private lateinit var prefs: SharedPreferences
 
     @Before
-    override fun setUp() {
-        super.setUp()
+    fun setUp() {
         prefs = targetContext.sharedPrefs()
     }
 
@@ -158,12 +166,12 @@ class PreferenceUpgradeServiceTest : RobolectricTest() {
     @Test
     fun `Fetch media pref's values are converted to 'always' if enabled and 'never' if disabled`() {
         // enabled -> always
-        prefs.edit { putBoolean(RemovedPreferences.SYNC_FETCHES_MEDIA, true) }
+        prefs.edit { putBoolean(RemovedPreferences.PREF_SYNC_FETCHES_MEDIA, true) }
         PreferenceUpgrade.UpgradeFetchMedia().performUpgrade(prefs)
         assertThat(prefs.getString("syncFetchMedia", null), equalTo("always"))
 
         // disabled -> never
-        prefs.edit { putBoolean(RemovedPreferences.SYNC_FETCHES_MEDIA, false) }
+        prefs.edit { putBoolean(RemovedPreferences.PREF_SYNC_FETCHES_MEDIA, false) }
         PreferenceUpgrade.UpgradeFetchMedia().performUpgrade(prefs)
         assertThat(prefs.getString("syncFetchMedia", null), equalTo("never"))
     }
@@ -230,56 +238,97 @@ class PreferenceUpgradeServiceTest : RobolectricTest() {
         val upgrade = UpgradeThemes()
 
         // Constants should have the correct values
-        assertEquals(UpgradeThemes.THEME_FOLLOW_SYSTEM, targetContext.getString(R.string.theme_follow_system_value))
-        assertEquals(UpgradeThemes.THEME_LIGHT, targetContext.getString(R.string.theme_light_value))
-        assertEquals(UpgradeThemes.THEME_PLAIN, targetContext.getString(R.string.theme_plain_value))
-        assertEquals(UpgradeThemes.THEME_BLACK, targetContext.getString(R.string.theme_black_value))
-        assertEquals(UpgradeThemes.THEME_DARK, targetContext.getString(R.string.theme_dark_value))
-        assertEquals(UpgradeThemes.THEME_DAY, targetContext.getString(R.string.theme_day_scheme_value))
-        assertEquals(UpgradeThemes.THEME_NIGHT, targetContext.getString(R.string.theme_night_scheme_value))
+        assertEquals(UpgradeThemes.THEME_FOLLOW_SYSTEM, targetContext.getString(CommonR.string.theme_follow_system_value))
+        assertEquals(UpgradeThemes.THEME_LIGHT, targetContext.getString(CommonR.string.theme_light_value))
+        assertEquals(UpgradeThemes.THEME_PLAIN, targetContext.getString(CommonR.string.theme_plain_value))
+        assertEquals(UpgradeThemes.THEME_BLACK, targetContext.getString(CommonR.string.theme_black_value))
+        assertEquals(UpgradeThemes.THEME_DARK, targetContext.getString(CommonR.string.theme_dark_value))
+        assertEquals(UpgradeThemes.THEME_DAY, targetContext.getString(CommonR.string.theme_day_scheme_value))
+        assertEquals(UpgradeThemes.THEME_NIGHT, targetContext.getString(CommonR.string.theme_night_scheme_value))
 
         // Follow System -> Should remain Follow System, no sub-themes set
-        prefs.edit { putString(UpgradeThemes.KEY_APP_THEME, UpgradeThemes.THEME_FOLLOW_SYSTEM) }
+        prefs.edit { putString(UpgradeThemes.PREF_APP_THEME, UpgradeThemes.THEME_FOLLOW_SYSTEM) }
         upgrade.performUpgrade(prefs)
-        assertThat(prefs.getString(UpgradeThemes.KEY_APP_THEME, null), equalTo(UpgradeThemes.THEME_FOLLOW_SYSTEM))
-        assertThat(prefs.contains(UpgradeThemes.KEY_DAY_THEME), equalTo(false))
-        assertThat(prefs.contains(UpgradeThemes.KEY_NIGHT_THEME), equalTo(false))
+        assertThat(prefs.getString(UpgradeThemes.PREF_APP_THEME, null), equalTo(UpgradeThemes.THEME_FOLLOW_SYSTEM))
+        assertThat(prefs.contains(UpgradeThemes.PREF_DAY_THEME), equalTo(false))
+        assertThat(prefs.contains(UpgradeThemes.PREF_NIGHT_THEME), equalTo(false))
 
         // Light -> Day + dayTheme: Light
         prefs.edit {
-            putString(UpgradeThemes.KEY_APP_THEME, UpgradeThemes.THEME_LIGHT)
-            remove(UpgradeThemes.KEY_DAY_THEME)
+            putString(UpgradeThemes.PREF_APP_THEME, UpgradeThemes.THEME_LIGHT)
+            remove(UpgradeThemes.PREF_DAY_THEME)
         }
         upgrade.performUpgrade(prefs)
-        assertThat(prefs.getString(UpgradeThemes.KEY_APP_THEME, null), equalTo(UpgradeThemes.THEME_DAY))
-        assertThat(prefs.getString(UpgradeThemes.KEY_DAY_THEME, null), equalTo(UpgradeThemes.THEME_LIGHT))
+        assertThat(prefs.getString(UpgradeThemes.PREF_APP_THEME, null), equalTo(UpgradeThemes.THEME_DAY))
+        assertThat(prefs.getString(UpgradeThemes.PREF_DAY_THEME, null), equalTo(UpgradeThemes.THEME_LIGHT))
 
         // Plain -> Day + dayTheme: Plain
         prefs.edit {
-            putString(UpgradeThemes.KEY_APP_THEME, UpgradeThemes.THEME_PLAIN)
-            remove(UpgradeThemes.KEY_DAY_THEME)
+            putString(UpgradeThemes.PREF_APP_THEME, UpgradeThemes.THEME_PLAIN)
+            remove(UpgradeThemes.PREF_DAY_THEME)
         }
         upgrade.performUpgrade(prefs)
-        assertThat(prefs.getString(UpgradeThemes.KEY_APP_THEME, null), equalTo(UpgradeThemes.THEME_DAY))
-        assertThat(prefs.getString(UpgradeThemes.KEY_DAY_THEME, null), equalTo(UpgradeThemes.THEME_PLAIN))
+        assertThat(prefs.getString(UpgradeThemes.PREF_APP_THEME, null), equalTo(UpgradeThemes.THEME_DAY))
+        assertThat(prefs.getString(UpgradeThemes.PREF_DAY_THEME, null), equalTo(UpgradeThemes.THEME_PLAIN))
 
         // Black -> Night + nightTheme: Black
         prefs.edit {
-            putString(UpgradeThemes.KEY_APP_THEME, UpgradeThemes.THEME_BLACK)
-            remove(UpgradeThemes.KEY_NIGHT_THEME)
+            putString(UpgradeThemes.PREF_APP_THEME, UpgradeThemes.THEME_BLACK)
+            remove(UpgradeThemes.PREF_NIGHT_THEME)
         }
         upgrade.performUpgrade(prefs)
-        assertThat(prefs.getString(UpgradeThemes.KEY_APP_THEME, null), equalTo(UpgradeThemes.THEME_NIGHT))
-        assertThat(prefs.getString(UpgradeThemes.KEY_NIGHT_THEME, null), equalTo(UpgradeThemes.THEME_BLACK))
+        assertThat(prefs.getString(UpgradeThemes.PREF_APP_THEME, null), equalTo(UpgradeThemes.THEME_NIGHT))
+        assertThat(prefs.getString(UpgradeThemes.PREF_NIGHT_THEME, null), equalTo(UpgradeThemes.THEME_BLACK))
 
         // Dark -> Night + nightTheme: Dark
         prefs.edit {
-            putString(UpgradeThemes.KEY_APP_THEME, UpgradeThemes.THEME_DARK)
-            remove(UpgradeThemes.KEY_NIGHT_THEME)
+            putString(UpgradeThemes.PREF_APP_THEME, UpgradeThemes.THEME_DARK)
+            remove(UpgradeThemes.PREF_NIGHT_THEME)
         }
         upgrade.performUpgrade(prefs)
-        assertThat(prefs.getString(UpgradeThemes.KEY_APP_THEME, null), equalTo(UpgradeThemes.THEME_NIGHT))
-        assertThat(prefs.getString(UpgradeThemes.KEY_NIGHT_THEME, null), equalTo(UpgradeThemes.THEME_DARK))
+        assertThat(prefs.getString(UpgradeThemes.PREF_APP_THEME, null), equalTo(UpgradeThemes.THEME_NIGHT))
+        assertThat(prefs.getString(UpgradeThemes.PREF_NIGHT_THEME, null), equalTo(UpgradeThemes.THEME_DARK))
+    }
+
+    @Test
+    fun `long touch migration removes invalid bindings and preserves valid bindings`() {
+        prefs.edit {
+            putString("binding_SHOW_ANSWER", "1/r⌨Ctrl+660|r⍝LONG_TAP2|r✅Ä1|r⌨not-a-number2|r⍝SWIPE_UP2")
+        }
+        val upgrade = PreferenceUpgrade.RemoveLongTouchGesture()
+
+        upgrade.performUpgrade(prefs)
+
+        val expected = "1/r⌨Ctrl+660|r✅Ä1|r⍝SWIPE_UP2"
+        assertEquals(expected, prefs.getString("binding_SHOW_ANSWER", null))
+
+        upgrade.performUpgrade(prefs)
+
+        assertEquals(expected, prefs.getString("binding_SHOW_ANSWER", null))
+    }
+
+    @Test
+    fun `long touch migration leaves all invalid bindings explicitly unbound`() {
+        prefs.edit {
+            putString("binding_SHOW_ANSWER", "1/r⍝LONG_TAP2|r⌨not-a-number2|r✅2")
+        }
+
+        PreferenceUpgrade.RemoveLongTouchGesture().performUpgrade(prefs)
+
+        assertEquals("1/", prefs.getString("binding_SHOW_ANSWER", null))
+        assertTrue(ViewerAction.SHOW_ANSWER.getBindings(prefs).isEmpty())
+    }
+
+    @Test
+    fun `long touch migration does not rewrite preferences with only valid bindings`() {
+        val original = "1/r⌨Shift+Ctrl+660|r✅Ä1|r⍝SWIPE_UP2"
+        prefs.edit {
+            putString("binding_SHOW_ANSWER", original)
+        }
+
+        PreferenceUpgrade.RemoveLongTouchGesture().performUpgrade(prefs)
+
+        assertEquals(original, prefs.getString("binding_SHOW_ANSWER", null))
     }
 
     @Test
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/UpgradeGesturesToControlsTestNoParam.kt b/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/UpgradeGesturesToControlsTestNoParam.kt
index 37f61ee2ab5a..5f86eb26a3e4 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/UpgradeGesturesToControlsTestNoParam.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/UpgradeGesturesToControlsTestNoParam.kt
@@ -6,7 +6,7 @@ import android.content.SharedPreferences
 import androidx.core.content.edit
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.RobolectricTest
-import com.ichi2.anki.servicelayer.PreferenceUpgradeService.PreferenceUpgrade.Companion.UPGRADE_VERSION_PREF_KEY
+import com.ichi2.anki.servicelayer.PreferenceUpgradeService.PreferenceUpgrade.Companion.PREF_PREFERENCE_UPGRADE_VERSION
 import com.ichi2.anki.servicelayer.PreferenceUpgradeService.PreferenceUpgrade.UpgradeGesturesToControls
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
@@ -49,7 +49,7 @@ class UpgradeGesturesToControlsTestNoParam : RobolectricTest() {
         upgradeAllGestures()
 
         // ensure that no settings were added to the preferences
-        assertThat(changedKeys, Matchers.contains(UPGRADE_VERSION_PREF_KEY))
+        assertThat(changedKeys, Matchers.contains(PREF_PREFERENCE_UPGRADE_VERSION))
     }
 
     @Test
@@ -66,7 +66,7 @@ class UpgradeGesturesToControlsTestNoParam : RobolectricTest() {
         upgradeAllGestures()
 
         // ensure that no settings were added to the preferences
-        assertThat(changedKeys, Matchers.contains(UPGRADE_VERSION_PREF_KEY, PREF_KEY_VOLUME_DOWN, PREF_KEY_VOLUME_UP))
+        assertThat(changedKeys, Matchers.contains(PREF_PREFERENCE_UPGRADE_VERSION, PREF_KEY_VOLUME_DOWN, PREF_KEY_VOLUME_UP))
 
         assertThat("Volume gestures are removed", prefs.contains(PREF_KEY_VOLUME_DOWN), equalTo(false))
         assertThat("Volume gestures are removed", prefs.contains(PREF_KEY_VOLUME_UP), equalTo(false))
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/services/NotificationServiceTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/services/NotificationServiceTest.kt
index 4cbffda2ff62..bad610a7e9c9 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/services/NotificationServiceTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/services/NotificationServiceTest.kt
@@ -17,11 +17,13 @@ import com.ichi2.anki.common.time.MockTime
 import com.ichi2.anki.common.time.TimeManager
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.libanki.EpochMilliseconds
+import com.ichi2.anki.libanki.QueueType
 import com.ichi2.anki.reviewreminders.ReviewReminder
 import com.ichi2.anki.reviewreminders.ReviewReminderAlarmManager
 import com.ichi2.anki.reviewreminders.ReviewReminderCardTriggerThreshold
 import com.ichi2.anki.reviewreminders.ReviewReminderScope.DeckSpecific
 import com.ichi2.anki.reviewreminders.ReviewReminderScope.Global
+import com.ichi2.anki.reviewreminders.ReviewReminderThresholdFilter
 import com.ichi2.anki.reviewreminders.ReviewReminderTime
 import com.ichi2.anki.reviewreminders.ReviewRemindersDatabase
 import com.ichi2.anki.settings.Prefs
@@ -260,6 +262,88 @@ class NotificationServiceTest : RobolectricTest() {
             reviewReminder.verifyLatestNotifTime(previousTime = creationTime, shouldHaveUpdated = false)
         }
 
+    @Test
+    fun `onReceive with rev cards not counted and only rev cards present should not fire notification`() =
+        runTest {
+            val did1 = addDeck("Deck", setAsSelected = true).withNotes(count = 2, queueType = QueueType.Rev)
+            val reviewReminder = createTestReminder(deckId = did1, countRev = false)
+            ReviewRemindersDatabase.insertReminder(reviewReminder)
+
+            TimeManager.resetWith(today)
+            attemptNotif(reviewReminder)
+
+            verifyNoNotifsSent()
+        }
+
+    @Test
+    fun `onReceive with new cards not counted and only new cards present should not fire notification`() =
+        runTest {
+            val did1 = addDeck("Deck").withNotes(count = 2)
+            val reviewReminder = createTestReminder(deckId = did1, countNew = false)
+            ReviewRemindersDatabase.insertReminder(reviewReminder)
+
+            TimeManager.resetWith(today)
+            attemptNotif(reviewReminder)
+
+            verifyNoNotifsSent()
+        }
+
+    @Test
+    fun `onReceive with lrn cards not counted and only lrn cards present should not fire notification`() =
+        runTest {
+            val did1 = addDeck("Deck").withNotes(count = 2, queueType = QueueType.Lrn)
+            val reviewReminder = createTestReminder(deckId = did1, countLrn = false)
+            ReviewRemindersDatabase.insertReminder(reviewReminder)
+
+            TimeManager.resetWith(today)
+            attemptNotif(reviewReminder)
+
+            verifyNoNotifsSent()
+        }
+
+    @Test
+    fun `onReceive with all cards not counted and many cards present should not fire notification`() =
+        runTest {
+            val did1 =
+                addDeck("Deck")
+                    .withNote(queueType = QueueType.New)
+                    .withNote(queueType = QueueType.Lrn)
+                    .withNote(queueType = QueueType.Rev)
+            val reviewReminder = createTestReminder(deckId = did1, countNew = false, countLrn = false, countRev = false)
+            ReviewRemindersDatabase.insertReminder(reviewReminder)
+
+            TimeManager.resetWith(today)
+            attemptNotif(reviewReminder)
+
+            verifyNoNotifsSent()
+        }
+
+    @Test
+    fun `onReceive with new cards not counted but other kinds present should fire notification`() =
+        runTest {
+            val did1 = addDeck("Deck").withNote(queueType = QueueType.Rev).withNote(queueType = QueueType.Lrn)
+            val reviewReminder = createTestReminder(deckId = did1, countNew = false)
+            ReviewRemindersDatabase.insertReminder(reviewReminder)
+
+            TimeManager.resetWith(today)
+            attemptNotif(reviewReminder)
+
+            verifyNotifSent(reviewReminder)
+        }
+
+    @Test
+    fun `onReceive with new cards not counted and not enough non new cards to trigger threshold should not fire notification`() =
+        runTest {
+            val did1 = addDeck("Deck").withNote(queueType = QueueType.New).withNote(queueType = QueueType.Lrn)
+            val reviewReminder = createTestReminder(deckId = did1, thresholdInt = 2, countNew = false)
+            ReviewRemindersDatabase.insertReminder(reviewReminder)
+
+            TimeManager.resetWith(today)
+            attemptNotif(reviewReminder)
+
+            verifyNoNotifsSent()
+        }
+
     @Test
     fun `triggering with reviews today and onlyNotifyIfNoReviews is true should not fire notification`() =
         runTest {
@@ -472,6 +556,9 @@ class NotificationServiceTest : RobolectricTest() {
         enabled: Boolean = true,
         onlyNotifyIfNoReviews: Boolean = false,
         scheduledTimeOffsetFromNow: Duration = (-1).minutes,
+        countNew: Boolean = true,
+        countLrn: Boolean = true,
+        countRev: Boolean = true,
     ): ReviewReminder {
         val scheduledTime = TimeManager.time.calendar().clone() as Calendar
         scheduledTime.add(Calendar.MINUTE, scheduledTimeOffsetFromNow.inWholeMinutes.toInt())
@@ -486,6 +573,12 @@ class NotificationServiceTest : RobolectricTest() {
             scope = if (deckId != null) DeckSpecific(deckId) else Global,
             enabled = enabled,
             onlyNotifyIfNoReviews = onlyNotifyIfNoReviews,
+            thresholdFilter =
+                ReviewReminderThresholdFilter(
+                    countNew = countNew,
+                    countLrn = countLrn,
+                    countRev = countRev,
+                ),
         )
     }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/settings/NotificationPreferencesTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/settings/NotificationPreferencesTest.kt
new file mode 100644
index 000000000000..6e56433b2e28
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/settings/NotificationPreferencesTest.kt
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.settings
+
+import androidx.core.content.edit
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.EmptyApplicationCategory
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.testutils.EmptyApplication
+import org.junit.Test
+import org.junit.experimental.categories.Category
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+@RunWith(AndroidJUnit4::class)
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class NotificationPreferencesTest : RobolectricTest() {
+    private val preferences = targetContext.sharedPrefs()
+    private val notifications = PrefsRepository(targetContext)
+
+    @Test
+    fun `existing reminder preference is read and updated without changing its key`() {
+        preferences.edit { putBoolean("newReviewReminders", true) }
+        assertTrue(notifications.newReviewRemindersEnabled)
+        notifications.newReviewRemindersEnabled = false
+        assertFalse(preferences.getBoolean("newReviewReminders", true))
+    }
+
+    @Test
+    fun `both notification systems default to disabled`() {
+        preferences.edit { clear() }
+        assertFalse(notifications.newReviewRemindersEnabled)
+        assertFalse(notifications.legacyNotificationsEnabled)
+    }
+
+    @Test
+    fun `legacy notification threshold retains its disabled boundary`() {
+        preferences.edit { putString("minimumCardsDueForNotification", "999999") }
+        assertTrue(notifications.legacyNotificationsEnabled)
+        preferences.edit { putString("minimumCardsDueForNotification", "1000000") }
+        assertFalse(notifications.legacyNotificationsEnabled)
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/settings/PrefsSingletonTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/settings/PrefsSingletonTest.kt
index 98961c35ecae..c630429d1269 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/settings/PrefsSingletonTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/settings/PrefsSingletonTest.kt
@@ -5,8 +5,9 @@ package com.ichi2.anki.settings
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.github.ivanshafran.sharedpreferencesmock.SPMockBuilder
 import com.ichi2.anki.AnkiDroidApp
-import com.ichi2.anki.R
+import com.ichi2.anki.CommonPreferenceKey
 import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.preferences.NotificationPreferences
 import com.ichi2.testutils.withBooleanPreference
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -17,17 +18,19 @@ import kotlin.test.assertTrue
 class PrefsSingletonTest : RobolectricTest() {
     @Test
     fun `reads and writes follow the current application preferences`() =
-        withBooleanPreference(R.string.pref_new_review_reminders, true) {
+        withBooleanPreference(CommonPreferenceKey.pref_new_review_reminders, true) {
+            val notifications: NotificationPreferences = Prefs
+            assertTrue(notifications.newReviewRemindersEnabled)
             val original = Prefs.sharedPrefs
             val originalOverride = AnkiDroidApp.sharedPreferencesTestingOverride
             val replacement = SPMockBuilder().createSharedPreferences()
-            val key = targetContext.getString(R.string.pref_new_review_reminders)
+            val key = targetContext.getString(CommonPreferenceKey.pref_new_review_reminders)
 
             // Replace SharedPreferences to simulate starting another Robolectric test.
             // Verify that Prefs uses the provider instead of keeping the previous instance.
             AnkiDroidApp.sharedPreferencesTestingOverride = replacement
             try {
-                assertFalse(Prefs.newReviewRemindersEnabled)
+                assertFalse(notifications.newReviewRemindersEnabled)
                 Prefs.newReviewRemindersEnabled = true
                 assertTrue(replacement.getBoolean(key, false))
                 Prefs.newReviewRemindersEnabled = false
@@ -37,6 +40,6 @@ class PrefsSingletonTest : RobolectricTest() {
                 AnkiDroidApp.sharedPreferencesTestingOverride = originalOverride
             }
 
-            assertTrue(Prefs.newReviewRemindersEnabled)
+            assertTrue(notifications.newReviewRemindersEnabled)
         }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/shareddeck/SharedDecksActivityTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/shareddeck/SharedDecksActivityTest.kt
index 4320f2d666f8..9f62dccc7034 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/shareddeck/SharedDecksActivityTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/shareddeck/SharedDecksActivityTest.kt
@@ -3,71 +3,275 @@
 
 package com.ichi2.anki.shareddeck
 
-import android.webkit.WebResourceRequest
+import android.util.Log
+import android.webkit.CookieManager
 import android.webkit.WebResourceResponse
 import android.webkit.WebView
+import androidx.appcompat.app.AlertDialog
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.CommonString
 import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.dialogs.utils.message
+import com.ichi2.anki.dialogs.utils.title
 import com.ichi2.anki.shareddeck.SharedDecksActivity.Companion.HTTP_STATUS_TOO_MANY_REQUESTS
+import com.ichi2.utils.neutralButton
+import com.ichi2.utils.positiveButton
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mockito.mock
-import org.mockito.Mockito.spy
 import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.whenever
+import org.mockito.kotlin.mock
 import org.robolectric.Robolectric
 import org.robolectric.Shadows
+import org.robolectric.fakes.RoboMenuItem
+import org.robolectric.shadows.ShadowDialog
+import timber.log.Timber
 import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
 
 /** Tests for [SharedDecksActivity] */
 @RunWith(AndroidJUnit4::class)
 class SharedDecksActivityTest : RobolectricTest() {
     @Test
-    fun redirectWhenUserIsNotLogin() {
-        val controller = Robolectric.buildActivity(SharedDecksActivity::class.java).create()
-        val activity = controller.get()
-        saveControllerForCleanup(controller)
+    fun `rate limit while logged out asks to log in or sign up`() {
+        val activity = startSharedDecks()
+
+        activity.receiveTooManyRequests()
+
+        val dialog = ShadowDialog.getLatestDialog() as AlertDialog
+        assertEquals(getResourceString(CommonString.not_logged_in_title), dialog.title)
+        assertEquals(getResourceString(CommonString.shared_decks_ankiweb_login_limit), dialog.message)
+        assertEquals(getResourceString(R.string.shared_decks_url), activity.lastLoadedUrl)
+    }
+
+    @Test
+    fun `log in from the rate limit dialog opens the AnkiWeb login page`() {
+        val activity = startSharedDecks()
+        activity.receiveTooManyRequests()
+
+        clickAlertDialogButton { positiveButton }
+
+        assertEquals(getResourceString(R.string.shared_decks_login_url), activity.lastLoadedUrl)
+    }
+
+    @Test
+    fun `sign up from the rate limit dialog opens the AnkiWeb sign up page`() {
+        val activity = startSharedDecks()
+        activity.receiveTooManyRequests()
+
+        clickAlertDialogButton { requireNotNull(neutralButton) }
+
+        assertEquals(getResourceString(R.string.shared_decks_sign_up_url), activity.lastLoadedUrl)
+    }
+
+    @Test
+    fun `repeated rate limits show a single dialog`() {
+        val activity = startSharedDecks()
+
+        activity.receiveTooManyRequests()
+        activity.receiveTooManyRequests()
+
+        assertEquals(1, ShadowDialog.getShownDialogs().size)
+    }
+
+    @Test
+    fun `rate limit while logged in to AnkiWeb leaves the page alone`() {
+        CookieManager.getInstance().setCookie("https://ankiweb.net", "has_auth=1")
+        val activity = startSharedDecks()
+
+        activity.receiveTooManyRequests()
+
+        assertNull(ShadowDialog.getLatestDialog())
+        assertEquals(getResourceString(R.string.shared_decks_url), activity.lastLoadedUrl)
+    }
+
+    @Test
+    fun `logging in to AnkiWeb returns to the shared deck`() {
+        val activity = startOnSharedDeck()
+
+        activity.logInToAnkiWeb()
+
+        assertEquals(SHARED_DECK, activity.webView.url)
+    }
+
+    @Test
+    fun `back after logging in to AnkiWeb returns to the search results`() {
+        val searchResults = "https://ankiweb.net/shared/decks/Japanese"
+        val activity = startSharedDecks()
+        activity.visit(searchResults)
+        activity.visit(SHARED_DECK)
+
+        activity.logInToAnkiWeb()
+
+        activity.visit(SHARED_DECK)
+        assertEquals(SHARED_DECK, activity.webView.url)
+
+        activity.onBackPressedDispatcher.onBackPressed()
 
-        val webView = activity.findViewById<WebView>(R.id.web_view)
-        val spyWebClient = spy(activity.webViewClient)
-        doReturn(false).whenever(spyWebClient).isLoggedInToAnkiWeb
-        webView.webViewClient = spyWebClient
+        assertFalse(activity.isFinishing, "Back should return to the search results instead of closing the screen")
+        assertEquals(searchResults, activity.webView.url)
+    }
 
-        controller.start().resume().visible()
+    @Test
+    fun `back after logging in to AnkiWeb returns to each earlier shared page once`() {
+        val sharedDecks = getResourceString(R.string.shared_decks_url)
+        val searchResults = "https://ankiweb.net/shared/decks/Japanese"
+        val activity = startSharedDecks()
+        activity.visit(sharedDecks)
+        activity.visit(searchResults)
+        activity.visit(SHARED_DECK)
+        activity.logInToAnkiWeb()
+        activity.visit(AFTER_LOGIN)
+        activity.visit(SHARED_DECK)
 
-        val mockRequest = mock<WebResourceRequest>()
-        val mockErrorResponse = mock<WebResourceResponse>()
-        whenever(mockErrorResponse.statusCode).thenReturn(HTTP_STATUS_TOO_MANY_REQUESTS)
+        activity.pressBack()
+        assertEquals(searchResults, activity.webView.url)
+        activity.pressBack()
+        assertEquals(sharedDecks, activity.webView.url)
+        activity.pressBack()
+        assertTrue(activity.isFinishing)
+    }
+
+    @Test
+    fun `back from home after logging in to AnkiWeb closes the screen`() {
+        val activity = startOnSharedDeck()
+        activity.logInToAnkiWeb()
+        activity.visit(SHARED_DECK)
 
-        spyWebClient.onReceivedHttpError(webView, mockRequest, mockErrorResponse)
+        activity.onOptionsItemSelected(RoboMenuItem(R.id.home))
+        activity.visit(getResourceString(R.string.shared_decks_url))
+        activity.pressBack()
+
+        assertTrue(activity.isFinishing)
+    }
+
+    @Test
+    fun `logging in after AnkiWeb refuses a download returns to the deck page`() {
+        val activity = startOnSharedDeck()
+        activity.visit(DECK_DOWNLOAD)
+
+        activity.logInToAnkiWeb()
+
+        assertEquals(SHARED_DECK, activity.webView.url)
+    }
+
+    @Test
+    fun `AnkiWeb login without a session stays on AnkiWeb`() {
+        val activity = startOnSharedDeck()
+        activity.openAnkiWebLogin()
+
+        activity.visit(AFTER_LOGIN)
+
+        assertEquals(AFTER_LOGIN, activity.webView.url)
+    }
 
-        val expectedUrl = getResourceString(R.string.shared_decks_login_url)
-        val actualUrl = Shadows.shadowOf(webView).lastLoadedUrl
-        assertEquals(expectedUrl, actualUrl)
+    @Test
+    fun `back while returning after login must not reopen login`() {
+        val activity = startOnSharedDeck()
+        activity.logInToAnkiWeb()
+        // loadUrl was requested, but the return navigation has not committed yet.
+        activity.onBackPressedDispatcher.onBackPressed()
+        assertFalse(
+            activity.webView.url?.startsWith(getResourceString(R.string.shared_decks_login_url)) == true,
+            "Back reopened the login page while the return to the deck was pending",
+        )
     }
 
     @Test
-    fun isNotRedirectWhenUserLogin() {
-        val controller = Robolectric.buildActivity(SharedDecksActivity::class.java).create()
-        val activity = controller.get()
+    fun `returning after a login does not log the deck URL at info`() {
+        val activity = startOnSharedDeck()
+
+        val logs = captureInfoLogs { activity.logInToAnkiWeb() }
+
+        assertEquals(SHARED_DECK, activity.webView.url)
+        assertFalse(logs.any { it.contains(SHARED_DECK) }, "Deck URL was logged at info or above: $logs")
+    }
+
+    private fun startOnSharedDeck(): SharedDecksActivity =
+        startSharedDecks().apply {
+            visit(getResourceString(R.string.shared_decks_url))
+            visit(SHARED_DECK)
+        }
+
+    private fun SharedDecksActivity.openAnkiWebLogin() {
+        receiveTooManyRequests()
+        clickAlertDialogButton { positiveButton }
+        visit(getResourceString(R.string.shared_decks_login_url))
+    }
+
+    private fun SharedDecksActivity.logInToAnkiWeb() {
+        openAnkiWebLogin()
+        CookieManager.getInstance().setCookie("https://ankiweb.net", "has_auth=1")
+        visit(AFTER_LOGIN)
+    }
+
+    private fun SharedDecksActivity.visit(url: String) {
+        if (webView.copyBackForwardList().currentItem?.url != url) {
+            Shadows.shadowOf(webView).pushEntryToHistory(url)
+        }
+        webViewClient.doUpdateVisitedHistory(webView, url, false)
+        webViewClient.onPageFinished(webView, url)
+        // Robolectric clears every history entry; real WebView keeps the current page.
+        if (webView.copyBackForwardList().size == 0) {
+            Shadows.shadowOf(webView).pushEntryToHistory(url)
+        }
+    }
+
+    private fun SharedDecksActivity.pressBack() {
+        onBackPressedDispatcher.onBackPressed()
+        if (!isFinishing) visit(requireNotNull(webView.url))
+    }
+
+    private fun startSharedDecks(): SharedDecksActivity {
+        val controller =
+            Robolectric
+                .buildActivity(SharedDecksActivity::class.java)
+                .create()
+                .start()
+                .resume()
+                .visible()
         saveControllerForCleanup(controller)
+        return controller.get()
+    }
 
-        val webView = activity.findViewById<WebView>(R.id.web_view)
-        val spyWebClient = spy(activity.webViewClient)
-        doReturn(true).whenever(spyWebClient).isLoggedInToAnkiWeb
-        webView.webViewClient = spyWebClient
+    private fun captureInfoLogs(block: () -> Unit): List<String> {
+        val messages = mutableListOf<String>()
+        val tree =
+            object : Timber.Tree() {
+                override fun log(
+                    priority: Int,
+                    tag: String?,
+                    message: String,
+                    t: Throwable?,
+                ) {
+                    if (priority >= Log.INFO) messages += message
+                }
+            }
+        Timber.plant(tree)
+        try {
+            block()
+        } finally {
+            Timber.uproot(tree)
+        }
+        return messages
+    }
 
-        controller.start().resume().visible()
+    private fun SharedDecksActivity.receiveTooManyRequests() {
+        val response = mock<WebResourceResponse> { on { statusCode } doReturn HTTP_STATUS_TOO_MANY_REQUESTS }
+        webViewClient.onReceivedHttpError(webView, mock(), response)
+    }
 
-        val mockRequest = mock<WebResourceRequest>()
-        val mockErrorResponse = mock<WebResourceResponse>()
-        whenever(mockErrorResponse.statusCode).thenReturn(HTTP_STATUS_TOO_MANY_REQUESTS)
+    private val SharedDecksActivity.webView: WebView
+        get() = findViewById(R.id.web_view)
 
-        spyWebClient.onReceivedHttpError(webView, mockRequest, mockErrorResponse)
+    private val SharedDecksActivity.lastLoadedUrl: String?
+        get() = Shadows.shadowOf(webView).lastLoadedUrl
 
-        val expectedUrl = getResourceString(R.string.shared_decks_url)
-        val lastUrl = Shadows.shadowOf(webView).lastLoadedUrl
-        assertEquals(expectedUrl, lastUrl)
+    companion object {
+        private const val SHARED_DECK = "https://ankiweb.net/shared/info/1234"
+        private const val DECK_DOWNLOAD = "https://ankiweb.net/svc/shared/download-deck/1234?t=key"
+        private const val AFTER_LOGIN = "https://ankiweb.net/account/login?afterAuth=1"
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/shareddeck/SharedDecksDownloadFragmentTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/shareddeck/SharedDecksDownloadFragmentTest.kt
index 8c88075b491b..11bd628ce543 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/shareddeck/SharedDecksDownloadFragmentTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/shareddeck/SharedDecksDownloadFragmentTest.kt
@@ -10,13 +10,14 @@ import android.os.Bundle
 import android.os.Looper
 import android.webkit.CookieManager
 import android.webkit.WebView
-import android.widget.TextView
 import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
 import androidx.compose.ui.semantics.SemanticsActions
 import androidx.compose.ui.test.junit4.v2.createEmptyComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performSemanticsAction
 import androidx.core.content.FileProvider
+import androidx.core.net.toUri
 import androidx.fragment.app.commitNow
 import androidx.lifecycle.Lifecycle
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -24,21 +25,29 @@ import com.ichi2.anki.CommonString
 import com.ichi2.anki.IntentHandler
 import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
-import com.ichi2.anki.settings.Prefs
+import com.ichi2.anki.common.crashreporting.CrashReportService
+import com.ichi2.anki.common.crashreporting.CrashReporter
+import com.ichi2.anki.dialogs.utils.message
 import com.ichi2.anki.shareddeck.SharedDecksDownloadFragment.Companion.getDeckPageUri
 import com.ichi2.utils.openInputStreamSafe
+import com.ichi2.utils.positiveButton
+import org.junit.After
 import org.junit.Assert.assertEquals
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mockito.mockStatic
 import org.mockito.kotlin.any
 import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.atLeastOnce
 import org.mockito.kotlin.doAnswer
 import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.doThrow
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoInteractions
 import org.mockito.kotlin.whenever
 import org.robolectric.Robolectric
 import org.robolectric.Shadows.shadowOf
@@ -60,6 +69,20 @@ class SharedDecksDownloadFragmentTest : RobolectricTest() {
     @get:Rule
     val composeRule = createEmptyComposeRule()
 
+    private lateinit var originalCrashReporter: CrashReporter
+    private val crashReporter = mock<CrashReporter>()
+
+    @Before
+    fun captureCrashReports() {
+        originalCrashReporter = CrashReportService.getReporter()
+        CrashReportService.setReporter(crashReporter)
+    }
+
+    @After
+    fun restoreCrashReporter() {
+        CrashReportService.setReporter(originalCrashReporter)
+    }
+
     @Test
     fun `completed download opens the existing file for import`() {
         val download = completedDownload()
@@ -251,6 +274,39 @@ class SharedDecksDownloadFragmentTest : RobolectricTest() {
         assertFalse(dialog.isShowing)
     }
 
+    @Test
+    fun `download manager rejecting the app folder downloads into its own storage instead`() {
+        val download = startDownload(rejectsAppStorage = true)
+        val deckUri = "content://downloads/all_downloads/1".toUri()
+
+        download.complete(localUri = deckUri)
+
+        val intent = assertNotNull(shadowOf(download.activity).nextStartedActivity)
+        assertEquals(IntentHandler::class.java.name, intent.component?.className)
+        assertEquals(deckUri, intent.data)
+        verifyNoInteractions(crashReporter)
+
+        importButton.performSemanticsAction(SemanticsActions.OnClick)
+        shadowOf(Looper.getMainLooper()).idle()
+        assertEquals(deckUri, shadowOf(download.activity).nextStartedActivity?.data)
+    }
+
+    @Test
+    fun `download manager rejecting every destination offers retry instead of crashing`() {
+        val failure = SecurityException("Unsupported path")
+        val download = startDownload(enqueueFailure = failure)
+
+        retryButton.assertExists()
+        verify(crashReporter).sendExceptionReport(failure, "SharedDecksDownloadFragment::downloadFile", null, false)
+
+        doReturn(2L).whenever(download.activity.downloadManager).enqueue(any())
+        retryButton.performSemanticsAction(SemanticsActions.OnClick)
+        download.file.writeText("deck contents")
+        download.complete(downloadId = 2L)
+
+        assertNotNull(shadowOf(download.activity).nextStartedActivity)
+    }
+
     /** 19876: AnkiWeb returns 429 to anonymous users downloading a second deck, asking them to log in */
     @Test
     fun `rate limited download while logged out prompts login instead of showing a generic error`() {
@@ -259,14 +315,7 @@ class SharedDecksDownloadFragmentTest : RobolectricTest() {
         download.complete(status = DownloadManager.STATUS_FAILED, reason = HTTP_TOO_MANY_REQUESTS)
         shadowOf(Looper.getMainLooper()).idle()
 
-        val snackbarText =
-            download
-                .activity
-                .findViewById<TextView>(com.google.android.material.R.id.snackbar_text)
-        assertEquals(
-            download.activity.getString(CommonString.shared_decks_login_required),
-            snackbarText?.text,
-        )
+        assertLoginPromptShown()
         retryButton.assertDoesNotExist()
         assertNull(ShadowToast.getLatestToast())
         // nothing else removes the failed download on this path, so the fragment must
@@ -297,40 +346,26 @@ class SharedDecksDownloadFragmentTest : RobolectricTest() {
         download.complete(status = DownloadManager.STATUS_FAILED, reason = HTTP_TOO_MANY_REQUESTS)
         shadowOf(Looper.getMainLooper()).idle()
 
-        assertNull(
-            download
-                .activity
-                .findViewById<TextView>(com.google.android.material.R.id.snackbar_text),
-        )
+        assertNull(ShadowDialog.getLatestDialog())
 
         controller.start().resume()
         shadowOf(Looper.getMainLooper()).idle()
 
-        val snackbarText =
-            download
-                .activity
-                .findViewById<TextView>(com.google.android.material.R.id.snackbar_text)
-        assertEquals(
-            download.activity.getString(CommonString.shared_decks_login_required),
-            snackbarText?.text,
-        )
+        assertLoginPromptShown()
     }
 
-    /** An AnkiDroid login exists (no sign-up action on the snackbar) but the WebView has no
-     * AnkiWeb session: the user still needs a way in, so the WebView must open its login page */
     @Test
-    fun `rate limited download with an AnkiDroid login redirects the WebView to the login page`() {
-        Prefs.hkey = "test-hkey"
+    fun `rate limited download opens the login page only once the user taps log in`() {
         val download = startDownload()
+        val webView = download.activity.findViewById<WebView>(R.id.web_view)
 
         download.complete(status = DownloadManager.STATUS_FAILED, reason = HTTP_TOO_MANY_REQUESTS)
         shadowOf(Looper.getMainLooper()).idle()
+        assertEquals(getResourceString(R.string.shared_decks_url), shadowOf(webView).lastLoadedUrl)
 
-        val webView = download.activity.findViewById<WebView>(R.id.web_view)
-        assertEquals(
-            getResourceString(R.string.shared_decks_login_url),
-            shadowOf(webView).lastLoadedUrl,
-        )
+        clickAlertDialogButton { positiveButton }
+
+        assertEquals(getResourceString(R.string.shared_decks_login_url), shadowOf(webView).lastLoadedUrl)
     }
 
     @Test
@@ -371,21 +406,42 @@ class SharedDecksDownloadFragmentTest : RobolectricTest() {
         @StringRes text: Int,
     ) = composeRule.onNodeWithText(targetContext.getString(text))
 
+    private fun assertLoginPromptShown() {
+        val dialog = assertNotNull(ShadowDialog.getLatestDialog() as? AlertDialog)
+        assertEquals(getResourceString(CommonString.shared_decks_ankiweb_login_limit), dialog.message)
+    }
+
     private fun completedDownload(): Download =
         startDownload().apply {
             file.writeText("deck contents")
             complete()
         }
 
-    private fun startDownload(): Download {
+    private fun startDownload(
+        enqueueFailure: Exception? = null,
+        rejectsAppStorage: Boolean = false,
+    ): Download {
         val activity = startActivityNormallyOpenCollectionWithIntent(SharedDecksActivity::class.java, Intent())
-        return setupDownload(activity)
+        return setupDownload(activity, enqueueFailure, rejectsAppStorage)
     }
 
-    private fun setupDownload(activity: SharedDecksActivity): Download {
+    private fun setupDownload(
+        activity: SharedDecksActivity,
+        enqueueFailure: Exception? = null,
+        rejectsAppStorage: Boolean = false,
+    ): Download {
         activity.downloadManager =
             mock {
-                on { enqueue(any()) } doReturn 1L
+                when {
+                    enqueueFailure != null -> on { enqueue(any()) } doThrow enqueueFailure
+                    rejectsAppStorage ->
+                        on { enqueue(any()) } doAnswer { invocation ->
+                            val destination = shadowOf(invocation.getArgument<DownloadManager.Request>(0)).destination
+                            if (destination != null) throw SecurityException("Unsupported path ${destination.path}")
+                            1L
+                        }
+                    else -> on { enqueue(any()) } doReturn 1L
+                }
                 on { query(any()) } doAnswer { downloadCursor(DownloadManager.STATUS_RUNNING) }
             }
         val fragment =
@@ -393,7 +449,7 @@ class SharedDecksDownloadFragmentTest : RobolectricTest() {
                 arguments =
                     Bundle().apply {
                         putSerializable(
-                            SharedDecksActivity.DOWNLOAD_FILE,
+                            SharedDecksActivity.ARG_DOWNLOAD_FILE,
                             DownloadFile(
                                 url = "https://ankiweb.net/svc/shared/download-deck/1",
                                 userAgent = "AnkiDroid",
@@ -408,7 +464,7 @@ class SharedDecksDownloadFragmentTest : RobolectricTest() {
         }
         shadowOf(Looper.getMainLooper()).idle()
         val request = argumentCaptor<DownloadManager.Request>()
-        verify(activity.downloadManager).enqueue(request.capture())
+        verify(activity.downloadManager, atLeastOnce()).enqueue(request.capture())
         return Download(activity, fragment, File(shadowOf(request.firstValue).destination.path!!))
     }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/shareddeck/SharedDecksScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/shareddeck/SharedDecksScreenshotTest.kt
index f80df6eedc9d..d68139daf62c 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/shareddeck/SharedDecksScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/shareddeck/SharedDecksScreenshotTest.kt
@@ -7,9 +7,12 @@ import android.content.Intent
 import android.database.Cursor
 import android.database.MatrixCursor
 import android.os.Bundle
+import android.os.Looper
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
+import android.webkit.WebResourceResponse
+import android.webkit.WebView
 import android.widget.FrameLayout
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@@ -17,16 +20,21 @@ import androidx.core.view.WindowInsetsCompat.Type.displayCutout
 import androidx.core.view.WindowInsetsCompat.Type.navigationBars
 import androidx.core.view.WindowInsetsCompat.Type.statusBars
 import androidx.fragment.app.commit
+import com.google.testing.junit.testparameterinjector.TestParameter
 import com.ichi2.anki.R
 import com.ichi2.anki.ScreenshotTest
+import com.ichi2.anki.common.utils.dp
+import com.ichi2.anki.shareddeck.SharedDecksActivity.Companion.HTTP_STATUS_TOO_MANY_REQUESTS
 import com.ichi2.testutils.insetsOf
-import com.ichi2.utils.dp
 import org.junit.Test
 import org.mockito.kotlin.any
 import org.mockito.kotlin.doAnswer
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.robolectric.RuntimeEnvironment
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.shadows.ShadowChoreographer
+import java.time.Duration
 
 /**
  * Screenshot tests for [SharedDecksActivity]
@@ -56,12 +64,29 @@ class SharedDecksScreenshotTest : ScreenshotTest() {
 
     /** [SharedDecksDownloadFragment]: a full-screen overlay above the WebView */
     @Test
-    fun downloadFragment() =
+    fun downloadFragment(
+        @TestParameter("-1", "0", "30", "100") percent: Int,
+    ) = withSharedDecks { activity ->
+        // show the fragment first: insets are only received by attached views
+        activity.showDownloadFragment(percent)
+        activity.simulateNavigationBar()
+        val name =
+            when (percent) {
+                -1 -> "download_indeterminate"
+                30 -> "download"
+                else -> "download_$percent"
+            }
+        captureScreen(name)
+    }
+
+    @Test
+    fun loginRequiredDialog() =
         withSharedDecks { activity ->
-            // show the fragment first: insets are only received by attached views
-            activity.showDownloadFragment()
             activity.simulateNavigationBar()
-            captureScreen("download")
+            val response = mock<WebResourceResponse> { on { statusCode } doReturn HTTP_STATUS_TOO_MANY_REQUESTS }
+            activity.webViewClient.onReceivedHttpError(activity.findViewById<WebView>(R.id.web_view), mock(), response)
+            advanceRobolectricLooper()
+            captureScreen("login_required_dialog")
         }
 
     private fun withSharedDecks(block: (SharedDecksActivity) -> Unit) {
@@ -76,20 +101,28 @@ class SharedDecksScreenshotTest : ScreenshotTest() {
 
     /**
      * Shows [SharedDecksDownloadFragment] as the activity's download listener would,
-     * with a mocked [DownloadManager] reporting a stable in-progress download
+     * with a mocked [DownloadManager] reporting a stable in-progress download.
+     * A [percent] of -1 makes progress unavailable, showing the indeterminate indicator.
      */
-    private fun SharedDecksActivity.showDownloadFragment() {
+    private fun SharedDecksActivity.showDownloadFragment(percent: Int) {
+        if (percent < 0) {
+            ShadowChoreographer.setPaused(true)
+            ShadowChoreographer.setFrameDelay(Duration.ofMillis(16))
+        }
         downloadManager =
             mock {
                 on { enqueue(any()) } doReturn 1L
-                on { query(any()) } doAnswer { inProgressDownloadCursor() }
+                on { query(any()) } doAnswer {
+                    if (percent < 0) throw IllegalArgumentException("Progress unavailable")
+                    inProgressDownloadCursor(percent)
+                }
             }
         val fragment =
             SharedDecksDownloadFragment().apply {
                 arguments =
                     Bundle().apply {
                         putSerializable(
-                            SharedDecksActivity.DOWNLOAD_FILE,
+                            SharedDecksActivity.ARG_DOWNLOAD_FILE,
                             DownloadFile(
                                 url = "https://ankiweb.net/svc/shared/download-deck/1104981491?t=token",
                                 userAgent = "Mozilla/5.0",
@@ -106,11 +139,16 @@ class SharedDecksScreenshotTest : ScreenshotTest() {
                 SharedDecksActivity.SHARED_DECKS_DOWNLOAD_FRAGMENT,
             )
         }
-        advanceRobolectricLooper()
+        if (percent < 0) {
+            // The indeterminate animation never ends. Capture a fixed frame instead of draining it.
+            shadowOf(Looper.getMainLooper()).idleFor(Duration.ofSeconds(1))
+        } else {
+            advanceRobolectricLooper()
+        }
     }
 
-    /** A download which is 30% complete */
-    private fun inProgressDownloadCursor(): Cursor =
+    /** A download with known progress. */
+    private fun inProgressDownloadCursor(percent: Int): Cursor =
         MatrixCursor(
             arrayOf(
                 DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR,
@@ -119,7 +157,9 @@ class SharedDecksScreenshotTest : ScreenshotTest() {
                 DownloadManager.COLUMN_REASON,
             ),
         ).apply {
-            addRow(arrayOf<Any>(3_000_000L, 10_000_000L, DownloadManager.STATUS_RUNNING, 0))
+            val totalBytes = 10_000_000L
+            val downloadedBytes = totalBytes * percent / 100
+            addRow(arrayOf<Any>(downloadedBytes, totalBytes, DownloadManager.STATUS_RUNNING, 0))
         }
 
     /**
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/snackbar/SnackbarsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/snackbar/SnackbarsTest.kt
index 59f37cd470ed..3c7c24455651 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/snackbar/SnackbarsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/snackbar/SnackbarsTest.kt
@@ -14,7 +14,6 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.android.material.snackbar.Snackbar
 import com.ichi2.anki.EmptyApplicationCategory
-import com.ichi2.anki.R
 import com.ichi2.testutils.EmptyApplication
 import org.junit.Before
 import org.junit.Test
@@ -26,12 +25,13 @@ import kotlin.test.assertFalse
 import kotlin.test.assertNull
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 @Config(application = EmptyApplication::class)
 @Category(EmptyApplicationCategory::class)
 class SnackbarsTest {
-    private val context = ContextThemeWrapper(ApplicationProvider.getApplicationContext<Context>(), R.style.Theme_Light)
+    private val context = ContextThemeWrapper(ApplicationProvider.getApplicationContext<Context>(), CommonR.style.Theme_Light)
     private val host = CoordinatorLayout(context)
     private val looper = shadowOf(Looper.getMainLooper())
 
@@ -68,12 +68,12 @@ class SnackbarsTest {
     fun `pending snackbar is retained by the root until shown`() {
         val child = View(context).also(host::addView)
         val snackbar = child.showSnackbar("Message")
-        assertSame(snackbar, host.getTag(R.id.pending_snackbar))
+        assertSame(snackbar, host.getTag(CommonR.id.pending_snackbar))
 
         looper.idle()
         snackbar.view.layout(0, 0, 300, 60)
 
-        assertNull(host.getTag(R.id.pending_snackbar))
+        assertNull(host.getTag(CommonR.id.pending_snackbar))
     }
 
     @Test
@@ -81,15 +81,15 @@ class SnackbarsTest {
         val first = host.showSnackbar("First")
         looper.idle()
         val second = host.showSnackbar("Second")
-        assertSame(second, host.getTag(R.id.pending_snackbar))
+        assertSame(second, host.getTag(CommonR.id.pending_snackbar))
 
         // Showing the first snackbar must not release the second, which is still queued.
         first.view.layout(0, 0, 300, 60)
-        assertSame(second, host.getTag(R.id.pending_snackbar))
+        assertSame(second, host.getTag(CommonR.id.pending_snackbar))
 
         // Finish dismissing the first and attach the second, without laying it out yet.
         looper.idle()
-        assertSame(second, host.getTag(R.id.pending_snackbar))
+        assertSame(second, host.getTag(CommonR.id.pending_snackbar))
     }
 
     @Test
@@ -100,18 +100,18 @@ class SnackbarsTest {
 
         looper.idle()
 
-        assertSame(second, host.getTag(R.id.pending_snackbar))
+        assertSame(second, host.getTag(CommonR.id.pending_snackbar))
     }
 
     @Test
     fun `dismissal before layout releases the pending snackbar`() {
         val snackbar = host.showSnackbar("Message")
         looper.idle()
-        assertSame(snackbar, host.getTag(R.id.pending_snackbar))
+        assertSame(snackbar, host.getTag(CommonR.id.pending_snackbar))
 
         snackbar.dismiss()
         looper.idle()
 
-        assertNull(host.getTag(R.id.pending_snackbar))
+        assertNull(host.getTag(CommonR.id.pending_snackbar))
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/startup/SetupStorageTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/startup/SetupStorageTest.kt
index 71031e4952d9..79aeac4b9aa4 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/startup/SetupStorageTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/startup/SetupStorageTest.kt
@@ -21,6 +21,7 @@ import org.robolectric.annotation.Config
 import java.io.File
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
+import kotlin.test.assertNull
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
 
@@ -40,7 +41,7 @@ class SetupStorageTest : RobolectricTest() {
 
     /**
      * Reading the collection path must not silently choose and persist a default:
-     * that decision belongs to startup ([ensureCollectionPathSet]).
+     * that decision belongs to startup ([maybeSetDefaultCollectionPath]).
      */
     @Test
     fun `reading the collection path throws when unset`() {
@@ -84,30 +85,29 @@ class SetupStorageTest : RobolectricTest() {
     }
 
     @Test
-    fun `ensureCollectionPathSet persists a default when unset`() {
+    fun `maybeSetDefaultCollectionPath persists a default when unset and storage is accessible`() {
         prefs.edit { remove(CollectionHelper.PREF_COLLECTION_PATH) }
 
-        ensureCollectionPathSet(targetContext)
+        withAllFilesAccess { maybeSetDefaultCollectionPath(targetContext) }
 
         assertTrue(!collectionPath.isNullOrEmpty(), "a default collection path should be set")
     }
 
     @Test
-    fun `ensureCollectionPathSet does not overwrite an existing value`() {
+    fun `maybeSetDefaultCollectionPath does not overwrite an existing value`() {
         prefs.edit { putString(CollectionHelper.PREF_COLLECTION_PATH, "/a/custom/path") }
 
-        ensureCollectionPathSet(targetContext)
+        maybeSetDefaultCollectionPath(targetContext)
 
         assertEquals("/a/custom/path", collectionPath)
     }
 
-    // The permission screen is mandatory on Android 10 and below: the folder is fixed
     @Test
     @Config(sdk = [Build.VERSION_CODES.Q])
     fun `Android 10 - public storage is persisted before permissions are granted`() {
         prefs.edit { remove(CollectionHelper.PREF_COLLECTION_PATH) }
 
-        ensureCollectionPathSet(targetContext)
+        maybeSetDefaultCollectionPath(targetContext)
 
         assertEquals(publicCollectionPath, collectionPath)
     }
@@ -117,20 +117,19 @@ class SetupStorageTest : RobolectricTest() {
     fun `Android 10 - public storage is persisted once permissions are granted`() {
         prefs.edit { remove(CollectionHelper.PREF_COLLECTION_PATH) }
 
-        withWritePermissions { ensureCollectionPathSet(targetContext) }
+        withWritePermissions { maybeSetDefaultCollectionPath(targetContext) }
 
         assertEquals(publicCollectionPath, collectionPath)
     }
 
-    // TODO: 13574 - the decision is deferred to the user: the screen may be skipped
     @Test
     @Config(sdk = [Build.VERSION_CODES.R])
-    fun `full build - public storage is persisted before 'All files access' is granted`() {
+    fun `full build - storage decision is deferred before 'All files access' is granted`() {
         prefs.edit { remove(CollectionHelper.PREF_COLLECTION_PATH) }
 
-        withManageExternalStorageInManifest { ensureCollectionPathSet(targetContext) }
+        withManageExternalStorageInManifest { maybeSetDefaultCollectionPath(targetContext) }
 
-        assertEquals(publicCollectionPath, collectionPath)
+        assertNull(collectionPath, "the storage decision should be deferred to the user")
     }
 
     @Test
@@ -139,7 +138,7 @@ class SetupStorageTest : RobolectricTest() {
         prefs.edit { remove(CollectionHelper.PREF_COLLECTION_PATH) }
 
         withManageExternalStorageInManifest {
-            withAllFilesAccess { ensureCollectionPathSet(targetContext) }
+            withAllFilesAccess { maybeSetDefaultCollectionPath(targetContext) }
         }
 
         assertEquals(publicCollectionPath, collectionPath)
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/startup/StoragePolicyTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/startup/StoragePolicyTest.kt
index 6afdd8d65de3..85f36fee3a15 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/startup/StoragePolicyTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/startup/StoragePolicyTest.kt
@@ -43,8 +43,7 @@ class StoragePolicyTest {
             listOf(
                 Case(StoragePermissionSet.LEGACY_ACCESS, granted = false, persists = AnkiDroidFolder.PUBLIC),
                 Case(StoragePermissionSet.LEGACY_ACCESS, granted = true, persists = AnkiDroidFolder.PUBLIC),
-                // TODO: 13574 - not granted: null (deferred to the permission screen)
-                Case(StoragePermissionSet.EXTERNAL_MANAGER, granted = false, persists = AnkiDroidFolder.PUBLIC),
+                Case(StoragePermissionSet.EXTERNAL_MANAGER, granted = false, persists = null),
                 Case(StoragePermissionSet.EXTERNAL_MANAGER, granted = true, persists = AnkiDroidFolder.PUBLIC),
                 Case(StoragePermissionSet.APP_PRIVATE, granted = false, persists = AnkiDroidFolder.APP_PRIVATE),
                 Case(StoragePermissionSet.APP_PRIVATE, granted = true, persists = AnkiDroidFolder.APP_PRIVATE),
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/study/DeckStudyStateTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/study/DeckStudyStateTest.kt
new file mode 100644
index 000000000000..7b72e4d6720e
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/study/DeckStudyStateTest.kt
@@ -0,0 +1,131 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.study
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import anki.scheduler.CardAnswer.Rating
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.libanki.Consts.DEFAULT_DECK_ID
+import org.json.JSONArray
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+import kotlin.time.Duration.Companion.seconds
+
+@RunWith(AndroidJUnit4::class)
+class DeckStudyStateTest : RobolectricTest() {
+    @Test
+    fun `hidden Default retains its identity and empty regular deck state`() {
+        addDeck("Other")
+        assertNull(col.sched.deckDueTree().find(DEFAULT_DECK_ID))
+        val undo = col.undoStatus()
+
+        val state = col.currentDeckStudyState()
+
+        assertEquals(DEFAULT_DECK_ID, state.deckId)
+        assertEquals(DeckKind.Regular, state.kind)
+        assertTrue(state.isEmptyRegularDeck)
+        assertEquals(StudyAvailability.NoCardsAvailable, state.availability)
+        assertNull(state.nextLearningIn)
+        assertEquals(DEFAULT_DECK_ID, col.decks.selected())
+        assertEquals(undo, col.undoStatus())
+    }
+
+    @Test
+    fun `empty filtered deck retains its kind`() {
+        val deckId = addDynamicDeck("Filtered", "deck:Missing")
+
+        val state = col.currentDeckStudyState()
+
+        assertEquals(deckId, state.deckId)
+        assertEquals(DeckKind.Filtered, state.kind)
+        assertEquals(0, state.cardCount)
+        assertFalse(state.isEmptyRegularDeck)
+        assertEquals(StudyAvailability.NoCardsAvailable, state.availability)
+    }
+
+    @Test
+    fun `parent contents and availability include subdecks`() {
+        val child = addDeck("Parent::Child")
+        col.setDeck(listOf(addBasicNote().firstCard().id), child)
+        val parent = col.decks.id("Parent")
+        col.decks.select(parent)
+
+        val state = col.currentDeckStudyState()
+
+        assertEquals(parent, state.deckId)
+        assertEquals(1, state.cardCount)
+        assertEquals(1, state.newCardsAvailable)
+        assertEquals(StudyAvailability.CardsAvailable, state.availability)
+    }
+
+    @Test
+    fun `suspended cards remain content without being available`() {
+        val card = addBasicNote().firstCard()
+        col.sched.suspendCards(listOf(card.id))
+
+        val state = col.currentDeckStudyState()
+
+        assertEquals(1, state.cardCount)
+        assertFalse(state.isEmptyRegularDeck)
+        assertEquals(StudyAvailability.NoCardsAvailable, state.availability)
+    }
+
+    @Test
+    fun `cards borrowed by a filtered deck remain part of the regular deck`() {
+        addBasicNote()
+        addDynamicDeck("Filtered", "")
+        col.decks.select(DEFAULT_DECK_ID)
+
+        val state = col.currentDeckStudyState()
+
+        assertEquals(1, state.cardCount)
+        assertFalse(state.isEmptyRegularDeck)
+        assertEquals(StudyAvailability.NoCardsAvailable, state.availability)
+    }
+
+    @Test
+    fun `learning later and available cards can coexist`() {
+        col.config.set("collapseTime", 0)
+        val config = col.decks.configDictForDeckId(DEFAULT_DECK_ID)
+        config.new.delays = JSONArray(listOf(1))
+        col.decks.save(config)
+        addBasicNote()
+        col.sched.answerCard(assertNotNull(col.sched.card), Rating.AGAIN)
+        assertNull(col.sched.card)
+        val waiting = col.currentDeckStudyState()
+        assertEquals(StudyAvailability.NoCardsAvailable, waiting.availability)
+        assertTrue(assertNotNull(waiting.nextLearningIn) in 60.seconds..75.seconds)
+
+        addBasicNote("Another")
+        val available = col.currentDeckStudyState()
+
+        assertEquals(StudyAvailability.CardsAvailable, available.availability)
+        assertEquals(2, available.cardCount)
+        assertNotNull(available.nextLearningIn)
+    }
+
+    @Test
+    fun `daily limits and buried cards are retained together`() {
+        preventDayRolloverAlarmFromUnburyingCards()
+        val buried = addBasicNote().firstCard()
+        col.sched.buryCards(listOf(buried.id))
+        addBasicNote("Limited")
+        val config = col.decks.configDictForDeckId(DEFAULT_DECK_ID)
+        config.new.perDay = 0
+        col.decks.save(config)
+
+        // Exercise a day-rollover alarm query after the card has been buried.
+        simulateDayRolloverAlarmCutoffQuery()
+        val state = col.currentDeckStudyState()
+
+        assertEquals(StudyAvailability.NoCardsAvailable, state.availability)
+        assertEquals(2, state.cardCount)
+        assertTrue(state.congratulations.newRemaining)
+        assertTrue(state.congratulations.haveUserBuried)
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/tags/FlattenTreeTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/tags/FlattenTreeTest.kt
index 9cc8c7cdc03e..42d3f5716c48 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/tags/FlattenTreeTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/tags/FlattenTreeTest.kt
@@ -2,12 +2,15 @@
 
 package com.ichi2.anki.tags
 
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import anki.tags.tagTreeNode
 import org.hamcrest.MatcherAssert
 import org.hamcrest.Matchers
 import org.junit.Test
+import org.junit.runner.RunWith
 
 /** Unit tests for [ManageTagsViewModel.flattenTree] (no collection needed) */
+@RunWith(AndroidJUnit4::class)
 class FlattenTreeTest {
     /** Composes flatten + filter to match the old two-arg flattenTree behavior */
     private fun flattenAndFilter(
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/tags/ManageTagsTestUtils.kt b/AnkiDroid/src/test/java/com/ichi2/anki/tags/ManageTagsTestUtils.kt
index 635156416183..4caecf27dec9 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/tags/ManageTagsTestUtils.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/tags/ManageTagsTestUtils.kt
@@ -17,6 +17,11 @@ internal fun ManageTagsViewModel.renameTag(
     newName: String,
 ) = renameTag(TagName.asValid(oldName), TagName.asValid(newName))
 
+internal fun ManageTagsViewModel.moveTag(
+    tag: String,
+    newParent: String?,
+) = moveTag(TagName.asValid(tag), newParent?.let(TagName::asValid))
+
 /** Creates a [TagListItemState] from a plain [String] tag */
 internal fun tagListItem(
     fullTag: String,
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/tags/ManageTagsViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/tags/ManageTagsViewModelTest.kt
index 3bc1d5ba277e..0e5e398dd9e7 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/tags/ManageTagsViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/tags/ManageTagsViewModelTest.kt
@@ -9,6 +9,7 @@ import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.dialogs.utils.AnKingTags
 import com.ichi2.anki.exception.CollectionLockedException
 import com.ichi2.anki.observability.ensureOpsExecuted
+import com.ichi2.testutils.NeedsRobolectric
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -27,14 +28,133 @@ import org.hamcrest.Matchers.sameInstance
 import org.junit.Test
 import org.junit.runner.RunWith
 import kotlin.system.measureTimeMillis
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
 import kotlin.test.assertIs
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
 import kotlin.test.assertTrue
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
 /** Integration tests for [ManageTagsViewModel] with a real collection */
 @RunWith(AndroidJUnit4::class)
+@NeedsRobolectric(
+    "Preserve RobolectricTest's scoped CollectionManager dispatcher when switching to JvmTest; tag operations must finish before assertions and teardown.",
+)
 class ManageTagsViewModelTest : RobolectricTest() {
+    @Test
+    fun `tagExists follows backend identity for hidden Unicode tags`() =
+        runTest {
+            addTags("i", "Straße::café")
+            withViewModel {
+                for (query in listOf("", "missing")) {
+                    filter(query)
+                    assertTrue(tagExists(TagName.asValid("I")))
+                    assertTrue(!tagExists(TagName.asValid("ı")))
+                    assertTrue(tagExists(TagName.asValid("STRASSE::cafe\u0301")))
+                }
+            }
+        }
+
+    @Test
+    fun `move uses backend identity to reject its own subtree`() =
+        runTest {
+            for ((source, parent) in listOf(
+                "café" to "cafe\u0301",
+                "café" to "cafe\u0301::child",
+                "Straße" to "STRASSE",
+                "Straße" to "STRASSE::child",
+            )) {
+                val note = addTags(source)
+                val undoBefore = col.undoStatus()
+                withViewModel {
+                    moveTag(source, parent).join()
+                    assertIs<IllegalArgumentException>(loadedState.error, "$source / $parent")
+                    assertEquals(listOf(source), col.getNote(note.id).tags)
+                    assertEquals(undoBefore, col.undoStatus())
+                }
+            }
+        }
+
+    @Test
+    fun `move uses backend identity to distinguish Turkish parents`() =
+        runTest {
+            val note = addTags("i::child")
+            addTags("ı")
+            withViewModel {
+                moveTag("i::child", "ı").join()
+                assertEquals(null, loadedState.error)
+                assertEquals(listOf("ı::child"), col.getNote(note.id).tags)
+                col.undo()
+                assertEquals(listOf("i::child"), col.getNote(note.id).tags)
+            }
+        }
+
+    @Test
+    fun `move uses backend identity to detect an unchanged parent`() =
+        runTest {
+            val note = addTags("Straße::child")
+            val undoBefore = col.undoStatus()
+            withViewModel {
+                moveTag("Straße::child", "STRASSE").join()
+                assertEquals(null, loadedState.error)
+                assertEquals(listOf("Straße::child"), col.getNote(note.id).tags)
+                assertEquals(undoBefore, col.undoStatus())
+                assertEquals(UserMessage.TagMoved(0), pendingMessages.value.single().message)
+            }
+        }
+
+    @Test
+    fun `renaming preserves unrelated backend distinct ligature tags`() =
+        runTest {
+            val original = setOf("source", "ffi", "ffi")
+            val note = addTags(*original.toTypedArray())
+            val unrelated = addTags("ffi", "ffi")
+            val untouched = col.backend.getNote(unrelated.id)
+            assertEquals(3, col.getNote(note.id).tags.size)
+            withViewModel {
+                ensureOpsExecuted(1) { renameTag("source", "renamed").join() }
+                val expected = setOf("renamed", "ffi", "ffi")
+                assertEquals(expected, col.getNote(note.id).tags.toSet())
+                assertEquals(3, col.getNote(note.id).tags.size)
+                assertEquals(untouched, col.backend.getNote(unrelated.id))
+                col.undo()
+                assertEquals(original, col.getNote(note.id).tags.toSet())
+                col.redo()
+                assertEquals(expected, col.getNote(note.id).tags.toSet())
+            }
+        }
+
+    @Test
+    fun `merging deduplicates ligatures using backend identity`() =
+        runTest {
+            val note = addTags("source", "iff")
+            withViewModel {
+                ensureOpsExecuted(1) { renameTag("source", "ffi").join() }
+                assertEquals(listOf("iff"), col.getNote(note.id).tags)
+                col.undo()
+                assertEquals(setOf("source", "iff"), col.getNote(note.id).tags.toSet())
+                col.redo()
+                assertEquals(listOf("iff"), col.getNote(note.id).tags)
+            }
+        }
+
+    @Test
+    fun `merge deduplicates using backend tag identity`() =
+        runTest {
+            val note = addBasicNote().update { listOf("source", "STRASSE", "i", "ı").forEach(::addTag) }
+            withViewModel {
+                ensureOpsExecuted(1) { renameTag("source", "Straße").join() }
+                assertEquals(null, loadedState.error)
+                assertThat(col.getNote(note.id).tags, containsInAnyOrder("STRASSE", "i", "ı"))
+                col.undo()
+                assertThat(col.getNote(note.id).tags, containsInAnyOrder("source", "STRASSE", "i", "ı"))
+                col.redo()
+                assertThat(col.getNote(note.id).tags, containsInAnyOrder("STRASSE", "i", "ı"))
+            }
+        }
+
     @Test
     fun `refreshTags loads empty collection`() =
         runTest {
@@ -115,7 +235,7 @@ class ManageTagsViewModelTest : RobolectricTest() {
     fun `operations requested while busy do not mutate tags`() =
         runTest {
             addTags("science::biology", "history")
-            addUnusedTag("unused")
+            addUnusedTags("unused")
             withViewModel {
                 withQueuedCollectionAccess {
                     val refresh = refreshTags()
@@ -125,6 +245,7 @@ class ManageTagsViewModelTest : RobolectricTest() {
                     assertThat(renameTag("history", "past"), sameInstance(refresh))
                     assertThat(clearUnusedTags(), sameInstance(refresh))
                     assertThat(toggleCollapsed("science"), sameInstance(refresh))
+                    assertThat(moveTag("history", "science"), sameInstance(refresh))
                     assertThat(refreshTags(), sameInstance(refresh))
 
                     refresh.join()
@@ -373,6 +494,22 @@ class ManageTagsViewModelTest : RobolectricTest() {
             }
         }
 
+    @Test
+    fun `expanding one distinct root leaves the other collapsed`() =
+        runTest {
+            addBasicNote().update {
+                addTag("ffi::child")
+                addTag("ffi::child")
+            }
+            withViewModel {
+                assertThat(loadedState.visibleTagNames, equalTo(listOf("ffi", "ffi")))
+
+                toggleCollapsed("ffi").join()
+
+                assertThat(loadedState.visibleTagNames, equalTo(listOf("ffi", "ffi", "ffi::child")))
+            }
+        }
+
     @Test
     fun `toggleCollapsed on unknown tag queues UnexpectedError`() =
         runTest {
@@ -436,11 +573,45 @@ class ManageTagsViewModelTest : RobolectricTest() {
             }
         }
 
+    @Test
+    fun `merge removes duplicates according to backend identity`() =
+        runTest {
+            val note =
+                addBasicNote().update {
+                    addTag("source")
+                    addTag("ffi")
+                }
+            assertEquals(1, col.db.queryScalar("select ? = ? collate unicase", "ffi", "iff"))
+            withViewModel {
+                renameTag("source", "iff").join()
+
+                assertEquals(1, col.getNote(note.id).tags.size)
+            }
+        }
+
+    @Test
+    fun `unrelated rename preserves backend-distinct tags`() =
+        runTest {
+            val note =
+                addBasicNote().update {
+                    addTag("source")
+                    addTag("ffi")
+                    addTag("ffi")
+                }
+            assertEquals(setOf("source", "ffi", "ffi"), col.getNote(note.id).tags.toSet())
+
+            withViewModel {
+                renameTag("source", "renamed").join()
+
+                assertEquals(setOf("renamed", "ffi", "ffi"), col.getNote(note.id).tags.toSet())
+            }
+        }
+
     @Test
     fun `clearUnusedTags removes tags not on any note`() =
         runTest {
             addTags("used")
-            addUnusedTag("unused")
+            addUnusedTags("unused")
             withViewModel {
                 assertThat(loadedState.visibleTagNames, hasItem("unused"))
 
@@ -450,11 +621,73 @@ class ManageTagsViewModelTest : RobolectricTest() {
             }
         }
 
+    @Test
+    fun `tag totals include hidden descendants and stay stable during search`() =
+        runTest {
+            addTags("parent::child::leaf", "unrelated")
+            withViewModel {
+                assertThat(loadedState.visibleNodes, hasSize(2))
+                assertThat(loadedState.totalTagCount, equalTo(4))
+                filter("leaf")
+                assertThat(loadedState.visibleNodes, hasSize(3))
+                assertThat(loadedState.totalTagCount, equalTo(4))
+                filter("absent")
+                assertThat(loadedState.visibleNodes, hasSize(0))
+                assertThat(loadedState.totalTagCount, equalTo(4))
+                removeTag("parent").join()
+                assertThat(loadedState.totalTagCount, equalTo(1))
+            }
+        }
+
+    @Test
+    fun `moveTag updates descendants on notes and reports affected notes`() =
+        runTest {
+            val first = addTags("source::child", "unrelated")
+            val second = addTags("source", "source::other")
+            withViewModel {
+                moveTag("source", "target").join()
+
+                assertThat(col.getNote(first.id).tags, containsInAnyOrder("target::source::child", "unrelated"))
+                assertThat(col.getNote(second.id).tags, containsInAnyOrder("target::source", "target::source::other"))
+                assertThat(pendingMessages.value.single().message, equalTo(UserMessage.TagMoved(2)))
+                assertThat(loadedState.visibleTagNames, containsInAnyOrder("target", "unrelated"))
+                assertThat(loadedState.totalTagCount, equalTo(5))
+            }
+        }
+
+    @Test
+    fun `moveTag to the top level preserves descendants and siblings`() =
+        runTest {
+            val note = addTags("parent::topic::child", "parent::sibling")
+            withViewModel {
+                moveTag("parent::topic", null).join()
+
+                assertThat(col.getNote(note.id).tags, containsInAnyOrder("topic::child", "parent::sibling"))
+                assertThat(loadedState.visibleTagNames, containsInAnyOrder("parent", "topic"))
+            }
+        }
+
+    @Test
+    fun `moveTag emits changes and can be undone`() =
+        runTest {
+            val note = addTags("source::child")
+            withViewModel {
+                ensureOpsExecuted(1) { moveTag("source", "target").join() }
+                assertThat(col.getNote(note.id).tags, equalTo(listOf("target::source::child")))
+
+                col.undo()
+                refreshTags().join()
+
+                assertThat(col.getNote(note.id).tags, equalTo(listOf("source::child")))
+                assertThat(loadedState.visibleTagNames, equalTo(listOf("source")))
+            }
+        }
+
     @Test
     fun `clearUnusedTags queues message with count`() =
         runTest {
             addTags("used")
-            addUnusedTag("unused")
+            addUnusedTags("unused")
             withViewModel {
                 clearUnusedTags()
                 assertThat(pendingMessages.value.single().message, equalTo(UserMessage.ClearedUnusedTags(1)))
@@ -540,7 +773,7 @@ class ManageTagsViewModelTest : RobolectricTest() {
     fun `clearUnusedTags fires opChanges`() =
         runTest {
             addTags("used")
-            addUnusedTag("unused")
+            addUnusedTags("unused")
             ensureOpsExecuted(1) {
                 withViewModel { clearUnusedTags() }
             }
@@ -581,6 +814,346 @@ class ManageTagsViewModelTest : RobolectricTest() {
             }
         }
 
+    @Test
+    fun `rename follows backend removal of unused descendants and remains undoable`() =
+        runTest {
+            val note = addBasicNote().update { addTag("source::used") }
+            addUnusedTags("source", "source::unused", "source::unused::leaf")
+            withViewModel {
+                val before = col.tags.all().toSet()
+                ensureOpsExecuted(1) { renameTag("source", "renamed").join() }
+                assertThat(col.tags.all(), equalTo(listOf("renamed::used")))
+                assertThat(col.getNote(note.id).tags, equalTo(listOf("renamed::used")))
+                col.undo()
+                assertThat(col.tags.all().toSet(), equalTo(before))
+                assertThat(col.getNote(note.id).tags, equalTo(listOf("source::used")))
+                col.redo()
+                assertThat(col.tags.all(), equalTo(listOf("renamed::used")))
+            }
+        }
+
+    @Test
+    fun `renaming an unused subtree preserves tags and the previous undo action`() =
+        runTest {
+            val note = addUnusedTags("unused", "unused::child")
+            withViewModel {
+                val before = col.tags.all().toSet()
+                val undoBefore = col.undoStatus()
+                renameTag("UNUSED", "renamed").join()
+                assertThat(col.tags.all().toSet(), equalTo(before))
+                assertEquals(undoBefore.undo, col.undoStatus().undo)
+                assertEquals(undoBefore.redo, col.undoStatus().redo)
+                assertThat(pendingMessages.value.single().message, equalTo(UserMessage.TagRenamed(0)))
+                col.undo()
+                assertEquals(before, col.getNote(note.id).tags.toSet())
+                col.redo()
+                assertThat(col.getNote(note.id).tags, hasSize(0))
+            }
+        }
+
+    @Test
+    fun `moving an unused subtree preserves tags and the previous undo action`() =
+        runTest {
+            val note = addUnusedTags("parent", "parent::child", "parent::child::leaf", "parent::sibling")
+            withViewModel {
+                val before = col.tags.all().toSet()
+                val undoBefore = col.undoStatus()
+                moveTag("parent::child", "target").join()
+                assertThat(col.tags.all().toSet(), equalTo(before))
+                assertEquals(undoBefore.undo, col.undoStatus().undo)
+                assertEquals(undoBefore.redo, col.undoStatus().redo)
+                assertThat(pendingMessages.value.single().message, equalTo(UserMessage.TagMoved(0)))
+                col.undo()
+                assertEquals(before, col.getNote(note.id).tags.toSet())
+                col.redo()
+                assertThat(col.getNote(note.id).tags, hasSize(0))
+            }
+        }
+
+    @Test
+    fun `moving a tag onto an existing subtree deduplicates notes and is undoable`() =
+        runTest {
+            val original = listOf("source", "source::child", "target::source", "target::source::child", "unrelated")
+            val note = addBasicNote().update { original.forEach(::addTag) }
+            withViewModel {
+                ensureOpsExecuted(1) { moveTag("source", "target").join() }
+                assertThat(col.getNote(note.id).tags, containsInAnyOrder("target::source", "target::source::child", "unrelated"))
+                assertThat(pendingMessages.value.single().message, equalTo(UserMessage.TagMoved(1)))
+                col.undo()
+                assertThat(col.getNote(note.id).tags, containsInAnyOrder(*original.toTypedArray()))
+                col.redo()
+                assertThat(col.getNote(note.id).tags, containsInAnyOrder("target::source", "target::source::child", "unrelated"))
+            }
+        }
+
+    @Test
+    fun `move to a sibling whose name starts with the source preserves notes`() =
+        runTest {
+            val note = addBasicNote().update { addTag("parent::a::child") }
+            withViewModel {
+                moveTag("parent::a", "parent::ab").join()
+                assertThat(col.getNote(note.id).tags, equalTo(listOf("parent::ab::a::child")))
+            }
+        }
+
+    @Test
+    fun `merge uses literal tag names and one undo step`() =
+        runTest {
+            for (source in listOf("none", "_*", "a*b", "a_b", "a\"b", "a\\b", "a.b")) {
+                val note = addBasicNote().update { listOf(source, "target").forEach(::addTag) }
+                withViewModel {
+                    ensureOpsExecuted(1) { renameTag(source, "target").join() }
+                    assertThat(col.getNote(note.id).tags, equalTo(listOf("target")))
+                    col.undo()
+                    assertThat(col.getNote(note.id).tags, containsInAnyOrder(source, "target"))
+                    col.redo()
+                    assertThat(col.getNote(note.id).tags, equalTo(listOf("target")))
+                }
+            }
+        }
+
+    @Test
+    fun `merge updates descendants and deduplicates tags on notes`() =
+        runTest {
+            val note = addBasicNote().update { listOf("source", "source::child", "target", "target::child", "unrelated").forEach(::addTag) }
+            with(ManageTagsViewModel()) {
+                renameTag("source", "target").join()
+
+                assertThat(col.getNote(note.id).tags, containsInAnyOrder("target", "target::child", "unrelated"))
+                assertThat(pendingMessages.value.single().message, equalTo(UserMessage.TagRenamed(1)))
+            }
+        }
+
+    @Test
+    fun `tagExists includes collapsed and filtered tags regardless of case`() =
+        runTest {
+            addTags("parent::child", "other")
+            withViewModel {
+                assertThat(loadedState.visibleTagNames, not(hasItem("parent::child")))
+                assertTrue(tagExists(TagName.asValid("PARENT::CHILD")))
+                filter("other")
+                assertThat(loadedState.visibleTagNames, equalTo(listOf("other")))
+                assertTrue(tagExists(TagName.asValid("parent::CHILD")))
+                assertTrue(!tagExists(TagName.asValid("missing")))
+            }
+        }
+
+    @Test
+    fun `rename refreshes hidden lookups and totals through undo and redo`() =
+        runTest {
+            val note = addTags("source::leaf", "unrelated")
+            withViewModel {
+                filter("no-match")
+                assertEquals(3, loadedState.totalTagCount)
+
+                renameTag("source", "target::topic").join()
+
+                assertNull(loadedState.error)
+                assertEquals(4, loadedState.totalTagCount)
+                assertTrue(loadedState.visibleNodes.isEmpty())
+                assertFalse(tagExists(TagName.asValid("source")))
+                assertFalse(tagExists(TagName.asValid("source::leaf")))
+                assertTrue(tagExists(TagName.asValid("target")))
+                assertTrue(tagExists(TagName.asValid("TARGET::TOPIC::LEAF")))
+                assertEquals(setOf("target::topic::leaf", "unrelated"), col.getNote(note.id).tags.toSet())
+
+                col.undo()
+                refreshTags().join()
+                assertEquals(3, loadedState.totalTagCount)
+                assertTrue(tagExists(TagName.asValid("source::leaf")))
+                assertFalse(tagExists(TagName.asValid("target")))
+
+                col.redo()
+                refreshTags().join()
+                assertEquals(4, loadedState.totalTagCount)
+                assertTrue(tagExists(TagName.asValid("target::topic::leaf")))
+                assertFalse(tagExists(TagName.asValid("source")))
+            }
+        }
+
+    @Test
+    fun `merge refreshes hidden lookups and totals and undo restores both trees`() =
+        runTest {
+            val note = addTags("source::child", "target::child", "other")
+            withViewModel {
+                filter("other")
+                assertEquals(5, loadedState.totalTagCount)
+
+                renameTag("source", "target").join()
+
+                assertNull(loadedState.error)
+                assertEquals(3, loadedState.totalTagCount)
+                assertFalse(tagExists(TagName.asValid("source::child")))
+                assertTrue(tagExists(TagName.asValid("target::child")))
+                assertEquals(setOf("other", "target::child"), col.getNote(note.id).tags.toSet())
+                assertEquals(2, col.getNote(note.id).tags.size)
+
+                col.undo()
+                refreshTags().join()
+                assertEquals(5, loadedState.totalTagCount)
+                assertTrue(tagExists(TagName.asValid("source::child")))
+                assertTrue(tagExists(TagName.asValid("target::child")))
+                assertEquals(3, col.getNote(note.id).tags.size)
+            }
+        }
+
+    @Test
+    fun `move refreshes hidden destinations without losing sibling lookups`() =
+        runTest {
+            val note = addTags("old::topic::child", "old::keep", "unrelated")
+            withViewModel {
+                filter("unrelated")
+                assertEquals(5, loadedState.totalTagCount)
+
+                moveTag("old::topic", "new").join()
+
+                assertNull(loadedState.error)
+                assertEquals(6, loadedState.totalTagCount)
+                assertFalse(tagExists(TagName.asValid("old::topic")))
+                assertTrue(tagExists(TagName.asValid("old::keep")))
+                assertTrue(tagExists(TagName.asValid("new::topic::child")))
+                assertEquals(listOf("unrelated"), loadedState.visibleTagNames)
+                assertEquals(setOf("new::topic::child", "old::keep", "unrelated"), col.getNote(note.id).tags.toSet())
+
+                col.undo()
+                refreshTags().join()
+                assertEquals(5, loadedState.totalTagCount)
+                assertTrue(tagExists(TagName.asValid("old::topic::child")))
+                assertFalse(tagExists(TagName.asValid("new")))
+            }
+        }
+
+    @Test
+    fun `invalid move preserves state and retry refreshes lookups`() =
+        runTest {
+            val note = addTags("source::child")
+            withViewModel {
+                val before = loadedState
+                val undoBefore = col.undoStatus()
+
+                moveTag("source", "source::child").join()
+
+                assertIs<IllegalArgumentException>(loadedState.error)
+                assertFalse(loadedState.isWorking)
+                assertEquals(before.visibleNodes, loadedState.visibleNodes)
+                assertEquals(before.totalTagCount, loadedState.totalTagCount)
+                assertTrue(tagExists(TagName.asValid("source::child")))
+                assertEquals(listOf("source::child"), col.getNote(note.id).tags)
+                assertEquals(undoBefore, col.undoStatus())
+                assertTrue(pendingMessages.value.isEmpty())
+
+                moveTag("source", "target").join()
+
+                assertNull(loadedState.error)
+                assertEquals(3, loadedState.totalTagCount)
+                assertFalse(tagExists(TagName.asValid("source")))
+                assertTrue(tagExists(TagName.asValid("target::source::child")))
+                assertEquals(
+                    UserMessage.TagMoved(1),
+                    pendingMessages.value
+                        .single()
+                        .message,
+                )
+            }
+        }
+
+    @Test
+    fun `unchanged move preserves an available redo`() =
+        runTest {
+            val note = addTags("source::child")
+            withViewModel {
+                moveTag("source", "target").join()
+                col.undo()
+                refreshTags().join()
+                messageShown(
+                    pendingMessages.value
+                        .single()
+                        .id,
+                )
+                val undoBefore = col.undoStatus()
+                assertNotNull(undoBefore.redo)
+
+                moveTag("source", null).join()
+
+                assertNull(loadedState.error)
+                assertEquals(undoBefore, col.undoStatus())
+                assertEquals(2, loadedState.totalTagCount)
+                assertEquals(
+                    UserMessage.TagMoved(0),
+                    pendingMessages.value
+                        .single()
+                        .message,
+                )
+                col.redo()
+                assertEquals(listOf("target::source::child"), col.getNote(note.id).tags)
+            }
+        }
+
+    @Test
+    fun `clear unused refreshes cached descendants and their implicit parents`() =
+        runTest {
+            addTags("used::leaf", "unused::leaf").update { removeTag("unused::leaf") }
+            withViewModel {
+                filter("used")
+                assertEquals(4, loadedState.totalTagCount)
+                assertTrue(tagExists(TagName.asValid("unused::leaf")))
+
+                clearUnusedTags().join()
+
+                assertNull(loadedState.error)
+                assertEquals(2, loadedState.totalTagCount)
+                assertFalse(tagExists(TagName.asValid("unused")))
+                assertFalse(tagExists(TagName.asValid("unused::leaf")))
+                assertTrue(tagExists(TagName.asValid("used")))
+                assertTrue(tagExists(TagName.asValid("used::leaf")))
+
+                col.undo()
+                refreshTags().join()
+                assertEquals(4, loadedState.totalTagCount)
+                assertTrue(tagExists(TagName.asValid("unused::leaf")))
+            }
+        }
+
+    @Test
+    fun `backend rename rejection preserves visible state and permits a valid retry`() =
+        runTest {
+            val note = addTags("source::child")
+            withViewModel {
+                val before = loadedState
+
+                renameTag("source", "invalid\u3000target").join()
+
+                assertNotNull(loadedState.error)
+                assertFalse(loadedState.isWorking)
+                assertEquals(before.visibleNodes, loadedState.visibleNodes)
+                assertEquals(before.totalTagCount, loadedState.totalTagCount)
+                assertEquals(listOf("source::child"), col.getNote(note.id).tags)
+                assertTrue(pendingMessages.value.isEmpty())
+
+                renameTag("source", "valid").join()
+
+                assertNull(loadedState.error)
+                assertFalse(tagExists(TagName.asValid("source")))
+                assertTrue(tagExists(TagName.asValid("valid::child")))
+                assertEquals(
+                    UserMessage.TagRenamed(1),
+                    pendingMessages.value
+                        .single()
+                        .message,
+                )
+            }
+        }
+
+    @Test
+    fun `lookup recognizes backend-equivalent spelling`() =
+        runTest {
+            addBasicNote().update { addTag("ffi") }
+            assertEquals(1, col.db.queryScalar("select ? = ? collate unicase", "ffi", "iff"))
+            withViewModel {
+                assertTrue(tagExists(TagName.asValid("iff")))
+            }
+        }
+
     private suspend fun <T> withLockedCollection(block: suspend () -> T): T {
         CollectionManager.emulatedOpenFailure = CollectionManager.CollectionOpenFailure.LOCKED
         try {
@@ -613,12 +1186,8 @@ class ManageTagsViewModelTest : RobolectricTest() {
 
     private fun addTags(vararg tags: String) = addBasicNote().update { tags.forEach { addTag(it) } }
 
-    /** Adds a tag to the collection cache without it being on any note */
-    private fun addUnusedTag(
-        @Suppress("SameParameterValue") tag: String,
-    ) {
-        addTags(tag).update { removeTag(tag) }
-    }
+    /** Removing tags from notes leaves their entries in the collection's tag cache. */
+    private fun addUnusedTags(vararg names: String) = addTags(*names).update { names.forEach(::removeTag) }
 }
 
 private val ManageTagsViewModel.loadedState: ManageTagsState.Content
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/tags/TagNameTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/tags/TagNameTest.kt
new file mode 100644
index 000000000000..57394c2d7587
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/tags/TagNameTest.kt
@@ -0,0 +1,101 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.tags
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.RobolectricTest
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNotEquals
+import kotlin.test.assertTrue
+
+@RunWith(AndroidJUnit4::class)
+class TagNameTest : RobolectricTest() {
+    @Test
+    fun `equivalent names persist collapse changes using the tree spelling`() =
+        runTest {
+            addBasicNote().update { addTag("café::child") }
+            val model = ManageTagsViewModel()
+            model.toggleCollapsed(TagName.asValid("cafe\u0301")).join()
+            assertTrue("café::child" in (model.state.value as ManageTagsState.Content).visibleTagNames)
+            model.refreshTags().join()
+            assertTrue("café::child" in (model.state.value as ManageTagsState.Content).visibleTagNames)
+        }
+
+    @Test
+    fun `identity agrees with the backend tag registry`() {
+        val pairs =
+            listOf(
+                "Science" to "SCIENCE",
+                "Straße" to "STRASSE",
+                "σ" to "ς",
+                "fi" to "fi",
+                "ffi" to "iff",
+                "ffi" to "ffi",
+                "ffl" to "lff",
+                "ffl" to "ffl",
+                "i" to "ı",
+                "i" to "İ",
+                "café" to "cafe\u0301",
+                "\uD801\uDC00" to "\uD801\uDC28",
+            )
+        for ((left, right) in pairs) {
+            val note =
+                addBasicNote().update {
+                    addTag(left)
+                    addTag(right)
+                }
+            val backendEqual = col.getNote(note.id).tags.size == 1
+            val leftTag = TagName.asValid(left)
+            val rightTag = TagName.asValid(right)
+            assertEquals(backendEqual, leftTag == rightTag, "$left / $right")
+            assertEquals(if (backendEqual) 1 else 2, setOf(leftTag, rightTag).size, "$left / $right")
+        }
+    }
+
+    @Test
+    fun `identity preserves spelling for display and case-only renames`() {
+        val lower = TagName.asValid("science::Straße")
+        val upper = TagName.asValid("SCIENCE::STRASSE")
+        assertEquals(lower, upper)
+        assertEquals(lower.hashCode(), upper.hashCode())
+        assertNotEquals(lower.value, upper.value)
+        assertEquals("science::Straße", lower.value)
+        assertEquals(lower.value, lower.toString())
+        assertEquals("cafe\u0301", TagName.asValid("cafe\u0301").value)
+    }
+
+    @Test
+    fun `ancestry uses identity and complete components`() {
+        val root = TagName.asValid("Straße::café")
+        assertTrue(TagName.asValid("STRASSE::cafe\u0301").isSameOrDescendantOf(root))
+        assertTrue(TagName.asValid("STRASSE::cafe\u0301::child").isSameOrDescendantOf(root))
+        assertFalse(TagName.asValid("Straße::caféteria").isSameOrDescendantOf(root))
+        assertFalse(root.isSameOrDescendantOf(TagName.asValid("Straße::café::child")))
+        assertFalse(TagName.asValid("ı::child").isSameOrDescendantOf(TagName.asValid("i")))
+    }
+
+    @Test
+    fun `normalization matches the backend rename operation`() {
+        for (input in listOf("cafe\u0301", "a\tb", "a\u007fb", "::a::", "\u0085a\u00a0::\u2003b\u2003")) {
+            val note = addBasicNote().update { addTag("source") }
+            col.tags.rename("source", input)
+            assertEquals(TagName.asValid(col.getNote(note.id).tags.single()), TagName.asValid(input), input)
+        }
+        // Preserve the tag manager's existing UI policy for ASCII spaces.
+        assertEquals("two_words", TagName.asValid("two words").value)
+        assertEquals(null, TagName.build(" \t"))
+    }
+
+    @Test
+    fun `three character folds preserve backend expansion order`() {
+        assertEquals(TagName.asValid("iff"), TagName.asValid("ffi"))
+        assertEquals(TagName.asValid("lff"), TagName.asValid("ffl"))
+        assertNotEquals(TagName.asValid("ffi"), TagName.asValid("ffi"))
+        assertNotEquals(TagName.asValid("ffl"), TagName.asValid("ffl"))
+        assertEquals(TagName.asValid("prefix::iff::suffix"), TagName.asValid("prefix::ffi::suffix"))
+        assertEquals(TagName.asValid("iffiff"), TagName.asValid("ffiffi"))
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/testutils/TestApplicationSingletons.kt b/AnkiDroid/src/test/java/com/ichi2/anki/testutils/TestApplicationSingletons.kt
index 68aa42330ffe..93b807e105d2 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/testutils/TestApplicationSingletons.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/testutils/TestApplicationSingletons.kt
@@ -7,8 +7,10 @@ import com.ichi2.anki.common.android.Animations
 import com.ichi2.anki.initializeWidgetRepository
 import com.ichi2.anki.navigation.initializeNavigator
 import com.ichi2.anki.settings.PrefsRepository
-import com.ichi2.anki.startup.ensureCollectionPathSet
+import com.ichi2.anki.startup.maybeSetDefaultCollectionPath
 import com.ichi2.testutils.EmptyApplication
+import com.ichi2.widget.AnkiDroidWidgetSmall
+import com.ichi2.widget.WidgetStatus
 
 /**
  * Registers the global singletons that [com.ichi2.anki.AnkiDroidApp.onCreate] wires up, for tests
@@ -18,6 +20,7 @@ context(application: Application)
 fun registerTestApplicationSingletons() {
     initializeNavigator()
     initializeWidgetRepository()
+    WidgetStatus.register(PrefsRepository(application)) { context -> AnkiDroidWidgetSmall.UpdateService().doUpdate(context) }
     Animations.setPreferencesProvider { context -> PrefsRepository(context) }
-    ensureCollectionPathSet(application)
+    maybeSetDefaultCollectionPath(application)
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ui/RecyclerFastScrollerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ui/RecyclerFastScrollerTest.kt
new file mode 100644
index 000000000000..4f2e60f2385e
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ui/RecyclerFastScrollerTest.kt
@@ -0,0 +1,144 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: 2026 Ashish Yadav <mailtoashish693@gmail.com>
+
+package com.ichi2.anki.ui
+
+import android.app.Activity
+import android.os.Looper
+import android.os.SystemClock
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewGroup.LayoutParams.MATCH_PARENT
+import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import android.widget.RelativeLayout
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.EmptyApplicationCategory
+import com.ichi2.testutils.EmptyApplication
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
+import org.junit.Test
+import org.junit.experimental.categories.Category
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.annotation.Config
+import java.time.Duration
+
+@RunWith(AndroidJUnit4::class)
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class RecyclerFastScrollerTest {
+    @Test
+    fun `scroller hides after a thumb drag`() {
+        val list = FastScrollerTestList(evenRows(200))
+        list.press()
+        list.moveTo(trackProportion = 0.5f)
+        list.release()
+
+        list.waitPastAutoHide()
+
+        assertThat(list.isThumbPressed, equalTo(false))
+        assertThat(list.isScrollerHidden, equalTo(true))
+    }
+
+    @Test
+    fun `scroller hides after the thumb is held still past the hide delay`() {
+        val list = FastScrollerTestList(evenRows(200))
+        list.press()
+        list.moveTo(trackProportion = 0.5f)
+        list.waitPastAutoHide()
+        list.release()
+
+        list.waitPastAutoHide()
+
+        assertThat(list.isScrollerHidden, equalTo(true))
+    }
+}
+
+private const val ROW_HEIGHT = 150
+
+private fun evenRows(count: Int) = List(count) { ROW_HEIGHT }
+
+private class FastScrollerTestList(
+    rowHeights: List<Int>,
+) {
+    private val activity = Robolectric.buildActivity(Activity::class.java).setup().get()
+    private val recyclerView =
+        RecyclerView(activity).also {
+            it.layoutManager = LinearLayoutManager(activity)
+            it.adapter = FixedHeightRowsAdapter(rowHeights)
+        }
+    private val scroller = RecyclerFastScroller(activity)
+    private val root =
+        RelativeLayout(activity).apply {
+            addView(recyclerView, RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT))
+            addView(
+                scroller,
+                RelativeLayout.LayoutParams(WRAP_CONTENT, MATCH_PARENT).apply { addRule(RelativeLayout.ALIGN_PARENT_END) },
+            )
+        }
+    private val downTime = SystemClock.uptimeMillis()
+    private var fingerY = 0f
+
+    val isThumbPressed: Boolean get() = scroller.handle.isPressed
+
+    val isScrollerHidden: Boolean get() = scroller.translationX == scroller.hiddenTranslationX.toFloat()
+
+    init {
+        scroller.attachRecyclerView(recyclerView)
+        activity.setContentView(root, ViewGroup.LayoutParams(WIDTH, HEIGHT))
+        showNextFrame()
+    }
+
+    fun press() = touch(MotionEvent.ACTION_DOWN, (scroller.handle.top + scroller.handle.bottom) / 2f)
+
+    fun moveTo(trackProportion: Float) {
+        val thumbHeight = scroller.handle.height
+        touch(MotionEvent.ACTION_MOVE, thumbHeight / 2f + trackProportion * (HEIGHT - thumbHeight))
+    }
+
+    fun release() = touch(MotionEvent.ACTION_UP, fingerY)
+
+    fun waitPastAutoHide() = shadowOf(Looper.getMainLooper()).idleFor(AUTO_HIDE_WAIT)
+
+    private fun touch(
+        action: Int,
+        y: Float,
+    ) {
+        fingerY = y
+        val event = MotionEvent.obtain(downTime, SystemClock.uptimeMillis(), action, scroller.width / 2f, y, 0)
+        scroller.dispatchTouchEvent(event)
+        event.recycle()
+        showNextFrame()
+    }
+
+    private fun showNextFrame() = shadowOf(Looper.getMainLooper()).idleFor(FRAME_INTERVAL)
+
+    private companion object {
+        const val WIDTH = 1000
+        const val HEIGHT = 2000
+        val FRAME_INTERVAL: Duration = Duration.ofMillis(16)
+        val AUTO_HIDE_WAIT: Duration = Duration.ofSeconds(2)
+    }
+}
+
+private class FixedHeightRowsAdapter(
+    private val rowHeights: List<Int>,
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ) = object : RecyclerView.ViewHolder(View(parent.context)) {}
+
+    override fun onBindViewHolder(
+        holder: RecyclerView.ViewHolder,
+        position: Int,
+    ) {
+        holder.itemView.layoutParams = RecyclerView.LayoutParams(MATCH_PARENT, rowHeights[position])
+    }
+
+    override fun getItemCount() = rowHeights.size
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ui/ResizablePaneLayoutTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ui/ResizablePaneLayoutTest.kt
new file mode 100644
index 000000000000..d223ac3aa254
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ui/ResizablePaneLayoutTest.kt
@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.ui
+
+import android.content.Context
+import android.os.SystemClock
+import android.view.MotionEvent
+import android.view.View
+import android.view.View.MeasureSpec
+import android.view.ViewGroup.LayoutParams.MATCH_PARENT
+import android.widget.LinearLayout
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.EmptyApplicationCategory
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.targetContext
+import org.junit.Test
+import org.junit.experimental.categories.Category
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+@RunWith(AndroidJUnit4::class)
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class ResizablePaneLayoutTest : AndroidTest {
+    private val startPane = View(targetContext)
+    private val endPane = View(targetContext)
+    private val divider = ResizingDivider(targetContext)
+    private val layout = createLayout(targetContext)
+
+    private val startWeight get() = (startPane.layoutParams as LinearLayout.LayoutParams).weight
+    private val dividerCenter get() = (divider.left + divider.right) / 2f
+
+    @Test
+    fun `dragging next to the divider resizes the panes`() {
+        startPane.isClickable = true
+        drag(fromX = dividerCenter - 16, dx = 100f, dy = 0f)
+        assertTrue(startWeight > 1f, "start pane weight: $startWeight")
+    }
+
+    @Test
+    fun `dragging next to the divider over an empty area resizes the panes`() {
+        drag(fromX = dividerCenter + 16, dx = -100f, dy = 0f)
+        assertTrue(startWeight < 1f, "start pane weight: $startWeight")
+    }
+
+    @Test
+    fun `tapping next to the divider still reaches the pane`() {
+        val actions = mutableListOf<Int>()
+        startPane.setOnTouchListener { _, event ->
+            actions += event.actionMasked
+            true
+        }
+        drag(fromX = dividerCenter - 16, dx = 0f, dy = 0f)
+        assertEquals(MotionEvent.ACTION_UP, actions.last())
+        assertEquals(1f, startWeight)
+    }
+
+    @Test
+    fun `vertical drags next to the divider do not resize`() {
+        startPane.isClickable = true
+        drag(fromX = dividerCenter - 16, dx = 0f, dy = 200f)
+        assertEquals(1f, startWeight)
+    }
+
+    @Test
+    fun `drags away from the divider do not resize`() {
+        startPane.isClickable = true
+        drag(fromX = 100f, dx = 100f, dy = 0f)
+        assertEquals(1f, startWeight)
+    }
+
+    private fun createLayout(context: Context): LinearLayout =
+        ResizablePaneLayout(context).apply {
+            orientation = LinearLayout.HORIZONTAL
+            addView(startPane, LinearLayout.LayoutParams(0, MATCH_PARENT, 1f))
+            addView(divider, LinearLayout.LayoutParams(8, MATCH_PARENT))
+            addView(endPane, LinearLayout.LayoutParams(0, MATCH_PARENT, 1f))
+            measure(MeasureSpec.makeMeasureSpec(808, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(600, MeasureSpec.EXACTLY))
+            layout(0, 0, 808, 600)
+            ResizablePaneManager(
+                parentLayout = this,
+                divider = divider,
+                startPane = startPane,
+                endPane = endPane,
+                sharedPrefs = context.getSharedPreferences("ResizablePaneLayoutTest", Context.MODE_PRIVATE),
+                startPaneWeightKey = "start",
+                endPaneWeightKey = "end",
+            )
+        }
+
+    private fun drag(
+        fromX: Float,
+        dx: Float,
+        dy: Float,
+    ) {
+        val fromY = 300f
+        val downTime = SystemClock.uptimeMillis()
+        val steps = 10
+        layout.dispatchTouchEvent(MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_DOWN, fromX, fromY, 0))
+        for (step in 1..steps) {
+            val x = fromX + dx * step / steps
+            val y = fromY + dy * step / steps
+            layout.dispatchTouchEvent(MotionEvent.obtain(downTime, downTime + step * 10, MotionEvent.ACTION_MOVE, x, y, 0))
+        }
+        layout.dispatchTouchEvent(MotionEvent.obtain(downTime, downTime + 200, MotionEvent.ACTION_UP, fromX + dx, fromY + dy, 0))
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ui/ResizablePaneManagerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ui/ResizablePaneManagerTest.kt
new file mode 100644
index 000000000000..dd2e7b68c5a4
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ui/ResizablePaneManagerTest.kt
@@ -0,0 +1,134 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.ui
+
+import android.content.Context
+import android.os.Looper
+import android.os.SystemClock
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup.LayoutParams.MATCH_PARENT
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import androidx.core.content.edit
+import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
+import androidx.fragment.app.FragmentActivity
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.EmptyApplicationCategory
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.targetContext
+import org.junit.Test
+import org.junit.experimental.categories.Category
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.annotation.Config
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class ResizablePaneManagerTest : AndroidTest {
+    private val prefs get() = targetContext.getSharedPreferences("ResizablePaneManagerTest", Context.MODE_PRIVATE)
+    private lateinit var startPane: View
+    private lateinit var endPane: View
+    private lateinit var divider: View
+
+    @Test
+    fun `a pane cannot be dragged narrower than 240dp`() {
+        createPanes(width = 1008)
+        dragDivider(by = 900f)
+        assertEquals(240f, endPane.width.toFloat(), absoluteTolerance = 1f)
+    }
+
+    @Test
+    fun `the minimum width grows with the font size`() {
+        RuntimeEnvironment.setFontScale(1.5f)
+        createPanes(width = 1008)
+        dragDivider(by = 900f)
+        assertEquals(360f, endPane.width.toFloat(), absoluteTolerance = 1f)
+    }
+
+    @Test
+    fun `the divider stays in the middle when two minimums do not fit`() {
+        createPanes(width = 408)
+        dragDivider(by = 300f)
+        assertEquals(startPane.width.toFloat(), endPane.width.toFloat(), absoluteTolerance = 1f)
+    }
+
+    @Test
+    fun `a saved layout that squeezes a pane opens at the minimum`() {
+        prefs.edit {
+            putFloat("start", 4.8f)
+            putFloat("end", 0.2f)
+        }
+        createPanes(width = 1008)
+        assertEquals(240f, endPane.width.toFloat(), absoluteTolerance = 1f)
+    }
+
+    @Test
+    fun `a layout with no width yet keeps its saved split`() {
+        prefs.edit {
+            putFloat("start", 3.5f)
+            putFloat("end", 1.5f)
+        }
+        createPanes(width = 1008, visible = false)
+        (startPane.parent as View).isVisible = true
+        shadowOf(Looper.getMainLooper()).idle()
+        assertEquals(300f, endPane.width.toFloat(), absoluteTolerance = 1f)
+    }
+
+    @Test
+    fun `a pane keeps the minimum when the window gets narrower`() {
+        createPanes(width = 1008)
+        dragDivider(by = 900f)
+        (startPane.parent as View).updateLayoutParams { width = 600 }
+        shadowOf(Looper.getMainLooper()).idle()
+        assertEquals(240f, endPane.width.toFloat(), absoluteTolerance = 1f)
+    }
+
+    private fun createPanes(
+        width: Int,
+        visible: Boolean = true,
+    ) {
+        val activity = Robolectric.buildActivity(FragmentActivity::class.java).setup().get()
+        startPane = View(activity)
+        endPane = View(activity)
+        divider = ResizingDivider(activity)
+        val layout =
+            LinearLayout(activity).apply {
+                orientation = LinearLayout.HORIZONTAL
+                isVisible = visible
+                addView(startPane, LinearLayout.LayoutParams(0, MATCH_PARENT, 3f))
+                addView(divider, LinearLayout.LayoutParams(8, MATCH_PARENT))
+                addView(endPane, LinearLayout.LayoutParams(0, MATCH_PARENT, 2f))
+            }
+        ResizablePaneManager(
+            parentLayout = layout,
+            divider = divider,
+            startPane = startPane,
+            endPane = endPane,
+            sharedPrefs = prefs,
+            startPaneWeightKey = "start",
+            endPaneWeightKey = "end",
+        )
+        activity.setContentView(FrameLayout(activity).apply { addView(layout, FrameLayout.LayoutParams(width, MATCH_PARENT)) })
+        shadowOf(Looper.getMainLooper()).idle()
+    }
+
+    private fun dragDivider(by: Float) {
+        val x = (divider.left + divider.right) / 2f
+        val downTime = SystemClock.uptimeMillis()
+        divider.dispatchTouchEvent(MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_DOWN, x, 300f, 0))
+        for (step in 1..10) {
+            divider.dispatchTouchEvent(
+                MotionEvent.obtain(downTime, downTime + step * 10L, MotionEvent.ACTION_MOVE, x + by * step / 10, 300f, 0),
+            )
+        }
+        divider.dispatchTouchEvent(MotionEvent.obtain(downTime, downTime + 200, MotionEvent.ACTION_UP, x + by, 300f, 0))
+        shadowOf(Looper.getMainLooper()).idle()
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ui/SpinnerDropdownWithRadioTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ui/SpinnerDropdownWithRadioTest.kt
index c871cc7c5008..f9a3e0ad30ed 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ui/SpinnerDropdownWithRadioTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ui/SpinnerDropdownWithRadioTest.kt
@@ -9,9 +9,9 @@ import android.widget.CheckedTextView
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.R
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.testutils.createRtlContext
 import com.ichi2.themes.Themes
-import com.ichi2.utils.dp
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.greaterThanOrEqualTo
 import org.junit.Test
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/managespace/ManageSpaceInsetsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/managespace/ManageSpaceInsetsTest.kt
index 89dd1fed877a..38ed6e1cd591 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/managespace/ManageSpaceInsetsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/managespace/ManageSpaceInsetsTest.kt
@@ -6,9 +6,9 @@ import android.content.Intent
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.anki.databinding.FragmentSettingsBinding
 import com.ichi2.testutils.dispatchInsets
-import com.ichi2.utils.dp
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/managespace/ManageSpaceScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/managespace/ManageSpaceScreenshotTest.kt
index 088029b5367a..aaadd7c7aaf0 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/managespace/ManageSpaceScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/managespace/ManageSpaceScreenshotTest.kt
@@ -14,8 +14,8 @@ import androidx.core.view.WindowInsetsCompat.Type.displayCutout
 import androidx.core.view.WindowInsetsCompat.Type.navigationBars
 import androidx.core.view.WindowInsetsCompat.Type.statusBars
 import com.ichi2.anki.ScreenshotTest
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.testutils.insetsOf
-import com.ichi2.utils.dp
 import org.junit.Test
 import org.robolectric.RuntimeEnvironment
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/permissions/PermissionsActivityScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/permissions/PermissionsActivityScreenshotTest.kt
new file mode 100644
index 000000000000..2462ab1244a2
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/permissions/PermissionsActivityScreenshotTest.kt
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.ui.windows.permissions
+
+import com.google.testing.junit.testparameterinjector.TestParameter
+import com.ichi2.anki.R
+import com.ichi2.anki.ScreenshotTest
+import com.ichi2.anki.StoragePermissionSet
+import com.ichi2.anki.simulateEdgeToEdge
+import org.junit.Test
+import kotlin.test.assertFalse
+import kotlin.test.assertIs
+
+/** Baseline permission-screen screenshots, with and without simulated system-bar insets. */
+class PermissionsActivityScreenshotTest : ScreenshotTest() {
+    @Test
+    fun permissions(
+        @TestParameter isEdgeToEdge: Boolean,
+    ) {
+        val activity =
+            startActivityNormallyOpenCollectionWithIntent(
+                PermissionsActivity::class.java,
+                PermissionsActivity.getIntent(targetContext, StoragePermissionSet.LEGACY_ACCESS),
+            )
+        assertFalse(activity.isFinishing, "The permissions screen must remain open for capture")
+        assertIs<PermissionsUntil29Fragment>(activity.supportFragmentManager.findFragmentById(R.id.fragment_container))
+
+        if (isEdgeToEdge) {
+            activity.simulateEdgeToEdge()
+        }
+
+        captureScreen("permissions" + if (isEdgeToEdge) "_edgeToEdge" else "")
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/permissions/PermissionsActivityTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/permissions/PermissionsActivityTest.kt
index d13cfb7fc8f0..9fe7fd48ed95 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/permissions/PermissionsActivityTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/permissions/PermissionsActivityTest.kt
@@ -10,7 +10,6 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.os.Build
 import android.provider.Settings
-import androidx.appcompat.widget.AppCompatButton
 import androidx.core.content.edit
 import androidx.fragment.app.commitNow
 import androidx.test.core.app.ActivityScenario
@@ -26,6 +25,7 @@ import com.ichi2.anki.StoragePermissionSet
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.common.storage.CollectionHelper
 import com.ichi2.testutils.HamcrestUtils.containsInAnyOrder
+import com.ichi2.testutils.grantPermissions
 import com.ichi2.testutils.publicCollectionPath
 import com.ichi2.testutils.withAllFilesAccess
 import com.ichi2.testutils.withManageExternalStorageInManifest
@@ -41,6 +41,7 @@ import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
+import kotlin.test.assertTrue
 
 @RunWith(AndroidJUnit4::class)
 class PermissionsActivityTest : RobolectricTest() {
@@ -54,9 +55,10 @@ class PermissionsActivityTest : RobolectricTest() {
 
     @Test
     fun testOnClickingContinueActivityFinishes() {
+        grantPermissions(*ARBITRARY_PERMISSION_SET.permissions.toTypedArray())
         testActivity { activity ->
-            activity.setContinueButtonEnabled(true)
-            activity.findViewById<AppCompatButton>(R.id.continue_button).performClick()
+            assertTrue(activity.binding.continueButton.isEnabled)
+            activity.binding.continueButton.performClick()
             assertThat("activity is finishing", activity.isFinishing)
         }
     }
@@ -69,8 +71,8 @@ class PermissionsActivityTest : RobolectricTest() {
         withManageExternalStorageInManifest {
             withAllFilesAccess {
                 testActivity(StoragePermissionSet.EXTERNAL_MANAGER) { activity ->
-                    activity.setContinueButtonEnabled(true)
-                    activity.findViewById<AppCompatButton>(R.id.continue_button).performClick()
+                    assertTrue(activity.binding.continueButton.isEnabled)
+                    activity.binding.continueButton.performClick()
                     assertThat("activity is finishing", activity.isFinishing)
                 }
             }
@@ -98,7 +100,7 @@ class PermissionsActivityTest : RobolectricTest() {
 
         withManageExternalStorageInManifest {
             testActivity(StoragePermissionSet.EXTERNAL_MANAGER) { activity ->
-                assertFalse(activity.findViewById<AppCompatButton>(R.id.continue_button).isEnabled)
+                assertFalse(activity.binding.continueButton.isEnabled)
                 activity.findViewById<PermissionsItem>(R.id.all_files_permission).performClick()
 
                 val shadowActivity = shadowOf(activity)
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/permissions/PermissionsItemScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/permissions/PermissionsItemScreenshotTest.kt
new file mode 100644
index 000000000000..fc491a1d930c
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/permissions/PermissionsItemScreenshotTest.kt
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.ui.windows.permissions
+
+import android.graphics.Color
+import android.graphics.Rect
+import androidx.core.content.edit
+import androidx.core.view.drawToBitmap
+import com.google.testing.junit.testparameterinjector.TestParameter
+import com.ichi2.anki.R
+import com.ichi2.anki.ScreenshotTest
+import com.ichi2.anki.StoragePermissionSet
+import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.anki.common.storage.CollectionHelper
+import com.ichi2.testutils.publicCollectionPath
+import com.ichi2.testutils.simulateSystemBars
+import org.junit.Test
+import org.robolectric.Robolectric
+import org.robolectric.RuntimeEnvironment
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+/** Regression coverage for configured permission icons at normal and enlarged text sizes. */
+class PermissionsItemScreenshotTest : ScreenshotTest() {
+    @Test
+    fun `configured permission icon is visible`(
+        @TestParameter("1.0", "2.0") fontScale: Float,
+        @TestParameter("EXTERNAL_MANAGER") permissionSet: StoragePermissionSet,
+    ) {
+        RuntimeEnvironment.setFontScale(fontScale)
+        targetContext.sharedPrefs().edit { putString(CollectionHelper.PREF_COLLECTION_PATH, publicCollectionPath) }
+        val intent = PermissionsActivity.getIntent(targetContext, permissionSet)
+        Robolectric.buildActivity(PermissionsActivity::class.java, intent).use { controller ->
+            val activity = controller.setup().get()
+            activity.simulateSystemBars()
+            advanceRobolectricLooper()
+            captureScreen("permission_icon_font_$fontScale")
+
+            val icon = activity.findViewById<PermissionsItem>(R.id.all_files_permission).binding.icon
+            val visibleBounds = Rect()
+            assertTrue(
+                icon.getGlobalVisibleRect(visibleBounds),
+                "The configured icon must be visible; size=${icon.width}x${icon.height}, bounds=${icon.left},${icon.top},${icon.right},${icon.bottom}",
+            )
+            assertEquals(icon.width, visibleBounds.width())
+            assertEquals(icon.height, visibleBounds.height())
+            val bitmap = icon.drawToBitmap()
+            val pixels = IntArray(bitmap.width * bitmap.height)
+            bitmap.getPixels(pixels, 0, bitmap.width, 0, 0, bitmap.width, bitmap.height)
+            assertTrue(pixels.any { Color.alpha(it) > 0 }, "The configured icon must draw visible pixels")
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragmentTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragmentTest.kt
index 05d6893edf62..88b888816cc2 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragmentTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragmentTest.kt
@@ -17,6 +17,7 @@ import anki.scheduler.CardAnswer.Rating
 import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.cardviewer.Gesture
+import com.ichi2.anki.cardviewer.TypeAnswerWebView
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.dialogs.tags.TagsDialog
 import com.ichi2.anki.preferences.reviewer.ViewerAction
@@ -71,6 +72,20 @@ class ReviewerFragmentTest : RobolectricTest() {
         }
     }
 
+    @Test
+    fun `recreated WebView retains keyboard support`() =
+        runTest {
+            addBasicWithTypingNote("front", "back")
+            withReviewer {
+                val layout = binding.webViewLayout
+                val original = assertIs<TypeAnswerWebView>(layout.getChildAt(0))
+                layout.onRenderProcessGone(original)
+                val replacement = assertIs<TypeAnswerWebView>(layout.getChildAt(0))
+                assertNotSame(original, replacement)
+                assertNotNull(shadowOf(replacement).getJavascriptInterface("AnkiDroidKeyboard"))
+            }
+        }
+
     @Test
     fun `software rendering is applied to the study screen when enabled`() =
         runTest {
@@ -292,7 +307,7 @@ class ReviewerFragmentTest : RobolectricTest() {
     fun `key press reaches the study screen while the whiteboard is hidden`() =
         runTest {
             val cardId = addBasicNote().firstCard().id
-            bindToStudyScreenAndWhiteboard(ReviewerBinding(Binding.keyCode(KeyEvent.KEYCODE_F5), CardSide.BOTH))
+            bindToStudyScreenAndWhiteboard(ReviewerBinding(Binding.KeyCode(KeyEvent.KEYCODE_F5), CardSide.BOTH))
             withReviewer {
                 hideWhiteboard(this)
                 dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_F5))
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModelTest.kt
index 690cc09c60ba..f3539c330271 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/ReviewerViewModelTest.kt
@@ -2,20 +2,29 @@
 
 package com.ichi2.anki.ui.windows.reviewer
 
+import androidx.core.content.edit
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModelStore
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import anki.scheduler.CardAnswer.Rating
 import app.cash.turbine.test
 import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.common.utils.ext.cardStateCustomizer
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceUntilIdle
+import org.json.JSONTokener
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Element
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
+import kotlin.test.assertIs
+import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
 
 @RunWith(AndroidJUnit4::class)
@@ -35,6 +44,44 @@ class ReviewerViewModelTest : RobolectricTest() {
         viewModelStore.clear()
     }
 
+    @Test
+    fun `HTML answer marks nosuggest fields and requests a Done key`() =
+        runTest {
+            val field = htmlAnswerField("nosuggest:type")
+
+            assertEquals("true", field.attr("data-ankidroid-nosuggest"))
+            assertEquals("done", field.attr("enterkeyhint"))
+        }
+
+    @Test
+    fun `ordinary HTML answers keep their keyboard defaults`() =
+        runTest {
+            val field = htmlAnswerField("type")
+
+            assertFalse(field.hasAttr("data-ankidroid-nosuggest"))
+            assertFalse(field.hasAttr("enterkeyhint"))
+        }
+
+    private suspend fun TestScope.htmlAnswerField(filter: String): Element {
+        targetContext.sharedPrefs().edit { putBoolean("useInputTag", true) }
+        val card = addBasicWithTypingNote("front", "back").firstCard()
+        val noteType = card.noteType(col)
+        noteType.templates[0].qfmt = "{{Front}}{{$filter:Back}}"
+        col.notetypes.save(noteType)
+        val viewModel = ReviewerViewModel(SavedStateHandle()).also { viewModelStore.put("reviewer", it) }
+        lateinit var html: String
+        viewModel.eval
+            .filter { it.startsWith("_showQuestion(") }
+            .test {
+                viewModel.onPageFinished(false)
+                advanceUntilIdle()
+                // The first argument is a JSON string containing the question HTML.
+                html = assertIs<String>(JSONTokener(awaitItem().removePrefix("_showQuestion(")).nextValue())
+                cancelAndIgnoreRemainingEvents()
+            }
+        return assertNotNull(Jsoup.parseBodyFragment(html).selectFirst("input#typeans"))
+    }
+
     @Test
     fun `answering waits for the custom scheduler of the first card`() =
         runTest {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/audiorecord/CheckPronunciationViewModelTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/audiorecord/CheckPronunciationViewModelTest.kt
index 63a1f89913eb..2d64cc007b0e 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/audiorecord/CheckPronunciationViewModelTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/ui/windows/reviewer/audiorecord/CheckPronunciationViewModelTest.kt
@@ -2,6 +2,7 @@
 
 package com.ichi2.anki.ui.windows.reviewer.audiorecord
 
+import android.content.Context
 import android.net.Uri
 import androidx.lifecycle.ViewModelStore
 import androidx.media3.common.MediaItem
@@ -11,10 +12,12 @@ import app.cash.turbine.test
 import com.ichi2.anki.recorder.AudioRecorder
 import com.ichi2.anki.recorder.MediaRecorderStub
 import com.ichi2.anki.recorder.PlayerStub
-import com.ichi2.testutils.JvmTest
+import com.ichi2.anki.recorder.VoiceRecorder
+import com.ichi2.testutils.rules.MainDispatcherRule
 import io.mockk.verify
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runTest
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -27,7 +30,10 @@ import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
 @RunWith(AndroidJUnit4::class)
-class CheckPronunciationViewModelTest : JvmTest() {
+class CheckPronunciationViewModelTest {
+    @get:Rule
+    val mainDispatcherRule = MainDispatcherRule()
+
     @get:Rule
     val recordingsFolder = TemporaryFolder()
 
@@ -287,6 +293,22 @@ class CheckPronunciationViewModelTest : JvmTest() {
             assertFalse(mediaRecorderStub.outputFiles.single().exists(), "the empty file is deleted")
         }
 
+    @Test
+    fun `recordings are stored outside the cache`() =
+        runTest {
+            val context = ApplicationProvider.getApplicationContext<Context>()
+            val viewModel =
+                CheckPronunciationViewModel(AudioRecorder(context), playerStub.factory)
+                    .also { viewModelStore.put(VIEW_MODEL_KEY, it) }
+            try {
+                val recording = viewModel.record()
+
+                assertEquals(File(context.noBackupFilesDir, VoiceRecorder.RECORDINGS_DIRECTORY), recording.parentFile)
+            } finally {
+                viewModelStore.clear()
+            }
+        }
+
     private fun runViewModelTest(testBody: suspend TestScope.(CheckPronunciationViewModel) -> Unit) =
         runTest {
             val viewModel =
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/utils/MessageQueueObserverTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/utils/MessageQueueObserverTest.kt
index bb67075f2252..21fb59ec5105 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/utils/MessageQueueObserverTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/utils/MessageQueueObserverTest.kt
@@ -12,7 +12,6 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commitNow
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.R
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.testutils.EmptyAnkiActivity
 import kotlinx.coroutines.CompletableDeferred
@@ -26,6 +25,7 @@ import org.robolectric.android.controller.ActivityController
 import org.robolectric.shadows.ShadowDialog
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 class MessageQueueObserverTest : RobolectricTest() {
@@ -62,7 +62,7 @@ class MessageQueueObserverTest : RobolectricTest() {
         runTest {
             val waiting =
                 launch(start = CoroutineStart.UNDISPATCHED) {
-                    AlertDialog.Builder(ContextThemeWrapper(targetContext, R.style.Theme_Light)).showAndAwaitDismissal {}
+                    AlertDialog.Builder(ContextThemeWrapper(targetContext, CommonR.style.Theme_Light)).showAndAwaitDismissal {}
                 }
             val dialog = ShadowDialog.getLatestDialog()
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/utils/OnlyOnceTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/utils/OnlyOnceTest.kt
index 43b684501af7..4fb78a2b8967 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/utils/OnlyOnceTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/utils/OnlyOnceTest.kt
@@ -2,8 +2,6 @@
 
 package com.ichi2.anki.utils
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.utils.OnlyOnce.Method.UNIT_TEST
 import com.ichi2.anki.utils.OnlyOnce.preventSimultaneousExecutions
 import kotlinx.coroutines.awaitCancellation
@@ -11,14 +9,13 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
-import org.junit.runner.RunWith
 
 /** Tests for [OnlyOnce] */
-@RunWith(AndroidJUnit4::class)
-class OnlyOnceTest : RobolectricTest() {
+class OnlyOnceTest {
     @Test
     fun `single run works`() =
         runTest {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/widget/AnkiDroidWidgetSmallScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/widget/AnkiDroidWidgetSmallScreenshotTest.kt
index 1a76ebb8a1a3..77bb7b083eca 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/widget/AnkiDroidWidgetSmallScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/widget/AnkiDroidWidgetSmallScreenshotTest.kt
@@ -9,7 +9,7 @@ import com.github.takahirom.roborazzi.ExperimentalRoborazziApi
 import com.github.takahirom.roborazzi.captureRoboImage
 import com.github.takahirom.roborazzi.provideRoborazziContext
 import com.ichi2.anki.ScreenshotTest
-import com.ichi2.utils.dp
+import com.ichi2.anki.common.utils.dp
 import org.junit.Test
 import org.robolectric.annotation.Config
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/widget/deckpicker/DeckNameAndStatsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/widget/deckpicker/DeckNameAndStatsTest.kt
index ad55eaa229f4..318a2e0767bf 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/widget/deckpicker/DeckNameAndStatsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/widget/deckpicker/DeckNameAndStatsTest.kt
@@ -3,15 +3,12 @@
 
 package com.ichi2.anki.widget.deckpicker
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
+import com.ichi2.testutils.JvmTest
 import com.ichi2.widget.deckpicker.getDeckNamesAndStats
 import org.junit.Test
-import org.junit.runner.RunWith
 import kotlin.test.assertEquals
 
-@RunWith(AndroidJUnit4::class)
-class DeckNameAndStatsTest : RobolectricTest() {
+class DeckNameAndStatsTest : JvmTest() {
     @Test
     fun testGetDeckNameAndStats_withTopLevelDecks() =
         runTest {
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/widget/deckpicker/DeckPickerWidgetScreenshotTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/widget/deckpicker/DeckPickerWidgetScreenshotTest.kt
index 074ebdfbf7c3..d784e12ce16b 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/widget/deckpicker/DeckPickerWidgetScreenshotTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/widget/deckpicker/DeckPickerWidgetScreenshotTest.kt
@@ -9,7 +9,7 @@ import android.os.Bundle
 import android.util.SizeF
 import android.view.View.MeasureSpec
 import com.ichi2.anki.ScreenshotTest
-import com.ichi2.utils.dp
+import com.ichi2.anki.common.utils.dp
 import com.ichi2.widget.AppWidgetId
 import com.ichi2.widget.deckpicker.DeckPickerWidget
 import kotlinx.coroutines.test.TestScope
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/worker/SyncNetworkConstraintsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/worker/SyncNetworkConstraintsTest.kt
index 170aef8e5c5d..e054f247b82c 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/worker/SyncNetworkConstraintsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/worker/SyncNetworkConstraintsTest.kt
@@ -8,10 +8,11 @@ import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkManager
 import anki.sync.syncAuth
 import com.ichi2.anki.R
-import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.settings.enums.ShouldFetchMedia
 import com.ichi2.anki.sync.SyncAuth
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.targetContext
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkObject
@@ -23,7 +24,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class SyncNetworkConstraintsTest : RobolectricTest() {
+class SyncNetworkConstraintsTest : AndroidTest {
     private val auth = SyncAuth(syncAuth { hkey = "test" })
 
     @Test
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/worker/SyncWorkerFullSyncTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/worker/SyncWorkerFullSyncTest.kt
new file mode 100644
index 000000000000..808b18cad86b
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/worker/SyncWorkerFullSyncTest.kt
@@ -0,0 +1,159 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.worker
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.work.Data
+import androidx.work.ListenableWorker.Result
+import androidx.work.testing.TestListenableWorkerBuilder
+import anki.sync.FullUploadOrDownloadRequest
+import anki.sync.SyncCollectionResponse.ChangesRequired
+import anki.sync.syncAuth
+import anki.sync.syncCollectionResponse
+import com.ichi2.anki.CollectionManager
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.libanki.Collection
+import com.ichi2.anki.sync.SyncAuth
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.mockkObject
+import io.mockk.unmockkObject
+import net.ankiweb.rsdroid.Backend
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+@RunWith(AndroidJUnit4::class)
+class SyncWorkerFullSyncTest : RobolectricTest() {
+    private val auth =
+        syncAuth {
+            hkey = "test"
+            ioTimeoutSecs = 123
+        }
+    private val endpoint = "https://sync.example.com/"
+    private val redirectedAuth get() = auth.toBuilder().setEndpoint(endpoint).build()
+    private var required = ChangesRequired.FULL_UPLOAD
+    private var transferError: Exception? = null
+    private var backupError: Exception? = null
+    private var backupCalls = 0
+    private val transfers = mutableListOf<FullUploadOrDownloadRequest>()
+    private val mediaAuth = mutableListOf<anki.sync.SyncAuth>()
+    private lateinit var collection: Collection
+    private lateinit var backend: Backend
+
+    override fun getCollectionStorageMode() = CollectionStorageMode.ON_DISK
+
+    @Before
+    fun setUpBackend() {
+        collection = CollectionManager.getColUnsafe()
+        backend = collection.backend
+        mockkObject(backend, SyncMediaWorker.Companion)
+        every { backend.syncCollection(any<anki.sync.SyncAuth>(), any()) } answers {
+            assertEquals(auth, firstArg())
+            assertFalse(secondArg())
+            syncCollectionResponse {
+                required = this@SyncWorkerFullSyncTest.required
+                newEndpoint = endpoint
+            }
+        }
+        every { backend.createBackup(any(), any(), any()) } answers {
+            assertFalse(collection.dbClosed)
+            assertTrue(secondArg())
+            assertTrue(thirdArg())
+            backupCalls++
+            backupError?.let { throw it }
+            false // An unchanged backup can be skipped without blocking the download.
+        }
+        every { backend.fullUploadOrDownload(any()) } answers {
+            val input = firstArg<FullUploadOrDownloadRequest>()
+            assertTrue(collection.dbClosed)
+            assertEquals(if (input.upload) 0 else 1, backupCalls)
+            transfers.add(input)
+            transferError?.let { throw it }
+        }
+        coEvery { SyncMediaWorker.start(any(), any(), any()) } coAnswers {
+            assertCollectionOpen()
+            assertEquals(1, transfers.size, "media must start after the collection transfer")
+            mediaAuth.add(secondArg<SyncAuth>().toProto())
+        }
+    }
+
+    @After
+    fun tearDownBackend() {
+        unmockkObject(backend, SyncMediaWorker.Companion)
+    }
+
+    @Test
+    fun `automatic full sync follows direction and media preference`() =
+        runTest {
+            for (direction in listOf(ChangesRequired.FULL_UPLOAD, ChangesRequired.FULL_DOWNLOAD)) {
+                for (media in listOf(true, false)) {
+                    assertEquals(Result.success(), runSync(direction, media))
+                    val request = transfers.single()
+                    assertEquals(direction == ChangesRequired.FULL_UPLOAD, request.upload)
+                    assertEquals(redirectedAuth, request.auth)
+                    assertFalse(request.hasServerUsn(), "media must start through WorkManager")
+                    assertEquals(if (media) listOf(redirectedAuth) else emptyList(), mediaAuth)
+                    assertCollectionOpen()
+                }
+            }
+        }
+
+    @Test
+    fun `failed full sync reopens the collection without starting media`() =
+        runTest {
+            transferError = IllegalStateException("transfer failed")
+            for (direction in listOf(ChangesRequired.FULL_UPLOAD, ChangesRequired.FULL_DOWNLOAD)) {
+                assertEquals(Result.failure(), runSync(direction))
+                assertEquals(1, transfers.size)
+                assertTrue(mediaAuth.isEmpty())
+                assertCollectionOpen()
+            }
+        }
+
+    @Test
+    fun `backup failure prevents full download`() =
+        runTest {
+            backupError = IllegalStateException("backup failed")
+            assertEquals(Result.failure(), runSync(ChangesRequired.FULL_DOWNLOAD))
+            assertEquals(1, backupCalls)
+            assertTrue(transfers.isEmpty())
+            assertTrue(mediaAuth.isEmpty())
+            assertCollectionOpen()
+        }
+
+    @Test
+    fun `ambiguous full sync waits for a user direction`() =
+        runTest {
+            runSync(ChangesRequired.FULL_SYNC)
+            assertTrue(transfers.isEmpty())
+            assertTrue(mediaAuth.isEmpty())
+            assertCollectionOpen()
+        }
+
+    private fun assertCollectionOpen() {
+        assertFalse(collection.dbClosed)
+        assertTrue(collection.decks.count() > 0)
+    }
+
+    private suspend fun runSync(
+        required: ChangesRequired,
+        media: Boolean = true,
+    ): Result {
+        this.required = required
+        backupCalls = 0
+        transfers.clear()
+        mediaAuth.clear()
+        val input =
+            Data
+                .Builder()
+                .putAll(SyncAuth(auth).toWorkData())
+                .putBoolean("syncMedia", media)
+                .build()
+        return TestListenableWorkerBuilder<SyncWorker>(targetContext, input).build().doWork()
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/worker/SyncWorkerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/worker/SyncWorkerTest.kt
index f63b3177f556..2f299bd01cf9 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/worker/SyncWorkerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/worker/SyncWorkerTest.kt
@@ -4,8 +4,13 @@ package com.ichi2.anki.worker
 
 import android.app.Notification
 import android.app.NotificationManager
+import android.content.pm.ServiceInfo
+import android.os.Build
+import androidx.concurrent.futures.CallbackToFutureAdapter
 import androidx.core.content.getSystemService
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SdkSuppress
+import androidx.work.ForegroundInfo
 import androidx.work.ListenableWorker.Result
 import androidx.work.testing.TestListenableWorkerBuilder
 import androidx.work.workDataOf
@@ -15,8 +20,12 @@ import anki.sync.SyncAuth
 import anki.sync.SyncCollectionResponse
 import anki.sync.syncCollectionResponse
 import com.ichi2.anki.CollectionManager
+import com.ichi2.anki.NotificationChannel
 import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.time.MockTime
+import com.ichi2.anki.common.time.TimeManager
 import com.ichi2.anki.notifications.NotificationId
+import com.ichi2.anki.settings.Prefs
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
@@ -24,6 +33,8 @@ import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runCurrent
 import net.ankiweb.rsdroid.Backend
 import net.ankiweb.rsdroid.BackendFactory
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.equalTo
 import org.junit.After
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -38,7 +49,7 @@ import kotlin.test.assertTrue
 
 @RunWith(AndroidJUnit4::class)
 class SyncWorkerTest : RobolectricTest() {
-    /** The current collection sync notification, or null if it has been removed. */
+    /** Direct worker notifications only: the test foreground updater does not start Android's foreground service. */
     private val syncNotification: Notification?
         get() = shadowOf(targetContext.getSystemService<NotificationManager>()!!).getNotification(NotificationId.SYNC)
 
@@ -78,14 +89,86 @@ class SyncWorkerTest : RobolectricTest() {
             assertNull(syncNotification)
         }
 
+    @Test
+    fun `failed sync advances the retry timestamp`() =
+        runTest {
+            val completedAt = 1_600_000_000_000L
+            TimeManager.resetWith(MockTime(completedAt))
+            Prefs.lastSyncTime = 0
+
+            val work = runSyncWithBlockedProgress(syncError = IllegalStateException("sync failed"))
+
+            assertThat(work.await(), equalTo(Result.failure()))
+            assertThat(Prefs.lastSyncTime, equalTo(completedAt))
+        }
+
+    @Test
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.Q)
+    fun `sync supplies a foreground notification when direct notifications are disabled`() =
+        runTest {
+            shadowOf(targetContext.getSystemService<NotificationManager>()!!).setNotificationsEnabled(false)
+            val foregroundUpdates = mutableListOf<ForegroundInfo>()
+
+            val work = runSyncWithBlockedProgress(onForeground = { foregroundUpdates.add(it) })
+
+            assertEquals(Result.success(), work.await())
+            assertForegroundSyncNotification(foregroundUpdates.single())
+            assertNull(syncNotification, "the worker must not post direct progress notifications")
+        }
+
+    @Test
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.Q)
+    fun `failed sync still advances the retry timestamp when notifications are disabled`() =
+        runTest {
+            shadowOf(targetContext.getSystemService<NotificationManager>()!!).setNotificationsEnabled(false)
+            val completedAt = 1_600_000_000_000L
+            TimeManager.resetWith(MockTime(completedAt))
+            Prefs.lastSyncTime = 0
+            val foregroundUpdates = mutableListOf<ForegroundInfo>()
+
+            val work =
+                runSyncWithBlockedProgress(
+                    syncError = IllegalStateException("sync failed"),
+                    onForeground = { foregroundUpdates.add(it) },
+                )
+
+            assertThat(work.await(), equalTo(Result.failure()))
+            assertThat(Prefs.lastSyncTime, equalTo(completedAt))
+            assertForegroundSyncNotification(foregroundUpdates.single())
+            assertNull(syncNotification, "the worker must not post a direct error notification")
+        }
+
+    @Test
+    fun `cancelled sync advances the retry timestamp`() =
+        runTest {
+            val completedAt = 1_600_000_000_000L
+            TimeManager.resetWith(MockTime(completedAt))
+            Prefs.lastSyncTime = 0
+
+            val work = runSyncWithBlockedProgress(cancelWorker = true)
+
+            work.join()
+            assertThat(work.isCancelled, equalTo(true))
+            assertThat(Prefs.lastSyncTime, equalTo(completedAt))
+        }
+
     /** Runs sync with a paused progress update, checks cleanup ordering, then releases the update. */
     private suspend fun TestScope.runSyncWithBlockedProgress(
         syncError: Exception? = null,
         cancelWorker: Boolean = false,
+        onForeground: (ForegroundInfo) -> Unit = {},
     ): Deferred<Result> {
         val releaseProgress = CountDownLatch(1)
         setUpSyncBackend(releaseProgress, syncError)
-        val worker = TestListenableWorkerBuilder<SyncWorker>(targetContext, workDataOf("hkey" to "test")).build()
+        val worker =
+            TestListenableWorkerBuilder<SyncWorker>(targetContext, workDataOf("hkey" to "test"))
+                .setForegroundUpdater { _, _, foregroundInfo ->
+                    onForeground(foregroundInfo)
+                    CallbackToFutureAdapter.getFuture<Void> { completer ->
+                        completer.set(null)
+                        "SyncWorkerTest foreground update"
+                    }
+                }.build()
         val work = async { worker.doWork() }
         try {
             assertCleanupWaitsForProgress(work, cancelWorker)
@@ -95,6 +178,17 @@ class SyncWorkerTest : RobolectricTest() {
         return work
     }
 
+    /** Verifies the notification supplied to WorkManager; Android's service lifecycle is outside this unit test. */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.Q)
+    private fun assertForegroundSyncNotification(foregroundInfo: ForegroundInfo) {
+        assertEquals(NotificationId.SYNC, foregroundInfo.notificationId)
+        assertEquals(ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC, foregroundInfo.foregroundServiceType)
+        val notification = foregroundInfo.notification
+        assertEquals(NotificationChannel.SYNC.id, notification.channelId)
+        assertNotNull(notification.smallIcon)
+        assertTrue(notification.flags and Notification.FLAG_ONGOING_EVENT != 0)
+    }
+
     /** Installs a backend whose sync finishes while a progress update waits for [releaseProgress]. */
     private suspend fun setUpSyncBackend(
         releaseProgress: CountDownLatch,
diff --git a/AnkiDroid/src/test/java/com/ichi2/compose/theme/ThemeTest.kt b/AnkiDroid/src/test/java/com/ichi2/compose/theme/ThemeTest.kt
index 399620874b5e..820c006b53df 100644
--- a/AnkiDroid/src/test/java/com/ichi2/compose/theme/ThemeTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/compose/theme/ThemeTest.kt
@@ -10,7 +10,6 @@ import androidx.compose.material3.lightColorScheme
 import androidx.compose.ui.graphics.toArgb
 import androidx.core.content.ContextCompat
 import androidx.test.core.app.ApplicationProvider
-import com.ichi2.anki.R
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
@@ -35,22 +34,22 @@ class ThemeTest {
 
     @Test
     fun `light theme bridges colorPrimary to scheme primary`() {
-        val scheme = themed(R.style.Theme_Light).toMaterial3ColorScheme()
+        val scheme = themed(CommonR.style.Theme_Light).toMaterial3ColorScheme()
         val expected = ContextCompat.getColor(appContext, CommonR.color.material_light_blue_500)
         assertEquals(expected, scheme.primary.toArgb())
     }
 
     @Test
     fun `dark theme bridges colorPrimary to scheme primary`() {
-        val scheme = themed(R.style.Theme_Dark).toMaterial3ColorScheme()
+        val scheme = themed(CommonR.style.Theme_Dark).toMaterial3ColorScheme()
         val expected = ContextCompat.getColor(appContext, CommonR.color.material_blue_400)
         assertEquals(expected, scheme.primary.toArgb())
     }
 
     @Test
     fun `plain theme produces a different primary than light theme`() {
-        val light = themed(R.style.Theme_Light).toMaterial3ColorScheme()
-        val plain = themed(R.style.Theme_Light_Plain).toMaterial3ColorScheme()
+        val light = themed(CommonR.style.Theme_Light).toMaterial3ColorScheme()
+        val plain = themed(CommonR.style.Theme_Light_Plain).toMaterial3ColorScheme()
         assertNotEquals(
             light.primary.toArgb(),
             plain.primary.toArgb(),
@@ -60,8 +59,8 @@ class ThemeTest {
 
     @Test
     fun `black theme produces a different surface than dark theme`() {
-        val dark = themed(R.style.Theme_Dark).toMaterial3ColorScheme()
-        val black = themed(R.style.Theme_Dark_Black).toMaterial3ColorScheme()
+        val dark = themed(CommonR.style.Theme_Dark).toMaterial3ColorScheme()
+        val black = themed(CommonR.style.Theme_Dark_Black).toMaterial3ColorScheme()
         assertNotEquals(
             dark.surface.toArgb(),
             black.surface.toArgb(),
@@ -71,7 +70,7 @@ class ThemeTest {
 
     @Test
     fun `light theme uses lightColorScheme as base for unspecified slots`() {
-        val scheme = themed(R.style.Theme_Light).toMaterial3ColorScheme()
+        val scheme = themed(CommonR.style.Theme_Light).toMaterial3ColorScheme()
         val lightDefaults = lightColorScheme()
         // inverseSurface is not overridden by Theme_Light, so it should come from the base
         assertEquals(lightDefaults.inverseSurface.toArgb(), scheme.inverseSurface.toArgb())
@@ -79,7 +78,7 @@ class ThemeTest {
 
     @Test
     fun `dark theme uses darkColorScheme as base for unspecified slots`() {
-        val scheme = themed(R.style.Theme_Dark).toMaterial3ColorScheme()
+        val scheme = themed(CommonR.style.Theme_Dark).toMaterial3ColorScheme()
         val darkDefaults = darkColorScheme()
         // inverseSurface is not overridden by Theme_Dark, so it should come from the base
         assertEquals(darkDefaults.inverseSurface.toArgb(), scheme.inverseSurface.toArgb())
@@ -87,7 +86,7 @@ class ThemeTest {
 
     @Test
     fun `light theme bridges fab_normal to the fab container color`() {
-        val context = themed(R.style.Theme_Light)
+        val context = themed(CommonR.style.Theme_Light)
         val colors = context.toAnkiDroidColors(context.toMaterial3ColorScheme())
         val expected = ContextCompat.getColor(appContext, CommonR.color.material_light_blue_700)
         assertEquals(expected, colors.fabContainer.toArgb())
@@ -95,14 +94,14 @@ class ThemeTest {
 
     @Test
     fun `black theme bridges its own fab_normal to the fab container color`() {
-        val context = themed(R.style.Theme_Dark_Black)
+        val context = themed(CommonR.style.Theme_Dark_Black)
         val colors = context.toAnkiDroidColors(context.toMaterial3ColorScheme())
         assertEquals(0xFF303030.toInt(), colors.fabContainer.toArgb())
     }
 
     @Test
     fun `fab content color follows the theme onPrimary`() {
-        val context = themed(R.style.Theme_Light)
+        val context = themed(CommonR.style.Theme_Light)
         val scheme = context.toMaterial3ColorScheme()
         assertEquals(scheme.onPrimary.toArgb(), context.toAnkiDroidColors(scheme).onFab.toArgb())
     }
diff --git a/AnkiDroid/src/test/java/com/ichi2/compose/ui/dialogs/TextInputDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/compose/ui/dialogs/TextInputDialogTest.kt
new file mode 100644
index 000000000000..561fe8102077
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/compose/ui/dialogs/TextInputDialogTest.kt
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: 2026 Ashish Yadav <mailtoashish693@gmail.com>
+
+package com.ichi2.compose.ui.dialogs
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.hasSetTextAction
+import androidx.compose.ui.test.junit4.v2.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performTextInput
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.RobolectricTest
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class TextInputDialogTest : RobolectricTest() {
+    @get:Rule
+    val composeRule = createComposeRule()
+
+    @Test
+    fun `the length counter uses the given length function`() {
+        composeRule.setContent {
+            TextInputDialog(
+                title = "Title",
+                label = "Label",
+                confirmText = "OK",
+                onConfirm = {},
+                onDismissRequest = {},
+                maxLengthCounter = 3,
+                lengthOf = { it.trim().length },
+            )
+        }
+
+        composeRule.onNode(hasSetTextAction()).performTextInput(" abc ")
+
+        composeRule.onNodeWithText("3/3").assertIsDisplayed()
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/preferences/ExternalDirectorySelectionPreferenceTest.kt b/AnkiDroid/src/test/java/com/ichi2/preferences/ExternalDirectorySelectionPreferenceTest.kt
index efecc5bfbdcb..ea6da74983cc 100644
--- a/AnkiDroid/src/test/java/com/ichi2/preferences/ExternalDirectorySelectionPreferenceTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/preferences/ExternalDirectorySelectionPreferenceTest.kt
@@ -6,16 +6,21 @@ package com.ichi2.preferences
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.EmptyApplicationCategory
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.common.storage.CollectionHelper
 import com.ichi2.anki.startup.getDefaultAnkiDroidDirectory
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.targetContext
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.hasItem
 import org.hamcrest.Matchers.instanceOf
 import org.junit.Test
+import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
 import java.io.File
 
 /**
@@ -23,7 +28,9 @@ import java.io.File
  * would expect to pick from.
  */
 @RunWith(AndroidJUnit4::class)
-class ExternalDirectorySelectionPreferenceTest : RobolectricTest() {
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class ExternalDirectorySelectionPreferenceTest : AndroidTest {
     @Test
     fun `the default directory is offered`() {
         val pref = buildPreference()
diff --git a/AnkiDroid/src/test/java/com/ichi2/preferences/NumberRangePreferenceCompatTest.kt b/AnkiDroid/src/test/java/com/ichi2/preferences/NumberRangePreferenceCompatTest.kt
index 0ab1ca237888..108ec7b59fb7 100644
--- a/AnkiDroid/src/test/java/com/ichi2/preferences/NumberRangePreferenceCompatTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/preferences/NumberRangePreferenceCompatTest.kt
@@ -7,7 +7,10 @@ import android.content.Context
 import android.widget.EditText
 import androidx.preference.PreferenceDialogFragmentCompat
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.EmptyApplicationCategory
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.targetContext
 import io.mockk.clearMocks
 import io.mockk.every
 import io.mockk.mockk
@@ -15,10 +18,14 @@ import io.mockk.verify
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test
+import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
 
 @RunWith(AndroidJUnit4::class)
-class NumberRangePreferenceCompatTest : RobolectricTest() {
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class NumberRangePreferenceCompatTest : AndroidTest {
     private val preference = TestableNumberRangePreferenceCompat(targetContext)
     private val preferenceMock: NumberRangePreferenceCompat = mockk(relaxed = true)
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/preferences/PreferenceExtensionsTest.kt b/AnkiDroid/src/test/java/com/ichi2/preferences/PreferenceExtensionsTest.kt
index 6c7dd520c567..c15cae16ee06 100644
--- a/AnkiDroid/src/test/java/com/ichi2/preferences/PreferenceExtensionsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/preferences/PreferenceExtensionsTest.kt
@@ -18,7 +18,7 @@ class PreferenceExtensionsTest {
     private val mockPreferences: SharedPreferences =
         SPMockBuilder().createSharedPreferences().apply {
             edit {
-                putString(VALID_KEY, VALID_RESULT)
+                putString(PREF_VALID, VALID_RESULT)
             }
         }
 
@@ -36,52 +36,52 @@ class PreferenceExtensionsTest {
 
     @Test
     fun existingKeyReturnsMappedValue() {
-        val ret = getOrSetString(VALID_KEY, UNUSED_SUPPLIER)
+        val ret = getOrSetString(PREF_VALID, UNUSED_SUPPLIER)
         assertEquals(ret, VALID_RESULT)
     }
 
     @Test
     fun missingKeyReturnsLambdaValue() {
-        val ret = getOrSetString(MISSING_KEY) { LAMBDA_RETURN }
+        val ret = getOrSetString(PREF_MISSING) { LAMBDA_RETURN }
         assertEquals(ret, LAMBDA_RETURN)
     }
 
     @Test
     fun missingKeySetsPreference() {
-        getOrSetString(MISSING_KEY) { LAMBDA_RETURN }
-        assertThat(mockPreferences.getString(MISSING_KEY, null), equalTo(LAMBDA_RETURN))
+        getOrSetString(PREF_MISSING) { LAMBDA_RETURN }
+        assertThat(mockPreferences.getString(PREF_MISSING, null), equalTo(LAMBDA_RETURN))
     }
 
     @SuppressWarnings("unused")
     @Test
     fun noLambdaExceptionIfKeyExists() {
-        assertDoesNotThrow { getOrSetString(VALID_KEY, EXCEPTION_SUPPLIER) }
+        assertDoesNotThrow { getOrSetString(PREF_VALID, EXCEPTION_SUPPLIER) }
     }
 
     @Test(expected = ExpectedException::class)
     fun rethrowLambdaExceptionIfKeyIsMissing() {
-        getOrSetString(MISSING_KEY, EXCEPTION_SUPPLIER)
+        getOrSetString(PREF_MISSING, EXCEPTION_SUPPLIER)
     }
 
     // Long Tests
 
     @Test
     fun existingLongKeyReturnsStoredValue() {
-        mockPreferences.edit { putLong(LONG_VALID_KEY, LONG_VALID_VALUE) }
-        val result = getOrSetLong(LONG_VALID_KEY, LONG_UNUSED_SUPPLIER)
+        mockPreferences.edit { putLong(PREF_LONG_VALID, LONG_VALID_VALUE) }
+        val result = getOrSetLong(PREF_LONG_VALID, LONG_UNUSED_SUPPLIER)
         assertEquals(LONG_VALID_VALUE, result)
     }
 
     @Test
     fun missingLongKeyPersistsValue() {
-        getOrSetLong(LONG_MISSING_KEY) { LONG_LAMBDA_VALUE }
-        assertEquals(LONG_LAMBDA_VALUE, mockPreferences.getLong(LONG_MISSING_KEY, -1))
+        getOrSetLong(PREF_LONG_MISSING) { LONG_LAMBDA_VALUE }
+        assertEquals(LONG_LAMBDA_VALUE, mockPreferences.getLong(PREF_LONG_MISSING, -1))
     }
 
     @Test
     fun handlesNegativeLongValue() {
-        getOrSetLong(NEGATIVE_TEST_KEY) { LONG_NEGATIVE_VALUE }
-        assertEquals(LONG_NEGATIVE_VALUE, mockPreferences.getLong(NEGATIVE_TEST_KEY, 0))
+        getOrSetLong(PREF_NEGATIVE_TEST) { LONG_NEGATIVE_VALUE }
+        assertEquals(LONG_NEGATIVE_VALUE, mockPreferences.getLong(PREF_NEGATIVE_TEST, 0))
     }
 
     private class ExpectedException : RuntimeException()
@@ -90,18 +90,18 @@ class PreferenceExtensionsTest {
 
     companion object {
         // String constants
-        private const val VALID_KEY = "VALID"
+        private const val PREF_VALID = "VALID"
         private const val VALID_RESULT = "WAS VALID KEY"
-        private const val MISSING_KEY = "INVALID"
+        private const val PREF_MISSING = "INVALID"
         private const val LAMBDA_RETURN = "LAMBDA"
 
         // Long constants
-        private const val LONG_VALID_KEY = "LONG_VALID"
+        private const val PREF_LONG_VALID = "LONG_VALID"
         private const val LONG_VALID_VALUE = 42L
-        private const val LONG_MISSING_KEY = "LONG_INVALID"
+        private const val PREF_LONG_MISSING = "LONG_INVALID"
         private const val LONG_LAMBDA_VALUE = 100L
         private const val LONG_NEGATIVE_VALUE = -500L
-        private const val NEGATIVE_TEST_KEY = "negative_test"
+        private const val PREF_NEGATIVE_TEST = "negative_test"
 
         // Suppliers
         private val UNUSED_SUPPLIER = Supplier<String> { throw UnexpectedException() }
diff --git a/AnkiDroid/src/test/java/com/ichi2/preferences/ReviewerControlPreferenceTest.kt b/AnkiDroid/src/test/java/com/ichi2/preferences/ReviewerControlPreferenceTest.kt
index 9c8f7473fb31..39c01cc3e5a4 100644
--- a/AnkiDroid/src/test/java/com/ichi2/preferences/ReviewerControlPreferenceTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/preferences/ReviewerControlPreferenceTest.kt
@@ -5,13 +5,14 @@ package com.ichi2.preferences
 
 import androidx.preference.PreferenceManager
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.cardviewer.Gesture
 import com.ichi2.anki.reviewer.Binding
 import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
 import com.ichi2.anki.reviewer.ReviewerBinding
+import com.ichi2.testutils.AndroidTest
 import com.ichi2.testutils.getJavaMethodAsAccessible
+import com.ichi2.testutils.targetContext
 import org.junit.Test
 import org.junit.runner.RunWith
 import kotlin.test.assertEquals
@@ -25,7 +26,7 @@ import kotlin.test.assertNull
  * `getPreferenceAssignedTo` are accessed via reflection as they're `protected`.
  */
 @RunWith(AndroidJUnit4::class)
-class ReviewerControlPreferenceTest : RobolectricTest() {
+class ReviewerControlPreferenceTest : AndroidTest {
     private val bindingsToPersist = mutableMapOf<ReviewerControlPreference, Binding>()
 
     @Test
diff --git a/AnkiDroid/src/test/java/com/ichi2/preferences/SliderPreferenceTest.kt b/AnkiDroid/src/test/java/com/ichi2/preferences/SliderPreferenceTest.kt
index 1e6ef51c428f..8d75cfdbecef 100644
--- a/AnkiDroid/src/test/java/com/ichi2/preferences/SliderPreferenceTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/preferences/SliderPreferenceTest.kt
@@ -6,15 +6,22 @@ import android.view.LayoutInflater
 import androidx.preference.PreferenceViewHolder
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.android.material.slider.Slider
-import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.EmptyApplicationCategory
 import com.ichi2.anki.databinding.PreferenceSliderBinding
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.EmptyApplication
+import com.ichi2.testutils.targetContext
 import org.junit.Assert.assertEquals
 import org.junit.Test
+import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
 import org.robolectric.Robolectric
+import org.robolectric.annotation.Config
 
 @RunWith(AndroidJUnit4::class)
-class SliderPreferenceTest : RobolectricTest() {
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class SliderPreferenceTest : AndroidTest {
     @Suppress("DEPRECATION")
     @Test
     fun `onTouchListener is only called once`() {
diff --git a/AnkiDroid/src/test/java/com/ichi2/testutils/ActivityList.kt b/AnkiDroid/src/test/java/com/ichi2/testutils/ActivityList.kt
index 494b1db491e1..24c8aeea34ee 100644
--- a/AnkiDroid/src/test/java/com/ichi2/testutils/ActivityList.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/testutils/ActivityList.kt
@@ -10,8 +10,8 @@ import android.content.Intent
 import androidx.annotation.CheckResult
 import com.ichi2.anki.CardBrowser
 import com.ichi2.anki.CardTemplateBrowserAppearanceEditor
-import com.ichi2.anki.CardTemplateBrowserAppearanceEditor.Companion.INTENT_ANSWER_FORMAT
-import com.ichi2.anki.CardTemplateBrowserAppearanceEditor.Companion.INTENT_QUESTION_FORMAT
+import com.ichi2.anki.CardTemplateBrowserAppearanceEditor.Companion.EXTRA_ANSWER_FORMAT
+import com.ichi2.anki.CardTemplateBrowserAppearanceEditor.Companion.EXTRA_QUESTION_FORMAT
 import com.ichi2.anki.CardTemplateEditor
 import com.ichi2.anki.DeckPicker
 import com.ichi2.anki.DrawingFragment
@@ -130,13 +130,13 @@ object ActivityList {
     private fun intentForCardTemplateBrowserAppearanceEditor(): Intent {
         // bundle != null
         return Intent().apply {
-            putExtra(INTENT_QUESTION_FORMAT, "{{Front}}")
-            putExtra(INTENT_ANSWER_FORMAT, "{{FrontSide}}\n{{Back}}")
+            putExtra(EXTRA_QUESTION_FORMAT, "{{Front}}")
+            putExtra(EXTRA_ANSWER_FORMAT, "{{FrontSide}}\n{{Back}}")
         }
     }
 
     private fun intentForCardTemplateEditor(noteTypeId: Long = 1L): Intent =
-        Intent().putExtra(CardTemplateEditor.EDITOR_NOTE_TYPE_ID, noteTypeId)
+        Intent().putExtra(CardTemplateEditor.EXTRA_NOTE_TYPE_ID, noteTypeId)
 
     private fun intentForWidgetConfig(): Intent = Intent().apply { putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, 1) }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/testutils/ActivitySavedStateHelpersTest.kt b/AnkiDroid/src/test/java/com/ichi2/testutils/ActivitySavedStateHelpersTest.kt
index de41b48b8d3a..d15138c73b29 100644
--- a/AnkiDroid/src/test/java/com/ichi2/testutils/ActivitySavedStateHelpersTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/testutils/ActivitySavedStateHelpersTest.kt
@@ -29,22 +29,25 @@ class ActivitySavedStateHelpersTest : AndroidTest {
         val payload = byteArrayOf(1, 2, 3)
         assertNull(intent.getBundleExtra(SingleFragmentActivity.EXTRA_FRAGMENT_ARGS))
 
-        intent.withLaunchPayload(SingleFragmentActivity::class.java, PAYLOAD_KEY, payload)
+        intent.withLaunchPayload(SingleFragmentActivity::class.java, EXTRA_PAYLOAD, payload)
 
-        assertContentEquals(payload, intent.getByteArrayExtra(PAYLOAD_KEY))
-        assertContentEquals(payload, intent.getBundleExtra(SingleFragmentActivity.EXTRA_FRAGMENT_ARGS)?.getByteArray(PAYLOAD_KEY))
+        assertContentEquals(payload, intent.getByteArrayExtra(EXTRA_PAYLOAD))
+        assertContentEquals(payload, intent.getBundleExtra(SingleFragmentActivity.EXTRA_FRAGMENT_ARGS)?.getByteArray(EXTRA_PAYLOAD))
     }
 
     @Test
     fun `saved state inspection detects copies made by the unfiltered default factory`() {
-        val intent = Intent().putExtra(PAYLOAD_KEY, ByteArray(300_000))
+        val intent = Intent().putExtra(EXTRA_PAYLOAD, ByteArray(300_000))
         // A plain AndroidX activity reproduces argument copying without AnkiActivity's override.
         Robolectric.buildActivity(FragmentActivity::class.java, intent).setup().use { controller ->
             controller.get().createSavedStateHandleWithDefaultFactory()
             val savedState = controller.saveState().parcelledCopy(javaClass.classLoader)
 
             assertTrue(savedState.savedStateHandlePaths().isNotEmpty(), "Expected a serialized SavedStateHandle provider")
-            assertTrue(savedState.savedStateHandlePathsToKey(PAYLOAD_KEY).isNotEmpty(), "Expected the copied intent payload to be detected")
+            assertTrue(
+                savedState.savedStateHandlePathsToKey(EXTRA_PAYLOAD).isNotEmpty(),
+                "Expected the copied intent payload to be detected",
+            )
         }
     }
 
@@ -54,7 +57,7 @@ class ActivitySavedStateHelpersTest : AndroidTest {
         val savedState =
             Robolectric.buildActivity(FragmentActivity::class.java).setup().use { controller ->
                 val activity = controller.get()
-                val fragment = Fragment().apply { arguments = Bundle().apply { putByteArray(PAYLOAD_KEY, payload) } }
+                val fragment = Fragment().apply { arguments = Bundle().apply { putByteArray(EXTRA_PAYLOAD, payload) } }
                 activity.supportFragmentManager
                     .beginTransaction()
                     .add(fragment, "payload")
@@ -64,14 +67,14 @@ class ActivitySavedStateHelpersTest : AndroidTest {
             }
 
         assertTrue(savedState.savedStateHandlePaths().isNotEmpty(), "Expected a serialized SavedStateHandle provider")
-        assertTrue(savedState.savedStateHandlePathsToKey(PAYLOAD_KEY).isEmpty(), "Fragment arguments are not ViewModel state")
+        assertTrue(savedState.savedStateHandlePathsToKey(EXTRA_PAYLOAD).isEmpty(), "Fragment arguments are not ViewModel state")
         Robolectric.buildActivity(FragmentActivity::class.java).setup(savedState).use { controller ->
             val restoredFragment = controller.get().supportFragmentManager.findFragmentByTag("payload")
-            assertContentEquals(payload, restoredFragment?.arguments?.getByteArray(PAYLOAD_KEY))
+            assertContentEquals(payload, restoredFragment?.arguments?.getByteArray(EXTRA_PAYLOAD))
         }
     }
 
     companion object {
-        private const val PAYLOAD_KEY = "saved_state_test_payload"
+        private const val EXTRA_PAYLOAD = "saved_state_test_payload"
     }
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/testutils/BackendEmulatingOpenConflict.kt b/AnkiDroid/src/test/java/com/ichi2/testutils/BackendEmulatingOpenConflict.kt
index 5645a6352ff2..f93dfbf81ea0 100644
--- a/AnkiDroid/src/test/java/com/ichi2/testutils/BackendEmulatingOpenConflict.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/testutils/BackendEmulatingOpenConflict.kt
@@ -3,6 +3,8 @@
 package com.ichi2.testutils
 
 import anki.backend.BackendError
+import com.ichi2.anki.CollectionManager
+import kotlinx.coroutines.runBlocking
 import net.ankiweb.rsdroid.Backend
 import net.ankiweb.rsdroid.BackendException.BackendDbException.BackendDbLockedException
 import net.ankiweb.rsdroid.BackendFactory
@@ -24,6 +26,8 @@ class BackendEmulatingOpenConflict : Backend() {
     companion object {
         fun enable() {
             BackendFactory.setOverride { BackendEmulatingOpenConflict() }
+            // Startup debug info may have already initialized a backend before the override.
+            runBlocking { CollectionManager.discardBackend() }
         }
 
         fun disable() {
diff --git a/AnkiDroid/src/test/java/com/ichi2/testutils/BackendEmulatingOpenConflictTest.kt b/AnkiDroid/src/test/java/com/ichi2/testutils/BackendEmulatingOpenConflictTest.kt
index b4c440d98e64..5881f8b007da 100644
--- a/AnkiDroid/src/test/java/com/ichi2/testutils/BackendEmulatingOpenConflictTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/testutils/BackendEmulatingOpenConflictTest.kt
@@ -8,18 +8,11 @@ import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.exception.CollectionLockedException
 import org.junit.After
 import org.junit.Assert.assertThrows
-import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class BackendEmulatingOpenConflictTest : RobolectricTest() {
-    @Before
-    override fun setUp() {
-        super.setUp()
-        BackendEmulatingOpenConflict.enable()
-    }
-
     @After
     override fun tearDown() {
         super.tearDown()
@@ -27,7 +20,10 @@ class BackendEmulatingOpenConflictTest : RobolectricTest() {
     }
 
     @Test
-    fun assumeMocksAreValid() {
+    fun `enabling conflicts replaces an already initialized backend`() {
+        CollectionManager.getBackend()
+        BackendEmulatingOpenConflict.enable()
+
         assertThrows(
             CollectionLockedException::class.java,
         ) { CollectionManager.getColUnsafe() }
diff --git a/AnkiDroid/src/test/java/com/ichi2/testutils/BrowserUtils.kt b/AnkiDroid/src/test/java/com/ichi2/testutils/BrowserUtils.kt
index ddd1bab28ac4..781f8fd75a4e 100644
--- a/AnkiDroid/src/test/java/com/ichi2/testutils/BrowserUtils.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/testutils/BrowserUtils.kt
@@ -30,6 +30,7 @@ fun Context.registerWebBrowser() {
             },
         )
     }
+    AdaptionUtil.resetWebBrowserAvailabilityCacheForTests()
     assertTrue(AdaptionUtil.hasWebBrowser(this), "A browser must be available to test external navigation")
 }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/testutils/FileProviderHostPathsTest.kt b/AnkiDroid/src/test/java/com/ichi2/testutils/FileProviderHostPathsTest.kt
new file mode 100644
index 000000000000..5b59ba741901
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/testutils/FileProviderHostPathsTest.kt
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.testutils
+
+import android.content.Context
+import androidx.core.content.FileProvider
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.EmptyApplicationCategory
+import com.ichi2.utils.openInputStreamSafe
+import org.junit.Before
+import org.junit.Test
+import org.junit.experimental.categories.Category
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+import org.robolectric.shadow.api.Shadow
+import org.robolectric.util.ReflectionHelpers
+import java.io.File
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertIs
+
+@RunWith(AndroidJUnit4::class)
+@Config(application = EmptyApplication::class, shadows = [ShadowFileProviderPathStrategy::class])
+@Category(EmptyApplicationCategory::class)
+class FileProviderHostPathsTest {
+    private val context: Context get() = ApplicationProvider.getApplicationContext()
+    private val authority: String get() = "${context.packageName}.apkgfileprovider"
+
+    @Before
+    fun setUp() {
+        // Robolectric gives each test a new cache directory, but AndroidX retains the old roots.
+        ReflectionHelpers.getStaticField<MutableMap<String, Any>>(FileProvider::class.java, "sCache").clear()
+    }
+
+    @Test
+    fun `nested cache files can be shared and opened`() {
+        val directory = File(context.cacheDir, "nested images").apply { mkdirs() }
+        val file = File(directory, "image #1.png").apply { writeText("original") }
+        val uri = FileProvider.getUriForFile(context, authority, file)
+
+        val strategies = ReflectionHelpers.getStaticField<Map<String, Any>>(FileProvider::class.java, "sCache")
+        assertIs<ShadowFileProviderPathStrategy>(Shadow.extract<Any>(strategies.getValue(authority)))
+        val contents =
+            context.contentResolver
+                .openInputStreamSafe(uri)!!
+                .bufferedReader()
+                .use { it.readText() }
+        assertEquals("original", contents)
+        context.contentResolver.openOutputStream(uri, "wt")!!.use { it.write("edited".toByteArray()) }
+        assertEquals("edited", file.readText())
+    }
+
+    @Test
+    fun `the root itself and a directory with the same prefix cannot be shared`() {
+        val root = context.cacheDir
+        val sibling = File(root.parentFile, "${root.name}-private/image.png")
+        for (file in listOf(root, sibling)) {
+            assertFailsWith<IllegalArgumentException> { FileProvider.getUriForFile(context, authority, file) }
+        }
+    }
+
+    @Test
+    fun `a URI cannot traverse outside its configured root`() {
+        val file = File(context.cacheDir, "image.png").apply { writeText("original") }
+        val uri = FileProvider.getUriForFile(context, authority, file)
+        val escaped =
+            uri
+                .buildUpon()
+                .encodedPath("/${uri.pathSegments.first()}/%2E%2E/${context.cacheDir.name}-private/image.png")
+                .build()
+
+        assertFailsWith<SecurityException> { context.contentResolver.openInputStreamSafe(escaped) }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/testutils/InsetsUtils.kt b/AnkiDroid/src/test/java/com/ichi2/testutils/InsetsUtils.kt
index 1381014b273f..d2c3ffb95733 100644
--- a/AnkiDroid/src/test/java/com/ichi2/testutils/InsetsUtils.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/testutils/InsetsUtils.kt
@@ -20,8 +20,8 @@ import androidx.core.view.WindowInsetsCompat.Type.navigationBars
 import androidx.core.view.WindowInsetsCompat.Type.statusBars
 import androidx.core.view.WindowInsetsCompat.Type.systemBars
 import com.ichi2.anki.RobolectricTest.Companion.advanceRobolectricLooper
-import com.ichi2.utils.Dp
-import com.ichi2.utils.dp
+import com.ichi2.anki.common.utils.Dp
+import com.ichi2.anki.common.utils.dp
 
 /**
  * The bottom navigation bar height when the gesture navigation indicator is hidden
diff --git a/AnkiDroid/src/test/java/com/ichi2/testutils/NeedsRobolectric.kt b/AnkiDroid/src/test/java/com/ichi2/testutils/NeedsRobolectric.kt
new file mode 100644
index 000000000000..dbb62d329e71
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/testutils/NeedsRobolectric.kt
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.testutils
+
+/** Records work needed before a test can run without Robolectric. Does not change test execution. */
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+@MustBeDocumented
+annotation class NeedsRobolectric(
+    val reason: String,
+)
diff --git a/AnkiDroid/src/test/java/com/ichi2/testutils/ScreenSize.kt b/AnkiDroid/src/test/java/com/ichi2/testutils/ScreenSize.kt
index bbea036ee146..9fe2c9c15a94 100644
--- a/AnkiDroid/src/test/java/com/ichi2/testutils/ScreenSize.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/testutils/ScreenSize.kt
@@ -12,8 +12,8 @@ import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.ichi2.anki.RobolectricTest.Companion.advanceRobolectricLooper
-import com.ichi2.utils.Dp
-import com.ichi2.utils.dp
+import com.ichi2.anki.common.utils.Dp
+import com.ichi2.anki.common.utils.dp
 import org.robolectric.RuntimeEnvironment
 import timber.log.Timber
 import kotlin.math.ceil
diff --git a/AnkiDroid/src/test/java/com/ichi2/testutils/ShadowFileProviderPathStrategy.kt b/AnkiDroid/src/test/java/com/ichi2/testutils/ShadowFileProviderPathStrategy.kt
new file mode 100644
index 000000000000..0dbe0ee25161
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/testutils/ShadowFileProviderPathStrategy.kt
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.testutils
+
+import org.robolectric.annotation.Implementation
+import org.robolectric.annotation.Implements
+import java.io.File
+
+/** Adapts AndroidX's Unix-only containment check to Robolectric's host filesystem. */
+@Implements(className = "androidx.core.content.FileProvider\$SimplePathStrategy", isInAndroidSdk = false)
+class ShadowFileProviderPathStrategy {
+    @Implementation
+    protected fun belongsToRoot(
+        filePath: String,
+        rootPath: String,
+    ): Boolean {
+        val file = File(filePath).toPath()
+        val root = File(rootPath).toPath()
+        return file != root && file.startsWith(root)
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/testutils/ShadowPreviewTranslations.kt b/AnkiDroid/src/test/java/com/ichi2/testutils/ShadowPreviewTranslations.kt
new file mode 100644
index 000000000000..9b681d288dd6
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/testutils/ShadowPreviewTranslations.kt
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.testutils
+
+import androidx.compose.runtime.Composer
+import anki.i18n.GeneratedTranslations
+import anki.i18n.PreviewTranslations
+import org.robolectric.annotation.Implementation
+import org.robolectric.annotation.Implements
+
+/** Uses preview strings without loading Rust in tests that span multiple SDK sandboxes. */
+@Implements(className = "com.ichi2.anki.ui.internationalization.ComposableTranslationsKt", isInAndroidSdk = false)
+class ShadowPreviewTranslations {
+    companion object {
+        // Match the compiled signature of the @Composable tr() provider.
+        @JvmStatic
+        @Implementation
+        @Suppress("UNUSED_PARAMETER")
+        fun tr(
+            composer: Composer?,
+            changed: Int,
+        ): GeneratedTranslations = PreviewTranslations
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/testutils/rules/MainDispatcherRule.kt b/AnkiDroid/src/test/java/com/ichi2/testutils/rules/MainDispatcherRule.kt
new file mode 100644
index 000000000000..77587e024904
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/testutils/rules/MainDispatcherRule.kt
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.testutils.rules
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.test.TestDispatcher
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.setMain
+import org.junit.rules.ExternalResource
+
+/** Shares Main's test scheduler with `runTest` and restores the platform dispatcher after each test. */
+class MainDispatcherRule(
+    private val dispatcher: TestDispatcher = UnconfinedTestDispatcher(),
+) : ExternalResource() {
+    override fun before() {
+        Dispatchers.setMain(dispatcher)
+    }
+
+    override fun after() {
+        Dispatchers.resetMain()
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/ui/BindingPreferenceTest.kt b/AnkiDroid/src/test/java/com/ichi2/ui/BindingPreferenceTest.kt
index e02a4742ae6e..5353d1e75c8d 100644
--- a/AnkiDroid/src/test/java/com/ichi2/ui/BindingPreferenceTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/ui/BindingPreferenceTest.kt
@@ -5,6 +5,9 @@ package com.ichi2.ui
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.cardviewer.Gesture
 import com.ichi2.anki.reviewer.Binding
+import com.ichi2.anki.reviewer.Binding.KeyCode
+import com.ichi2.anki.reviewer.BindingTest
+import com.ichi2.anki.reviewer.BindingUnicodeCharacter
 import com.ichi2.anki.reviewer.CardSide
 import com.ichi2.anki.reviewer.MappableBinding
 import com.ichi2.anki.reviewer.MappableBinding.Companion.toPreferenceString
@@ -12,6 +15,7 @@ import com.ichi2.anki.reviewer.ReviewerBinding
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
+import kotlin.test.assertTrue
 
 @RunWith(AndroidJUnit4::class)
 class BindingPreferenceTest {
@@ -33,13 +37,38 @@ class BindingPreferenceTest {
         assertEquals(expected, getSampleBindings().toPreferenceString())
     }
 
+    @Test
+    fun `unicode characters and modifiers survive preference round trip`() {
+        val bindings =
+            listOf(
+                ReviewerBinding(Binding.UnicodeCharacter(BindingUnicodeCharacter('Ä'), BindingTest.allModifierKeys()), CardSide.QUESTION),
+                ReviewerBinding(Binding.UnicodeCharacter(BindingUnicodeCharacter(' ')), CardSide.ANSWER),
+                ReviewerBinding(Binding.UnicodeCharacter(BindingUnicodeCharacter('*')), CardSide.BOTH),
+            )
+        val expected = "1/r✅Ctrl+Alt+Shift+Ä0|r✅ 1|r✅*2"
+
+        assertEquals(expected, bindings.toPreferenceString())
+        assertEquals(bindings, ReviewerBinding.fromPreferenceString(expected))
+    }
+
+    @Test
+    fun `reviewer preference parsing preserves valid bindings and card sides around invalid entries`() {
+        val bindings = ReviewerBinding.fromPreferenceString("1/r⌨Ctrl+660|r⍝LONG_TAP2|r✅Ä1|r⌨not-a-number2|r⍝SWIPE_UP2")
+
+        assertEquals(3, bindings.size)
+        assertEquals("1/r⌨Ctrl+660|r✅Ä1|r⍝SWIPE_UP2", bindings.toPreferenceString())
+    }
+
+    @Test
+    fun `reviewer preference parsing returns no bindings when all entries are invalid`() {
+        assertTrue(ReviewerBinding.fromPreferenceString("1/r⍝LONG_TAP2|r⌨not-a-number2|r✅2").isEmpty())
+    }
+
     private fun getSampleBindings(): List<MappableBinding> =
         listOf(
-            ReviewerBinding(Binding.unicode('a'), CardSide.BOTH),
-            ReviewerBinding(Binding.unicode(' '), CardSide.ANSWER),
-            // this one is important: ensure that "|" as a unicode char can't be used
-            ReviewerBinding(Binding.unicode(Binding.FORBIDDEN_UNICODE_CHAR), CardSide.QUESTION),
+            ReviewerBinding(Binding.unicode(BindingUnicodeCharacter('a')), CardSide.BOTH),
+            ReviewerBinding(Binding.unicode(BindingUnicodeCharacter(' ')), CardSide.ANSWER),
             ReviewerBinding(Binding.gesture(Gesture.DOUBLE_TAP), CardSide.BOTH),
-            ReviewerBinding(Binding.keyCode(12), CardSide.BOTH),
+            ReviewerBinding(KeyCode(12), CardSide.BOTH),
         )
 }
diff --git a/AnkiDroid/src/test/java/com/ichi2/ui/KeyPickerTest.kt b/AnkiDroid/src/test/java/com/ichi2/ui/KeyPickerTest.kt
index 279609dbba39..6c8eae411b4e 100644
--- a/AnkiDroid/src/test/java/com/ichi2/ui/KeyPickerTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/ui/KeyPickerTest.kt
@@ -3,20 +3,27 @@
 package com.ichi2.ui
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.EmptyApplicationCategory
 import com.ichi2.anki.dialogs.KeySelectionDialogUtils
 import com.ichi2.anki.settings.enums.DayTheme
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.EmptyApplication
 import com.ichi2.testutils.KeyEventUtils
+import com.ichi2.testutils.targetContext
 import org.hamcrest.CoreMatchers.not
 import org.hamcrest.CoreMatchers.notNullValue
 import org.hamcrest.CoreMatchers.nullValue
 import org.hamcrest.CoreMatchers.sameInstance
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
+import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
 
 @RunWith(AndroidJUnit4::class)
-class KeyPickerTest : RobolectricTest() {
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class KeyPickerTest : AndroidTest {
     private var keyPicker: KeyPicker =
         run {
             targetContext.setTheme(DayTheme.LIGHT.styleResId)
diff --git a/AnkiDroid/src/test/java/com/ichi2/ui/TypeAnswerEditTextTest.kt b/AnkiDroid/src/test/java/com/ichi2/ui/TypeAnswerEditTextTest.kt
index 209977d8ce9d..6a9ab9f01141 100644
--- a/AnkiDroid/src/test/java/com/ichi2/ui/TypeAnswerEditTextTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/ui/TypeAnswerEditTextTest.kt
@@ -6,18 +6,25 @@ import android.os.LocaleList
 import android.text.InputType
 import android.view.inputmethod.EditorInfo
 import android.widget.EditText
-import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.EmptyApplicationCategory
 import com.ichi2.anki.settings.enums.DayTheme
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.EmptyApplication
 import com.ichi2.testutils.ext.createInputConnection
+import com.ichi2.testutils.targetContext
 import org.junit.Before
 import org.junit.Test
+import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 import org.robolectric.ParameterizedRobolectricTestRunner as Parameterized
 
 @RunWith(Parameterized::class)
-class TypeAnswerEditTextTest : RobolectricTest() {
+@Config(application = EmptyApplication::class)
+@Category(EmptyApplicationCategory::class)
+class TypeAnswerEditTextTest : AndroidTest {
     enum class AnswerField {
         FIXED_EDIT_TEXT,
         TYPE_ANSWER_EDIT_TEXT,
diff --git a/AnkiDroid/src/test/java/com/ichi2/utils/DisplayUtilsTest.kt b/AnkiDroid/src/test/java/com/ichi2/utils/DisplayUtilsTest.kt
index 83d06205fe3a..501bd8cca352 100644
--- a/AnkiDroid/src/test/java/com/ichi2/utils/DisplayUtilsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/utils/DisplayUtilsTest.kt
@@ -16,7 +16,6 @@ import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.EmptyApplicationCategory
-import com.ichi2.anki.R
 import com.ichi2.testutils.EmptyApplication
 import com.ichi2.utils.DisplayUtils.setDialogKeyboardResize
 import org.junit.Test
@@ -25,6 +24,7 @@ import org.junit.runner.RunWith
 import org.robolectric.Robolectric
 import org.robolectric.annotation.Config
 import kotlin.test.assertEquals
+import com.ichi2.anki.common.android.R as CommonR
 
 @RunWith(AndroidJUnit4::class)
 @Config(sdk = [29, 30, 36], application = EmptyApplication::class)
@@ -69,7 +69,7 @@ class DisplayUtilsTest {
     private fun withDialog(block: (AlertDialog) -> Unit) {
         Robolectric.buildActivity(Activity::class.java).use { controller ->
             val activity = controller.get()
-            activity.setTheme(R.style.Theme_Light)
+            activity.setTheme(CommonR.style.Theme_Light)
             controller.setup()
             val dialog = AlertDialog.Builder(activity).setView(EditText(activity)).create()
             try {
diff --git a/AnkiDroid/src/test/java/com/ichi2/utils/ImportUtilsTest.kt b/AnkiDroid/src/test/java/com/ichi2/utils/ImportUtilsTest.kt
index 5e3026532961..e8c8705abe85 100644
--- a/AnkiDroid/src/test/java/com/ichi2/utils/ImportUtilsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/utils/ImportUtilsTest.kt
@@ -11,10 +11,14 @@ import android.net.Uri
 import androidx.annotation.CheckResult
 import androidx.core.net.toUri
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.AnkiActivity
 import com.ichi2.anki.CommonString
 import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.common.crashreporting.CrashReportService
 import com.ichi2.anki.common.crashreporting.CrashReporter
+import com.ichi2.anki.common.time.MockTime
+import com.ichi2.anki.common.time.TimeManager
+import com.ichi2.anki.dialogs.DialogHandler
 import com.ichi2.utils.ImportUtils.FileImporter
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.containsString
@@ -39,6 +43,7 @@ import java.io.FileNotFoundException
 import java.io.IOException
 import java.io.InputStream
 import kotlin.test.assertIs
+import kotlin.test.assertNull
 
 /** Tests for [ImportUtils]. */
 @RunWith(AndroidJUnit4::class)
@@ -63,7 +68,7 @@ class ImportUtilsTest : RobolectricTest() {
         val missingFile = File(tempFolder.root, "deleted.apkg")
         shadowOf(targetContext.contentResolver).registerInputStreamSupplier(uri) { missingFile.inputStream() }
 
-        val result = importerWithFileName("deleted.apkg").handleFileImport(targetContext, Intent(Intent.ACTION_VIEW, uri))
+        val result = importerWithFileName("deleted.apkg").prepareImport(targetContext, Intent(Intent.ACTION_VIEW, uri))
 
         val failure = assertIs<ImportResult.Failure>(result)
         assertIs<FileNotFoundException>(failure.exception)
@@ -77,7 +82,31 @@ class ImportUtilsTest : RobolectricTest() {
         val exception = IOException("Provider failed")
         shadowOf(targetContext.contentResolver).registerInputStreamSupplier(uri) { throw exception }
 
-        val result = importerWithFileName("broken.apkg").handleFileImport(targetContext, Intent(Intent.ACTION_VIEW, uri))
+        val result = importerWithFileName("broken.apkg").prepareImport(targetContext, Intent(Intent.ACTION_VIEW, uri))
+
+        assertEquals(exception, assertIs<ImportResult.Failure>(result).exception)
+        verify(crashReporter).sendExceptionReport(exception, "ImportUtils", null, false)
+    }
+
+    @Test
+    fun `pending or trashed download returns an import failure without a crash report`() {
+        val uri = "content://import/pending.apkg".toUri()
+        val exception = IllegalStateException("Only owner is able to interact with pending/trashed item $uri")
+        shadowOf(targetContext.contentResolver).registerInputStreamSupplier(uri) { throw exception }
+
+        val result = importerWithFileName("pending.apkg").prepareImport(targetContext, Intent(Intent.ACTION_VIEW, uri))
+
+        assertEquals(exception, assertIs<ImportResult.Failure>(result).exception)
+        verifyNoInteractions(crashReporter)
+    }
+
+    @Test
+    fun `other illegal state errors from the source are still reported`() {
+        val uri = "content://import/illegal-state.apkg".toUri()
+        val exception = IllegalStateException("Provider failed")
+        shadowOf(targetContext.contentResolver).registerInputStreamSupplier(uri) { throw exception }
+
+        val result = importerWithFileName("illegal-state.apkg").prepareImport(targetContext, Intent(Intent.ACTION_VIEW, uri))
 
         assertEquals(exception, assertIs<ImportResult.Failure>(result).exception)
         verify(crashReporter).sendExceptionReport(exception, "ImportUtils", null, false)
@@ -93,7 +122,7 @@ class ImportUtilsTest : RobolectricTest() {
             }
         }
 
-        val result = importerWithFileName("unreadable.apkg").handleFileImport(targetContext, Intent(Intent.ACTION_VIEW, uri))
+        val result = importerWithFileName("unreadable.apkg").prepareImport(targetContext, Intent(Intent.ACTION_VIEW, uri))
 
         assertEquals(exception, assertIs<ImportResult.Failure>(result).exception)
         verify(crashReporter).sendExceptionReport(exception, "ImportUtils", null, false)
@@ -107,6 +136,56 @@ class ImportUtilsTest : RobolectricTest() {
             ): String = fileName
         }
 
+    @Test
+    fun `preparation keeps the filename resolved before copying`() {
+        var queries = 0
+        val importer =
+            object : FileImporter() {
+                override fun getFileNameFromContentProvider(
+                    context: Context,
+                    data: Uri,
+                ): String {
+                    queries++
+                    return if (queries == 1) "deck name.apkg" else "collection.colpkg"
+                }
+
+                override fun copyFileToCache(
+                    context: Context,
+                    data: Uri,
+                    tempPath: String,
+                ) = CacheFileResult.Success(tempPath)
+            }
+        val uri = "content://import/document/123".toUri()
+
+        val result = assertIs<ImportResult.Success>(importer.prepareImport(targetContext, Intent(Intent.ACTION_VIEW, uri)))
+
+        assertIs<ImportResolution.DeckPackage>(result.file)
+        assertEquals(uri, result.file.source.uri)
+        assertEquals("deck name.apkg", File(Uri.decode(result.path)).name)
+        assertEquals(1, queries)
+    }
+
+    @Test
+    fun `preparing packages does not store a confirmation`() {
+        val handler = DialogHandler(mock(AnkiActivity::class.java))
+        val uri = "content://import/document/123".toUri()
+        val packages =
+            listOf(
+                "deck.apkg" to ImportResolution.DeckPackage::class,
+                "backup.colpkg" to ImportResolution.CollectionPackage::class,
+            )
+
+        for ((fileName, expectedType) in packages) {
+            val result =
+                assertIs<ImportResult.Success>(
+                    TestFileImporter(fileName).prepareImport(targetContext, Intent(Intent.ACTION_VIEW, uri)),
+                )
+
+            assertEquals(expectedType, result.file::class)
+            assertNull(handler.popMessage(), "Preparation must not store a confirmation for $fileName")
+        }
+    }
+
     @Test
     fun `resolution reports missing filenames instead of assuming text`() {
         val intent = Intent(Intent.ACTION_VIEW).setDataAndType("content://import/document/123".toUri(), "text/plain")
@@ -194,7 +273,7 @@ class ImportUtilsTest : RobolectricTest() {
     private fun importValidFile(fileName: String): String {
         val testFileImporter = TestFileImporter(fileName)
         val intent = getValidClipDataUri(fileName)
-        testFileImporter.handleFileImport(targetContext, intent)
+        testFileImporter.prepareImport(targetContext, intent)
 
         // COULD_BE_BETTER: Strip off the file path
         return testFileImporter.cacheFileName
@@ -218,10 +297,10 @@ class ImportUtilsTest : RobolectricTest() {
         for (maliciousFilename in maliciousFilenames) {
             val testFileImporter = TestFileImporter(maliciousFilename)
             val intent = getValidClipDataUri(maliciousFilename)
-            val result = testFileImporter.handleFileImport(targetContext, intent)
+            val result = testFileImporter.prepareImport(targetContext, intent)
             assertTrue("Import should succeed after basename sanitization: $maliciousFilename", result is ImportResult.Success)
 
-            // the cached path is Uri-encoded (see handleContentProviderFile): decode it before resolving it on disk
+            // the cached path is Uri-encoded (see cacheImport): decode it before resolving it on disk
             val cachedFile = File(Uri.decode(testFileImporter.cacheFileName)).canonicalFile
             assertEquals(
                 "Cached file must be a direct child of cacheDir: $maliciousFilename -> $cachedFile",
@@ -255,6 +334,19 @@ class ImportUtilsTest : RobolectricTest() {
         assertEquals(expectedFilepath, actualFilepath)
     }
 
+    @Test
+    fun getFileCachedCopyUsesFallbackFileNameWhenDecodingFails() {
+        TimeManager.resetWith(MockTime(1_600_000_000_000))
+        val prefix = "a".repeat(89)
+        val invalidShortenedFileName = "${prefix}ääääääääää.apkg"
+        val expectedFallbackFileName = "file_1600000000000.apkg"
+        val expectedFilepath = File(targetContext.cacheDir, expectedFallbackFileName).absolutePath
+
+        val actualFilepath = TestFileImporter(invalidShortenedFileName).getFileCachedCopy(targetContext, "dummy".toUri())
+
+        assertEquals(expectedFilepath, actualFilepath)
+    }
+
     @Test
     fun collectionApkgIsValid() {
         assertTrue(ImportUtils.isValidPackageName("collection.apkg"))
diff --git a/AnkiDroid/src/test/java/com/ichi2/utils/LanguageDebugInfoTest.kt b/AnkiDroid/src/test/java/com/ichi2/utils/LanguageDebugInfoTest.kt
new file mode 100644
index 000000000000..c0f3b18e78dd
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/utils/LanguageDebugInfoTest.kt
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.utils
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.CollectionManager
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.servicelayer.DebugInfoService
+import kotlinx.coroutines.runBlocking
+import net.ankiweb.rsdroid.BackendFactory
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+import kotlin.test.assertContains
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class LanguageDebugInfoTest : RobolectricTest() {
+    @Before
+    override fun setUp() {
+        super.setUp()
+        LanguageUtil.setDefaultBackendLanguages()
+        runBlocking { CollectionManager.discardBackend() }
+    }
+
+    @Test
+    @Config(qualifiers = "zn")
+    fun `language debug info reports the backend fallback locale`() {
+        assertEquals(listOf("en-US"), getLanguageDebugInfo(targetContext).backendLocales)
+    }
+
+    @Test
+    @Config(qualifiers = "pl")
+    fun `copied debug info includes the backend fallback order`() =
+        runTest {
+            assertContains(DebugInfoService.getDebugInfo(targetContext), "| Backend: pl, en-US")
+        }
+
+    @Test
+    @Config(qualifiers = "pl")
+    fun `language debug info uses the active backend instead of defaults for future backends`() {
+        CollectionManager.getBackend()
+        val originalLanguages = BackendFactory.defaultLanguages
+        try {
+            BackendFactory.defaultLanguages = listOf("fr")
+
+            assertEquals(listOf("pl", "en-US"), getLanguageDebugInfo(targetContext).backendLocales)
+        } finally {
+            BackendFactory.defaultLanguages = originalLanguages
+        }
+    }
+}
diff --git a/AnkiDroid/src/test/java/com/ichi2/utils/LanguageUtilRobolectricTest.kt b/AnkiDroid/src/test/java/com/ichi2/utils/LanguageUtilRobolectricTest.kt
index 289dd0badd10..d38379c809f6 100644
--- a/AnkiDroid/src/test/java/com/ichi2/utils/LanguageUtilRobolectricTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/utils/LanguageUtilRobolectricTest.kt
@@ -3,7 +3,6 @@
 package com.ichi2.utils
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
 import net.ankiweb.rsdroid.BackendFactory
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -11,7 +10,7 @@ import org.robolectric.annotation.Config
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
-class LanguageUtilRobolectricTest : RobolectricTest() {
+class LanguageUtilRobolectricTest {
     @Test
     @Config(qualifiers = "zn")
     fun `Language without region is set`() {
diff --git a/AnkiDroid/src/test/java/com/ichi2/widget/WidgetStatusTest.kt b/AnkiDroid/src/test/java/com/ichi2/widget/WidgetStatusTest.kt
new file mode 100644
index 000000000000..b79ffca7d426
--- /dev/null
+++ b/AnkiDroid/src/test/java/com/ichi2/widget/WidgetStatusTest.kt
@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.widget
+
+import android.app.Application
+import android.content.Context
+import android.os.Environment
+import androidx.core.content.edit
+import androidx.test.core.app.ApplicationProvider.getApplicationContext
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anki.CollectionManager
+import com.ichi2.anki.RobolectricTest
+import com.ichi2.anki.common.preferences.NotificationPreferences
+import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.anki.settings.Prefs
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkObject
+import io.mockk.unmockkObject
+import io.mockk.verify
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.advanceUntilIdle
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.shadows.ShadowEnvironment
+import kotlin.test.assertFalse
+
+@RunWith(AndroidJUnit4::class)
+@OptIn(DelicateCoroutinesApi::class)
+class WidgetStatusTest : RobolectricTest() {
+    private val preferences =
+        object : NotificationPreferences {
+            override var newReviewRemindersEnabled = false
+            override var legacyNotificationsEnabled = false
+        }
+    private val repository = mockk<WidgetRepository>(relaxed = true)
+    private val scheduler = mockk<WidgetNotificationScheduler>(relaxed = true)
+    private val updater = mockk<(Context) -> Unit>(relaxed = true)
+
+    @Test
+    fun `disabled widgets and notifications do not open the collection`() =
+        withWidgetStatus {
+            WidgetStatus.updateInBackground(targetContext)
+            advanceUntilIdle()
+
+            assertFalse(CollectionManager.isOpenUnsafe())
+            verify(exactly = 0) { repository.storeSmallWidgetStatus(any()) }
+            verify(exactly = 0) { scheduler.scheduleNotification() }
+            verify(exactly = 0) { updater(any()) }
+        }
+
+    @Test
+    fun `legacy notifications follow changes to the registered preferences`() =
+        withWidgetStatus {
+            addBasicNote("front", "back")
+            preferences.legacyNotificationsEnabled = true
+            WidgetStatus.updateInBackground(targetContext)
+            advanceUntilIdle()
+            verify(exactly = 1) { repository.storeSmallWidgetStatus(match { it.dueCardsCount == 1 }) }
+            verify(exactly = 1) { scheduler.scheduleNotification() }
+
+            preferences.legacyNotificationsEnabled = false
+            WidgetStatus.updateInBackground(targetContext)
+            advanceUntilIdle()
+            preferences.legacyNotificationsEnabled = true
+            preferences.newReviewRemindersEnabled = true
+            WidgetStatus.updateInBackground(targetContext)
+            advanceUntilIdle()
+            verify(exactly = 1) { repository.storeSmallWidgetStatus(any()) }
+            verify(exactly = 1) { scheduler.scheduleNotification() }
+            verify(exactly = 0) { updater(any()) }
+        }
+
+    @Test
+    fun `enabled widgets invoke the registered updater with either reminder system`() =
+        withWidgetStatus {
+            targetContext.sharedPrefs().edit { putBoolean("widgetSmallEnabled", true) }
+            preferences.newReviewRemindersEnabled = true
+            WidgetStatus.updateInBackground(targetContext)
+            advanceUntilIdle()
+            verify(exactly = 1) { repository.storeSmallWidgetStatus(any()) }
+            verify(exactly = 1) { updater(targetContext) }
+            verify(exactly = 0) { scheduler.scheduleNotification() }
+
+            preferences.newReviewRemindersEnabled = false
+            WidgetStatus.updateInBackground(targetContext)
+            advanceUntilIdle()
+            verify(exactly = 2) { repository.storeSmallWidgetStatus(any()) }
+            verify(exactly = 2) { updater(targetContext) }
+            verify(exactly = 1) { scheduler.scheduleNotification() }
+        }
+
+    private fun withWidgetStatus(block: suspend TestScope.() -> Unit) =
+        runTest {
+            val originalRepository = widgetRepository
+            val originalScheduler = widgetNotificationScheduler
+            val application = getApplicationContext<Application>()
+            val originalStorageState = Environment.getExternalStorageState()
+            ShadowEnvironment.setExternalStorageState(Environment.MEDIA_MOUNTED)
+            targetContext.sharedPrefs().edit { putBoolean("widgetSmallEnabled", false) }
+            mockkObject(GlobalScope)
+            // Run the real background job on this test's scheduler, and await it before cleanup.
+            every { GlobalScope.coroutineContext } returns coroutineContext
+            WidgetRepository.register(repository)
+            WidgetNotificationScheduler.register(scheduler)
+            with(application) { WidgetStatus.register(preferences, updater) }
+            try {
+                block()
+            } finally {
+                advanceUntilIdle()
+                ShadowEnvironment.setExternalStorageState(originalStorageState)
+                unmockkObject(GlobalScope)
+                WidgetRepository.register(originalRepository)
+                WidgetNotificationScheduler.register(originalScheduler)
+                with(application) {
+                    WidgetStatus.register(Prefs) { context -> AnkiDroidWidgetSmall.UpdateService().doUpdate(context) }
+                }
+            }
+        }
+}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cbd183a0a139..2742185922a8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -152,7 +152,7 @@ We have a limited amount of time to spend on the project. We are trying our best
         * Incidental changes (lint, refactorings) should be in separate commits
         * Whitespace changes should be reverted  
 3. Write a PR description
-    * Our [PR template]((https://github.com/david-allison/Anki-Android/blob/contributing-md/.github/pull_request_template.md)) **must** be filled (unless trivial). Create PRs using GitHub so this template will be present in the PR Description area, ready for you to fill in with information about your work.
+    * Our [PR template](https://github.com/ankidroid/Anki-Android/blob/main/.github/pull_request_template.md) **must** be filled (unless trivial). Create PRs using GitHub so this template will be present in the PR Description area, ready for you to fill in with information about your work.
 
 Writing automated tests helps reviewers be more confident that your change is correct. This is currently 
  optional but recommended, and should reduce the number of rounds of reviews.
diff --git a/anki-common/build.gradle.kts b/anki-common/build.gradle.kts
index 4a3c52c377c7..532fadfb9ae9 100644
--- a/anki-common/build.gradle.kts
+++ b/anki-common/build.gradle.kts
@@ -5,8 +5,8 @@ import com.ichi2.anki.gradle.addAnkiBackendDependencies
 
 plugins {
     id("ankidroid.android.library")
+    id("ankidroid.android.compose")
     id("org.jetbrains.kotlin.plugin.parcelize")
-    alias(libs.plugins.kotlin.compose)
 }
 
 configure<LibraryExtension> {
@@ -14,7 +14,6 @@ configure<LibraryExtension> {
     // namespace must be unique for resources generation.
     namespace = "com.ichi2.anki.ankicommon"
     buildFeatures.buildConfig = false
-    buildFeatures.compose = true
     testFixtures.enable = true
 }
 
@@ -23,16 +22,13 @@ dependencies {
     implementation(project(":common:android"))
     implementation(project(":libanki"))
     implementation(project(":compat"))
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.ui)
-    implementation(libs.androidx.compose.ui.tooling.preview)
-    implementation(libs.androidx.compose.material3)
-    debugImplementation(libs.androidx.compose.ui.tooling)
 
     addAnkiBackendDependencies(project)
 
     implementation(libs.androidx.activity)
+    implementation(libs.androidx.appcompat)
     implementation(libs.androidx.sqlite.framework)
+    implementation(libs.google.material)
     implementation(libs.androidx.fragment.ktx)
     implementation(libs.jakewharton.timber)
     implementation(libs.kotlinx.coroutines.core)
@@ -57,10 +53,4 @@ dependencies {
     testFixturesImplementation(libs.androidx.test.core)
     testFixturesImplementation(libs.jakewharton.timber)
     testFixturesImplementation(libs.kotlin.test)
-    // The Kotlin Compose Compiler plugin attaches to every Kotlin compilation in the
-    // module including testFixtures, which has no @Composable code and refuses to
-    // run unless the Compose Runtime is on the classpath. compileOnly satisfies the
-    // plugin's version check without shipping the runtime in the testFixtures output.
-    testFixturesCompileOnly(platform(libs.androidx.compose.bom))
-    testFixturesCompileOnly(libs.androidx.compose.runtime)
 }
diff --git a/anki-common/src/main/kotlin/com/ichi2/anki/CollectionLease.kt b/anki-common/src/main/kotlin/com/ichi2/anki/CollectionLease.kt
index f0ec1ec4b7e1..5898292037e7 100644
--- a/anki-common/src/main/kotlin/com/ichi2/anki/CollectionLease.kt
+++ b/anki-common/src/main/kotlin/com/ichi2/anki/CollectionLease.kt
@@ -23,6 +23,15 @@ enum class CollectionOperation {
     CHECK_DATABASE,
     CHECK_MEDIA,
     EMPTY_CARDS,
+    ;
+
+    /** Whether this operation syncs the collection, including full uploads and downloads. */
+    val isSync: Boolean
+        get() =
+            when (this) {
+                SYNC, FULL_DOWNLOAD, FULL_UPLOAD -> true
+                IMPORT_COLLECTION_PACKAGE, CHECK_DATABASE, CHECK_MEDIA, EMPTY_CARDS -> false
+            }
 }
 
 /**
diff --git a/anki-common/src/main/kotlin/com/ichi2/anki/CollectionManager.kt b/anki-common/src/main/kotlin/com/ichi2/anki/CollectionManager.kt
index 57a33c2d1a57..531174c04451 100644
--- a/anki-common/src/main/kotlin/com/ichi2/anki/CollectionManager.kt
+++ b/anki-common/src/main/kotlin/com/ichi2/anki/CollectionManager.kt
@@ -331,10 +331,23 @@ object CollectionManager {
      * If the collection is open, close it.
      */
     suspend fun ensureClosed() {
+        withClosedCollection {}
+    }
+
+    /**
+     * Closes the cached collection and runs [block] on the collection queue.
+     *
+     * Use when changing the collection path: another queued operation must not reopen the
+     * old collection between closing it and recording the new path.
+     * [block] must not call other methods which enter the collection queue.
+     */
+    suspend fun <T> withClosedCollection(
+        @WorkerThread block: () -> T,
+    ): T =
         withQueue {
             ensureClosedInner()
+            block()
         }
-    }
 
     /** See [ensureClosed]. This must only be run inside the queue. */
     private fun ensureClosedInner() {
diff --git a/anki-common/src/main/kotlin/com/ichi2/anki/backend/BackendLocales.kt b/anki-common/src/main/kotlin/com/ichi2/anki/backend/BackendLocales.kt
new file mode 100644
index 000000000000..39a2b1ac0573
--- /dev/null
+++ b/anki-common/src/main/kotlin/com/ichi2/anki/backend/BackendLocales.kt
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.backend
+
+import com.google.protobuf.InvalidProtocolBufferException
+import com.ichi2.anki.common.utils.ext.stringIterable
+import net.ankiweb.rsdroid.Backend
+import net.ankiweb.rsdroid.BackendException
+import org.json.JSONException
+import org.json.JSONObject
+
+/**
+ * Locales currently used by a backend for translations.
+ *
+ * @property all Active locales in preference order, including the final `en-US` fallback.
+ */
+class BackendLocales internal constructor(
+    val all: List<String>,
+) {
+    /** The first locale tried when translating, before falling back to the remaining locales. */
+    val primary: String
+        get() = all.first()
+}
+
+/**
+ * Returns the backend's active translation locales after resolving its preferred languages.
+ * The backend uses `en-US` when none of the requested languages are supported.
+ * Backend and response-decoding errors propagate to the caller.
+ *
+ * @throws BackendException if the backend is closed or the request fails.
+ * @throws InvalidProtocolBufferException if the backend's protobuf response cannot be decoded.
+ * @throws JSONException if the returned JSON cannot be read as an object containing a `langs`
+ * array of strings.
+ */
+fun Backend.getLocales(): BackendLocales {
+    // An empty module name omits translation text; an empty list would request all modules.
+    val resources = i18nResources(modules = listOf(""))
+    val locales = JSONObject(resources.toStringUtf8()).getJSONArray("langs").stringIterable().toList()
+    return BackendLocales(locales)
+}
diff --git a/anki-common/src/main/kotlin/com/ichi2/anki/browser/search/SavedSearch.kt b/anki-common/src/main/kotlin/com/ichi2/anki/browser/search/SavedSearch.kt
new file mode 100644
index 000000000000..3f08865c4a91
--- /dev/null
+++ b/anki-common/src/main/kotlin/com/ichi2/anki/browser/search/SavedSearch.kt
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.browser.search
+
+/**
+ * A named query for the Card Browser
+ *
+ * Selecting a saved search quickly allows a user to either:
+ * - search the given query
+ * - add additional terms to the query before searching
+ *
+ * @see com.ichi2.anki.common.utils.ext.savedFilters
+ */
+data class SavedSearch(
+    val name: String,
+    val query: String,
+) {
+    fun normalize() = SavedSearch(name = this.name, query = this.query.trim())
+}
+
+fun List<SavedSearch>.toMap(): Map<String, String> = associate { it.name to it.query }
diff --git a/anki-common/src/main/kotlin/com/ichi2/anki/common/android/AdaptionUtil.kt b/anki-common/src/main/kotlin/com/ichi2/anki/common/android/AdaptionUtil.kt
index d07d24576af1..74642e408d61 100644
--- a/anki-common/src/main/kotlin/com/ichi2/anki/common/android/AdaptionUtil.kt
+++ b/anki-common/src/main/kotlin/com/ichi2/anki/common/android/AdaptionUtil.kt
@@ -14,6 +14,7 @@ import android.content.pm.PackageManager
 import android.content.pm.ResolveInfo
 import android.os.Build
 import android.provider.Settings
+import androidx.annotation.VisibleForTesting
 import androidx.core.net.toUri
 import com.ichi2.anki.compat.CompatHelper.Companion.getPackageInfoCompat
 import com.ichi2.anki.compat.CompatHelper.Companion.queryIntentActivitiesCompat
@@ -36,6 +37,17 @@ object AdaptionUtil {
         return hasWebBrowser
     }
 
+    /**
+     * Clears the memoized web-browser availability result.
+     *
+     * Robolectric tests can register a browser handler after another test in the same JVM fork
+     * already cached "no browser"; production code should not call this.
+     */
+    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+    fun resetWebBrowserAvailabilityCacheForTests() {
+        hasRunWebBrowserCheck = false
+    }
+
     val isUserATestClient: Boolean
         get() =
             try {
diff --git a/anki-common/src/main/kotlin/com/ichi2/anki/common/destinations/NoteEditorDestination.kt b/anki-common/src/main/kotlin/com/ichi2/anki/common/destinations/NoteEditorDestination.kt
index 4876e4e1f676..69488347bd2c 100644
--- a/anki-common/src/main/kotlin/com/ichi2/anki/common/destinations/NoteEditorDestination.kt
+++ b/anki-common/src/main/kotlin/com/ichi2/anki/common/destinations/NoteEditorDestination.kt
@@ -8,6 +8,7 @@ import android.os.Bundle
 import com.ichi2.anki.common.ui.TransitionDirection
 import com.ichi2.anki.libanki.CardId
 import com.ichi2.anki.libanki.DeckId
+import com.ichi2.anki.libanki.NoteTypeId
 
 /** Opens the Add Note/Note Editor screen. */
 sealed class NoteEditorDestination : Destination() {
@@ -87,6 +88,7 @@ sealed class NoteEditorDestination : Destination() {
     data class CopyNote(
         val deckId: DeckId,
         val fieldsText: String,
+        val noteTypeId: NoteTypeId,
         val tags: List<String> = listOf(),
     ) : NoteEditorDestination()
 
diff --git a/anki-common/src/main/kotlin/com/ichi2/anki/common/destinations/WidgetConfigDestination.kt b/anki-common/src/main/kotlin/com/ichi2/anki/common/destinations/WidgetConfigDestination.kt
new file mode 100644
index 000000000000..bf99fe191e86
--- /dev/null
+++ b/anki-common/src/main/kotlin/com/ichi2/anki/common/destinations/WidgetConfigDestination.kt
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.common.destinations
+
+sealed class WidgetConfigDestination : Destination() {
+    abstract val appWidgetId: Int
+
+    data class CardAnalysis(
+        override val appWidgetId: Int,
+    ) : WidgetConfigDestination()
+
+    data class DeckPicker(
+        override val appWidgetId: Int,
+    ) : WidgetConfigDestination()
+}
diff --git a/anki-common/src/main/kotlin/com/ichi2/anki/common/storage/CollectionHelper.kt b/anki-common/src/main/kotlin/com/ichi2/anki/common/storage/CollectionHelper.kt
index 244774323dd8..8615e6421fc8 100644
--- a/anki-common/src/main/kotlin/com/ichi2/anki/common/storage/CollectionHelper.kt
+++ b/anki-common/src/main/kotlin/com/ichi2/anki/common/storage/CollectionHelper.kt
@@ -140,9 +140,10 @@ object CollectionHelper {
      * [PREF_COLLECTION_PATH] is set (or a [ankiDroidDirectoryOverride] is active), which mirrors
      * when [getCurrentAnkiDroidDirectory] can return a directory rather than throwing.
      *
-     * The user is not asked yet: until the dedicated setup flow exists (#19552), the 'decision'
-     * is made on their behalf during startup by `ensureCollectionPathSet` (app module), so this
-     * is [StorageDecision.Decided] by the time the collection is opened.
+     * Startup (`maybeSetDefaultCollectionPath`, app module) decides on the user's behalf according to the
+     * storage policy. If the policy defers the choice, the decision stays undecided. Completing
+     * the permission screen after granting storage access selects public storage
+     * (Issue 13574).
      *
      * @param preferences the preferences the collection path will be read from: pass the same
      * (profile) context's preferences as the [getCurrentAnkiDroidDirectory] call being gated
@@ -163,7 +164,7 @@ object CollectionHelper {
      *
      * @throws StorageNotConfiguredException if no collection path has been set
      * ([PREF_COLLECTION_PATH] is unset): a default is chosen during startup by
-     * `ensureCollectionPathSet` (app module)
+     * `maybeSetDefaultCollectionPath` (app module)
      * @throws SystemStorageException if startup failed to choose a default collection path
      * ([systemStorageFailure])
      */
@@ -179,7 +180,7 @@ object CollectionHelper {
      *
      * @throws StorageNotConfiguredException if no collection path has been set
      * ([PREF_COLLECTION_PATH] is unset): a default is chosen during startup by
-     * `ensureCollectionPathSet` (app module)
+     * `maybeSetDefaultCollectionPath` (app module)
      * @throws SystemStorageException if startup failed to choose a default collection path
      * ([systemStorageFailure])
      */
diff --git a/anki-common/src/main/kotlin/com/ichi2/anki/common/storage/LegacyStorage.kt b/anki-common/src/main/kotlin/com/ichi2/anki/common/storage/LegacyStorage.kt
index 320b6fd7ce23..c899a12b4f97 100644
--- a/anki-common/src/main/kotlin/com/ichi2/anki/common/storage/LegacyStorage.kt
+++ b/anki-common/src/main/kotlin/com/ichi2/anki/common/storage/LegacyStorage.kt
@@ -4,9 +4,11 @@
 package com.ichi2.anki.common.storage
 
 import android.content.Context
+import com.ichi2.anki.CommonString
 import com.ichi2.anki.common.permissions.hasLegacyStorageAccessPermission
 import com.ichi2.anki.common.permissions.isExternalStorageManagerCompat
 import com.ichi2.anki.common.preferences.sharedPrefs
+import com.ichi2.anki.common.utils.android.showThemedToast
 import timber.log.Timber
 import java.io.File
 
@@ -98,3 +100,22 @@ fun grantedStoragePermissions(context: Context): Boolean =
     !isLegacyStorage(context) ||
         hasLegacyStorageAccessPermission(context) ||
         isExternalStorageManagerCompat()
+
+/** Checks whether storage permissions are granted on the device. If the device is not using legacy storage,
+ *  it verifies if the app has been granted the necessary storage access permission.
+ *  @return `true`: if granted, otherwise `false` and shows a missing permission toast
+ *
+ * @throws com.ichi2.anki.exception.SystemStorageException if `getExternalFilesDir` returns null
+ */
+fun grantedStoragePermissions(
+    context: Context,
+    showToast: Boolean,
+): Boolean {
+    val granted = grantedStoragePermissions(context)
+
+    if (!granted && showToast) {
+        showThemedToast(context, context.getString(CommonString.intent_handler_failed_no_storage_permission), false)
+    }
+
+    return granted
+}
diff --git a/anki-common/src/main/kotlin/com/ichi2/anki/common/utils/ext/Config.kt b/anki-common/src/main/kotlin/com/ichi2/anki/common/utils/ext/Config.kt
index 032979053854..e4c3b90d9b0c 100644
--- a/anki-common/src/main/kotlin/com/ichi2/anki/common/utils/ext/Config.kt
+++ b/anki-common/src/main/kotlin/com/ichi2/anki/common/utils/ext/Config.kt
@@ -3,12 +3,15 @@
 package com.ichi2.anki.common.utils.ext
 
 import anki.config.ConfigKey
+import com.ichi2.anki.browser.search.SavedSearch
+import com.ichi2.anki.browser.search.toMap
 import com.ichi2.anki.common.utils.ConfigProperty
 import com.ichi2.anki.common.utils.configProperty
 import com.ichi2.anki.common.utils.ext.AddingDefaultsMode.DECIDE_BY_NOTE_TYPE
 import com.ichi2.anki.common.utils.ext.AddingDefaultsMode.USE_CURRENT_DECK
 import com.ichi2.anki.common.utils.jsonConfigProperty
 import com.ichi2.anki.common.utils.orDefault
+import com.ichi2.anki.libanki.BrowserConfig
 import com.ichi2.anki.libanki.Config
 import com.ichi2.anki.libanki.Consts
 import com.ichi2.anki.libanki.DeckId
@@ -91,3 +94,26 @@ var Config.flagLabels by ConfigProperty(
     read = { getObject("flagLabels", JSONObject()) },
     write = { set("flagLabels", it) },
 )
+
+/**
+ * Saved searches in the collection. Names are case-sensitive.
+ * Anki Desktop orders them by name, regardless of the order written here.
+ *
+ * @see SavedSearch
+ */
+var Config.savedFilters by jsonConfigProperty<Map<String, String>>("savedFilters").orDefault(emptyMap()).mapped(
+    decode = { values -> values.map { (name, query) -> SavedSearch(name, query) } },
+    encode = { values -> values.toMap() },
+)
+
+/** Column key used to sort the browser in cards mode. */
+var Config.browserSortCardsColumn by jsonConfigProperty<String>(BrowserConfig.CARDS_SORT_COLUMN_KEY).orDefault("noteFld")
+
+/** Column key used to sort the browser in notes mode. */
+var Config.browserSortNotesColumn by jsonConfigProperty<String>(BrowserConfig.NOTES_SORT_COLUMN_KEY).orDefault("noteFld")
+
+/** Whether the cards-mode browser sort is reversed. */
+var Config.browserSortCardsBackwards by jsonConfigProperty<Boolean>(BrowserConfig.CARDS_SORT_BACKWARDS_KEY).orDefault(false)
+
+/** Whether the notes-mode browser sort is reversed. */
+var Config.browserSortNotesBackwards by jsonConfigProperty<Boolean>(BrowserConfig.NOTES_SORT_BACKWARDS_KEY).orDefault(false)
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CreateDeckDialog.kt b/anki-common/src/main/kotlin/com/ichi2/anki/dialogs/CreateDeckDialog.kt
similarity index 98%
rename from AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CreateDeckDialog.kt
rename to anki-common/src/main/kotlin/com/ichi2/anki/dialogs/CreateDeckDialog.kt
index bbb73b98f2d4..2eeaf182e501 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CreateDeckDialog.kt
+++ b/anki-common/src/main/kotlin/com/ichi2/anki/dialogs/CreateDeckDialog.kt
@@ -13,7 +13,6 @@ import com.google.android.material.snackbar.Snackbar
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.CollectionManager.TR
 import com.ichi2.anki.CommonString
-import com.ichi2.anki.R
 import com.ichi2.anki.common.utils.android.showThemedToast
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.libanki.Decks
@@ -27,6 +26,7 @@ import com.ichi2.utils.show
 import net.ankiweb.rsdroid.exceptions.BackendDeckIsFilteredException
 import net.ankiweb.rsdroid.exceptions.BackendNotFoundException
 import timber.log.Timber
+import com.ichi2.anki.common.android.R as CommonR
 
 /**
  * A dialog which manages the creation of decks, subdecks and filtered decks.
@@ -97,7 +97,7 @@ class CreateDeckDialog(
                         onPositiveButtonClicked()
                     }
                     negativeButton(CommonString.dialog_cancel)
-                    setView(R.layout.dialog_generic_text_input)
+                    setView(CommonR.layout.dialog_generic_text_input)
                 }.input(
                     hint = textInputHint,
                     prefill = initialDeckName,
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DiscardChangesDialog.kt b/anki-common/src/main/kotlin/com/ichi2/anki/dialogs/DiscardChangesDialog.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DiscardChangesDialog.kt
rename to anki-common/src/main/kotlin/com/ichi2/anki/dialogs/DiscardChangesDialog.kt
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/startup/StartupGuards.kt b/anki-common/src/main/kotlin/com/ichi2/anki/startup/StartupGuards.kt
similarity index 88%
rename from AnkiDroid/src/main/java/com/ichi2/anki/startup/StartupGuards.kt
rename to anki-common/src/main/kotlin/com/ichi2/anki/startup/StartupGuards.kt
index cf8b2c0f5b4c..357175e1afe5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/startup/StartupGuards.kt
+++ b/anki-common/src/main/kotlin/com/ichi2/anki/startup/StartupGuards.kt
@@ -4,10 +4,13 @@ package com.ichi2.anki.startup
 
 import android.app.Activity
 import android.content.Intent
-import com.ichi2.anki.IntentHandler
+import com.ichi2.anki.common.destinations.DeferredNavigation
+import com.ichi2.anki.common.destinations.LauncherDestination
+import com.ichi2.anki.common.destinations.toIntent
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.common.storage.CollectionHelper
 import com.ichi2.anki.common.storage.StorageDecision
+import com.ichi2.anki.common.storage.grantedStoragePermissions
 import com.ichi2.anki.exception.SystemStorageException
 import timber.log.Timber
 
@@ -63,7 +66,7 @@ private fun Activity.ensureStorageIsConfigured(): Boolean {
  * @throws SystemStorageException if `getExternalFilesDir` returns null
  */
 private fun Activity.ensureStoragePermissions(): Boolean {
-    if (IntentHandler.grantedStoragePermissions(this, showToast = true)) {
+    if (grantedStoragePermissions(this, showToast = true)) {
         return true
     }
     Timber.w("finishing activity. No storage permission")
@@ -80,8 +83,7 @@ private fun Activity.ensureStoragePermissions(): Boolean {
 fun Activity.redirectToMainEntryPoint() {
     Timber.i("redirecting to app start")
     startActivity(
-        Intent(this, IntentHandler::class.java).apply {
-            action = Intent.ACTION_MAIN
+        with(DeferredNavigation) { LauncherDestination.toIntent() }.apply {
             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
         },
     )
diff --git a/anki-common/src/main/kotlin/com/ichi2/anki/sync/FullSync.kt b/anki-common/src/main/kotlin/com/ichi2/anki/sync/FullSync.kt
new file mode 100644
index 000000000000..9baa2e7138a1
--- /dev/null
+++ b/anki-common/src/main/kotlin/com/ichi2/anki/sync/FullSync.kt
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.sync
+
+import com.ichi2.anki.libanki.Collection
+
+/**
+ * Whether a successful full collection sync should start a media sync (executed in the backend).
+ *
+ * Upstream [documents](https://github.com/ankitects/anki/blob/2727cf39b24869e9d379049c9aa141caaf66c49c/proto/anki/sync.proto#L85-L90)
+ * that omitting `server_usn` skips media sync. When supplied, the backend
+ * [starts media sync after a successful full sync](https://github.com/ankitects/anki/blob/2727cf39b24869e9d379049c9aa141caaf66c49c/rslib/src/backend/sync.rs#L452-L454).
+ */
+sealed interface MediaSync {
+    /**
+     * Leave media startup to the caller.
+     *
+     * Useful for separately enforcing network constraints.
+     */
+    data object Skip : MediaSync
+
+    /** Start media immediately, using the server media USN returned by the initial collection sync. */
+    data class Start(
+        val serverUsn: Int,
+    ) : MediaSync
+}
+
+/** Transfer the full collection to/from the server */
+fun Collection.fullUploadOrDownload(
+    auth: SyncAuth,
+    upload: Boolean,
+    mediaSync: MediaSync,
+) = fullUploadOrDownload(
+    auth = auth.toProto(),
+    upload = upload,
+    // The backend uses `usn != null` to start a media sync.
+    // Make this distinction explicit, so a media sync is an explicit action.
+    serverUsn =
+        when (mediaSync) {
+            MediaSync.Skip -> null
+            is MediaSync.Start -> mediaSync.serverUsn
+        },
+)
diff --git a/anki-common/src/main/kotlin/com/ichi2/anki/sync/SyncAuth.kt b/anki-common/src/main/kotlin/com/ichi2/anki/sync/SyncAuth.kt
index 494f79b6db01..1e93ca4385b5 100644
--- a/anki-common/src/main/kotlin/com/ichi2/anki/sync/SyncAuth.kt
+++ b/anki-common/src/main/kotlin/com/ichi2/anki/sync/SyncAuth.kt
@@ -35,9 +35,3 @@ fun Collection.syncCollection(
     auth: SyncAuth,
     syncMedia: Boolean,
 ): SyncCollectionResponse = syncCollection(auth.toProto(), syncMedia)
-
-fun Collection.fullUploadOrDownload(
-    auth: SyncAuth,
-    serverUsn: Int?,
-    upload: Boolean,
-) = fullUploadOrDownload(auth.toProto(), serverUsn, upload)
diff --git a/AnkiDroid/src/main/java/com/ichi2/ui/AccessibleSearchView.kt b/anki-common/src/main/kotlin/com/ichi2/ui/AccessibleSearchView.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/ui/AccessibleSearchView.kt
rename to anki-common/src/main/kotlin/com/ichi2/ui/AccessibleSearchView.kt
diff --git a/anki-common/src/test/kotlin/com/ichi2/anki/backend/BackendLocalesTest.kt b/anki-common/src/test/kotlin/com/ichi2/anki/backend/BackendLocalesTest.kt
new file mode 100644
index 000000000000..f0bbb688d173
--- /dev/null
+++ b/anki-common/src/test/kotlin/com/ichi2/anki/backend/BackendLocalesTest.kt
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.backend
+
+import net.ankiweb.rsdroid.Backend
+import net.ankiweb.rsdroid.testing.RustBackendLoader
+import org.junit.Before
+import org.junit.Test
+import kotlin.test.assertEquals
+
+class BackendLocalesTest {
+    @Before
+    fun setUp() {
+        RustBackendLoader.ensureSetup()
+    }
+
+    @Test
+    fun `returns all active locales in preference order and the primary locale`() {
+        Backend(langs = listOf("pl", "fr")).use { backend ->
+            val locales = backend.getLocales()
+            assertEquals(listOf("pl", "fr", "en-US"), locales.all)
+            assertEquals("pl", locales.primary)
+        }
+    }
+
+    @Test
+    fun `skips unsupported preferred languages`() {
+        Backend(langs = listOf("zz", "fr")).use { backend ->
+            val locales = backend.getLocales()
+            assertEquals(listOf("fr", "en-US"), locales.all)
+            assertEquals("fr", locales.primary)
+        }
+    }
+
+    @Test
+    fun `falls back to English when no preferred language is available`() {
+        for (languages in listOf(emptyList(), listOf("zz"), listOf("invalid_locale"))) {
+            Backend(langs = languages).use { backend ->
+                val locales = backend.getLocales()
+                assertEquals(listOf("en-US"), locales.all, "Requested languages: $languages")
+                assertEquals("en-US", locales.primary, "Requested languages: $languages")
+            }
+        }
+    }
+}
diff --git a/anki-common/src/test/kotlin/com/ichi2/anki/common/utils/ext/ConfigTest.kt b/anki-common/src/test/kotlin/com/ichi2/anki/common/utils/ext/ConfigTest.kt
index c8dd8ac86873..530fcf5f4716 100644
--- a/anki-common/src/test/kotlin/com/ichi2/anki/common/utils/ext/ConfigTest.kt
+++ b/anki-common/src/test/kotlin/com/ichi2/anki/common/utils/ext/ConfigTest.kt
@@ -2,6 +2,7 @@
 
 package com.ichi2.anki.common.utils.ext
 
+import com.ichi2.anki.browser.search.SavedSearch
 import com.ichi2.anki.libanki.testutils.InMemoryAnkiTest
 import com.ichi2.anki.model.CardsOrNotes
 import org.json.JSONObject
@@ -25,6 +26,10 @@ class ConfigTest : InMemoryAnkiTest() {
                 "rollover",
                 "estTimes",
                 "dueCounts",
+                "sortType",
+                "noteSortType",
+                "sortBackwards",
+                "browserNoteSortBackwards",
             )
 
         fun assertDefaults() {
@@ -33,6 +38,10 @@ class ConfigTest : InMemoryAnkiTest() {
             assertEquals(4, col.config.rolloverHour)
             assertTrue(col.config.showIntervalsOnButtons)
             assertTrue(col.config.showRemainingDueCounts)
+            assertEquals("noteFld", col.config.browserSortCardsColumn)
+            assertEquals("noteFld", col.config.browserSortNotesColumn)
+            assertFalse(col.config.browserSortCardsBackwards)
+            assertFalse(col.config.browserSortNotesBackwards)
         }
 
         keys.forEach { col.config.remove(it) }
@@ -88,6 +97,19 @@ class ConfigTest : InMemoryAnkiTest() {
         assertEquals(0, col.config.flagLabels.length())
     }
 
+    @Test
+    fun `saved searches preserve the backend map format and recover from invalid values`() {
+        col.config.savedFilters = listOf(SavedSearch("A", "deck:Default"), SavedSearch("a", "is:new"))
+        assertEquals(mapOf("A" to "deck:Default", "a" to "is:new"), col.config.get<Map<String, String>>("savedFilters"))
+
+        col.config.set("savedFilters", mapOf("external" to "is:due"))
+        assertEquals(listOf(SavedSearch("external", "is:due")), col.config.savedFilters)
+        col.config.set("savedFilters", listOf("invalid"))
+        assertEquals(emptyList(), col.config.savedFilters)
+        col.config.remove("savedFilters")
+        assertEquals(emptyList(), col.config.savedFilters)
+    }
+
     @Test
     fun `browser mode helpers use the mapped config property`() {
         CardsOrNotes.NOTES.saveToCollection(col)
diff --git a/anki-common/src/test/kotlin/com/ichi2/anki/sync/FullSyncTest.kt b/anki-common/src/test/kotlin/com/ichi2/anki/sync/FullSyncTest.kt
new file mode 100644
index 000000000000..f3b915451268
--- /dev/null
+++ b/anki-common/src/test/kotlin/com/ichi2/anki/sync/FullSyncTest.kt
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.sync
+
+import anki.sync.FullUploadOrDownloadRequest
+import anki.sync.syncAuth
+import com.ichi2.anki.libanki.testutils.InMemoryAnkiTest
+import net.ankiweb.rsdroid.Backend
+import net.ankiweb.rsdroid.BackendFactory
+import org.junit.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+class FullSyncTest : InMemoryAnkiTest() {
+    private lateinit var request: FullUploadOrDownloadRequest
+    private val auth =
+        SyncAuth(
+            syncAuth {
+                hkey = "test"
+                endpoint = "https://sync.example.com/"
+                ioTimeoutSecs = 123
+            },
+        )
+
+    override fun setUp() {
+        BackendFactory.setOverride {
+            object : Backend() {
+                override fun fullUploadOrDownload(input: FullUploadOrDownloadRequest) {
+                    request = input
+                }
+            }
+        }
+        super.setUp()
+    }
+
+    override fun tearDown() {
+        try {
+            super.tearDown()
+        } finally {
+            BackendFactory.setOverride(null)
+        }
+    }
+
+    @Test
+    fun `skipping media omits the backend startup trigger in both directions`() {
+        for (upload in listOf(false, true)) {
+            col.fullUploadOrDownload(auth, upload = upload, mediaSync = MediaSync.Skip)
+
+            assertFalse(request.hasServerUsn())
+            assertEquals(upload, request.upload)
+            assertEquals(auth.toProto(), request.auth)
+        }
+    }
+
+    @Test
+    fun `starting media preserves the server USN including zero in both directions`() {
+        for (upload in listOf(false, true)) {
+            for (serverUsn in listOf(0, 42)) {
+                col.fullUploadOrDownload(auth, upload = upload, mediaSync = MediaSync.Start(serverUsn))
+
+                assertTrue(request.hasServerUsn())
+                assertEquals(serverUsn, request.serverUsn)
+                assertEquals(upload, request.upload)
+                assertEquals(auth.toProto(), request.auth)
+            }
+        }
+    }
+}
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index cb704c294186..bce7628b28fa 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -21,21 +21,11 @@ configure<LibraryExtension> {
             libs.versions.apiMinSdk
                 .get()
                 .toInt()
-        buildConfigField(
-            "String",
-            "READ_WRITE_PERMISSION",
-            "\"com.ichi2.anki.permission.READ_WRITE_DATABASE\"",
-        )
-        buildConfigField("String", "AUTHORITY", "\"com.ichi2.anki.flashcards\"")
+        buildConfigField("String", "ANKI_PACKAGE_NAME", "\"com.ichi2.anki\"")
     }
     buildTypes {
         debug {
-            buildConfigField(
-                "String",
-                "READ_WRITE_PERMISSION",
-                "\"com.ichi2.anki.debug.permission.READ_WRITE_DATABASE\"",
-            )
-            buildConfigField("String", "AUTHORITY", "\"com.ichi2.anki.debug.flashcards\"")
+            buildConfigField("String", "ANKI_PACKAGE_NAME", "\"com.ichi2.anki.debug\"")
         }
         release {
             isMinifyEnabled = false
diff --git a/api/src/main/java/com/ichi2/anki/FlashCardsContract.kt b/api/src/main/java/com/ichi2/anki/FlashCardsContract.kt
index 287f32182841..30d15025acce 100644
--- a/api/src/main/java/com/ichi2/anki/FlashCardsContract.kt
+++ b/api/src/main/java/com/ichi2/anki/FlashCardsContract.kt
@@ -96,14 +96,28 @@ import com.ichi2.anki.api.Ease
  * operations on this provider throw [IllegalStateException].
  */
 public object FlashCardsContract {
-    public const val AUTHORITY: String = BuildConfig.AUTHORITY
-    public const val READ_WRITE_PERMISSION: String = BuildConfig.READ_WRITE_PERMISSION
+    /** For when dealing with parallel builds (.A, .B, etc.) */
+    public fun getAuthority(ankiPackageName: String = BuildConfig.ANKI_PACKAGE_NAME): String = "$ankiPackageName.flashcards"
+
+    public fun getPermission(ankiPackageName: String = BuildConfig.ANKI_PACKAGE_NAME): String =
+        "$ankiPackageName.permission.READ_WRITE_DATABASE"
+
+    public fun getAuthorityUri(authority: String = getAuthority()): Uri = Uri.parse("content://$authority")
+
+    /**
+     *  This assumes the default release/debug build package name. Use [getAuthority] and [getPermission] when working with parallel builds
+     */
+    public const val AUTHORITY: String = "${BuildConfig.ANKI_PACKAGE_NAME}.flashcards"
+    public const val READ_WRITE_PERMISSION: String = "${BuildConfig.ANKI_PACKAGE_NAME}.permission.READ_WRITE_DATABASE"
 
     /**
      * A content:// style uri to the authority for the flash card provider
+     *
+     * This uri assumes the default release-build package name.
+     * Use [getAuthorityUri] and [getPermission] for parallel builds (.A, .B, etc.)
      */
     @JvmField // required for Java API
-    public val AUTHORITY_URI: Uri = Uri.parse("content://$AUTHORITY")
+    public val AUTHORITY_URI: Uri = getAuthorityUri()
 
     /**
      * The Notes can be accessed by
@@ -200,6 +214,8 @@ public object FlashCardsContract {
      * ```
      */
     public object Note {
+        public const val CONTENT_URI_SEGMENT: String = "notes"
+
         /**
          * The content:// style URI for notes. If the it is appended by the note's ID, this
          * note can be directly accessed, e.g.
@@ -221,14 +237,20 @@ public object FlashCardsContract {
          * For examples on how to use the URI for queries see class description.
          */
         @JvmField // required for Java API
-        public val CONTENT_URI: Uri = Uri.withAppendedPath(AUTHORITY_URI, "notes")
+        public val CONTENT_URI: Uri = Uri.withAppendedPath(AUTHORITY_URI, CONTENT_URI_SEGMENT)
+
+        public fun getContentUri(authority: Uri): Uri = Uri.withAppendedPath(authority, CONTENT_URI_SEGMENT)
+
+        public const val CONTENT_URI_V2_SEGMENT: String = "notes_v2"
 
         /**
          * The content:// style URI for notes, but with a direct SQL query to the notes table instead of accepting
          * a query in the libanki browser search syntax like the main URI #CONTENT_URI does.
          */
         @JvmField // required for Java API
-        public val CONTENT_URI_V2: Uri = Uri.withAppendedPath(AUTHORITY_URI, "notes_v2")
+        public val CONTENT_URI_V2: Uri = Uri.withAppendedPath(AUTHORITY_URI, CONTENT_URI_V2_SEGMENT)
+
+        public fun getContentUriV2(authority: Uri): Uri = Uri.withAppendedPath(authority, CONTENT_URI_V2_SEGMENT)
 
         /**
          * This is the ID of the note. It is the same as the note ID in Anki. This ID can be
@@ -370,12 +392,17 @@ public object FlashCardsContract {
      * ```
      */
     public object Model {
+        public const val CONTENT_URI_SEGMENT: String = "models"
+
         /**
          * The content:// style URI for note type. If the it is appended by the note type's ID, this
          * note can be directly accessed. See class description above for further details.
          */
         @JvmField // required for Java API
-        public val CONTENT_URI: Uri = Uri.withAppendedPath(AUTHORITY_URI, "models")
+        public val CONTENT_URI: Uri = Uri.withAppendedPath(AUTHORITY_URI, CONTENT_URI_SEGMENT)
+
+        public fun getContentUri(authority: Uri): Uri = Uri.withAppendedPath(authority, CONTENT_URI_SEGMENT)
+
         public const val CURRENT_MODEL_ID: String = "current"
 
         /**
@@ -608,6 +635,8 @@ public object FlashCardsContract {
      * ```
      */
     public object Card {
+        public const val CONTENT_URI_SEGMENT: String = "cards"
+
         /**
          * The ID of the card in the Anki database.
          */
@@ -943,7 +972,9 @@ public object FlashCardsContract {
          * for all other requested columns. Rows already loaded may still contain the earlier values.
          */
         @JvmField // required for Java API
-        public val CONTENT_URI: Uri = Uri.withAppendedPath(AUTHORITY_URI, "cards")
+        public val CONTENT_URI: Uri = Uri.withAppendedPath(AUTHORITY_URI, CONTENT_URI_SEGMENT)
+
+        public fun getContentUri(authority: Uri): Uri = Uri.withAppendedPath(authority, CONTENT_URI_SEGMENT)
 
         /**
          * Default columns returned by queries.
@@ -1086,8 +1117,12 @@ public object FlashCardsContract {
      * ```
      */
     public object ReviewInfo {
+        public const val CONTENT_URI_SEGMENT: String = "schedule"
+
         @JvmField // required for Java API
-        public val CONTENT_URI: Uri = Uri.withAppendedPath(AUTHORITY_URI, "schedule")
+        public val CONTENT_URI: Uri = Uri.withAppendedPath(AUTHORITY_URI, CONTENT_URI_SEGMENT)
+
+        public fun getContentUri(authority: Uri): Uri = Uri.withAppendedPath(authority, CONTENT_URI_SEGMENT)
 
         /**
          * This is the ID of the note that this card belongs to (i.e. [Note._ID]).
@@ -1254,11 +1289,19 @@ public object FlashCardsContract {
      * ```
      */
     public object Deck {
+        public const val CONTENT_ALL_URI_SEGMENT: String = "decks"
+
         @JvmField // required for Java API
-        public val CONTENT_ALL_URI: Uri = Uri.withAppendedPath(AUTHORITY_URI, "decks")
+        public val CONTENT_ALL_URI: Uri = Uri.withAppendedPath(AUTHORITY_URI, CONTENT_ALL_URI_SEGMENT)
+
+        public fun getContentAllUri(authority: Uri): Uri = Uri.withAppendedPath(authority, CONTENT_ALL_URI_SEGMENT)
+
+        public const val CONTENT_SELECTED_URI_SEGMENT: String = "selected_deck"
 
         @JvmField // required for Java API
-        public val CONTENT_SELECTED_URI: Uri = Uri.withAppendedPath(AUTHORITY_URI, "selected_deck")
+        public val CONTENT_SELECTED_URI: Uri = Uri.withAppendedPath(AUTHORITY_URI, CONTENT_SELECTED_URI_SEGMENT)
+
+        public fun getContentSelectedUri(authority: Uri): Uri = Uri.withAppendedPath(authority, CONTENT_SELECTED_URI_SEGMENT)
 
         /**
          * The name of the Deck
@@ -1333,11 +1376,15 @@ public object FlashCardsContract {
      * ```
      */
     public object AnkiMedia {
+        public const val CONTENT_URI_SEGMENT: String = "media"
+
         /**
          * Content Uri for the MEDIA row of the CardContentProvider
          */
         @JvmField // required for Java API
-        public val CONTENT_URI: Uri = Uri.withAppendedPath(AUTHORITY_URI, "media")
+        public val CONTENT_URI: Uri = Uri.withAppendedPath(AUTHORITY_URI, CONTENT_URI_SEGMENT)
+
+        public fun getContentUri(authority: Uri): Uri = Uri.withAppendedPath(authority, CONTENT_URI_SEGMENT)
 
         /**
          * Uri.toString() which points to the media file that is to be inserted.
diff --git a/api/src/test/java/com/ichi2/anki/api/ApiConstantsJavaTest.java b/api/src/test/java/com/ichi2/anki/api/ApiConstantsJavaTest.java
new file mode 100644
index 000000000000..567fe9bb3fd9
--- /dev/null
+++ b/api/src/test/java/com/ichi2/anki/api/ApiConstantsJavaTest.java
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+package com.ichi2.anki.api;
+
+import static org.junit.Assert.assertEquals;
+
+import com.ichi2.anki.FlashCardsContract;
+import org.junit.Test;
+
+/** Verifies the fields used by existing Java API clients remain accessible. */
+public class ApiConstantsJavaTest {
+    @Test
+    public void exposesLegacyConstants() {
+        String ankiPackageName = BuildConfig.DEBUG ? "com.ichi2.anki.debug" : "com.ichi2.anki";
+        assertEquals(ankiPackageName + ".flashcards", FlashCardsContract.AUTHORITY);
+        assertEquals(
+                ankiPackageName + ".permission.READ_WRITE_DATABASE",
+                FlashCardsContract.READ_WRITE_PERMISSION);
+        assertEquals(FlashCardsContract.READ_WRITE_PERMISSION, AddContentApi.READ_WRITE_PERMISSION);
+    }
+}
diff --git a/api/src/test/java/com/ichi2/anki/api/FlashCardsContractTest.kt b/api/src/test/java/com/ichi2/anki/api/FlashCardsContractTest.kt
new file mode 100644
index 000000000000..d79700080456
--- /dev/null
+++ b/api/src/test/java/com/ichi2/anki/api/FlashCardsContractTest.kt
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+package com.ichi2.anki.api
+
+import android.net.Uri
+import com.ichi2.anki.FlashCardsContract
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import kotlin.test.assertEquals
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [35])
+internal class FlashCardsContractTest {
+    @Test
+    fun cardUriUsesSuppliedAuthority() {
+        val authority = Uri.parse("content://com.ichi2.anki.a.flashcards")
+
+        assertEquals(
+            "content://com.ichi2.anki.a.flashcards/cards",
+            FlashCardsContract.Card.getContentUri(authority).toString(),
+        )
+    }
+
+    @Test
+    fun defaultCardUriRemainsUnchanged() {
+        val packageName = if (BuildConfig.DEBUG) "com.ichi2.anki.debug" else "com.ichi2.anki"
+
+        assertEquals("content://$packageName.flashcards/cards", FlashCardsContract.Card.CONTENT_URI.toString())
+    }
+}
diff --git a/baselineprofile/src/main/kotlin/com/ichi2/anki/baselineprofile/BaselineProfileGenerator.kt b/baselineprofile/src/main/kotlin/com/ichi2/anki/baselineprofile/BaselineProfileGenerator.kt
index c978a92ae743..330ee4ce564d 100644
--- a/baselineprofile/src/main/kotlin/com/ichi2/anki/baselineprofile/BaselineProfileGenerator.kt
+++ b/baselineprofile/src/main/kotlin/com/ichi2/anki/baselineprofile/BaselineProfileGenerator.kt
@@ -9,9 +9,13 @@ import androidx.test.filters.LargeTest
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.Until
+import androidx.test.uiautomator.uiAutomator
+import org.junit.Assert.assertTrue
+import org.junit.FixMethodOrder
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.junit.runners.MethodSorters
 
 /**
  * Generates a baseline profile that captures the critical user journey for AnkiDroid's
@@ -30,6 +34,10 @@ import org.junit.runner.RunWith
  * (resource id `get_started`) if it is present, so the profile captures the
  * full path to DeckPicker regardless of device state.
  *
+ * That first launch only goes into the baseline profile. [launchWithDecks] runs
+ * after it, adds two decks and records launches that wait for a deck row, which
+ * feed both profiles.
+ *
  * Run on a connected API 28+ physical device with:
  * ```
  * ./gradlew :AnkiDroid:generateBaselineProfile
@@ -41,16 +49,17 @@ import org.junit.runner.RunWith
  */
 @LargeTest
 @RunWith(AndroidJUnit4::class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 class BaselineProfileGenerator {
     @get:Rule
     val rule = BaselineProfileRule()
 
-    @Test
-    fun generate() {
-        val targetPackage =
-            InstrumentationRegistry.getArguments().getString("targetAppId")
-                ?: throw IllegalStateException("targetAppId not passed as instrumentation runner arg")
+    private val targetPackage =
+        InstrumentationRegistry.getArguments().getString("targetAppId")
+            ?: throw IllegalStateException("targetAppId not passed as instrumentation runner arg")
 
+    @Test
+    fun firstLaunch() {
         rule.collect(packageName = targetPackage) {
             pressHome()
             // Launches IntentHandler (MAIN/LAUNCHER), which routes to DeckPicker.
@@ -66,4 +75,39 @@ class BaselineProfileGenerator {
             device.waitForIdle()
         }
     }
+
+    @Test
+    fun launchWithDecks() {
+        createDecksIfEmpty()
+
+        rule.collect(packageName = targetPackage, includeInStartupProfile = true) {
+            pressHome()
+            startActivityAndWait()
+            assertTrue(
+                "Deck list did not render within 5 seconds; refusing to capture an incomplete startup profile",
+                device.wait(Until.hasObject(By.res(targetPackage, "deck_name")), 5_000),
+            )
+            device.waitForIdle()
+        }
+    }
+
+    private fun createDecksIfEmpty() =
+        uiAutomator {
+            fun id(name: String) = "$targetPackage:id/$name"
+
+            startApp(targetPackage)
+            val firstScreen = onElement { viewIdResourceName in setOf(id("get_started"), id("fab_main")) }
+            if (firstScreen.resourceName == id("get_started")) firstScreen.click()
+
+            val deckList = onElement { viewIdResourceName in setOf(id("deck_name"), id("no_decks_placeholder")) }
+            if (deckList.resourceName == id("deck_name")) return@uiAutomator
+
+            for (name in listOf("Japanese::Vocabulary", "Spanish")) {
+                onElement { viewIdResourceName == id("fab_main") }.click()
+                onElement { viewIdResourceName == id("add_deck_button") }.click()
+                onElement { viewIdResourceName == id("dialog_text_input") }.text = name
+                onElement { viewIdResourceName == "android:id/button1" && isEnabled }.click()
+            }
+            onElement { viewIdResourceName == id("deck_name") }
+        }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index ff850664a8d4..208ebd997a03 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,9 +1,12 @@
 
 import com.android.build.api.dsl.CommonExtension
 import com.android.build.api.extension.impl.AndroidComponentsExtensionImpl
+import com.ichi2.anki.gradle.BackendTempLibraryService
 import com.ichi2.anki.gradle.GitHubActionsTestListener
 import com.ichi2.anki.gradle.TestSummaryService
 import com.ichi2.anki.gradle.configureRobolectricJvm
+import com.ichi2.anki.gradle.registerJacocoLibraryVariants
+import com.ichi2.anki.gradle.reportBackendTempLibraries
 import com.slack.keeper.optInToKeeper
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.buildconfiguration.tasks.UpdateDaemonJvm
@@ -30,12 +33,14 @@ plugins {
     alias(libs.plugins.androidx.baselineprofile) apply false
     // Serialization is a separate artifact, not pinned transitively by AGP.
     alias(libs.plugins.kotlin.serialization) apply false
-    // Compose Compiler plugin (required since Kotlin 2.0); applied per-module that opts in.
-    alias(libs.plugins.kotlin.compose) apply false
+    // Pinned by buildSrc; applied by the Compose convention plugin.
+    id("org.jetbrains.kotlin.plugin.compose") apply false
     alias(libs.plugins.ktlint.gradle.plugin) apply false
     alias(libs.plugins.keeper) apply false
 }
 
+registerJacocoLibraryVariants()
+
 val localProperties = Properties()
 if (project.rootProject.file("local.properties").exists()) {
     localProperties.load(project.rootProject.file("local.properties").inputStream())
@@ -53,6 +58,15 @@ val testSummaryService = System.getenv("GITHUB_STEP_SUMMARY")?.let { path ->
     }
 }
 
+// The backend keeps native libraries in the test JVM's temp directory, outside Gradle clean.
+// Use -PbackendTempLibraryWarnBytes=0 to report even small amounts; the default is 1 GiB.
+val backendTempLibraryService =
+    gradle.sharedServices.registerIfAbsent("backendTempLibraryService", BackendTempLibraryService::class) {
+        parameters.warnAboveBytes.set(
+            providers.gradleProperty("backendTempLibraryWarnBytes").map { it.toLong() }.orElse(1024L * 1024 * 1024),
+        )
+    }
+
 /**
  * Per-fork JVM heap for unit tests.
  * See [Test.setMaxHeapSize]
@@ -96,6 +110,7 @@ subprojects {
                 it.minHeapSize = "1g"
 
                 it.configureRobolectricJvm()
+                it.reportBackendTempLibraries(backendTempLibraryService)
 
                 it.useJUnitPlatform()
                 it.testLogging {
diff --git a/buildSrc/README.md b/buildSrc/README.md
index 3023345db7e8..7a3684b16529 100644
--- a/buildSrc/README.md
+++ b/buildSrc/README.md
@@ -11,4 +11,15 @@ outside the `.gradle.kts` build scripts.
   * NOTE: The overhead for one-off scripts is not worthwhile
 * Extracting build logic to support the [Gradle Configuration Cache](https://docs.gradle.org/current/userguide/configuration_cache.html)
   * Closures inside `.kts` files can capture an implicit `this` reference, which is CC-incompatible.
-* Defining a convention plugin to reduce duplication in `.kts` files
\ No newline at end of file
+* Defining a convention plugin to reduce duplication in `.kts` files
+
+## Backend test libraries
+
+`rsdroid-testing` keeps native libraries in the test JVM's temporary directory for reuse
+across classloaders and test runs. After unit tests run, `BackendTempLibraryService`
+warns if those files total more than 1 GiB. Use `-PbackendTempLibraryWarnBytes=0` to
+show the report for any nonempty libraries. Cached and up-to-date test tasks do not report.
+
+The report lists the library files and their sizes. Stop tests in all checkouts and IDEs
+before manually removing them; leave the backend's `.lock` files in place. Subsequent
+tests extract any libraries they need again. Gradle `clean` does not remove these files.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 02e06c222126..48457b1153e7 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.jlleitschuh.gradle.ktlint.KtlintExtension
 
 plugins {
@@ -19,15 +20,23 @@ dependencies {
     implementation("com.android.tools.build:gradle:${libs.versions.androidGradlePlugin.get()}")
     // Force the catalog version of KGP, otherwise it's overridden by AGP.
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}")
+    implementation("org.jetbrains.kotlin:compose-compiler-gradle-plugin:${libs.versions.kotlin.get()}")
+    implementation("io.github.takahirom.roborazzi:roborazzi-gradle-plugin:${libs.versions.roborazzi.get()}")
     testImplementation(gradleTestKit())
+    testImplementation(libs.hamcrest)
     testImplementation(libs.junit.jupiter)
+    testImplementation("org.jacoco:org.jacoco.core:${libs.versions.jacoco.get()}")
     testRuntimeOnly(libs.junit.platform.launcher)
 }
 
 tasks.test {
     useJUnitPlatform()
+    // Show nested Gradle build failures from TestKit in CI logs.
+    testLogging.exceptionFormat = TestExceptionFormat.FULL
     // Rerun the path guard if the app build file is moved.
     inputs.files("../AnkiDroid/build.gradle.kts")
+    // The screenshot fixture uses the same Android SDK as the main build.
+    inputs.file("../gradle/libs.versions.toml")
 }
 
 configure<KtlintExtension> {
diff --git a/buildSrc/src/main/kotlin/ankidroid.android.compose.gradle.kts b/buildSrc/src/main/kotlin/ankidroid.android.compose.gradle.kts
new file mode 100644
index 000000000000..ca87c6cba625
--- /dev/null
+++ b/buildSrc/src/main/kotlin/ankidroid.android.compose.gradle.kts
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// Apply after the Android app or library plugin:
+// plugins {
+//     id("ankidroid.android.library") // or "ankidroid.android.app"
+//     id("ankidroid.android.compose")
+// }
+
+import com.android.build.api.dsl.CommonExtension
+import com.android.build.api.dsl.TestedExtension
+import com.android.build.api.variant.AndroidComponentsExtension
+import com.ichi2.anki.gradle.libsLibrary
+
+plugins {
+    id("org.jetbrains.kotlin.plugin.compose")
+}
+
+extensions.configure<CommonExtension> {
+    buildFeatures.compose = true
+}
+
+dependencies {
+    "implementation"(platform(libsLibrary("androidx-compose-bom")))
+    "implementation"(libsLibrary("androidx-compose-ui"))
+    "implementation"(libsLibrary("androidx-compose-ui-tooling-preview"))
+    "implementation"(libsLibrary("androidx-compose-material3"))
+    "debugImplementation"(libsLibrary("androidx-compose-ui-tooling"))
+    "testImplementation"(libsLibrary("androidx-compose-ui-test-junit4"))
+    // Needed for createComposeRule(), but not for createAndroidComposeRule<YourActivity>().
+    "debugImplementation"(libsLibrary("androidx-compose-ui-test-manifest"))
+}
+
+// The Compose compiler also runs on test fixtures without @Composable code.
+// Wait until the module has configured whether it enables test fixtures, and keep
+// the runtime compile-only so it is not shipped in the test fixtures output.
+extensions.getByType(AndroidComponentsExtension::class.java).finalizeDsl { androidDsl ->
+    if (androidDsl is TestedExtension && androidDsl.testFixtures.enable) {
+        dependencies {
+            "testFixturesCompileOnly"(platform(libsLibrary("androidx-compose-bom")))
+            "testFixturesCompileOnly"(libsLibrary("androidx-compose-runtime"))
+        }
+    }
+}
diff --git a/buildSrc/src/main/kotlin/ankidroid.jvm.library.gradle.kts b/buildSrc/src/main/kotlin/ankidroid.jvm.library.gradle.kts
index 1ae1fba591e5..729c21bc5896 100644
--- a/buildSrc/src/main/kotlin/ankidroid.jvm.library.gradle.kts
+++ b/buildSrc/src/main/kotlin/ankidroid.jvm.library.gradle.kts
@@ -28,6 +28,9 @@ if (path != ":lint-rules") {
         "lintChecks"(project(":lint-rules"))
     }
     configure<com.android.build.api.dsl.Lint> {
+        // Only relevant to lint implementations; :lint-rules is excluded above.
+        disable += "UElementAsPsi"
+
         // Workaround for internal lint rule: `CannotEnableHidden`
         // we want to enable this in `:AnkiDroid` with `checkDependencies = true`
 
diff --git a/buildSrc/src/main/kotlin/ankidroid.plugins.jacoco.gradle.kts b/buildSrc/src/main/kotlin/ankidroid.plugins.jacoco.gradle.kts
index 24bcd95e4978..313ce7a9be03 100644
--- a/buildSrc/src/main/kotlin/ankidroid.plugins.jacoco.gradle.kts
+++ b/buildSrc/src/main/kotlin/ankidroid.plugins.jacoco.gradle.kts
@@ -1,15 +1,11 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-import com.ichi2.anki.gradle.ReportOpener
-import groovy.util.Node
-import groovy.xml.XmlParser
-import org.gradle.api.GradleException
+import com.ichi2.anki.gradle.assertNonzeroAndroidTestCoverage
+import com.ichi2.anki.gradle.registerJacocoCoverageReports
 import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.api.tasks.testing.Test
 import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
 import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
-import org.gradle.testing.jacoco.tasks.JacocoReport
-import java.io.FileNotFoundException
 import java.util.Properties
 
 apply(plugin = "jacoco")
@@ -80,186 +76,12 @@ val fileFilter =
         "**/*\$Result\$*.*",
     )
 
-fun builtInKotlincClassDir(variant: String): String {
-    // AGP9 built-in Kotlin compiler writes classes to
-    // build/intermediates/built_in_kotlinc/<variant>/compile<Variant>Kotlin/classes
-    return "intermediates/built_in_kotlinc/$variant/compile${variant.replaceFirstChar { it.uppercase() }}Kotlin/classes"
-}
-
-val flavorClassDir = builtInKotlincClassDir("play${rootProject.androidTestVariantName}")
-val moduleClassDir = builtInKotlincClassDir(rootProject.androidTestVariantName.lowercase())
-
-// Narrow coverage roots: a fileTree over the whole build/ dir makes Gradle treat every
-// sibling task output under build/ as an undeclared input (e.g. lintFullDebug + this report).
-val unitTestCoverageDirs = listOf("outputs/unit_test_code_coverage", "jacoco")
-val androidTestCoverageDirs = listOf("outputs/code_coverage")
-
-fun Project.coverageFileTree(
-    relativeDirs: List<String>,
-    includes: List<String>,
-) = files(
-    relativeDirs.map { relativeDir ->
-        fileTree(
-            mapOf(
-                "dir" to layout.buildDirectory.dir(relativeDir),
-                "includes" to includes,
-            ),
-        )
-    },
+registerJacocoCoverageReports(
+    fileFilter,
+    openReportRequested,
+    linuxHtmlCmd,
 )
 
-// Our merge report task
-tasks.register<JacocoReport>("jacocoTestReport") {
-    val htmlOutDir =
-        project.layout.buildDirectory
-            .dir("reports/jacoco/$name/html")
-            .get()
-            .asFile
-    val openReport = openReportRequested
-    val htmlCmd = linuxHtmlCmd
-
-    doLast {
-        ReportOpener.open(htmlOutDir, openReport, htmlCmd)
-    }
-
-    reports {
-        xml.required = true
-        html.outputLocation = htmlOutDir
-    }
-
-    val kotlinClasses =
-        project.fileTree(
-            mapOf(
-                "dir" to project.layout.buildDirectory.dir(flavorClassDir),
-                "excludes" to fileFilter,
-            ),
-        )
-    val mainSrc = "${project.projectDir}/src/main/java"
-
-    sourceDirectories.setFrom(project.files(mainSrc))
-    classDirectories.setFrom(project.files(kotlinClasses))
-    executionData.setFrom(
-        project.coverageFileTree(unitTestCoverageDirs, listOf("**/*.exec")),
-        project.coverageFileTree(androidTestCoverageDirs, listOf("**/*.ec")),
-    )
-    dependsOn("testPlayDebugUnitTest")
-    dependsOn("connectedPlay${rootProject.androidTestVariantName}AndroidTest")
-}
-
-// Android library modules (do not yet support flavors play/full)
-val androidModulesToUnitTest = listOf(":api", ":common:android", ":libanki", ":compat")
-// JVM modules: use 'test' task and 'classes/kotlin/main' class dir
-val jvmModulesToUnitTest = listOf(":common")
-
-// A unit-test only report task
-tasks.register<JacocoReport>("jacocoUnitTestReport") {
-    val report = this
-    val htmlOutDir =
-        layout.buildDirectory
-            .dir("reports/jacoco/$name/html")
-            .get()
-            .asFile
-    val openReport = openReportRequested
-    val htmlCmd = linuxHtmlCmd
-
-    doLast {
-        ReportOpener.open(htmlOutDir, openReport, htmlCmd)
-    }
-
-    reports {
-        xml.required = true
-        html.outputLocation = htmlOutDir
-    }
-
-    includeUnitTestCoverage(report, getProject(), flavorClassDir)
-    dependsOn("testPlayDebugUnitTest")
-
-    for (module in androidModulesToUnitTest) {
-        includeUnitTestCoverage(report, project(module), moduleClassDir)
-        dependsOn("$module:testDebugUnitTest")
-    }
-
-    for (module in jvmModulesToUnitTest) {
-        includeUnitTestCoverage(report, project(module), "classes/kotlin/main")
-        dependsOn("$module:test")
-    }
-}
-
-gradle.projectsEvaluated {
-    // ensure test results aren't cached
-    tasks.configureEach {
-        if (name == "testPlayDebugUnitTest") {
-            outputs.upToDateWhen { false }
-            outputs.cacheIf { false }
-        }
-    }
-    for (module in androidModulesToUnitTest) {
-        project(module).tasks.findByName("testDebugUnitTest")?.let { task ->
-            task.outputs.upToDateWhen { false }
-            task.outputs.cacheIf { false }
-        }
-    }
-    for (module in jvmModulesToUnitTest) {
-        project(module).tasks.findByName("test")?.let { task ->
-            task.outputs.upToDateWhen { false }
-            task.outputs.cacheIf { false }
-        }
-    }
-}
-
-fun includeUnitTestCoverage(
-    report: JacocoReport,
-    project: Project,
-    classDir: String,
-) {
-    report.sourceDirectories.from(project.files("src/main/java"))
-    report.classDirectories.from(
-        project.files(
-            project.fileTree(
-                mapOf(
-                    "dir" to project.layout.buildDirectory.dir(classDir),
-                    "excludes" to fileFilter,
-                ),
-            ),
-        ),
-    )
-    report.executionData.from(project.coverageFileTree(unitTestCoverageDirs, listOf("**/*.exec")))
-}
-
-// A connected android tests only report task
-tasks.register<JacocoReport>("jacocoAndroidTestReport") {
-    val htmlOutDir =
-        layout.buildDirectory
-            .dir("reports/jacoco/$name/html")
-            .get()
-            .asFile
-    val openReport = openReportRequested
-    val htmlCmd = linuxHtmlCmd
-
-    doLast {
-        ReportOpener.open(htmlOutDir, openReport, htmlCmd)
-    }
-
-    reports {
-        xml.required = true
-        html.outputLocation = htmlOutDir
-    }
-
-    val kotlinClasses =
-        project.fileTree(
-            mapOf(
-                "dir" to project.layout.buildDirectory.dir(flavorClassDir),
-                "excludes" to fileFilter,
-            ),
-        )
-    val mainSrc = "${project.projectDir}/src/main/java"
-
-    sourceDirectories.setFrom(project.files(mainSrc))
-    classDirectories.setFrom(project.files(kotlinClasses))
-    executionData.setFrom(project.coverageFileTree(androidTestCoverageDirs, listOf("**/*.ec")))
-    dependsOn("connectedPlay${rootProject.androidTestVariantName}AndroidTest")
-}
-
 // Issue 16640 - some emulators run, but register zero coverage
 tasks.register("assertNonzeroAndroidTestCoverage") {
     // Resolve the file at configuration time, which is Gradle Configuration Cache compatible
@@ -267,37 +89,7 @@ tasks.register("assertNonzeroAndroidTestCoverage") {
     doLast {
         val jacocoReport = jacocoReportFile.get().asFile
 
-        if (!jacocoReport.exists()) {
-            throw FileNotFoundException("jacocoAndroidTestReport.xml was not found after running jacocoAndroidTestReport")
-        }
-
-        val xmlParser = XmlParser()
-        xmlParser.setFeature("http://apache.org/xml/features/disallow-doctype-decl", false)
-        xmlParser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
-
-        val reportRoot: Node = xmlParser.parse(jacocoReport)
-        var hasCovered = false
-
-        // https://github.com/jacoco/jacoco/blob/5aabb2eb60bbcd05df968005f1746ba19dcd5361/org.jacoco.report/src/org/jacoco/report/internal/xml/ReportElement.java#L190
-        for (rawChild in reportRoot.children()) {
-            val child = rawChild as Node
-            if (child.name() != "counter") continue
-
-            if (child.attribute("covered") == "0") {
-                logger.warn(
-                    "jacoco registered zero code coverage for counter type ${child.attribute("type")}",
-                    null as Throwable?,
-                )
-            } else {
-                hasCovered = true
-            }
-        }
-
-        if (!hasCovered) {
-            throw GradleException(
-                "androidTest registered zero code coverage in jacocoAndroidTestReport.xml. Probably some incompatibilities in the toolchain.",
-            )
-        }
+        assertNonzeroAndroidTestCoverage(jacocoReport, logger)
     }
 }
 
@@ -306,5 +98,3 @@ afterEvaluate {
         finalizedBy("assertNonzeroAndroidTestCoverage")
     }
 }
-
-val Project.androidTestVariantName: String get() = extra["androidTestVariantName"] as String
diff --git a/buildSrc/src/main/kotlin/ankidroid.plugins.screenshots.gradle.kts b/buildSrc/src/main/kotlin/ankidroid.plugins.screenshots.gradle.kts
new file mode 100644
index 000000000000..ca5a90687d3d
--- /dev/null
+++ b/buildSrc/src/main/kotlin/ankidroid.plugins.screenshots.gradle.kts
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// Apply after the Android app/library plugin. Gradle runs these aliases in every
+// participating module: ./gradlew compareScreenshots -Pscreenshot
+plugins {
+    id("io.github.takahirom.roborazzi")
+}
+
+val screenshotRun = providers.gradleProperty("screenshot").isPresent
+val variant = if (plugins.hasPlugin("com.android.application")) "PlayDebug" else "Debug"
+
+tasks.register("compileScreenshotTests") {
+    group = "verification"
+    description = "Compiles $variant screenshot tests without running them."
+    dependsOn("compile${variant}UnitTestSources")
+}
+
+listOf("record", "compare", "verify").forEach { mode ->
+    tasks.register("${mode}Screenshots") {
+        group = "verification"
+        description = "Runs Roborazzi $mode for $variant (requires -Pscreenshot)."
+        if (screenshotRun) {
+            dependsOn("${mode}Roborazzi$variant")
+        } else {
+            doLast { throw GradleException("Screenshot tasks require -Pscreenshot") }
+        }
+    }
+}
+
+val cleanScreenshotDiffs =
+    tasks.register<Delete>("cleanScreenshotDiffs") {
+        // Keep baselines, including when running a filtered subset of tests.
+        // Match generated filenames: a directory named `diffs` may contain baselines.
+        // Clear cached copies too, so Roborazzi cannot restore obsolete comparisons.
+        listOf("outputs/roborazzi", "intermediates/roborazzi").forEach { directory ->
+            delete(
+                fileTree(layout.buildDirectory.dir(directory)) {
+                    include("**/*_compare.png", "**/*_actual.png")
+                },
+            )
+        }
+    }
+
+val collectScreenshotDiffs =
+    tasks.register<Sync>("collectScreenshotDiffs") {
+        // Roborazzi declares this directory as a test output, including cached runs.
+        from(layout.buildDirectory.dir("intermediates/roborazzi")) {
+            include("**/*_compare.png")
+        }
+        into(layout.buildDirectory.dir("reports/screenshot-diffs"))
+        includeEmptyDirs = false
+        mustRunAfter("finalizeTestRoborazzi$variant")
+    }
+
+tasks.withType<Test>().configureEach {
+    useJUnitPlatform {
+        if (screenshotRun) {
+            includeTags("com.ichi2.anki.ScreenshotTestCategory")
+        } else {
+            excludeTags("com.ichi2.anki.ScreenshotTestCategory")
+        }
+    }
+    if (screenshotRun && name == "test${variant}UnitTest") {
+        dependsOn(cleanScreenshotDiffs)
+        // Keep comparisons available even when verification fails.
+        finalizedBy(collectScreenshotDiffs)
+    }
+}
diff --git a/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/AndroidCoverageInputs.kt b/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/AndroidCoverageInputs.kt
new file mode 100644
index 000000000000..7ab28269d236
--- /dev/null
+++ b/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/AndroidCoverageInputs.kt
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.gradle
+
+import org.gradle.api.file.ArchiveOperations
+import org.gradle.api.file.Directory
+import org.gradle.api.file.RegularFile
+import org.gradle.api.model.ObjectFactory
+import javax.inject.Inject
+
+/**
+ * Provides the compiled classes for an Android variant to a JaCoCo coverage report.
+ * AGP populates [jars] and [directories]; [classes] combines them and expands the JARs.
+ * Gradle providers preserve dependencies on the compilation tasks.
+ */
+abstract class AndroidCoverageInputs {
+    /** Factory for the coverage input properties and file collection. */
+    @get:Inject
+    protected abstract val objects: ObjectFactory
+
+    /** Archive operations used to expand class JARs. */
+    @get:Inject
+    protected abstract val archives: ArchiveOperations
+
+    /** Class JARs supplied by AGP for the selected variant. */
+    val jars = objects.listProperty(RegularFile::class.java)
+
+    /** Class directories supplied by AGP for the selected variant. */
+    val directories = objects.listProperty(Directory::class.java)
+
+    /** Combined class files from directories and expanded JARs for JaCoCo. */
+    val classes =
+        // Capture the service so the provider does not serialize this input holder.
+        archives.let { archiveOperations ->
+            objects
+                .fileCollection()
+                .from(
+                    directories,
+                    jars.map { files -> files.map { archiveOperations.zipTree(it) } },
+                ).asFileTree
+        }
+}
diff --git a/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/AndroidLint.kt b/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/AndroidLint.kt
index 004c1b723dfd..a1029845ff60 100644
--- a/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/AndroidLint.kt
+++ b/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/AndroidLint.kt
@@ -20,6 +20,9 @@ fun Project.configureAndroidLint() {
             textReport = true
             warningsAsErrors = true
 
+            // Only relevant to lint implementations; these modules do not use UAST/PSI APIs.
+            disable += "UElementAsPsi"
+
             if (System.getenv("CI") == "true") {
                 // 14853: we want this to appear in the IDE, but it adds noise to CI
                 disable += "WrongThread"
diff --git a/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/AndroidTestCoverage.kt b/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/AndroidTestCoverage.kt
new file mode 100644
index 000000000000..9d4cbea9e04a
--- /dev/null
+++ b/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/AndroidTestCoverage.kt
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.gradle
+
+import groovy.util.Node
+import groovy.xml.XmlParser
+import org.gradle.api.GradleException
+import org.gradle.api.logging.Logger
+import java.io.File
+import java.io.FileNotFoundException
+
+/** Rejects missing reports and emulator runs that produced no covered code. */
+fun assertNonzeroAndroidTestCoverage(
+    jacocoReport: File,
+    logger: Logger,
+) {
+    if (!jacocoReport.exists()) {
+        throw FileNotFoundException("jacocoAndroidTestReport.xml was not found after running jacocoAndroidTestReport")
+    }
+
+    val xmlParser = XmlParser()
+    xmlParser.setFeature("http://apache.org/xml/features/disallow-doctype-decl", false)
+    xmlParser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
+
+    val reportRoot: Node = xmlParser.parse(jacocoReport)
+    var hasCovered = false
+
+    // https://github.com/jacoco/jacoco/blob/5aabb2eb60bbcd05df968005f1746ba19dcd5361/org.jacoco.report/src/org/jacoco/report/internal/xml/ReportElement.java#L190
+    for (rawChild in reportRoot.children()) {
+        val child = rawChild as Node
+        if (child.name() != "counter") continue
+
+        if (child.attribute("covered") == "0") {
+            logger.warn(
+                "jacoco registered zero code coverage for counter type ${child.attribute("type")}",
+                null as Throwable?,
+            )
+        } else {
+            hasCovered = true
+        }
+    }
+
+    if (!hasCovered) {
+        throw GradleException(
+            "androidTest registered zero code coverage in jacocoAndroidTestReport.xml. Probably some incompatibilities in the toolchain.",
+        )
+    }
+}
diff --git a/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/BackendTempLibraryService.kt b/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/BackendTempLibraryService.kt
new file mode 100644
index 000000000000..b70957d74645
--- /dev/null
+++ b/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/BackendTempLibraryService.kt
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.gradle
+
+import org.gradle.api.Action
+import org.gradle.api.Task
+import org.gradle.api.logging.Logging
+import org.gradle.api.provider.Property
+import org.gradle.api.provider.Provider
+import org.gradle.api.services.BuildService
+import org.gradle.api.services.BuildServiceParameters
+import org.gradle.api.tasks.testing.Test
+import java.io.File
+import java.nio.file.Files
+import java.nio.file.LinkOption.NOFOLLOW_LINKS
+import java.util.Locale
+import java.util.concurrent.ConcurrentHashMap
+
+/** Reports persistent rsdroid-testing libraries after the build's test tasks finish. Never deletes files. */
+abstract class BackendTempLibraryService :
+    BuildService<BackendTempLibraryService.Params>,
+    AutoCloseable {
+    interface Params : BuildServiceParameters {
+        val warnAboveBytes: Property<Long>
+    }
+
+    private val directories = ConcurrentHashMap.newKeySet<File>()
+
+    fun recordDirectory(directory: File) {
+        directories.add(directory.canonicalFile)
+    }
+
+    override fun close() {
+        backendTempLibraryReport(directories, parameters.warnAboveBytes.get())?.let {
+            Logging.getLogger(BackendTempLibraryService::class.java).warn(it)
+        }
+    }
+}
+
+/** Uses an execution-time action so skipped/cached tests do not produce a report. */
+fun Test.reportBackendTempLibraries(service: Provider<BackendTempLibraryService>) {
+    // Make the default explicit: a forked JVM need not inherit the daemon's java.io.tmpdir.
+    systemProperty("java.io.tmpdir", systemProperties["java.io.tmpdir"] ?: project.providers.systemProperty("java.io.tmpdir").get())
+    usesService(service)
+    doFirst(RecordBackendTempDirectory(service))
+}
+
+private class RecordBackendTempDirectory(
+    private val service: Provider<BackendTempLibraryService>,
+) : Action<Task> {
+    override fun execute(task: Task) {
+        val test = task as Test
+        // Read the final fork arguments, including overrides supplied after our configuration.
+        val path = test.allJvmArgs.last { it.startsWith("-Djava.io.tmpdir=") }.substringAfter('=')
+        val directory = File(path).let { if (it.isAbsolute) it else File(test.workingDir, path) }
+        service.get().recordDirectory(directory)
+    }
+}
+
+// Names from RustBackendLoader.getPathFromResourceStream and File.numberedCopy in rsdroid-testing.
+private val checksumAndCopy = "[0-9a-f]{40}(?:-[1-9][0-9]*)?"
+private val backendLibraryName = Regex("(?:librsdroid-$checksumAndCopy\\.(?:so|dylib)|rsdroid-$checksumAndCopy\\.dll)")
+
+/** A snapshot of library sizes; modification times cannot tell us which versions are still in use. */
+internal fun backendTempLibraryReport(
+    directories: Set<File>,
+    warnAboveBytes: Long,
+): String? {
+    val libraries =
+        directories
+            .flatMap { it.listFiles().orEmpty().asList() }
+            .filter { backendLibraryName.matches(it.name) && Files.isRegularFile(it.toPath(), NOFOLLOW_LINKS) }
+            .sortedBy { it.path }
+            .map { it to it.length() }
+    val total = libraries.sumOf { it.second }
+    if (libraries.isEmpty() || total <= warnAboveBytes) return null
+    return buildString {
+        appendLine("Anki backend test libraries are using ${total.asMiB()} MiB (${libraries.size} files):")
+        libraries.forEach { (file, bytes) -> appendLine("    ${bytes.asMiB()} MiB  $file") }
+        appendLine("rsdroid-testing keeps an original and up to five copies per checksum by default, for reuse across classloaders.")
+        appendLine("By default these files live outside the project and are not removed by Gradle clean.")
+        appendLine("To reclaim space, stop tests in all checkouts and IDEs, then delete the listed library files.")
+        append("Needed libraries will be extracted again on the next test run. Leave .lock files in place.")
+    }
+}
+
+private fun Long.asMiB(): String = String.format(Locale.ROOT, "%.1f", this / (1024.0 * 1024))
diff --git a/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/HasUnitTestSources.kt b/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/HasUnitTestSources.kt
new file mode 100644
index 000000000000..98ea8552f36e
--- /dev/null
+++ b/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/HasUnitTestSources.kt
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.gradle
+
+import com.android.build.api.dsl.LibraryExtension
+import org.gradle.api.Project
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.provider.ValueSource
+import org.gradle.api.provider.ValueSourceParameters
+import org.gradle.api.tasks.util.PatternSet
+import org.gradle.kotlin.dsl.getByType
+
+/**
+ * Tracks whether a library has unit-test sources as an input to the configuration cache.
+ *
+ * Moving from 0 to 1 tests changes this value, ensuring that code coverage is set up correctly.
+ */
+abstract class HasUnitTestSources : ValueSource<Boolean, HasUnitTestSources.Parameters> {
+    interface Parameters : ValueSourceParameters {
+        val sourceDirectories: ConfigurableFileCollection
+    }
+
+    override fun obtain(): Boolean =
+        !parameters.sourceDirectories
+            .asFileTree
+            .matching(PatternSet().include("**/*.java", "**/*.kt"))
+            .isEmpty
+
+    companion object {
+        // Library unit tests currently use the unflavored debug variant.
+        fun Project.hasAndroidUnitTestSources(): Boolean {
+            val sourceDirectories =
+                extensions
+                    .getByType<LibraryExtension>()
+                    .sourceSets
+                    .filter { it.name == "test" || it.name == "testDebug" }
+                    .flatMap { sourceSet ->
+                        files(sourceSet.java.directories, sourceSet.kotlin.directories).files
+                    }
+            return providers
+                .of(HasUnitTestSources::class.java) {
+                    parameters.sourceDirectories.from(sourceDirectories)
+                }.get()
+        }
+    }
+}
diff --git a/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/JacocoCoverage.kt b/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/JacocoCoverage.kt
new file mode 100644
index 000000000000..1a32db84a02b
--- /dev/null
+++ b/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/JacocoCoverage.kt
@@ -0,0 +1,224 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.gradle
+
+import com.android.build.api.artifact.ScopedArtifact
+import com.android.build.api.variant.ApplicationAndroidComponentsExtension
+import com.android.build.api.variant.HostTestBuilder
+import com.android.build.api.variant.LibraryAndroidComponentsExtension
+import com.android.build.api.variant.ScopedArtifacts
+import com.android.build.api.variant.Variant
+import com.ichi2.anki.gradle.HasUnitTestSources.Companion.hasAndroidUnitTestSources
+import org.gradle.api.DomainObjectSet
+import org.gradle.api.Project
+import org.gradle.api.artifacts.component.ProjectComponentIdentifier
+import org.gradle.api.tasks.SourceSetContainer
+import org.gradle.api.tasks.TaskProvider
+import org.gradle.api.tasks.testing.Test
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.extra
+import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.named
+import org.gradle.kotlin.dsl.register
+import org.gradle.testing.jacoco.tasks.JacocoReport
+
+private class JacocoLibraryVariants(
+    val variants: DomainObjectSet<Variant>,
+)
+
+/** Captures library variants before any library can finish configuring. */
+fun Project.registerJacocoLibraryVariants() {
+    allprojects {
+        val variants = objects.domainObjectSet(Variant::class.java)
+        extensions.add("jacocoLibraryVariants", JacocoLibraryVariants(variants))
+        pluginManager.withPlugin("com.android.library") {
+            extensions.configure<LibraryAndroidComponentsExtension> {
+                onVariants(selector().withBuildType("debug")) { variant ->
+                    variants.add(variant)
+                }
+            }
+        }
+    }
+}
+
+/** Registers the merged, unit-test, and Android-test coverage reports. */
+fun Project.registerJacocoCoverageReports(
+    fileFilter: List<String>,
+    openReportRequested: Boolean,
+    linuxHtmlCmd: String?,
+) {
+    // Our merge report task
+    val mergedReport =
+        tasks.register<JacocoReport>("jacocoTestReport") {
+            configureJacocoReportOutput(layout, openReportRequested, linuxHtmlCmd)
+        }
+
+    // A unit-test only report task
+    val unitTestReport =
+        tasks.register<JacocoReport>("jacocoUnitTestReport") {
+            configureJacocoReportOutput(layout, openReportRequested, linuxHtmlCmd)
+        }
+
+    // A connected android tests only report task
+    val androidTestReport =
+        tasks.register<JacocoReport>("jacocoAndroidTestReport") {
+            configureJacocoReportOutput(layout, openReportRequested, linuxHtmlCmd)
+        }
+
+    configureAndroidAppCoverage(
+        unitTestReport,
+        androidTestReport,
+        mergedReport,
+        rootProject.androidTestVariantName,
+        fileFilter,
+    )
+
+    // Libraries may already be configured. Subscribe to the captured variants,
+    // then select runtime dependencies when the report's graph is available.
+    for (module in rootProject.allprojects.filter { it != project }) {
+        val includeModule = { module in runtimeProjectDependencies("playDebugRuntimeClasspath") }
+        module.configureAndroidLibraryCoverage(unitTestReport, fileFilter, includeModule)
+        module.configureJvmCoverage(unitTestReport, fileFilter, includeModule)
+    }
+}
+
+/**
+ * Connects app reports to debug unit tests and the selected emulator-test variant.
+ * The merged report uses the emulator variant's classes and both tests' execution data.
+ */
+private fun Project.configureAndroidAppCoverage(
+    unitTestReport: TaskProvider<JacocoReport>,
+    androidTestReport: TaskProvider<JacocoReport>,
+    mergedReport: TaskProvider<JacocoReport>,
+    androidTestVariantName: String,
+    classExcludes: List<String>,
+) {
+    extensions.configure<ApplicationAndroidComponentsExtension> {
+        // AGP enables unit tests only for testBuildType by default. These reports
+        // always run debug unit tests, including when emulator tests target release.
+        beforeVariants(selector().withName("playDebug")) { variant ->
+            variant.hostTests[HostTestBuilder.UNIT_TEST_TYPE]?.enable = true
+        }
+        onVariants(selector().withName("playDebug")) { debugVariant ->
+            includeAndroidClasses(unitTestReport, debugVariant, classExcludes)
+            includeTestExecutionData(unitTestReport, "testPlayDebugUnitTest", "**/*.exec")
+            includeTestExecutionData(mergedReport, "testPlayDebugUnitTest", "**/*.exec")
+        }
+
+        onVariants(selector().withName("play$androidTestVariantName")) { androidTestVariant ->
+            val connectedTest = "connectedPlay${androidTestVariantName}AndroidTest"
+            includeAndroidClasses(androidTestReport, androidTestVariant, classExcludes)
+            includeTestExecutionData(androidTestReport, connectedTest, "**/*.ec")
+            includeAndroidClasses(mergedReport, androidTestVariant, classExcludes)
+            includeTestExecutionData(mergedReport, connectedTest, "**/*.ec")
+        }
+    }
+}
+
+/** Adds an Android library's debug classes and unit-test coverage to a report. */
+private fun Project.configureAndroidLibraryCoverage(
+    report: TaskProvider<JacocoReport>,
+    classExcludes: List<String>,
+    includeModule: () -> Boolean,
+) {
+    val coverageVariants = extensions.getByType(JacocoLibraryVariants::class.java)
+    coverageVariants.variants.all {
+        includeAndroidClasses(report, this, classExcludes, includeModule)
+        // Classes from libraries without tests still count as uncovered.
+        // Their empty test tasks may require resources supplied by the app.
+        includeTestExecutionData(report, "testDebugUnitTest", "**/*.exec") {
+            includeModule() && hasAndroidUnitTestSources()
+        }
+    }
+}
+
+/** Adds a JVM module's main classes and unit-test coverage to a report. */
+private fun Project.configureJvmCoverage(
+    report: TaskProvider<JacocoReport>,
+    classExcludes: List<String>,
+    includeModule: () -> Boolean,
+) {
+    pluginManager.withPlugin("java") {
+        val mainSourceSet = extensions.getByType(SourceSetContainer::class.java).named("main")
+        val sources = mainSourceSet.map { it.allSource.srcDirs }
+        val classes =
+            mainSourceSet.map { sourceSet ->
+                sourceSet.output.classesDirs.asFileTree
+                    .matching { exclude(classExcludes) }
+            }
+        report.configure {
+            if (!includeModule()) return@configure
+            sourceDirectories.from(sources)
+            classDirectories.from(classes)
+        }
+        includeTestExecutionData(report, "test", "**/*.exec", includeModule)
+    }
+}
+
+private fun Project.includeAndroidClasses(
+    report: TaskProvider<JacocoReport>,
+    variant: Variant,
+    classExcludes: List<String>,
+    includeModule: () -> Boolean = { true },
+) {
+    val classInputs = objects.newInstance(AndroidCoverageInputs::class.java)
+    val projectArtifacts = variant.artifacts.forScope(ScopedArtifacts.Scope.PROJECT)
+    projectArtifacts.use(report).toGet(
+        ScopedArtifact.CLASSES,
+        { classInputs.jars },
+        { classInputs.directories },
+    )
+    report.configure {
+        if (!includeModule()) return@configure
+        classDirectories.from(classInputs.classes.matching { exclude(classExcludes) })
+        sourceDirectories.from(variant.sources.java?.all, variant.sources.kotlin?.all)
+    }
+}
+
+private fun Project.includeTestExecutionData(
+    report: TaskProvider<JacocoReport>,
+    taskName: String,
+    pattern: String,
+    includeModule: () -> Boolean = { true },
+) {
+    val coverageProject = this
+    // Restrict the input to this producer's declared outputs. In particular, do
+    // not pick up stale coverage from other flavors or build types.
+    // AGP may register the producer later, so use a live task collection.
+    val testTasks = tasks.named { it == taskName }
+    val testTaskPath = "$path:$taskName"
+    val coverageFiles = files(testTasks).asFileTree.matching { include(pattern) }
+    report.configure {
+        if (!includeModule()) return@configure
+        executionData.from(coverageFiles)
+        dependsOn(testTaskPath)
+        if (pattern == "**/*.exec") {
+            runUnitTestsWithoutCaching(this, coverageProject, taskName)
+        }
+    }
+}
+
+// Follow the app's runtime graph, including transitive project dependencies.
+// This excludes build tooling such as lint rules and baseline-profile generators.
+fun Project.runtimeProjectDependencies(configurationName: String): List<Project> =
+    configurations[configurationName]
+        .incoming.resolutionResult.allComponents
+        .mapNotNull { it.id as? ProjectComponentIdentifier }
+        .filter { it.build.buildPath == ":" && it.projectPath != path }
+        .map { project(it.projectPath) }
+
+fun runUnitTestsWithoutCaching(
+    report: JacocoReport,
+    project: Project,
+    taskName: String,
+) {
+    val test = project.tasks.named<Test>(taskName).get()
+    report.dependsOn(test)
+    // Preserve the existing coverage policy: always rerun these tests, bypassing
+    // up-to-date checks and the build cache. Configuration caching is unaffected.
+    // TODO: Revisit whether coverage reports need fresh test executions.
+    test.outputs.upToDateWhen { false }
+    test.outputs.cacheIf { false }
+}
+
+private val Project.androidTestVariantName: String get() = extra["androidTestVariantName"] as String
diff --git a/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/JacocoReports.kt b/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/JacocoReports.kt
new file mode 100644
index 000000000000..49f00c783a5d
--- /dev/null
+++ b/buildSrc/src/main/kotlin/com/ichi2/anki/gradle/JacocoReports.kt
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.gradle
+
+import org.gradle.api.file.ProjectLayout
+import org.gradle.kotlin.dsl.assign
+import org.gradle.testing.jacoco.tasks.JacocoReport
+
+/** Configures XML, HTML, and optional browser opening for a JaCoCo report. */
+fun JacocoReport.configureJacocoReportOutput(
+    layout: ProjectLayout,
+    openReportRequested: Boolean,
+    linuxHtmlCmd: String?,
+) {
+    val htmlOutDir =
+        layout.buildDirectory
+            .dir("reports/jacoco/$name/html")
+            .get()
+            .asFile
+    val openReport = openReportRequested
+    val htmlCmd = linuxHtmlCmd
+
+    doLast {
+        ReportOpener.open(htmlOutDir, openReport, htmlCmd)
+    }
+
+    reports {
+        xml.required = true
+        html.outputLocation = htmlOutDir
+    }
+}
diff --git a/buildSrc/src/test/kotlin/com/ichi2/anki/gradle/BackendTempLibraryReportTest.kt b/buildSrc/src/test/kotlin/com/ichi2/anki/gradle/BackendTempLibraryReportTest.kt
new file mode 100644
index 000000000000..09c8088eb0f4
--- /dev/null
+++ b/buildSrc/src/test/kotlin/com/ichi2/anki/gradle/BackendTempLibraryReportTest.kt
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.gradle
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.condition.DisabledOnOs
+import org.junit.jupiter.api.condition.OS
+import org.junit.jupiter.api.io.TempDir
+import java.io.File
+import java.io.RandomAccessFile
+import java.nio.file.Files
+
+class BackendTempLibraryReportTest {
+    @TempDir
+    lateinit var directory: File
+
+    private val checksum = "a".repeat(40)
+
+    @Test
+    fun `counts only originals and numbered copies on supported platforms without deleting anything`() {
+        val included =
+            listOf(
+                "librsdroid-$checksum.so",
+                "librsdroid-$checksum-1.so",
+                "librsdroid-$checksum.dylib",
+                "librsdroid-$checksum-12.dylib",
+                "rsdroid-$checksum.dll",
+                "rsdroid-$checksum-5.dll",
+            )
+        val excluded =
+            listOf(
+                "librsdroid-$checksum.so.lock",
+                "librsdroid-$checksum-123.tmp",
+                "librsdroid-not-a-checksum.so",
+                "librsdroid-$checksum-0.so",
+                "librsdroid-$checksum.dll",
+                "rsdroid-$checksum.so",
+            )
+        (included + excluded).forEach { File(directory, it).writeText("x") }
+        File(directory, "librsdroid-${"b".repeat(40)}.so").mkdir()
+
+        val report = checkNotNull(backendTempLibraryReport(setOf(directory), 5))
+        assertTrue(report.contains("(6 files)"), report)
+        included.forEach { assertTrue(report.contains(File(directory, it).path), report) }
+        excluded.forEach { assertFalse(report.contains(File(directory, it).path), report) }
+        assertNull(backendTempLibraryReport(setOf(directory), 6))
+        val remaining =
+            directory
+                .listFiles()!!
+                .filter { it.isFile }
+                .map { it.name }
+                .toSet()
+        assertEquals((included + excluded).toSet(), remaining)
+    }
+
+    @Test
+    fun `sums bytes across directories and respects the threshold exactly`() {
+        val otherDirectory = File(directory, "other").apply { mkdir() }
+        val size = 1024L * 1024
+        listOf(directory, otherDirectory).forEach {
+            RandomAccessFile(File(it, "librsdroid-$checksum.so"), "rw").use { file -> file.setLength(size) }
+        }
+        val directories = setOf(directory, otherDirectory, File(directory, "missing"))
+        assertNull(backendTempLibraryReport(directories, 2 * size))
+        val report = checkNotNull(backendTempLibraryReport(directories, 2 * size - 1))
+        assertTrue(report.contains("2.0 MiB (2 files)"), report)
+    }
+
+    @Test
+    @DisabledOnOs(OS.WINDOWS, disabledReason = "Creating symlinks requires special Windows privileges")
+    fun `ignores symbolic links to libraries`() {
+        val target = File(directory, "target").apply { writeText("library") }
+        Files.createSymbolicLink(File(directory, "librsdroid-$checksum.so").toPath(), target.toPath())
+        assertNull(backendTempLibraryReport(setOf(directory), 0))
+        assertTrue(target.exists())
+    }
+
+    @Test
+    fun `empty or removed directories do not produce a warning`() {
+        assertNull(backendTempLibraryReport(setOf(directory, File(directory, "missing")), 0))
+    }
+}
diff --git a/buildSrc/src/test/kotlin/com/ichi2/anki/gradle/BackendTempLibraryServiceTest.kt b/buildSrc/src/test/kotlin/com/ichi2/anki/gradle/BackendTempLibraryServiceTest.kt
new file mode 100644
index 000000000000..03b1a21cb854
--- /dev/null
+++ b/buildSrc/src/test/kotlin/com/ichi2/anki/gradle/BackendTempLibraryServiceTest.kt
@@ -0,0 +1,130 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.gradle
+
+import org.gradle.testkit.runner.GradleRunner
+import org.gradle.testkit.runner.TaskOutcome
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import java.io.File
+
+class BackendTempLibraryServiceTest {
+    @TempDir
+    lateinit var projectDir: File
+
+    @Test
+    fun `reports the worker directory once across tasks and configuration cache reuse`() {
+        writeFixture()
+        val runner = runner("test", "moreTests", "--rerun-tasks")
+        repeat(2) { run ->
+            val result = runner.build()
+            assertEquals(TaskOutcome.SUCCESS, result.task(":test")?.outcome, result.output)
+            assertEquals(1, Regex("Anki backend test libraries are using").findAll(result.output).count(), result.output)
+            assertTrue(result.output.contains("worker-temp"), result.output)
+            assertTrue(result.output.contains("a".repeat(40)), result.output)
+            assertFalse(result.output.contains("most recently used"), result.output)
+            assertFalse(result.output.contains("rm "), result.output)
+            if (run > 0) assertTrue(result.output.contains("Reusing configuration cache."), result.output)
+        }
+        val upToDate = runner("test", "moreTests").build()
+        assertEquals(TaskOutcome.UP_TO_DATE, upToDate.task(":test")?.outcome, upToDate.output)
+        assertFalse(upToDate.output.contains("Anki backend test libraries are using"), upToDate.output)
+        assertFalse(runner("help").build().output.contains("Anki backend test libraries are using"))
+
+        val cached = runner("clean", "test", "moreTests").build()
+        assertEquals(TaskOutcome.FROM_CACHE, cached.task(":test")?.outcome, cached.output)
+        assertFalse(cached.output.contains("Anki backend test libraries are using"), cached.output)
+
+        val failed = runner("test", "-PfailTests=true").buildAndFail()
+        assertEquals(TaskOutcome.FAILED, failed.task(":test")?.outcome, failed.output)
+        assertTrue(failed.output.contains("Anki backend test libraries are using"), failed.output)
+    }
+
+    private fun runner(vararg tasks: String): GradleRunner =
+        GradleRunner
+            .create()
+            .withProjectDir(projectDir)
+            .withTestKitDir(File("build/test-kit").absoluteFile)
+            .withArguments(
+                *tasks,
+                "--build-cache",
+                "--configuration-cache",
+                "--stacktrace",
+                "-Djava.io.tmpdir=${File(projectDir, "daemon-temp")}",
+            )
+
+    private fun writeFixture() {
+        File(projectDir, "daemon-temp").mkdirs()
+        File(projectDir, "worker-temp").mkdirs()
+        File("../gradle/libs.versions.toml").copyTo(File(projectDir, "libs.versions.toml"))
+        writeFile(
+            "settings.gradle",
+            """
+            rootProject.name = 'backend-temp-library-regression'
+            dependencyResolutionManagement {
+                repositories { mavenCentral() }
+                versionCatalogs { libs { from(files('libs.versions.toml')) } }
+            }
+            buildCache { local { directory = file('build-cache') } }
+            """.trimIndent(),
+        )
+        writeFile("gradle.properties", "org.gradle.workers.max=2\n")
+        val productionClasses =
+            BackendTempLibraryService::class.java.protectionDomain.codeSource.location
+                .toURI()
+        writeFile(
+            "build.gradle",
+            """
+            import com.ichi2.anki.gradle.BackendTempLibraryService
+            import com.ichi2.anki.gradle.BackendTempLibraryServiceKt
+            buildscript { dependencies { classpath files(new URI('$productionClasses')) } }
+            apply plugin: 'java'
+            dependencies {
+                testImplementation libs.junit.jupiter
+                testRuntimeOnly libs.junit.platform.launcher
+            }
+            def service = gradle.sharedServices.registerIfAbsent('backendTempLibraries', BackendTempLibraryService) {
+                parameters.warnAboveBytes.set(0L)
+            }
+            tasks.register('moreTests', Test) {
+                testClassesDirs = sourceSets.test.output.classesDirs
+                classpath = sourceSets.test.runtimeClasspath
+            }
+            tasks.withType(Test).configureEach {
+                useJUnitPlatform()
+                BackendTempLibraryServiceKt.reportBackendTempLibraries(delegate, service)
+                systemProperty 'java.io.tmpdir', file('worker-temp').absolutePath
+                systemProperty 'fixture.fail', providers.gradleProperty('failTests').getOrElse('false')
+            }
+            """.trimIndent(),
+        )
+        writeFile(
+            "src/test/java/FixtureTest.java",
+            """
+            import java.nio.file.Files;
+            import java.nio.file.Path;
+            import org.junit.jupiter.api.Test;
+            class FixtureTest {
+                @Test void leavesLibrary() throws Exception {
+                    Files.writeString(Path.of(System.getProperty("java.io.tmpdir"),
+                        "librsdroid-${"a".repeat(40)}-1.dylib"), "library");
+                    if (Boolean.getBoolean("fixture.fail")) throw new AssertionError("intentional fixture failure");
+                }
+            }
+            """.trimIndent(),
+        )
+    }
+
+    private fun writeFile(
+        path: String,
+        contents: String,
+    ) {
+        File(projectDir, path).apply {
+            parentFile.mkdirs()
+            writeText(contents)
+        }
+    }
+}
diff --git a/buildSrc/src/test/kotlin/com/ichi2/anki/gradle/JacocoPluginTest.kt b/buildSrc/src/test/kotlin/com/ichi2/anki/gradle/JacocoPluginTest.kt
new file mode 100644
index 000000000000..8be34b8da1aa
--- /dev/null
+++ b/buildSrc/src/test/kotlin/com/ichi2/anki/gradle/JacocoPluginTest.kt
@@ -0,0 +1,132 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.gradle
+
+import org.gradle.testkit.runner.BuildResult
+import org.gradle.testkit.runner.GradleRunner
+import org.gradle.testkit.runner.TaskOutcome
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.containsString
+import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.greaterThan
+import org.hamcrest.Matchers.not
+import org.jacoco.core.tools.ExecFileLoader
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import java.io.File
+import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.xpath.XPathFactory
+
+class JacocoPluginTest {
+    @TempDir
+    lateinit var projectDir: File
+
+    @BeforeEach
+    fun setUp() {
+        val fixture = File(requireNotNull(javaClass.getResource("/jacoco-project")).toURI())
+        fixture.walkTopDown().filter { it.isFile && it.extension == "fixture" }.forEach { source ->
+            writeFile(source.relativeTo(fixture).path.removeSuffix(".fixture"), source.readText())
+        }
+        for (module in listOf("app", "library", "nested/core", "empty", "tooling")) {
+            File(projectDir, module).mkdirs()
+        }
+        File("../gradle/libs.versions.toml").copyTo(File(projectDir, "libs.versions.toml"))
+        File("../local.properties").takeIf { it.isFile }?.copyTo(File(projectDir, "local.properties"))
+        writeFile("gradle.properties", "org.gradle.workers.max=2\n")
+        writeFile("library/src/test/java/ExampleTest.java", "class ExampleTest {}")
+        writeFile("nested/core/src/test/kotlin/ExampleTest.kt", "class ExampleTest")
+        // Resources alone must not cause a unit-test task to be scheduled.
+        writeFile("empty/src/test/resources/example.txt", "Not a test source")
+    }
+
+    @Test
+    fun `report covers runtime modules and skips empty library test tasks`() {
+        val output = dryRunCoverage()
+
+        for (module in listOf("app", "library", "nested/core", "empty")) {
+            assertThat(output, containsString("$module/src/main/kotlin"))
+        }
+        assertThat(output, not(containsString("tooling/src/main")))
+
+        assertThat(output, containsString(":app:testPlayDebugUnitTest SKIPPED"))
+        assertThat(output, containsString(":library:testDebugUnitTest SKIPPED"))
+        assertThat(output, containsString(":nested:core:test SKIPPED"))
+        assertThat(output, not(containsString(":empty:testDebugUnitTest")))
+        assertThat(output, not(containsString(":tooling:test")))
+    }
+
+    @Test
+    fun `library without unit tests is included as uncovered in the report`() {
+        // A valid, empty execution file represents a run that never touched this class.
+        ExecFileLoader().save(File(projectDir, "app/build/jacoco/testPlayDebugUnitTest.exec"), false)
+
+        // Run the real report with Android compilation, skipping only test execution.
+        val result =
+            runCoverage(
+                "-x",
+                ":app:testPlayDebugUnitTest",
+                "-x",
+                ":library:testDebugUnitTest",
+                "-x",
+                ":nested:core:test",
+            )
+        assertThat(result.task(":app:jacocoUnitTestReport")?.outcome, equalTo(TaskOutcome.SUCCESS))
+
+        val report =
+            DocumentBuilderFactory
+                .newInstance()
+                .apply { setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false) }
+                .newDocumentBuilder()
+                .parse(File(projectDir, "app/build/reports/jacoco/jacocoUnitTestReport/jacocoUnitTestReport.xml"))
+        val xpath = XPathFactory.newInstance().newXPath()
+        val counter = "/report/package/class[@name='regression/Uncovered']/counter[@type='LINE']"
+        assertThat(xpath.evaluate("$counter/@covered", report), equalTo("0"))
+        assertThat(xpath.evaluate("$counter/@missed", report).toInt(), greaterThan(0))
+    }
+
+    @Test
+    fun `adding the first test in a custom source root updates the cached task graph`() {
+        val before = dryRunCoverage()
+        assertThat(before, not(containsString(":empty:testDebugUnitTest")))
+
+        val cached = dryRunCoverage()
+        assertThat(cached, containsString("Reusing configuration cache."))
+
+        writeFile("empty/custom-tests/ExampleTest.kt", "class ExampleTest")
+        val after = dryRunCoverage()
+        assertThat(after, containsString(":empty:testDebugUnitTest SKIPPED"))
+    }
+
+    @Test
+    fun `removing the last test updates the cached task graph`() {
+        writeFile("empty/custom-tests/ExampleTest.kt", "class ExampleTest")
+        val before = dryRunCoverage()
+        assertThat(before, containsString(":empty:testDebugUnitTest SKIPPED"))
+
+        assertThat(File(projectDir, "empty/custom-tests/ExampleTest.kt").delete(), equalTo(true))
+        val after = dryRunCoverage()
+        assertThat(after, not(containsString(":empty:testDebugUnitTest")))
+    }
+
+    private fun dryRunCoverage(): String = runCoverage("--dry-run").output
+
+    private fun runCoverage(vararg arguments: String): BuildResult =
+        GradleRunner
+            .create()
+            .withProjectDir(projectDir)
+            .withTestKitDir(File("build/test-kit").absoluteFile)
+            .withPluginClasspath()
+            .withArguments(":app:jacocoUnitTestReport", "--configuration-cache", "--stacktrace", *arguments)
+            .build()
+
+    private fun writeFile(
+        path: String,
+        contents: String,
+    ) {
+        File(projectDir, path).apply {
+            parentFile.mkdirs()
+            writeText(contents)
+        }
+    }
+}
diff --git a/buildSrc/src/test/kotlin/com/ichi2/anki/gradle/ScreenshotPluginTest.kt b/buildSrc/src/test/kotlin/com/ichi2/anki/gradle/ScreenshotPluginTest.kt
new file mode 100644
index 000000000000..7808946730a9
--- /dev/null
+++ b/buildSrc/src/test/kotlin/com/ichi2/anki/gradle/ScreenshotPluginTest.kt
@@ -0,0 +1,138 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.gradle
+
+import org.gradle.testkit.runner.GradleRunner
+import org.gradle.testkit.runner.TaskOutcome
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import java.io.File
+
+/** Test of `ankidroid.plugins.screenshots.gradle.kts` */
+class ScreenshotPluginTest {
+    @TempDir
+    lateinit var projectDir: File
+
+    @Test
+    fun `matching screenshots clear previous diffs including cached results`() {
+        writeFixture()
+        // Preserve baselines not exercised by this run, even inside a directory named 'diffs'.
+        // Populate that directory up front so creating it cannot change the comparison's cache key.
+        val baselines = mapOf("Example/screen.png" to "baseline", "Example/diffs/other.png" to "unselected baseline")
+        val diffs = mapOf("Example/diffs/screen_compare.png" to "comparison", "Example/diffs/screen_actual.png" to "actual")
+        baselines.forEach { (path, contents) ->
+            writeFile("build/outputs/roborazzi/$path", contents)
+        }
+
+        val runner =
+            GradleRunner
+                .create()
+                .withProjectDir(projectDir)
+                .withTestKitDir(File("build/test-kit").absoluteFile)
+                .withPluginClasspath()
+                .withArguments("compareScreenshots", "-Pscreenshot", "--build-cache", "--configuration-cache", "--stacktrace")
+
+        // Run changed → matching once normally, then repeat with both results restored from cache.
+        listOf(TaskOutcome.SUCCESS, TaskOutcome.FROM_CACHE).forEach { outcome ->
+            listOf(true, false).forEach { changed ->
+                writeFile("changed.txt", changed.toString())
+                val result = runner.build()
+                assertEquals(outcome, result.task(":testDebugUnitTest")?.outcome, result.output)
+                val expectedDiffs = if (changed) diffs else emptyMap()
+                listOf("outputs/roborazzi", "intermediates/roborazzi").forEach { directory ->
+                    assertEquals(baselines + expectedDiffs, fileContents(directory), "$directory: $outcome, changed=$changed")
+                }
+                if (outcome == TaskOutcome.FROM_CACHE) {
+                    assertTrue(result.output.contains("Reusing configuration cache."))
+                    assertEquals(expectedDiffs.filterKeys { it.endsWith("_compare.png") }, fileContents("reports/screenshot-diffs"))
+                }
+            }
+        }
+    }
+
+    private fun fileContents(directory: String): Map<String, String> {
+        val root = File(projectDir, "build/$directory")
+        return root
+            .walkTopDown()
+            .filter { it.isFile }
+            .associate { it.relativeTo(root).invariantSeparatorsPath to it.readText() }
+    }
+
+    private fun writeFixture() {
+        File("../gradle/libs.versions.toml").copyTo(File(projectDir, "libs.versions.toml"))
+        File("../local.properties").takeIf { it.isFile }?.copyTo(File(projectDir, "local.properties"))
+        writeFile(
+            "settings.gradle",
+            """
+            rootProject.name = 'screenshot-cleanup-regression'
+            dependencyResolutionManagement {
+                repositories { google(); mavenCentral() }
+                versionCatalogs { libs { from(files('libs.versions.toml')) } }
+            }
+            buildCache { local { directory = file('build-cache') } }
+            """.trimIndent(),
+        )
+        writeFile("gradle.properties", "android.builtInKotlin=false\nandroid.newDsl=false\norg.gradle.workers.max=2\n")
+
+        writeFile(
+            "build.gradle",
+            """
+            plugins {
+                id 'com.android.library'
+                id 'ankidroid.plugins.screenshots'
+            }
+            android {
+                namespace = 'regression.screenshots'
+                compileSdk = libs.versions.compileSdk.get().toInteger()
+                compileSdkMinor = libs.versions.compileSdkMinor.get().toInteger()
+                defaultConfig { minSdk = 24 }
+            }
+            dependencies {
+                testImplementation libs.junit.jupiter
+                testRuntimeOnly libs.junit.platform.launcher
+            }
+            tasks.withType(Test).configureEach {
+                inputs.file('changed.txt')
+            }
+            """.trimIndent(),
+        )
+        // Pixel comparison is outside this test's scope. Emit a renderer's diff files and let
+        // the real Roborazzi and screenshot plugins handle copying, cleanup and cache restoration.
+        writeFile(
+            "src/test/java/regression/ScreenshotTest.java",
+            """
+            package regression;
+
+            import java.nio.file.Files;
+            import java.nio.file.Path;
+            import org.junit.jupiter.api.Tag;
+            import org.junit.jupiter.api.Test;
+
+            @Tag("com.ichi2.anki.ScreenshotTestCategory")
+            public class ScreenshotTest {
+                @Test
+                void screenshot() throws Exception {
+                    if (Files.readString(Path.of("changed.txt")).equals("true")) {
+                        Path diffs = Path.of("build/outputs/roborazzi/Example/diffs");
+                        Files.createDirectories(diffs);
+                        Files.writeString(diffs.resolve("screen_compare.png"), "comparison");
+                        Files.writeString(diffs.resolve("screen_actual.png"), "actual");
+                    }
+                }
+            }
+            """.trimIndent(),
+        )
+    }
+
+    private fun writeFile(
+        path: String,
+        contents: String,
+    ) {
+        File(projectDir, path).apply {
+            parentFile.mkdirs()
+            writeText(contents)
+        }
+    }
+}
diff --git a/buildSrc/src/test/resources/jacoco-project/app/build.gradle.fixture b/buildSrc/src/test/resources/jacoco-project/app/build.gradle.fixture
new file mode 100644
index 000000000000..e60c5488c42b
--- /dev/null
+++ b/buildSrc/src/test/resources/jacoco-project/app/build.gradle.fixture
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+plugins {
+    id 'com.android.application'
+    id 'ankidroid.plugins.jacoco'
+}
+
+android {
+    namespace = 'regression.app'
+    compileSdk = libs.versions.compileSdk.get().toInteger()
+    compileSdkMinor = libs.versions.compileSdkMinor.get().toInteger()
+    defaultConfig { minSdk = 24 }
+    flavorDimensions += 'distribution'
+    productFlavors { play { dimension = 'distribution' } }
+}
+
+configurations { tooling }
+dependencies {
+    implementation project(':library')
+    runtimeOnly project(':empty')
+    tooling project(':tooling')
+}
+
+gradle.projectsEvaluated {
+    tasks.named('jacocoUnitTestReport') {
+        println 'Coverage sources: ' + sourceDirectories.files.collect {
+            rootDir.toPath().relativize(it.toPath()).toString().replace(File.separator, '/')
+        }.sort()
+    }
+}
diff --git a/buildSrc/src/test/resources/jacoco-project/app/src/main/AndroidManifest.xml.fixture b/buildSrc/src/test/resources/jacoco-project/app/src/main/AndroidManifest.xml.fixture
new file mode 100644
index 000000000000..f4795a2a1336
--- /dev/null
+++ b/buildSrc/src/test/resources/jacoco-project/app/src/main/AndroidManifest.xml.fixture
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application />
+</manifest>
diff --git a/buildSrc/src/test/resources/jacoco-project/build.gradle.fixture b/buildSrc/src/test/resources/jacoco-project/build.gradle.fixture
new file mode 100644
index 000000000000..e1ef3a2fdfdf
--- /dev/null
+++ b/buildSrc/src/test/resources/jacoco-project/build.gradle.fixture
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+plugins {
+    id 'com.android.library' apply false
+    id 'org.jetbrains.kotlin.jvm' apply false
+}
+
+com.ichi2.anki.gradle.JacocoCoverageKt.registerJacocoLibraryVariants(project)
+
+ext.androidTestVariantName = 'Debug'
+
+// Runtime graph: app -> library -> nested:core (a transitive JVM dependency).
+//                   -> empty (a runtime-only Android library without test sources).
+// tooling is on a separate configuration and must be excluded from coverage.
+configure([project(':nested:core'), project(':tooling')]) {
+    apply plugin: 'org.jetbrains.kotlin.jvm'
+}
+
+configure([project(':library'), project(':empty')]) {
+    apply plugin: 'com.android.library'
+    android {
+        namespace = "regression.${project.name}"
+        compileSdk = libs.versions.compileSdk.get().toInteger()
+        compileSdkMinor = libs.versions.compileSdkMinor.get().toInteger()
+        defaultConfig { minSdk = 24 }
+        sourceSets { testDebug { kotlin.directories.add('custom-tests') } }
+    }
+    dependencies { implementation project(':nested:core') }
+}
+
+// A runtime library may finish configuring before the app applies coverage.
+evaluationDependsOn(':library')
diff --git a/buildSrc/src/test/resources/jacoco-project/empty/src/main/java/regression/Uncovered.java.fixture b/buildSrc/src/test/resources/jacoco-project/empty/src/main/java/regression/Uncovered.java.fixture
new file mode 100644
index 000000000000..5d36c60b89fd
--- /dev/null
+++ b/buildSrc/src/test/resources/jacoco-project/empty/src/main/java/regression/Uncovered.java.fixture
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package regression;
+
+public class Uncovered {
+    public int answer() {
+        return 42;
+    }
+}
diff --git a/buildSrc/src/test/resources/jacoco-project/settings.gradle.fixture b/buildSrc/src/test/resources/jacoco-project/settings.gradle.fixture
new file mode 100644
index 000000000000..8692cfa5000c
--- /dev/null
+++ b/buildSrc/src/test/resources/jacoco-project/settings.gradle.fixture
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+rootProject.name = 'coverage-discovery-regression'
+include ':app', ':library', ':nested:core', ':empty', ':tooling'
+
+dependencyResolutionManagement {
+    repositories { google(); mavenCentral() }
+    versionCatalogs { libs { from(files('libs.versions.toml')) } }
+}
diff --git a/common/android/README.md b/common/android/README.md
index 0fe9dcf500bc..e175750ab8ff 100644
--- a/common/android/README.md
+++ b/common/android/README.md
@@ -44,6 +44,22 @@ getQuantityString(CommonPlurals.widget_cards_due, n, n)
 
 Files in package `com.ichi2.anki` need no import.
 
+### Preference keys (`CommonPreferenceKey`)
+
+Use `CommonPreferenceKey` for non-translatable preference key resources shared by
+Kotlin code and preference XML:
+
+```kotlin
+import com.ichi2.anki.CommonPreferenceKey
+
+getString(CommonPreferenceKey.pref_new_review_reminders)
+```
+
+The key remains defined once in XML with `translatable="false"` and referenced
+as `@string/pref_new_review_reminders` by the preference UI. `CommonPreferenceKey`
+and `CommonString` alias the same generated `R.string` class, so the distinction
+is a naming convention rather than a compiler-enforced restriction.
+
 ### Other resource types (`CommonR`)
 
 Use `CommonR` as an alias when outside this module. Inside this module, `R` should be used as the alias.
diff --git a/common/android/build.gradle.kts b/common/android/build.gradle.kts
index 38ec5f64b412..cf30b072617f 100644
--- a/common/android/build.gradle.kts
+++ b/common/android/build.gradle.kts
@@ -4,11 +4,14 @@ import com.android.build.api.dsl.LibraryExtension
 
 plugins {
     id("ankidroid.android.library")
+    id("ankidroid.android.compose")
     id("org.jetbrains.kotlin.plugin.parcelize")
 }
 
 configure<LibraryExtension> {
     namespace = "com.ichi2.anki.common.android"
+    buildFeatures.buildConfig = true
+    buildFeatures.viewBinding = true
     testFixtures.enable = true
 }
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/OnContextAndLongClickListener.kt b/common/android/src/main/java/com/ichi2/anki/OnContextAndLongClickListener.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/anki/OnContextAndLongClickListener.kt
rename to common/android/src/main/java/com/ichi2/anki/OnContextAndLongClickListener.kt
diff --git a/common/android/src/main/java/com/ichi2/anki/StringResAliases.kt b/common/android/src/main/java/com/ichi2/anki/StringResAliases.kt
index 58a47ef8f43b..6081f746ea8f 100644
--- a/common/android/src/main/java/com/ichi2/anki/StringResAliases.kt
+++ b/common/android/src/main/java/com/ichi2/anki/StringResAliases.kt
@@ -10,5 +10,12 @@ package com.ichi2.anki
  */
 typealias CommonString = com.ichi2.anki.common.android.R.string
 
+/**
+ * Non-translatable preference keys: `getString(CommonPreferenceKey.pref_new_review_reminders)`.
+ *
+ * Shares the generated resource type with [CommonString]; the distinction is a naming convention.
+ */
+typealias CommonPreferenceKey = com.ichi2.anki.common.android.R.string
+
 /** Plural resources: `getQuantityString(CommonPlurals.widget_cards_due, n, n)`. */
 typealias CommonPlurals = com.ichi2.anki.common.android.R.plurals
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/analytics/AnalyticsDialogFragment.kt b/common/android/src/main/java/com/ichi2/anki/analytics/AnalyticsDialogFragment.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/anki/analytics/AnalyticsDialogFragment.kt
rename to common/android/src/main/java/com/ichi2/anki/analytics/AnalyticsDialogFragment.kt
diff --git a/common/android/src/main/java/com/ichi2/anki/common/preferences/SharedPrefs.kt b/common/android/src/main/java/com/ichi2/anki/common/preferences/SharedPrefs.kt
index c392977e398d..16547f0a863e 100644
--- a/common/android/src/main/java/com/ichi2/anki/common/preferences/SharedPrefs.kt
+++ b/common/android/src/main/java/com/ichi2/anki/common/preferences/SharedPrefs.kt
@@ -4,7 +4,21 @@ package com.ichi2.anki.common.preferences
 
 import android.content.Context
 import android.content.SharedPreferences
+import androidx.annotation.VisibleForTesting
 import androidx.preference.PreferenceManager
 
 /** shorthand method to get the default [SharedPreferences] instance */
-fun Context.sharedPrefs(): SharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
+fun Context.sharedPrefs(): SharedPreferences =
+    SharedPreferencesTestHook.override?.invoke(this)
+        ?: PreferenceManager.getDefaultSharedPreferences(this)
+
+/**
+ * Optional override for unit tests that need isolated default preferences.
+ *
+ * Robolectric tests share one application [Context]; parallel tests can otherwise mutate the same
+ * preference file. Tests set [override] and clear it in `@After`.
+ */
+object SharedPreferencesTestHook {
+    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+    var override: ((Context) -> SharedPreferences)? = null
+}
diff --git a/common/android/src/main/java/com/ichi2/anki/common/utils/Dp.kt b/common/android/src/main/java/com/ichi2/anki/common/utils/Dp.kt
new file mode 100644
index 000000000000..f80d0d0177c7
--- /dev/null
+++ b/common/android/src/main/java/com/ichi2/anki/common/utils/Dp.kt
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.common.utils
+
+import android.content.Context
+
+/** Returns a [Dp] instance equal to this [Int] number of display pixels. */
+val Int.dp
+    get() = Dp(dp = this.toFloat())
+
+val Float.dp
+    get() = Dp(dp = this)
+
+val Double.dp
+    get() = Dp(dp = this.toFloat())
+
+/**
+ * Helper for 'display pixels' to 'pixels' conversions
+ */
+@JvmInline
+value class Dp(
+    val dp: Float,
+) : Comparable<Dp> {
+    // TODO: improve once we have context parameters
+    fun toPx(context: Context) = dp.dpToPx(context)
+
+    operator fun plus(other: Dp) = Dp(dp = dp + other.dp)
+
+    override fun compareTo(other: Dp) = dp.compareTo(other.dp)
+}
+
+private fun Float.dpToPx(context: Context): Int = (this * context.resources.displayMetrics.density + 0.5f).toInt()
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/deckpicker/DeckFilters.kt b/common/android/src/main/java/com/ichi2/anki/deckpicker/DeckFilters.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/anki/deckpicker/DeckFilters.kt
rename to common/android/src/main/java/com/ichi2/anki/deckpicker/DeckFilters.kt
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/settings/enums/AppTheme.kt b/common/android/src/main/java/com/ichi2/anki/settings/enums/AppTheme.kt
similarity index 89%
rename from AnkiDroid/src/main/java/com/ichi2/anki/settings/enums/AppTheme.kt
rename to common/android/src/main/java/com/ichi2/anki/settings/enums/AppTheme.kt
index f061a27f5b47..572285393a1f 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/settings/enums/AppTheme.kt
+++ b/common/android/src/main/java/com/ichi2/anki/settings/enums/AppTheme.kt
@@ -2,7 +2,7 @@
 
 package com.ichi2.anki.settings.enums
 
-import com.ichi2.anki.R
+import com.ichi2.anki.common.android.R
 
 /** [R.array.app_theme_values] */
 enum class AppTheme(
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/settings/enums/DayTheme.kt b/common/android/src/main/java/com/ichi2/anki/settings/enums/DayTheme.kt
similarity index 93%
rename from AnkiDroid/src/main/java/com/ichi2/anki/settings/enums/DayTheme.kt
rename to common/android/src/main/java/com/ichi2/anki/settings/enums/DayTheme.kt
index ca53ff84ce8c..84d306d9dbf9 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/settings/enums/DayTheme.kt
+++ b/common/android/src/main/java/com/ichi2/anki/settings/enums/DayTheme.kt
@@ -3,7 +3,7 @@
 package com.ichi2.anki.settings.enums
 
 import androidx.annotation.StyleRes
-import com.ichi2.anki.R
+import com.ichi2.anki.common.android.R
 
 sealed interface Theme : PrefEnum {
     @get:StyleRes
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/settings/enums/NightTheme.kt b/common/android/src/main/java/com/ichi2/anki/settings/enums/NightTheme.kt
similarity index 89%
rename from AnkiDroid/src/main/java/com/ichi2/anki/settings/enums/NightTheme.kt
rename to common/android/src/main/java/com/ichi2/anki/settings/enums/NightTheme.kt
index 204d66f088a0..e283f979c262 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/settings/enums/NightTheme.kt
+++ b/common/android/src/main/java/com/ichi2/anki/settings/enums/NightTheme.kt
@@ -2,7 +2,7 @@
 
 package com.ichi2.anki.settings.enums
 
-import com.ichi2.anki.R
+import com.ichi2.anki.common.android.R
 
 /** [R.array.night_theme_values] */
 enum class NightTheme(
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/settings/enums/PrefEnum.kt b/common/android/src/main/java/com/ichi2/anki/settings/enums/PrefEnum.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/anki/settings/enums/PrefEnum.kt
rename to common/android/src/main/java/com/ichi2/anki/settings/enums/PrefEnum.kt
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/snackbar/SensibleSwipeDismissBehavior.kt b/common/android/src/main/java/com/ichi2/anki/snackbar/SensibleSwipeDismissBehavior.kt
similarity index 99%
rename from AnkiDroid/src/main/java/com/ichi2/anki/snackbar/SensibleSwipeDismissBehavior.kt
rename to common/android/src/main/java/com/ichi2/anki/snackbar/SensibleSwipeDismissBehavior.kt
index 3ca47622237c..1a589216ca3b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/snackbar/SensibleSwipeDismissBehavior.kt
+++ b/common/android/src/main/java/com/ichi2/anki/snackbar/SensibleSwipeDismissBehavior.kt
@@ -13,7 +13,7 @@ import androidx.customview.widget.ViewDragHelper
 import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
 import com.ichi2.anki.common.android.appContext
-import com.ichi2.utils.dp
+import com.ichi2.anki.common.utils.dp
 import kotlin.math.absoluteValue
 import kotlin.math.sign
 
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/snackbar/SnackbarPackageWorkaround.kt b/common/android/src/main/java/com/ichi2/anki/snackbar/SnackbarPackageWorkaround.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/anki/snackbar/SnackbarPackageWorkaround.kt
rename to common/android/src/main/java/com/ichi2/anki/snackbar/SnackbarPackageWorkaround.kt
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/snackbar/Snackbars.kt b/common/android/src/main/java/com/ichi2/anki/snackbar/Snackbars.kt
similarity index 99%
rename from AnkiDroid/src/main/java/com/ichi2/anki/snackbar/Snackbars.kt
rename to common/android/src/main/java/com/ichi2/anki/snackbar/Snackbars.kt
index 949a7161ed77..1b93ba2ff974 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/snackbar/Snackbars.kt
+++ b/common/android/src/main/java/com/ichi2/anki/snackbar/Snackbars.kt
@@ -14,8 +14,8 @@ import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.onAttachedToWindow2
-import com.ichi2.anki.BuildConfig
-import com.ichi2.anki.R
+import com.ichi2.anki.common.android.BuildConfig
+import com.ichi2.anki.common.android.R
 import com.ichi2.anki.common.crashreporting.CrashReportService
 import com.ichi2.anki.common.exception.ManuallyReportedException
 import com.ichi2.anki.common.utils.android.showThemedToast
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/snackbar/SwipeDismissBehaviorFix.kt b/common/android/src/main/java/com/ichi2/anki/snackbar/SwipeDismissBehaviorFix.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/anki/snackbar/SwipeDismissBehaviorFix.kt
rename to common/android/src/main/java/com/ichi2/anki/snackbar/SwipeDismissBehaviorFix.kt
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/BundleUtils.kt b/common/android/src/main/java/com/ichi2/anki/utils/ext/BundleUtils.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/BundleUtils.kt
rename to common/android/src/main/java/com/ichi2/anki/utils/ext/BundleUtils.kt
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/FragmentResult.kt b/common/android/src/main/java/com/ichi2/anki/utils/ext/FragmentResult.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/anki/utils/ext/FragmentResult.kt
rename to common/android/src/main/java/com/ichi2/anki/utils/ext/FragmentResult.kt
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/workarounds/DialogTitleView.kt b/common/android/src/main/java/com/ichi2/anki/workarounds/DialogTitleView.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/anki/workarounds/DialogTitleView.kt
rename to common/android/src/main/java/com/ichi2/anki/workarounds/DialogTitleView.kt
diff --git a/common/android/src/main/java/com/ichi2/compose/ui/dialogs/AnkiDroidDialog.kt b/common/android/src/main/java/com/ichi2/compose/ui/dialogs/AnkiDroidDialog.kt
new file mode 100644
index 000000000000..4a328e8158da
--- /dev/null
+++ b/common/android/src/main/java/com/ichi2/compose/ui/dialogs/AnkiDroidDialog.kt
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.compose.ui.dialogs
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.sizeIn
+import androidx.compose.material3.BasicAlertDialog
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.DialogProperties
+
+/**
+ * A [BasicAlertDialog] whose content renders inline in Compose previews.
+ *
+ * Callers supply the card's styling and any action buttons, which appear in both modes.
+ * [modifier] applies to the content container; [properties] and [onDismissRequest] configure
+ * the dialog window at runtime.
+ */
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AnkiDroidDialog(
+    onDismissRequest: () -> Unit,
+    modifier: Modifier = Modifier,
+    properties: DialogProperties = DialogProperties(),
+    content: @Composable () -> Unit,
+) {
+    if (LocalInspectionMode.current) {
+        // TODO: Preview the surrounding dialog window, including its scrim, positioning and system UI.
+        // Match BasicAlertDialog's content constraints, including caller overrides.
+        Box(
+            modifier = modifier.sizeIn(minWidth = 280.dp, maxWidth = 560.dp),
+            propagateMinConstraints = true,
+        ) {
+            content()
+        }
+    } else {
+        BasicAlertDialog(
+            onDismissRequest = onDismissRequest,
+            modifier = modifier,
+            properties = properties,
+            content = content,
+        )
+    }
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/AlertDialogFacade.kt b/common/android/src/main/java/com/ichi2/utils/AlertDialogFacade.kt
similarity index 97%
rename from AnkiDroid/src/main/java/com/ichi2/utils/AlertDialogFacade.kt
rename to common/android/src/main/java/com/ichi2/utils/AlertDialogFacade.kt
index 1446d8df72de..4dcc08c6c7c5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/utils/AlertDialogFacade.kt
+++ b/common/android/src/main/java/com/ichi2/utils/AlertDialogFacade.kt
@@ -12,6 +12,7 @@ import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
+import android.view.WindowManager
 import android.widget.ArrayAdapter
 import android.widget.Button
 import android.widget.CheckBox
@@ -26,13 +27,13 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
 import com.google.android.material.textfield.TextInputLayout
-import com.ichi2.anki.R
+import com.ichi2.anki.common.android.R
+import com.ichi2.anki.common.android.databinding.DialogAlertDialogCheckboxBinding
+import com.ichi2.anki.common.android.databinding.DialogAlertDialogTitleWithHelpBinding
+import com.ichi2.anki.common.android.databinding.DialogGenericRecyclerViewBinding
+import com.ichi2.anki.common.android.databinding.DialogListviewMessageBinding
 import com.ichi2.anki.common.utils.android.HandlerUtils.executeOnMainThread
 import com.ichi2.anki.common.utils.android.getResFromAttr
-import com.ichi2.anki.databinding.DialogAlertDialogCheckboxBinding
-import com.ichi2.anki.databinding.DialogAlertDialogTitleWithHelpBinding
-import com.ichi2.anki.databinding.DialogGenericRecyclerViewBinding
-import com.ichi2.anki.databinding.DialogListviewMessageBinding
 import timber.log.Timber
 
 /** Wraps [DialogInterface.OnClickListener] as we don't need the `which` parameter */
@@ -332,7 +333,8 @@ fun AlertDialog.input(
 
     getInputField().apply {
         if (displayKeyboard) {
-            AndroidUiUtils.setFocusAndOpenKeyboard(this, window!!)
+            requestFocus()
+            window!!.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
         }
 
         inputType?.let { this.inputType = it }
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/EditTextUtils.kt b/common/android/src/main/java/com/ichi2/utils/EditTextUtils.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/utils/EditTextUtils.kt
rename to common/android/src/main/java/com/ichi2/utils/EditTextUtils.kt
diff --git a/AnkiDroid/src/main/java/com/ichi2/utils/TypedFilter.kt b/common/android/src/main/java/com/ichi2/utils/TypedFilter.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/utils/TypedFilter.kt
rename to common/android/src/main/java/com/ichi2/utils/TypedFilter.kt
diff --git a/common/android/src/main/java/com/ichi2/utils/ViewHitTest.kt b/common/android/src/main/java/com/ichi2/utils/ViewHitTest.kt
new file mode 100644
index 000000000000..8999f17cb016
--- /dev/null
+++ b/common/android/src/main/java/com/ichi2/utils/ViewHitTest.kt
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.utils
+
+import android.graphics.Rect
+import android.view.MotionEvent
+import android.view.View
+
+/**
+ * Performs a hit test using the raw coordinates of the provided [MotionEvent]
+ */
+fun View.rawHitTest(event: MotionEvent): Boolean {
+    val location = IntArray(2)
+    getLocationOnScreen(location)
+
+    val rect = Rect()
+    getHitRect(rect)
+
+    rect.left += location[0]
+    rect.top += location[1]
+    rect.right += location[0]
+    rect.bottom += location[1]
+
+    return rect.contains(event.rawX.toInt(), event.rawY.toInt())
+}
diff --git a/AnkiDroid/src/main/res/color/drawer_item_text_dark.xml b/common/android/src/main/res/color/drawer_item_text_dark.xml
similarity index 100%
rename from AnkiDroid/src/main/res/color/drawer_item_text_dark.xml
rename to common/android/src/main/res/color/drawer_item_text_dark.xml
diff --git a/AnkiDroid/src/main/res/color/drawer_item_text_light.xml b/common/android/src/main/res/color/drawer_item_text_light.xml
similarity index 100%
rename from AnkiDroid/src/main/res/color/drawer_item_text_light.xml
rename to common/android/src/main/res/color/drawer_item_text_light.xml
diff --git a/AnkiDroid/src/main/res/color/faded_primary.xml b/common/android/src/main/res/color/faded_primary.xml
similarity index 100%
rename from AnkiDroid/src/main/res/color/faded_primary.xml
rename to common/android/src/main/res/color/faded_primary.xml
diff --git a/AnkiDroid/src/main/res/color/slider_active_track_color.xml b/common/android/src/main/res/color/slider_active_track_color.xml
similarity index 100%
rename from AnkiDroid/src/main/res/color/slider_active_track_color.xml
rename to common/android/src/main/res/color/slider_active_track_color.xml
diff --git a/AnkiDroid/src/main/res/color/slider_halo_color.xml b/common/android/src/main/res/color/slider_halo_color.xml
similarity index 100%
rename from AnkiDroid/src/main/res/color/slider_halo_color.xml
rename to common/android/src/main/res/color/slider_halo_color.xml
diff --git a/AnkiDroid/src/main/res/color/slider_inactive_track_color.xml b/common/android/src/main/res/color/slider_inactive_track_color.xml
similarity index 100%
rename from AnkiDroid/src/main/res/color/slider_inactive_track_color.xml
rename to common/android/src/main/res/color/slider_inactive_track_color.xml
diff --git a/AnkiDroid/src/main/res/color/slider_thumb_color.xml b/common/android/src/main/res/color/slider_thumb_color.xml
similarity index 100%
rename from AnkiDroid/src/main/res/color/slider_thumb_color.xml
rename to common/android/src/main/res/color/slider_thumb_color.xml
diff --git a/AnkiDroid/src/main/res/color/text_color_dark.xml b/common/android/src/main/res/color/text_color_dark.xml
similarity index 100%
rename from AnkiDroid/src/main/res/color/text_color_dark.xml
rename to common/android/src/main/res/color/text_color_dark.xml
diff --git a/AnkiDroid/src/main/res/color/text_color_eink.xml b/common/android/src/main/res/color/text_color_eink.xml
similarity index 100%
rename from AnkiDroid/src/main/res/color/text_color_eink.xml
rename to common/android/src/main/res/color/text_color_eink.xml
diff --git a/AnkiDroid/src/main/res/color/text_color_light.xml b/common/android/src/main/res/color/text_color_light.xml
similarity index 100%
rename from AnkiDroid/src/main/res/color/text_color_light.xml
rename to common/android/src/main/res/color/text_color_light.xml
diff --git a/AnkiDroid/src/main/res/color/text_color_secondary_dark.xml b/common/android/src/main/res/color/text_color_secondary_dark.xml
similarity index 100%
rename from AnkiDroid/src/main/res/color/text_color_secondary_dark.xml
rename to common/android/src/main/res/color/text_color_secondary_dark.xml
diff --git a/AnkiDroid/src/main/res/color/text_color_secondary_eink.xml b/common/android/src/main/res/color/text_color_secondary_eink.xml
similarity index 100%
rename from AnkiDroid/src/main/res/color/text_color_secondary_eink.xml
rename to common/android/src/main/res/color/text_color_secondary_eink.xml
diff --git a/AnkiDroid/src/main/res/color/text_color_secondary_light.xml b/common/android/src/main/res/color/text_color_secondary_light.xml
similarity index 100%
rename from AnkiDroid/src/main/res/color/text_color_secondary_light.xml
rename to common/android/src/main/res/color/text_color_secondary_light.xml
diff --git a/AnkiDroid/src/main/res/drawable-nodpi/nav_drawer_logo.png b/common/android/src/main/res/drawable-nodpi/nav_drawer_logo.png
similarity index 100%
rename from AnkiDroid/src/main/res/drawable-nodpi/nav_drawer_logo.png
rename to common/android/src/main/res/drawable-nodpi/nav_drawer_logo.png
diff --git a/AnkiDroid/src/main/res/drawable-nodpi/nav_drawer_logo_black_theme.png b/common/android/src/main/res/drawable-nodpi/nav_drawer_logo_black_theme.png
similarity index 100%
rename from AnkiDroid/src/main/res/drawable-nodpi/nav_drawer_logo_black_theme.png
rename to common/android/src/main/res/drawable-nodpi/nav_drawer_logo_black_theme.png
diff --git a/AnkiDroid/src/main/res/drawable-nodpi/nav_drawer_logo_dark_theme.png b/common/android/src/main/res/drawable-nodpi/nav_drawer_logo_dark_theme.png
similarity index 100%
rename from AnkiDroid/src/main/res/drawable-nodpi/nav_drawer_logo_dark_theme.png
rename to common/android/src/main/res/drawable-nodpi/nav_drawer_logo_dark_theme.png
diff --git a/AnkiDroid/src/main/res/drawable-nodpi/nav_drawer_logo_eink.png b/common/android/src/main/res/drawable-nodpi/nav_drawer_logo_eink.png
similarity index 100%
rename from AnkiDroid/src/main/res/drawable-nodpi/nav_drawer_logo_eink.png
rename to common/android/src/main/res/drawable-nodpi/nav_drawer_logo_eink.png
diff --git a/AnkiDroid/src/main/res/drawable/bg_dialog_eink.xml b/common/android/src/main/res/drawable/bg_dialog_eink.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/bg_dialog_eink.xml
rename to common/android/src/main/res/drawable/bg_dialog_eink.xml
diff --git a/AnkiDroid/src/main/res/drawable/bg_popup.xml b/common/android/src/main/res/drawable/bg_popup.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/bg_popup.xml
rename to common/android/src/main/res/drawable/bg_popup.xml
diff --git a/AnkiDroid/src/main/res/drawable/bg_snackbar_eink.xml b/common/android/src/main/res/drawable/bg_snackbar_eink.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/bg_snackbar_eink.xml
rename to common/android/src/main/res/drawable/bg_snackbar_eink.xml
diff --git a/AnkiDroid/src/main/res/drawable/divider.xml b/common/android/src/main/res/drawable/divider.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/divider.xml
rename to common/android/src/main/res/drawable/divider.xml
diff --git a/AnkiDroid/src/main/res/drawable/divider_black.xml b/common/android/src/main/res/drawable/divider_black.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/divider_black.xml
rename to common/android/src/main/res/drawable/divider_black.xml
diff --git a/AnkiDroid/src/main/res/drawable/divider_dark.xml b/common/android/src/main/res/drawable/divider_dark.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/divider_dark.xml
rename to common/android/src/main/res/drawable/divider_dark.xml
diff --git a/AnkiDroid/src/main/res/drawable/drawer_item_background_dark.xml b/common/android/src/main/res/drawable/drawer_item_background_dark.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/drawer_item_background_dark.xml
rename to common/android/src/main/res/drawable/drawer_item_background_dark.xml
diff --git a/AnkiDroid/src/main/res/drawable/drawer_item_background_light.xml b/common/android/src/main/res/drawable/drawer_item_background_light.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/drawer_item_background_light.xml
rename to common/android/src/main/res/drawable/drawer_item_background_light.xml
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_again.xml b/common/android/src/main/res/drawable/footer_button_again.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/footer_button_again.xml
rename to common/android/src/main/res/drawable/footer_button_again.xml
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_again_dark.xml b/common/android/src/main/res/drawable/footer_button_again_dark.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/footer_button_again_dark.xml
rename to common/android/src/main/res/drawable/footer_button_again_dark.xml
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_all_black.xml b/common/android/src/main/res/drawable/footer_button_all_black.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/footer_button_all_black.xml
rename to common/android/src/main/res/drawable/footer_button_all_black.xml
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_all_black_ripple.xml b/common/android/src/main/res/drawable/footer_button_all_black_ripple.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/footer_button_all_black_ripple.xml
rename to common/android/src/main/res/drawable/footer_button_all_black_ripple.xml
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_all_eink.xml b/common/android/src/main/res/drawable/footer_button_all_eink.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/footer_button_all_eink.xml
rename to common/android/src/main/res/drawable/footer_button_all_eink.xml
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_all_eink_ripple.xml b/common/android/src/main/res/drawable/footer_button_all_eink_ripple.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/footer_button_all_eink_ripple.xml
rename to common/android/src/main/res/drawable/footer_button_all_eink_ripple.xml
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_all_plain.xml b/common/android/src/main/res/drawable/footer_button_all_plain.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/footer_button_all_plain.xml
rename to common/android/src/main/res/drawable/footer_button_all_plain.xml
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_all_plain_ripple.xml b/common/android/src/main/res/drawable/footer_button_all_plain_ripple.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/footer_button_all_plain_ripple.xml
rename to common/android/src/main/res/drawable/footer_button_all_plain_ripple.xml
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_easy.xml b/common/android/src/main/res/drawable/footer_button_easy.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/footer_button_easy.xml
rename to common/android/src/main/res/drawable/footer_button_easy.xml
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_easy_dark.xml b/common/android/src/main/res/drawable/footer_button_easy_dark.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/footer_button_easy_dark.xml
rename to common/android/src/main/res/drawable/footer_button_easy_dark.xml
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_good.xml b/common/android/src/main/res/drawable/footer_button_good.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/footer_button_good.xml
rename to common/android/src/main/res/drawable/footer_button_good.xml
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_good_dark.xml b/common/android/src/main/res/drawable/footer_button_good_dark.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/footer_button_good_dark.xml
rename to common/android/src/main/res/drawable/footer_button_good_dark.xml
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_hard.xml b/common/android/src/main/res/drawable/footer_button_hard.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/footer_button_hard.xml
rename to common/android/src/main/res/drawable/footer_button_hard.xml
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_hard_dark.xml b/common/android/src/main/res/drawable/footer_button_hard_dark.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/footer_button_hard_dark.xml
rename to common/android/src/main/res/drawable/footer_button_hard_dark.xml
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_ripple.xml b/common/android/src/main/res/drawable/footer_button_ripple.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/footer_button_ripple.xml
rename to common/android/src/main/res/drawable/footer_button_ripple.xml
diff --git a/AnkiDroid/src/main/res/drawable/ic_baseline_chevron_right_24.xml b/common/android/src/main/res/drawable/ic_baseline_chevron_right_24.xml
similarity index 66%
rename from AnkiDroid/src/main/res/drawable/ic_baseline_chevron_right_24.xml
rename to common/android/src/main/res/drawable/ic_baseline_chevron_right_24.xml
index d060b807f4a7..1b05acac4a20 100644
--- a/AnkiDroid/src/main/res/drawable/ic_baseline_chevron_right_24.xml
+++ b/common/android/src/main/res/drawable/ic_baseline_chevron_right_24.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://fonts.gstatic.com/s/i/materialicons/chevron_right/v16/24px.xml
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_chevron_right_black.xml b/common/android/src/main/res/drawable/ic_chevron_right_black.xml
similarity index 64%
rename from AnkiDroid/src/main/res/drawable/ic_chevron_right_black.xml
rename to common/android/src/main/res/drawable/ic_chevron_right_black.xml
index 8edf2089e048..243d93bdf73e 100644
--- a/AnkiDroid/src/main/res/drawable/ic_chevron_right_black.xml
+++ b/common/android/src/main/res/drawable/ic_chevron_right_black.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://fonts.gstatic.com/s/i/materialicons/chevron_right/v16/24px.xml
+-->
 <vector android:autoMirrored="true" xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/AnkiDroid/src/main/res/drawable/ic_chevron_right_white.xml b/common/android/src/main/res/drawable/ic_chevron_right_white.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/ic_chevron_right_white.xml
rename to common/android/src/main/res/drawable/ic_chevron_right_white.xml
diff --git a/common/android/src/main/res/drawable/ic_delete_white.xml b/common/android/src/main/res/drawable/ic_delete_white.xml
index 7248d1609bd1..e0d13a25a5d6 100644
--- a/common/android/src/main/res/drawable/ic_delete_white.xml
+++ b/common/android/src/main/res/drawable/ic_delete_white.xml
@@ -1,3 +1,9 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled
+  Source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/action/delete/materialicons/black/res/drawable/baseline_delete_24.xml
+-->
 <vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/AnkiDroid/src/main/res/drawable/ic_expand_more_black.xml b/common/android/src/main/res/drawable/ic_expand_more_black.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/ic_expand_more_black.xml
rename to common/android/src/main/res/drawable/ic_expand_more_black.xml
diff --git a/AnkiDroid/src/main/res/drawable/ic_expand_more_white.xml b/common/android/src/main/res/drawable/ic_expand_more_white.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/ic_expand_more_white.xml
rename to common/android/src/main/res/drawable/ic_expand_more_white.xml
diff --git a/AnkiDroid/src/main/res/drawable/ic_help_black_24dp.xml b/common/android/src/main/res/drawable/ic_help_black_24dp.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/ic_help_black_24dp.xml
rename to common/android/src/main/res/drawable/ic_help_black_24dp.xml
diff --git a/AnkiDroid/src/main/res/drawable/item_background_selected.xml b/common/android/src/main/res/drawable/item_background_selected.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/item_background_selected.xml
rename to common/android/src/main/res/drawable/item_background_selected.xml
diff --git a/AnkiDroid/src/main/res/drawable/material_dialog_background.xml b/common/android/src/main/res/drawable/material_dialog_background.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/material_dialog_background.xml
rename to common/android/src/main/res/drawable/material_dialog_background.xml
diff --git a/AnkiDroid/src/main/res/layout/dialog_alert_dialog_checkbox.xml b/common/android/src/main/res/layout/dialog_alert_dialog_checkbox.xml
similarity index 100%
rename from AnkiDroid/src/main/res/layout/dialog_alert_dialog_checkbox.xml
rename to common/android/src/main/res/layout/dialog_alert_dialog_checkbox.xml
diff --git a/AnkiDroid/src/main/res/layout/dialog_alert_dialog_title_with_help.xml b/common/android/src/main/res/layout/dialog_alert_dialog_title_with_help.xml
similarity index 100%
rename from AnkiDroid/src/main/res/layout/dialog_alert_dialog_title_with_help.xml
rename to common/android/src/main/res/layout/dialog_alert_dialog_title_with_help.xml
diff --git a/AnkiDroid/src/main/res/layout/dialog_generic_recycler_view.xml b/common/android/src/main/res/layout/dialog_generic_recycler_view.xml
similarity index 100%
rename from AnkiDroid/src/main/res/layout/dialog_generic_recycler_view.xml
rename to common/android/src/main/res/layout/dialog_generic_recycler_view.xml
diff --git a/AnkiDroid/src/main/res/layout/dialog_generic_text_input.xml b/common/android/src/main/res/layout/dialog_generic_text_input.xml
similarity index 100%
rename from AnkiDroid/src/main/res/layout/dialog_generic_text_input.xml
rename to common/android/src/main/res/layout/dialog_generic_text_input.xml
diff --git a/AnkiDroid/src/main/res/layout/dialog_listview_message.xml b/common/android/src/main/res/layout/dialog_listview_message.xml
similarity index 100%
rename from AnkiDroid/src/main/res/layout/dialog_listview_message.xml
rename to common/android/src/main/res/layout/dialog_listview_message.xml
diff --git a/AnkiDroid/src/main/res/layout/preference_material_switch_widget.xml b/common/android/src/main/res/layout/preference_material_switch_widget.xml
similarity index 100%
rename from AnkiDroid/src/main/res/layout/preference_material_switch_widget.xml
rename to common/android/src/main/res/layout/preference_material_switch_widget.xml
diff --git a/common/android/src/main/res/values-af/02-strings.xml b/common/android/src/main/res/values-af/02-strings.xml
index d16108aaa7fa..c773c17ae343 100644
--- a/common/android/src/main/res/values-af/02-strings.xml
+++ b/common/android/src/main/res/values-af/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Lettergrootte</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Wys nutsbalk</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Jou tuisskerm laat nie toe dat AnkiDroid kortpaaie byvoeg nie</string>
     <string name="create_shortcut_error">Fout met byvoeging van kortpad: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Hoofletters sinne</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Rol nutsbalk</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Meld asseblief aan om meer dekke af te laai</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Beskrywing</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-af/03-dialogs.xml b/common/android/src/main/res/values-af/03-dialogs.xml
index 19abd00df7fa..a3eaa6656d4f 100644
--- a/common/android/src/main/res/values-af/03-dialogs.xml
+++ b/common/android/src/main/res/values-af/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Wil jy regtig probeer om die databasis te herstel?\n\nVoor die poging begin, sal \'n kopie in subgids “%s” geskep word.</string>
     <string name="intent_aedict_empty">Kategorie “verstek” is leeg</string>
     <string name="intent_aedict_category">Om kaarte by AnkiDroid te voeg, verwyder alle Notepad-kategorieë of voeg een by met die naam “verstek”</string>
-    <string name="custom_study_new_extend">Verhoog/verlaag (“-3”) vandag se nuwe kaartlimiet met</string>
-    <string name="custom_study_rev_extend">Verhoog/verlaag (“-3”) vandag se nuwe hersieningslimiet met</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Hersien kaarte wat in die laaste x dae vergeet is</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Alle kaarte</string>
-    <string name="tags_dialog_option_new_cards">Nuut</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Nuut</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Verskuldig</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Tans besig om leë kaarte te vind&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-af/10-preferences.xml b/common/android/src/main/res/values-af/10-preferences.xml
index 97fef688fee2..893bba49016e 100644
--- a/common/android/src/main/res/values-af/10-preferences.xml
+++ b/common/android/src/main/res/values-af/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-af/16-multimedia-editor.xml b/common/android/src/main/res/values-af/16-multimedia-editor.xml
index d9a9211644fc..7d3e5ec19a56 100644
--- a/common/android/src/main/res/values-af/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-af/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-am/02-strings.xml b/common/android/src/main/res/values-am/02-strings.xml
index e07cedd7eb06..de628947adb1 100644
--- a/common/android/src/main/res/values-am/02-strings.xml
+++ b/common/android/src/main/res/values-am/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-am/03-dialogs.xml b/common/android/src/main/res/values-am/03-dialogs.xml
index db8e076091f4..3d2c3438973f 100644
--- a/common/android/src/main/res/values-am/03-dialogs.xml
+++ b/common/android/src/main/res/values-am/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">All cards</string>
-    <string name="tags_dialog_option_new_cards">New</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">New</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-am/10-preferences.xml b/common/android/src/main/res/values-am/10-preferences.xml
index e2dc63311162..3eb964058c21 100644
--- a/common/android/src/main/res/values-am/10-preferences.xml
+++ b/common/android/src/main/res/values-am/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-am/16-multimedia-editor.xml b/common/android/src/main/res/values-am/16-multimedia-editor.xml
index d9a9211644fc..7d3e5ec19a56 100644
--- a/common/android/src/main/res/values-am/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-am/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-ar/02-strings.xml b/common/android/src/main/res/values-ar/02-strings.xml
index f512c524a0f0..493df356a860 100644
--- a/common/android/src/main/res/values-ar/02-strings.xml
+++ b/common/android/src/main/res/values-ar/02-strings.xml
@@ -231,7 +231,10 @@
     <string name="ankidroid_init_failed_storage">لم يتمكن آنكي درويد من الوصول إلى التخزين نتيجة لخلل في نظام الآندرويد.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">حجم الخط</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">إظهار شريط الأدوات</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">تعريض</string>
@@ -259,7 +262,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">لا تسمح شاشتك الرئيسة لآنكي درويد بإضافة اختصارات</string>
     <string name="create_shortcut_error">خلل في إضافة الاختصار: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">ضع الجمل في حروف كبيرة</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">تمرير شريط الأدوات</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">الرابط</string>
     <string name="dialog_hint_certificate">الرخصة</string>
@@ -354,7 +356,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">الإنترنت</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">تنصيب</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">فشل فتح إعدادات تحويل النص إلى كلام</string>
-    <string name="shared_decks_login_required">الرجاء تسجيل الدخول لتنزيل المزيد من المجموعات</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">الوصف</string>
     <string name="deck_description_saved">تم تعديل الوصف</string>
     <string name="format_deck_description_as_markdown">تنسيق كـ Markdown</string>
diff --git a/common/android/src/main/res/values-ar/03-dialogs.xml b/common/android/src/main/res/values-ar/03-dialogs.xml
index 04a088b4420f..f51d19e6bff3 100644
--- a/common/android/src/main/res/values-ar/03-dialogs.xml
+++ b/common/android/src/main/res/values-ar/03-dialogs.xml
@@ -53,8 +53,8 @@
     <string name="repair_deck_dialog">هل تريد حقًا إصلاح قاعدة البيانات؟\n\nقبل بدء هذه المحاولة، ستُنشَأ نسخة في المجلد الفرعي “%s”.</string>
     <string name="intent_aedict_empty">الصنف «default» فارغ</string>
     <string name="intent_aedict_category">لإضافة بطاقات إلى آنكي درويد، أزل كل تصنيفات المذكرة أو أضف تصنيفًا باسم «default»</string>
-    <string name="custom_study_new_extend">إضافة/طرح (مثلًا «-٣») إلى حد البطاقات الجديدة لهذا اليوم</string>
-    <string name="custom_study_rev_extend">إضافة/طرح (مثلًا «-٣») إلى حد المراجعات لهذا اليوم</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">راجع البطاقات المنسية في آخر س يوم:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -108,7 +108,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">كل البطاقات</string>
-    <string name="tags_dialog_option_new_cards">الجديدة</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">الجديدة</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">المستحقة</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">يتم البحث عن البطاقات الفارغة&#8230;</string>
@@ -260,6 +260,8 @@
     <string name="webview_update_message">إصدار ويب فيو لهذا النظام قديم. لن تعمل بعض الميزات بشكل صحيح. حدثه رجاءًا.\n\nالإصدار المنصب: %1$d\nالإصدار الأدنى المطلوب: %2$d</string>
     <string name="compress">ضغط</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">اللغة غير مدعومة</string>
     <string name="tts_error_dialog_reason_text">لا يدعم محرك تحويل النص إلى كلام <b>%1$s</b> اللغة التالية:
 <b>%2$s</b></string>
@@ -296,7 +298,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">مِن</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">إلى</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-ar/10-preferences.xml b/common/android/src/main/res/values-ar/10-preferences.xml
index aacc729c79e5..d14657e92b86 100644
--- a/common/android/src/main/res/values-ar/10-preferences.xml
+++ b/common/android/src/main/res/values-ar/10-preferences.xml
@@ -59,7 +59,7 @@
     <string name="dangerous_js_api_denied_snackbar">الأمان: تم ردع نداء شديد الخطر لـ JavaScript.\nإن كنت تثق بجميع البطاقات والقوالب في مجموعتك فيمكنك أن تسمح لهذا في الخيارات المتقدمة.</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">السماح للبطاقات بفتح تطبيقات أخرى</string>
-    <string name="allow_card_external_launch_summ">تستطيع البطاقات فتح تطبيقات أخرى على جهازك مما قد يسبب نتائج غير مرغوبة.\nدع هذا الخيار إلا إن كنت تثق بجميع البطاقات والقوالب في مجموعتك.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">الأمان: تم منع البطاقة من فتح تطبيق آخر.\nإن كنت تثق بجميع البطاقات والقوالب في مجموعتك فيمكنك أن تسمح لهذا في الخيارات المتقدمة.</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">عرض الخط</string>
@@ -173,6 +173,18 @@
     <string name="use_current" maxLength="41">رزمة البطاقات الجديدة</string>
     <string name="learn_cutoff" maxLength="41">حد التعلم المبكر</string>
     <string name="time_limit" maxLength="41">مهلة مربع الوقت</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="zero">mins</item>
+        <item quantity="one">min</item>
+        <item quantity="two">mins</item>
+        <item quantity="few">mins</item>
+        <item quantity="many">mins</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">بداية اليوم التالي</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="zero">%d ساعة بعد منتصف الليل</item>
@@ -259,6 +271,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-ar/16-multimedia-editor.xml b/common/android/src/main/res/values-ar/16-multimedia-editor.xml
index ef077858de52..c4f87439cb0f 100644
--- a/common/android/src/main/res/values-ar/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ar/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">أتريد قص هذه الصورة؟</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">حجم الصورة الحالي هو %s ميغابايت. حد الحجم الافتراضي هو 1 ميغابايت. هل تريد ضغطها؟</string>
     <string name="select_image_failed">"فشل تحديد الصورة، الرجاء إعادة المحاولة"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">محتويات الحقل</string>
diff --git a/common/android/src/main/res/values-az/02-strings.xml b/common/android/src/main/res/values-az/02-strings.xml
index 36d16689c7bb..a07f61ddfc4c 100644
--- a/common/android/src/main/res/values-az/02-strings.xml
+++ b/common/android/src/main/res/values-az/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-az/03-dialogs.xml b/common/android/src/main/res/values-az/03-dialogs.xml
index 4b1553ad1b1a..7bfa4c1eeecc 100644
--- a/common/android/src/main/res/values-az/03-dialogs.xml
+++ b/common/android/src/main/res/values-az/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Doğrudan verilənlər bazasını bərpa etməyə çalışırsınız?Keçirilməyə başlamazdan əvvəl,alt klasörlerde bir kopya yaradılacaq \"%s\"</string>
     <string name="intent_aedict_empty">Kateqoriya \"default\" boşdur</string>
     <string name="intent_aedict_category">AnkiDroid kartlarını əlavə etmək üçün bütün Notepad kateqoriyalarını silin və ya \"default\" adını əlavə edin</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Son x günlərdə unudulmuş kartları nəzərdən keçirin:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Bütün kartlar</string>
-    <string name="tags_dialog_option_new_cards">Yeni</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Yeni</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Boş kartlar axtarılır&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-az/10-preferences.xml b/common/android/src/main/res/values-az/10-preferences.xml
index fb0f556a916f..c61be38a709e 100644
--- a/common/android/src/main/res/values-az/10-preferences.xml
+++ b/common/android/src/main/res/values-az/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-az/16-multimedia-editor.xml b/common/android/src/main/res/values-az/16-multimedia-editor.xml
index 11a9d7bb55c6..fb417c9fb286 100644
--- a/common/android/src/main/res/values-az/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-az/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-be/02-strings.xml b/common/android/src/main/res/values-be/02-strings.xml
index 458d8a4082b5..e2d320ac2ba8 100644
--- a/common/android/src/main/res/values-be/02-strings.xml
+++ b/common/android/src/main/res/values-be/02-strings.xml
@@ -223,7 +223,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid не можа атрымаць доступ да сховішча з-за памылкі ў аперацыйнай сістэме.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Памер шрыфту</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Паказаць панэль інструментаў</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Паказаць папярэдні прагляд</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Схаваць папярэдні прагляд</string>
     <string name="format_insert_bold">Фарматаваць як тлусты</string>
@@ -251,7 +254,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Ваш галоўны экран не дазваляе праграме дадаваць ярлыкі</string>
     <string name="create_shortcut_error">Памылка дадавання ярлыка: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Пачынаць сказ з вялікай літары</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Панэль прагорткі</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL-адрас</string>
     <string name="dialog_hint_certificate">Сертыфікат</string>
@@ -342,7 +344,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Інтэрнэт</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Усталяваць</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Не ўдалося адкрыць налады сінтэзу маўлення</string>
-    <string name="shared_decks_login_required">Увайдзіце, каб спампаваць больш калод</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Апісанне</string>
     <string name="deck_description_saved">Апісанне абноўлена</string>
     <string name="format_deck_description_as_markdown">Фармат як Markdown</string>
diff --git a/common/android/src/main/res/values-be/03-dialogs.xml b/common/android/src/main/res/values-be/03-dialogs.xml
index a47b0dd08230..4c0cec093722 100644
--- a/common/android/src/main/res/values-be/03-dialogs.xml
+++ b/common/android/src/main/res/values-be/03-dialogs.xml
@@ -49,8 +49,8 @@
     <string name="repair_deck_dialog">Вы сапраўды хочаце аднавіць базу даных?\n\nПерад спробай па яе аднаўленні, будзе створана копія ў  падпапцы \'%s\'.</string>
     <string name="intent_aedict_empty">Катэгорыя “default” нічога не змяшчае</string>
     <string name="intent_aedict_category">Для таго, каб дадаць карткі ў AnkiDroid, выдаліце ўсе катэгорыі Notepad або дадайце катэгорыю з назвай \"default\"</string>
-    <string name="custom_study_new_extend">Павялічыць/паменшыць (“-3”) абмежаванні новых картак на сёння</string>
-    <string name="custom_study_rev_extend">Павялічыць/паменшыць (“-3”) абмежаванні паўтарэння новых картак на сёння</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Паўтарыць забытыя карткі за апошнія некалькі дзён:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -102,7 +102,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Усе карткі</string>
-    <string name="tags_dialog_option_new_cards">Новыя</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Новыя</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Да прагляду</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Пошук пустых картак&#8230;</string>
@@ -244,6 +244,8 @@
     <string name="webview_update_message">Сістэма WebView састарэла. Некаторыя функцыі будуць працаваць некарэктна. Неабходна абнаўленне.\n\nБягучая версія: %1$d\nМінімальна неабходная версія: %2$d</string>
     <string name="compress">Сціснуць</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Мова не падтрымліваецца</string>
     <string name="tts_error_dialog_reason_text">Рухавік пераўтварэння тэксту ў голас <b>%1$s</b> не падтрымлівае наступную мову: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Змяніць рухавік</string>
@@ -279,7 +281,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">З</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">На</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Назва профілю</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Назва профілю не можа быць пустой</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Назва профілю павінна змяшчаць %1$d сімв. або менш</string>
diff --git a/common/android/src/main/res/values-be/10-preferences.xml b/common/android/src/main/res/values-be/10-preferences.xml
index 9cacb384a88e..771e0e919ac3 100644
--- a/common/android/src/main/res/values-be/10-preferences.xml
+++ b/common/android/src/main/res/values-be/10-preferences.xml
@@ -57,7 +57,7 @@
     <string name="dangerous_js_api_denied_snackbar">Бяспека: небяспечны выклік JavaScript заблакіраваны.\nКалі вы давяраеце ўсім карткам і шаблонам у вашай калекцыі, то гэту функцыю можна разблакіраваць у пашыраных наладах</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Карткі могуць запускаць іншыя праграмы</string>
-    <string name="allow_card_external_launch_summ">Карткі могуць адкрываць іншыя праграму ў вашай прыладзе і запускаць патэнцыйна непажаданыя дзеянні.\nПакіньце выключаным пакуль у вас няма даверу да ўсіх картак і шаблонаў у вашай калекцыі.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Бяспека: картка не можа запускаць іншыя праграмы.\nКалі вы давяраеце ўсім карткам і шаблонам у вашай калекцыі, то гэту функцыю можна разблакіраваць у пашыраных наладах.</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Шырыня штрыха</string>
@@ -171,6 +171,16 @@
     <string name="use_current" maxLength="41">Калода для новых картак</string>
     <string name="learn_cutoff" maxLength="41">Вучыць наперад</string>
     <string name="time_limit" maxLength="41">Абмежаванне навучальнага блока</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="few">mins</item>
+        <item quantity="many">mins</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Пачатак наступнага дня</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d гадзіна пасля поўначы</item>
@@ -256,6 +266,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-be/16-multimedia-editor.xml b/common/android/src/main/res/values-be/16-multimedia-editor.xml
index 5d15fb2e9ef0..d890c1f13de5 100644
--- a/common/android/src/main/res/values-be/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-be/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Вы сапраўды хочаце абрэзаць гэты відарыс?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Памер бягучага відарыса складае %s МБ. Стандартна, памер відарыса абмежаваны да 1 МБ. Хочаце сціснуць гэты відарыс?</string>
     <string name="select_image_failed">"Не атрымалася выбраць відарыс. Паўтарыце спробу"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Змесціва поля</string>
diff --git a/common/android/src/main/res/values-bg/02-strings.xml b/common/android/src/main/res/values-bg/02-strings.xml
index 9c8975d1856e..39b1c24f337c 100644
--- a/common/android/src/main/res/values-bg/02-strings.xml
+++ b/common/android/src/main/res/values-bg/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Големина на шрифт</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Показване на лентата с инструменти</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Грешка, добавяйки пряк път: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Изречения с главна буква</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Превъртане на лентата с инструменти</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-bg/03-dialogs.xml b/common/android/src/main/res/values-bg/03-dialogs.xml
index 31235d85154f..a1c72146b85c 100644
--- a/common/android/src/main/res/values-bg/03-dialogs.xml
+++ b/common/android/src/main/res/values-bg/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Наистина ли искате да опитате да поправите базата данни? \n\nПреди да започнете, копие ще бъде създадено в папка \"%s\".</string>
     <string name="intent_aedict_empty">Категория \"по подразбиране\" е празна</string>
     <string name="intent_aedict_category">За да добавите карти за AnkiDroid, премахнете всички категории на Notepad или добавите такава с име \'default\'</string>
-    <string name="custom_study_new_extend">Увеличаване/намаляване (\"-3\") днешен лимитът на нови карти</string>
-    <string name="custom_study_rev_extend">Увеличаване/намаляване (\"-3\") днешен лимитът на повтарящи се карти</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Повтаряне на забравени карти през последните x дни:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Всички карти</string>
-    <string name="tags_dialog_option_new_cards">Ново</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Ново</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Край</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Намиране на празни карти&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-bg/10-preferences.xml b/common/android/src/main/res/values-bg/10-preferences.xml
index f79b98e92c90..3558f097eef5 100644
--- a/common/android/src/main/res/values-bg/10-preferences.xml
+++ b/common/android/src/main/res/values-bg/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Ширина на щриха</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">Тесте за нови карти</string>
     <string name="learn_cutoff" maxLength="41">Учене над лимита</string>
     <string name="time_limit" maxLength="41">Ограничение на времето</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -251,6 +259,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-bg/16-multimedia-editor.xml b/common/android/src/main/res/values-bg/16-multimedia-editor.xml
index 047c9db92c96..87bbb6dfef8e 100644
--- a/common/android/src/main/res/values-bg/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-bg/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Искате ли да изрежете изображението?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Избраното изображение пропадна. Опитайте пак"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-bn/02-strings.xml b/common/android/src/main/res/values-bn/02-strings.xml
index 1ebf3aeb151d..2b9ff52b20af 100644
--- a/common/android/src/main/res/values-bn/02-strings.xml
+++ b/common/android/src/main/res/values-bn/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">ফন্টের আকার</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">টুলবার দেখান</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">আপনার হোম স্ক্রীন AnkiDroid-কে শর্টকাট যোগ করার অনুমতি দেয় না</string>
     <string name="create_shortcut_error">শর্টকাট যোগ করার সময় ত্রুটি: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">টুলবার স্ক্রোল করুন</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">আরো ডেক ডাউনলোড করতে লগ ইন করুন</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">বর্ণনা</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-bn/03-dialogs.xml b/common/android/src/main/res/values-bn/03-dialogs.xml
index 65be7decd335..e4585744e866 100644
--- a/common/android/src/main/res/values-bn/03-dialogs.xml
+++ b/common/android/src/main/res/values-bn/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">আপনি কি ডাটাবেস মেরামত করার চেষ্টা করার বিষয়ে নিশ্চিত?\n\nপ্রয়াস শুরু করার আগে, সাবফোল্ডার “%s”-এ একটি অনুলিপি তৈরি করা হবে।</string>
     <string name="intent_aedict_empty">বিভাগ \"ডিফল্ট\" খালি</string>
     <string name="intent_aedict_category">AnkiDroid-এ কার্ড যোগ করতে নোটপ্যাডের সমস্ত বিভাগ সরিয়ে ফেলুন বা \"ডিফল্ট\" নামে একটি যোগ করুন।</string>
-    <string name="custom_study_new_extend">আজকের নতুন কার্ডের সীমা বাড়ান/কমান (“-3”)</string>
-    <string name="custom_study_rev_extend">আজকের পর্যালোচনা সীমা বাড়ান/কমান (“-3”)</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">গত x দিনে ভুলে যাওয়া কার্ডগুলি পর্যালোচনা করুন:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">সব কার্ড</string>
-    <string name="tags_dialog_option_new_cards">নতুন</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">নতুন</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">খালি কার্ড খুঁজছি&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">কম্প্রেস</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">ভাষা সমর্থিত নয়</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">ইঞ্জিন পরিবর্তন করুন</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-bn/10-preferences.xml b/common/android/src/main/res/values-bn/10-preferences.xml
index f870652f72c2..b93da2ef056e 100644
--- a/common/android/src/main/res/values-bn/10-preferences.xml
+++ b/common/android/src/main/res/values-bn/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">স্ট্রোকের প্রস্থ</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">নতুন কার্ডের জন্য ডেক</string>
     <string name="learn_cutoff" maxLength="41">এগিয়ে সীমা শিখুন</string>
     <string name="time_limit" maxLength="41">টাইমবক্স হল সময়সীমা</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">পরের দিনের শুরু</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-bn/16-multimedia-editor.xml b/common/android/src/main/res/values-bn/16-multimedia-editor.xml
index 4cda9e3e8f05..ae4f0ec796f4 100644
--- a/common/android/src/main/res/values-bn/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-bn/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">আপনি কি এই ছবিটি ক্রপ করতে চান?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"ছবি নির্বাচন করতে ব্যর্থ, আবার চেষ্টা করুন"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">ক্ষেত্রের বিষয়বস্তু</string>
diff --git a/common/android/src/main/res/values-ca/01-core.xml b/common/android/src/main/res/values-ca/01-core.xml
index b20c5708bd89..f939f1ef4956 100644
--- a/common/android/src/main/res/values-ca/01-core.xml
+++ b/common/android/src/main/res/values-ca/01-core.xml
@@ -41,7 +41,7 @@
     <string name="no_cards_placeholder_description" comment="Text shown the first time AnkiDroid is opened, to explain what should be their first action.">Comenceu a afegir cartes\n amb la icona +.</string>
     <!-- Reviewer -->
     <plurals name="reviewer_window_title" comment="Header of the reviewer, telling the users how many minutes remains before they have seen all cards.">
-        <item quantity="one">Falta %d minut</item>
+        <item quantity="one">Queda %d minut</item>
         <item quantity="other">Queden %d minuts</item>
     </plurals>
     <plurals name="reviewer_window_title_hours_new" comment="Header of the reviewer, telling the users how many minutes remains before they have seen all cards. The second parameter is the number of minutes.">
@@ -92,7 +92,7 @@
     <string name="empty_cram_label" maxLength="28">Buit</string>
     <string name="create_subdeck">Crea un paquet</string>
     <string name="empty_filtered_deck">S\'està buidant el paquet filtrat</string>
-    <string name="search_deck" comment="Deck search for selecting it">Deck search</string>
+    <string name="search_deck" comment="Deck search for selecting it">Cerca de baralles</string>
     <string name="empty_deck">Aquest paquet és buit</string>
     <string name="invalid_deck_name">El nom del paquet no és vàlid</string>
     <string name="studyoptions_congrats_finished">Enhorabona! Ja has acabat per ara.</string>
@@ -127,8 +127,8 @@
     <string name="read_write_permission_label">Llegir i escriure a la base de dades d\'AnkiDroid</string>
     <string name="read_write_permission_description">accés a notes, targetes, tipus de nota i malls existents, així com crear-ne de nous</string>
     <!-- Context Menu -->
-    <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">Card browser</string>
-    <string name="context_menu_anki_card_label">Anki card</string>
+    <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">Navegador de cartes</string>
+    <string name="context_menu_anki_card_label">Targeta Anki</string>
     <!-- Sync conflict -->
     <string name="sync_conflict_message_new">Les col·leccions no es poden combinar.\nQuina col·lecció vols conservar?</string>
     <string name="sync_conflict_keep_local_new" comment="Select AnkiDroid files to keep while syncing">AnkiDroid</string>
diff --git a/common/android/src/main/res/values-ca/02-strings.xml b/common/android/src/main/res/values-ca/02-strings.xml
index ae063a86638c..4c9e7cfba413 100644
--- a/common/android/src/main/res/values-ca/02-strings.xml
+++ b/common/android/src/main/res/values-ca/02-strings.xml
@@ -26,15 +26,15 @@
     <!-- Navigation drawer strings -->
     <string name="drawer_open">Obrir el calaix</string>
     <string name="drawer_close">Tancar el calaix</string>
-    <string name="note_message">Note saved</string>
+    <string name="note_message">Nota desada</string>
     <!-- Note editor screen -->
     <string name="CardEditorCardDeck">Paquet de cartes:</string>
     <string name="CardEditorNoteDeck" comment="Label of the field choosing which deck a note\'s cards go into, in the note editor.">Paquet:</string>
     <string name="CardEditorModel">Tipus:</string>
     <string name="CardEditorTags">Etiquetes: %1$s</string>
     <string name="CardEditorCards">Cartes: %1$s</string>
-    <string name="edit_occlusions">Edit occlusions</string>
-    <string name="paste_from_clipboard" maxLength="28">Paste from clipboard</string>
+    <string name="edit_occlusions">Edita oclusions</string>
+    <string name="paste_from_clipboard" maxLength="28">Enganxa des del porta-retalls</string>
     <string name="add_new_filter_tags">Afegir/filtrar etiquetes</string>
     <string name="add_tag" maxLength="28">Afegir etiqueta</string>
     <string name="check_all_tags" maxLength="28">Activar/desactivar totes les etiquetes</string>
@@ -45,15 +45,15 @@
     <string name="save_whiteboard" maxLength="28">Desar pissarra</string>
     <string name="enable_stylus" maxLength="28">Activa el mode de llapis</string>
     <string name="disable_stylus">Desactiva el mode de llapis</string>
-    <string name="eraser" maxLength="28">Eraser</string>
+    <string name="eraser" maxLength="28">Esborrador</string>
     <string name="add_brush" maxLength="28">Add brush</string>
-    <string name="whiteboard_align_left" comment="Option to align the whiteboard toolbar on the left" maxLength="28">Left</string>
-    <string name="whiteboard_align_bottom" comment="Option to align the whiteboard toolbar on the bottom" maxLength="28">Bottom</string>
-    <string name="whiteboard_align_right" comment="Option to align the whiteboard toolbar on the right" maxLength="28">Right</string>
-    <string name="whiteboard_more_options" comment="Tooltip of the whiteboard \'More\' button" maxLength="28">More options</string>
+    <string name="whiteboard_align_left" comment="Option to align the whiteboard toolbar on the left" maxLength="28">Esquerra</string>
+    <string name="whiteboard_align_bottom" comment="Option to align the whiteboard toolbar on the bottom" maxLength="28">A baix</string>
+    <string name="whiteboard_align_right" comment="Option to align the whiteboard toolbar on the right" maxLength="28">Dreta</string>
+    <string name="whiteboard_more_options" comment="Tooltip of the whiteboard \'More\' button" maxLength="28">Més opcions</string>
     <string name="whiteboard_remove_brush_message">Are you sure you want to remove this brush from your palette?</string>
-    <string name="whiteboard_ink_eraser" comment="Title of the whiteboard Ink eraser">Ink</string>
-    <string name="whiteboard_stroke_eraser" comment="Title of the whiteboard Stroke eraser">Stroke</string>
+    <string name="whiteboard_ink_eraser" comment="Title of the whiteboard Ink eraser">Tinta</string>
+    <string name="whiteboard_stroke_eraser" comment="Title of the whiteboard Stroke eraser">Traç</string>
     <string name="stylus_mode" comment="Title of the menu item that toggles the whiteboard stylus mode" maxLength="28">Stylus mode</string>
     <string name="cannot_remove_last_brush_message">The last brush may not be removed</string>
     <string name="enable_whiteboard" maxLength="28">Activar pissarra</string>
@@ -63,13 +63,13 @@
     <string name="disable_eraser" maxLength="28">Disable eraser</string>
     <string name="hide_whiteboard" maxLength="28">Amaga la pissarra</string>
     <string name="clear_whiteboard" maxLength="28">Esborra la pissarra</string>
-    <string name="hide_toolbar" maxLength="28">Hide toolbar</string>
+    <string name="hide_toolbar" maxLength="28">Amaga la barra d\'eines</string>
     <string name="replay_media" maxLength="28">Replay media</string>
     <string name="leech_suspend_notification">Fitxa marcada com a lapa i suspesa</string>
     <string name="leech_notification">Fitxa marcada com a lapa</string>
     <string name="webview_crash_unknown">Error desconegut</string>
     <string name="webview_crash_unknwon_detailed">Això ha estat causat per un error intern a WebView</string>
-    <string name="webview_crash_oom">Out of memory</string>
+    <string name="webview_crash_oom">No hi ha prou memòria.</string>
     <string name="webview_crash_oom_details">El sistema ha finalitzat WebView. Això sol passar quan l’aplicació es queda sense memòria, sovint a causa de dades de grans dimensions.</string>
     <string name="webview_crash_nonfatal">El renderitzador de WebVieu s\'ha penjat. Causa %s</string>
     <string name="webview_crash_fatal">Fatal error: WebView renderer crashed. Cause: %s</string>
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Mida de la lletra</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Mostra la barra d\'eines</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">La pantalla d\'inici no permet que AnkiDroid afegeixi dreceres</string>
     <string name="create_shortcut_error">Error afegint drecera: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Posar els frases en majúscules</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Barra d\'eines de desplaçament</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Descripció</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-ca/03-dialogs.xml b/common/android/src/main/res/values-ca/03-dialogs.xml
index c675919833bd..8f539be36e5b 100644
--- a/common/android/src/main/res/values-ca/03-dialogs.xml
+++ b/common/android/src/main/res/values-ca/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Realment voleu intentar reparar la base de dades? \n\nAbans de començar, es desarà una còpia a la carpeta \'%s\'.</string>
     <string name="intent_aedict_empty">La categoria \'per omissió\' és buida</string>
     <string name="intent_aedict_category">Per afegir fitxes d\'AnkiDroid treieu totes les categories del bloc de notes o afegiu-ne una anomenada \'per omissió\'</string>
-    <string name="custom_study_new_extend">Augmenta/disminueix (\"-3\") el límit d\'avui de noves cartes a</string>
-    <string name="custom_study_rev_extend">Augmenta/disminueix (\"-3\") el límit d\'avui de revisions a</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Revisa les fitxes oblidades en els darrers x dies:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Totes les cartes</string>
-    <string name="tags_dialog_option_new_cards">Nou</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Nou</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Venciment</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Trobar targetes buides&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-ca/10-preferences.xml b/common/android/src/main/res/values-ca/10-preferences.xml
index 048bc63d2104..043f490c0f1b 100644
--- a/common/android/src/main/res/values-ca/10-preferences.xml
+++ b/common/android/src/main/res/values-ca/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Amplada del traç</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">Paquet per a cartes noves</string>
     <string name="learn_cutoff" maxLength="41">Informeu-vos de límit per davant</string>
     <string name="time_limit" maxLength="41">Límit de temps de Timebox</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Principi del proper dia</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -251,6 +259,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-ca/11-arrays.xml b/common/android/src/main/res/values-ca/11-arrays.xml
index e4dc82967c38..7370c2cae4e0 100644
--- a/common/android/src/main/res/values-ca/11-arrays.xml
+++ b/common/android/src/main/res/values-ca/11-arrays.xml
@@ -30,12 +30,12 @@
     <string name="add_to_deck_decide_by_note_type">Dedueix pel tipus de nota</string>
     <!-- theme labels -->
     <string name="theme_follow_system">Segueix el sistema</string>
-    <string name="theme_day" comment="Day/Light theme color scheme">Day</string>
-    <string name="theme_night" comment="Night/Dark theme color scheme">Night</string>
+    <string name="theme_day" comment="Day/Light theme color scheme">Dia</string>
+    <string name="theme_night" comment="Night/Dark theme color scheme">Nit</string>
     <!-- day_theme_labels -->
     <string name="day_theme_light">Clar</string>
     <string name="day_theme_plain">Pla</string>
-    <string name="day_theme_eink">E-Ink</string>
+    <string name="day_theme_eink">Tinta electrònica</string>
     <!-- night_theme_labels -->
     <string name="night_theme_black">Negre</string>
     <string name="night_theme_dark">Fosc</string>
@@ -49,7 +49,7 @@
     <string name="html_size_code_xx_large">immens</string>
     <!-- gestures_labels -->
     <string name="answer_easy" comment="Match Anki\'s translations: deckConfigAnswerAgain" maxLength="41">Resposta fàcil</string>
-    <string name="gesture_abort_learning" maxLength="41">Close study screen</string>
+    <string name="gesture_abort_learning" maxLength="41">Escolliu una pantalla d\'estudi</string>
     <string name="gesture_flag_red" maxLength="41">Canviar bandera vermella</string>
     <string name="gesture_flag_orange" maxLength="41">Canviar bandera taronja</string>
     <string name="gesture_flag_green" maxLength="41">Canviar bandera verda</string>
diff --git a/common/android/src/main/res/values-ca/16-multimedia-editor.xml b/common/android/src/main/res/values-ca/16-multimedia-editor.xml
index a1a03a339201..82eb9306b9a3 100644
--- a/common/android/src/main/res/values-ca/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ca/16-multimedia-editor.xml
@@ -49,7 +49,8 @@
     <string name="multimedia_editor_audio_view_create_failed">No es pot crear la barra d\'eines de gravació</string>
     <!-- Crop function-->
     <string name="crop_image">Voleu retallar aquesta imatge?</string>
-    <string name="crop_button" maxLength="28">Crop</string>
+    <string name="crop_button" maxLength="28">Retalla</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">La mida actual de la imatge és de %sMB. El límit predeterminat de la mida és d\'1 MB. Ho voleu comprimir?</string>
     <string name="select_image_failed">"No s\'ha pogut seleccionar la imatge. Torneu-ho a provar si us plau"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Contingut del camp</string>
diff --git a/common/android/src/main/res/values-ca/17-model-manager.xml b/common/android/src/main/res/values-ca/17-model-manager.xml
index 383aef1f413a..f6b1b991b195 100644
--- a/common/android/src/main/res/values-ca/17-model-manager.xml
+++ b/common/android/src/main/res/values-ca/17-model-manager.xml
@@ -35,7 +35,7 @@
     <string name="model_browser_template">Edita les targetes</string>
     <!--Rename-->
     <string name="rename_model">Canvieu el nom del tipus de nota</string>
-    <string name="rename_card_type" maxLength="28">Rename card type</string>
+    <string name="rename_card_type" maxLength="28">Renombrar tipus de targeta</string>
     <!--Language Hint-->
     <string name="model_field_editor_language_hint_dialog_success_result">Estableix consell d\'idioma a %s</string>
     <!--Field Editing-->
@@ -46,8 +46,8 @@
     <string name="model_field_editor_changing">Actualitzant els camps</string>
     <string name="model_field_editor_sort_field">Ordena per aquest camp</string>
     <!-- Card type -->
-    <string name="delete_card_type" maxLength="28">Delete card type</string>
-    <string name="add_card_type" maxLength="28">Add card type</string>
+    <string name="delete_card_type" maxLength="28">Esborrar tipus de targeta</string>
+    <string name="add_card_type" maxLength="28">Afegir tipus de targeta</string>
     <!--Warnings-->
     <string name="model_delete_warning">Esteu segur de que voleu suprimir aquest tipus de nota?</string>
     <!--
@@ -55,17 +55,17 @@
         Delete the note types below?
         Basic, Basic (and reversed card), Cloze
      -->
-    <string name="model_delete_multiple_warning">Delete the note types below?\n %s</string>
+    <string name="model_delete_multiple_warning">Esborrar els tipus de nota de sota?\n %s</string>
     <string name="field_delete_warning">Esteu segur que voleu suprimir aquest camp?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Add: %1$s</string>
+    <string name="model_browser_add_add">Afegeix: %1$s</string>
     <!--This prefix is used for standard note types-->
-    <string name="model_browser_add_clone">Clone: %1$s</string>
+    <string name="model_browser_add_clone">Clona: %1$s</string>
     <!--Browser Appearance-->
     <string name="card_template_browser_appearance_summary">Introduïu la plantilla que utilitzarà el navegador de cartes per mostrar les vostres cartes. Utilitzeu aquesta opció per mostrar una resposta més concisa.\n\nUna plantilla frontal de\n “La capital de {{Country}} és:”\nes pot comprimir al navegador de targetes com\n “Capital: {{Country}}”</string>
-    <string name="card_template_browser_appearance_question_format">Question format</string>
-    <string name="card_template_browser_appearance_answer_format">Answer format</string>
-    <string name="card_template_browser_appearance_restore_default_dialog">Are you sure you want to restore the browser appearance to default?</string>
+    <string name="card_template_browser_appearance_question_format">Format de la pregunta</string>
+    <string name="card_template_browser_appearance_answer_format">Format de la resposta</string>
+    <string name="card_template_browser_appearance_restore_default_dialog">Esteu segur que voleu restaurar l\'aparença del navegador per defecte?</string>
     <string name="card_template_browser_appearance_saving_note">Aquests canvis s\'apliquen quan es desa la plantilla de la carta</string>
     <!-- Deck Override -->
     <string name="card_template_editor_deck_override_on">Substitució de paquet (sí)</string>
diff --git a/common/android/src/main/res/values-ckb/02-strings.xml b/common/android/src/main/res/values-ckb/02-strings.xml
index 4477f1687c5a..4b18d023a6fe 100644
--- a/common/android/src/main/res/values-ckb/02-strings.xml
+++ b/common/android/src/main/res/values-ckb/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-ckb/03-dialogs.xml b/common/android/src/main/res/values-ckb/03-dialogs.xml
index eb7d19bd02d5..f6fb0d5b3cb6 100644
--- a/common/android/src/main/res/values-ckb/03-dialogs.xml
+++ b/common/android/src/main/res/values-ckb/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">All cards</string>
-    <string name="tags_dialog_option_new_cards">New</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">New</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-ckb/10-preferences.xml b/common/android/src/main/res/values-ckb/10-preferences.xml
index cbeb8e721571..ffce61630df5 100644
--- a/common/android/src/main/res/values-ckb/10-preferences.xml
+++ b/common/android/src/main/res/values-ckb/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-ckb/16-multimedia-editor.xml b/common/android/src/main/res/values-ckb/16-multimedia-editor.xml
index 5145ad3045b9..8b793bd48efa 100644
--- a/common/android/src/main/res/values-ckb/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ckb/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">دەتەوێت ئەم وێنەیە ببڕیت؟</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"دیاریکردنی وێنە سەرکەوتوو نەبوو، تکایە دووبارە هەوڵ بدەرەوە"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">ناوەڕۆکی خانەکان</string>
diff --git a/common/android/src/main/res/values-cs/01-core.xml b/common/android/src/main/res/values-cs/01-core.xml
index eae19da124b4..0dad1bfe2b24 100644
--- a/common/android/src/main/res/values-cs/01-core.xml
+++ b/common/android/src/main/res/values-cs/01-core.xml
@@ -137,8 +137,8 @@
     <string name="read_write_permission_label">Čtení a zápis do AnkiDroid databáze</string>
     <string name="read_write_permission_description">spravovat stávající poznámky, karty, typy poznámek a balíčky, a také vytvářet nové</string>
     <!-- Context Menu -->
-    <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">Card browser</string>
-    <string name="context_menu_anki_card_label">Anki card</string>
+    <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">Prohlížeč karet</string>
+    <string name="context_menu_anki_card_label">Anki karta</string>
     <!-- Sync conflict -->
     <string name="sync_conflict_message_new">Kolekce nelze zkombinovat.\nKterou kolekci chcete ponechat?</string>
     <string name="sync_conflict_keep_local_new" comment="Select AnkiDroid files to keep while syncing">AnkiDroid</string>
diff --git a/common/android/src/main/res/values-cs/02-strings.xml b/common/android/src/main/res/values-cs/02-strings.xml
index 20856d99ea04..f875b699cadc 100644
--- a/common/android/src/main/res/values-cs/02-strings.xml
+++ b/common/android/src/main/res/values-cs/02-strings.xml
@@ -225,7 +225,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid nemůže přistupovat k úložišti kvůli chybě Androidu.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Velikost písma</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Zobrazit nástrojovou lištu</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Formátovat jako tučné</string>
@@ -242,8 +245,8 @@
     <string name="edit_toolbar_item">Upravit položku nástrojové lišty</string>
     <string name="toolbar_item_explain_edit_or_remove">Zadejte HTML, které se vloží před a za vybraný text\n\nDlouze stiskněte položku nástrojové lišty, abyste ji upravili nebo odstranili</string>
     <string name="remove_toolbar_item">Odstranit položku nástrojové lišty?</string>
-    <string name="note_editor_toolbar_icon_requirement_error">Button text is required</string>
-    <string name="before_after_text_requirement_error">At least one HTML field is required</string>
+    <string name="note_editor_toolbar_icon_requirement_error">Text tlačítka je povinný</string>
+    <string name="before_after_text_requirement_error">Alespoň jedno HTML pole je povinné</string>
     <string name="note_editor_image_too_large">Obrázek je příliš velký, vložte ho prosím ručně</string>
     <string name="note_editor_video_too_large">Video je příliš velké, vložte ho prosím ručně</string>
     <string name="note_editor_audio_too_large">Zvukový soubor je příliš velký, vložte ho prosím ručně</string>
@@ -253,7 +256,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Vaše domovská obrazovka neumožňuje AnkiDroidu přidávat zástupce</string>
     <string name="create_shortcut_error">Chyba při přidávání zástupce: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Velká počáteční písmena</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Posouvat nástrojovou lištu</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certifikát</string>
@@ -281,8 +283,8 @@
     <string name="download_speed_unit" comment="Download speed. %1$s is an amount of data, e.g. \'1.2 MB\', giving \'1.2 MB/s\'">%1$s/s</string>
     <string name="download_speed_unknown" comment="Placeholder shown when the current download speed is unknown">-/s</string>
     <string name="download_time_unknown" comment="Placeholder when the remaining download time is unknown">-</string>
-    <string name="download_speed_label">Speed</string>
-    <string name="download_time_left_label">Time left</string>
+    <string name="download_speed_label">Rychlost</string>
+    <string name="download_time_left_label">Zbývající čas</string>
     <string name="deck_download_progress_message">Během stahování můžete používat jiné aplikace</string>
     <string name="check_network">Zkontrolujte prosím připojení k síti</string>
     <string name="external_storage_unavailable">Stahování přerušeno, externí úložiště není k dispozici</string>
@@ -344,7 +346,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Instalovat</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Nepodařilo se otevřít nastavení převodu textu na řeč</string>
-    <string name="shared_decks_login_required">Prosím přihlaste se, abyste mohli stáhnout více balíčků</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Popisek</string>
     <string name="deck_description_saved">Popis aktualizován</string>
     <string name="format_deck_description_as_markdown">Formátovat jako Markdown</string>
@@ -389,9 +391,9 @@
     <!--Set up date-->
     <string name="set_due_date_day" comment="Used for setting due date">Den</string>
     <string name="set_due_date_date_range">Časové období</string>
-    <string comment="Shown when retrying a running action" name="already_in_progress">Already in progress</string>
+    <string comment="Shown when retrying a running action" name="already_in_progress">Již probíhá</string>
     <!-- Switch profiles screen -->
-    <string name="switch_profile" maxLength="41" comment="Title of the screen where the user switches between profiles">Switch profile</string>
-    <string name="edit_profile" comment="Content description of the button that edits a profile in the profile list">Edit profile</string>
-    <string name="delete_profile" comment="Content description of the button that deletes a profile in the profile list">Delete profile</string>
+    <string name="switch_profile" maxLength="41" comment="Title of the screen where the user switches between profiles">Změnit profil</string>
+    <string name="edit_profile" comment="Content description of the button that edits a profile in the profile list">Upravit profil</string>
+    <string name="delete_profile" comment="Content description of the button that deletes a profile in the profile list">Odstranit profil</string>
 </resources>
diff --git a/common/android/src/main/res/values-cs/03-dialogs.xml b/common/android/src/main/res/values-cs/03-dialogs.xml
index a162a57df65c..fd407221a9fb 100644
--- a/common/android/src/main/res/values-cs/03-dialogs.xml
+++ b/common/android/src/main/res/values-cs/03-dialogs.xml
@@ -49,8 +49,8 @@
     <string name="repair_deck_dialog">Opravdu se chcete pokusit opravit databázi?\n\nPřed obnovou bude vytvořena kopie v podadresáři „%s“.</string>
     <string name="intent_aedict_empty">Kategorie „výchozí“ je prázdná</string>
     <string name="intent_aedict_category">Chcete-li přidat karty do AnkiDroid, odstraňte všechny kategorie Poznámkového bloku nebo přidejte jednu s názvem „default“</string>
-    <string name="custom_study_new_extend">Zvýšit/snížit („-3“) dnešní limit nových karet o</string>
-    <string name="custom_study_rev_extend">Zvýšit/snížit („-3“) dnešní limit opakování o</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Opakovat zapomenuté karty z posledních x dnů:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -91,7 +91,7 @@
     <string name="check_media_warning">Toto může trvat dlouhou dobu u velké sbírky multimédií? Pokračovat?</string>
     <string name="check_media_message">Kontrolují se multimédia&#8230;</string>
     <string name="check_media_adding_missing_tag">Přidávání štítků&#8230;</string>
-    <string name="check_media_tags_added">Tags added</string>
+    <string name="check_media_tags_added">Štítky přidány</string>
     <string name="delete_media_message">Odstraňují se multimédia&#8230;</string>
     <string name="delete_media_result_title">Výsledek odstraňování</string>
     <plurals name="delete_media_result_message">
@@ -102,7 +102,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Všechny karty</string>
-    <string name="tags_dialog_option_new_cards">Nové</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Nové</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Ke zkoušení</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Hledají se prázdné karty&#8230;</string>
@@ -112,7 +112,7 @@
     <!-- Multimedia - Audio View -->
     <string name="multimedia_editor_audio_permission_denied">Oprávnění k nahrávání zvuku bylo odepřeno</string>
     <string name="permission_denied">Oprávnění zamítnuto</string>
-    <string name="microphone_permission_denied_message">Microphone permission denied. Please grant it in the app settings.</string>
+    <string name="microphone_permission_denied_message">Oprávnění k mikrofonu bylo odepřeno. Prosím, povolte jej v nastavení aplikace.</string>
     <!-- Database Integrity Check -->
     <string name="integrity_check_continue_anyway">Přesto pokračovat</string>
     <string name="integrity_check_insufficient_space">Kontrola databáze používá velké množství dočasného úložiště.\n\nDůrazně se doporučuje, abyste předtím, než budete pokračovat, měli v zařízení alespoň %s volného místa.</string>
@@ -145,7 +145,7 @@
     <!-- Locale Selection Dialog -->
     <string name="locale_selection_dialog_title_new">Nastavit jazyk</string>
     <string name="locale_selection_dialog_summary">Některé vícejazyčné klávesnice, např. GBoard podporují změnu jazyka při úpravách textu\n\nProsím požádejte výrobce klávesnice o funkci „setImeHintLocales“, pokud vaše klávesnice nepřepíná mezi jazyky.</string>
-    <string name="locale_selection_dialog_unknown_language" comment="Used for the locales whose name is not displayed when selected and placeholder is language tag">Unknown language [%1$s]</string>
+    <string name="locale_selection_dialog_unknown_language" comment="Used for the locales whose name is not displayed when selected and placeholder is language tag">Neznámý jazyk [%1$s]</string>
     <!-- Help Dialog -->
     <string name="help_title_using_ankidroid">Používání AnkiDroid</string>
     <string name="help_item_ankidroid_manual">Příručka AnkiDroid</string>
@@ -244,6 +244,8 @@
     <string name="webview_update_message">Systémový WebView je zastaralý. Některé funkce nebudou fungovat správně. Aktualizujte jej prosím.\n\nNainstalovaná verze: %1$d\nMinimální požadovaná verze: %2$d</string>
     <string name="compress">Komprimovat</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Jazyk není podporován</string>
     <string name="tts_error_dialog_reason_text">Modul převodu textu na řeč <b>%1$s</b> nepodporuje následující jazyk: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Změnit modul</string>
@@ -279,8 +281,9 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">Z</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">Na</string>
-    <!-- Add profile dialog -->
-    <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
-    <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
-    <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Přejmenovat profil</string>
+    <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Název profilu</string>
+    <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Název profilu nemůže být prázdný</string>
+    <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Název profilu musí být %1$d znaků nebo méně</string>
 </resources>
diff --git a/common/android/src/main/res/values-cs/07-cardbrowser.xml b/common/android/src/main/res/values-cs/07-cardbrowser.xml
index a31148a8bc78..84ace4c8d25f 100644
--- a/common/android/src/main/res/values-cs/07-cardbrowser.xml
+++ b/common/android/src/main/res/values-cs/07-cardbrowser.xml
@@ -110,10 +110,10 @@
     <string name="card_browser_order_snackbar_sort_by" comment="Snackbar shown after sort changes. %1$s is the column name (e.g. \'Card Type\')">Řazeno podle %1$s</string>
     <string name="card_browser_order_subtitle_text_ascending" comment="Sort direction subtitle for text columns when ascending (A before Z)">A–Z</string>
     <string name="card_browser_order_subtitle_text_descending" comment="Sort direction subtitle for text columns when descending (Z before A)">Z–A</string>
-    <string name="card_browser_order_subtitle_numeric_ascending" comment="Sort direction subtitle for numeric columns when ascending (smallest value first)">Low to high</string>
-    <string name="card_browser_order_subtitle_numeric_descending" comment="Sort direction subtitle for numeric columns when descending (largest value first)">High to low</string>
-    <string name="card_browser_order_subtitle_date_ascending" comment="Sort direction subtitle for date columns when ascending (oldest entry first)">Oldest first</string>
-    <string name="card_browser_order_subtitle_date_descending" comment="Sort direction subtitle for date columns when descending (newest entry first)">Newest first</string>
+    <string name="card_browser_order_subtitle_numeric_ascending" comment="Sort direction subtitle for numeric columns when ascending (smallest value first)">Od nejnižší po nejvyšší</string>
+    <string name="card_browser_order_subtitle_numeric_descending" comment="Sort direction subtitle for numeric columns when descending (largest value first)">Od nejvyšší po nejnižšší</string>
+    <string name="card_browser_order_subtitle_date_ascending" comment="Sort direction subtitle for date columns when ascending (oldest entry first)">Od nejstarších</string>
+    <string name="card_browser_order_subtitle_date_descending" comment="Sort direction subtitle for date columns when descending (newest entry first)">Od nejnovějších</string>
     <!-- SortPill labels: a single character on each half hinting at the direction.
          Translators: pick the first/last character of your locale\'s sort order. -->
     <string name="sort_pill_label_text_ascending" comment="SortPill standard half marker for text columns. Use a 1-char glyph that suggests the start of the alphabet.">A</string>
diff --git a/common/android/src/main/res/values-cs/09-backup.xml b/common/android/src/main/res/values-cs/09-backup.xml
index 227b24582d1a..d8aba34db8fd 100644
--- a/common/android/src/main/res/values-cs/09-backup.xml
+++ b/common/android/src/main/res/values-cs/09-backup.xml
@@ -43,6 +43,6 @@
     <string name="backup_restore_no_backups">Žádné zálohy nejsou na tomto zařízení k dispozici. Máte-li zálohy na stolním počítači, zkopírujte je ručně do složky AnkiDroid.</string>
     <string name="open_collection_failed_title">Kolekce není otevřena</string>
     <string name="corrupt_db_message">Vaše kolekce se poškodila.\n\nklepněte na „Možnosti“, kde ji můžete obnovit ze zálohy, nebo, pokud se obnova nepovede, přečtěte si následující pokyny k ruční opravě databáze:\n%1$s</string>
-    <string name="access_collection_failed_message">Došlo k chybě při přístupu k vašemu balíčku. To může být způsobeno chybou v aplikaci, nebo může být problém s balíčkem. \n\nZkuste spustit kontrolu databáze nebo obnovení ze zálohy stisknutím tlačítka „Možnosti“. Objeví-li se znovu tato zpráva, zašlete nám zprávu: \n%1$s</string>
+    <string name="access_collection_failed_message">Došlo k chybě během přístupu k vaší kolekci. To může být způsobeno neškodnou chybou, nebo může být problém s kolekcí. \n\nZkuste spustit kontrolu databáze nebo obnovení ze zálohy stisknutím tlačítka „Možnosti“. Objeví-li se znovu tato zpráva, vyplňte prosím hlášení o chybách: \n%1$s</string>
     <string name="deck_repair_error">Kolekci nelze opravit</string>
 </resources>
diff --git a/common/android/src/main/res/values-cs/10-preferences.xml b/common/android/src/main/res/values-cs/10-preferences.xml
index b7160625d362..77db15610215 100644
--- a/common/android/src/main/res/values-cs/10-preferences.xml
+++ b/common/android/src/main/res/values-cs/10-preferences.xml
@@ -57,7 +57,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Povolit kartám spouštět jiné aplikace</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Karty mohou otevírat jiné aplikace na vašem zařízení, což může spustit potenciálně nežádoucí akce.\nWebové odkazy mohou stále otevírat jiné aplikace, i když je toto nastavení vypnuto.\nPonechte vypnuté, pokud nedůvěřujete všem kartám a šablonám ve vaší kolekci.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Šířka tahu</string>
@@ -170,6 +170,16 @@
     <string name="use_current" maxLength="41">Balíček pro nové karty</string>
     <string name="learn_cutoff" maxLength="41">Limit učení se napřed</string>
     <string name="time_limit" maxLength="41">Časové omezení</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="few">mins</item>
+        <item quantity="many">mins</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Začátek příštího dne</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hodina po půlnoci</item>
@@ -227,7 +237,7 @@
          ################################## Review reminders ###################################
          ####################################################################################### -->
     <!-- Entry points -->
-    <string name="review_reminders_title" maxLength="41" comment="Name of the review reminders feature. Used as a settings screen title, a toolbar title, and the name of the notification channel review reminders are posted to.">Review reminders</string>
+    <string name="review_reminders_title" maxLength="41" comment="Name of the review reminders feature. Used as a settings screen title, a toolbar title, and the name of the notification channel review reminders are posted to.">Upomínky opakování</string>
     <string name="review_reminders_summary_app_wide" comment="The descriptor for reminders that are attached to the whole app rather than a single deck.">App-wide</string>
     <string name="review_reminders_summary_deck_specific" comment="The descriptor for reminders attached to one particular deck.">Deck-specific</string>
     <string name="review_reminders_load_error" comment="Error dialog shown when stored review reminders could not be read back. Technical details follow this text.">An error occurred while loading your review reminders, corrupted reminders have been deleted. Details:</string>
@@ -238,29 +248,30 @@
     <string name="schedule_reminders_troubleshoot_menu" maxLength="28" comment="Text in a menu button which opens a screen for diagnosing why review reminders may not be delivered.">Troubleshoot</string>
     <string name="schedule_reminders_notification_settings_menu" maxLength="28" comment="Text in a menu button which opens the operating system notification settings for the app.">Notification settings</string>
     <string name="schedule_reminders_list_content_description" comment="Accessibility description of the list showing scheduled review reminders.">List of scheduled review reminders</string>
-    <string name="schedule_reminders_deck_not_found" comment="Shown in place of a deck name when the deck a review reminder points at no longer exists.">Deck not found</string>
-    <string name="schedule_reminders_unavailable" comment="Pop-up text shown when review reminders cannot be delivered at all, such as due to missing permissions.">Reminders are unavailable</string>
-    <string name="schedule_reminders_fix" comment="Text for the button which, when pressed, opens the review reminder troubleshooting screen for fixing issues with review reminders.">Fix</string>
-    <string name="schedule_reminders_added" comment="Pop-up text which confirms a new review reminder was created.">Successfully added new review reminder</string>
-    <string name="schedule_reminders_deleted" comment="Pop-up text which confirms a review reminder was deleted.">Successfully deleted review reminder</string>
-    <string name="schedule_reminders_edited" comment="Pop-up text which confirms an existing review reminder was changed.">Successfully edited review reminder</string>
+    <string name="schedule_reminders_deck_not_found" comment="Shown in place of a deck name when the deck a review reminder points at no longer exists.">Balíček nenalezen</string>
+    <string name="schedule_reminders_unavailable" comment="Pop-up text shown when review reminders cannot be delivered at all, such as due to missing permissions.">Upomínky nejsou k dispozici</string>
+    <string name="schedule_reminders_fix" comment="Text for the button which, when pressed, opens the review reminder troubleshooting screen for fixing issues with review reminders.">Opravit</string>
+    <string name="schedule_reminders_added" comment="Pop-up text which confirms a new review reminder was created.">Nová upomínka opakování byla úspěšně přidána</string>
+    <string name="schedule_reminders_deleted" comment="Pop-up text which confirms a review reminder was deleted.">Upomínka opakování byla úspěšně odstraněna</string>
+    <string name="schedule_reminders_edited" comment="Pop-up text which confirms an existing review reminder was changed.">Upomínka opakování byla úspěšně upravena</string>
     <!-- Add / edit reminder dialog -->
     <string name="add_review_reminder" comment="Title of the dialog for creating a new review reminder.">Přidat upomínku opakování</string>
     <string name="edit_review_reminder" comment="Title of the dialog for editing an existing review reminder.">Upravit upomínku opakování</string>
-    <string name="add_edit_reminder_time_label" comment="Label of the field for choosing what time of day a review reminder fires.">Time:</string>
-    <string name="add_edit_reminder_deck_label" comment="Label of the field for choosing which deck a review reminder applies to.">Deck:</string>
-    <string name="add_edit_reminder_advanced_label" comment="Header of the collapsible section holding extra review reminder customization options.">Advanced settings</string>
-    <string name="add_edit_reminder_card_threshold_label" comment="Label of the field setting the minimum number of due cards needed before a review reminder fires.">Card threshold:</string>
-    <string name="add_edit_reminder_card_threshold_description" comment="Explanation shown under the card threshold field.">Do not send me notifications if there are less than this many cards due</string>
-    <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
+    <string name="add_edit_reminder_time_label" comment="Label of the field for choosing what time of day a review reminder fires.">Čas:</string>
+    <string name="add_edit_reminder_deck_label" comment="Label of the field for choosing which deck a review reminder applies to.">Balíček:</string>
+    <string name="add_edit_reminder_advanced_label" comment="Header of the collapsible section holding extra review reminder customization options.">Pokročilé nastavení</string>
+    <string name="add_edit_reminder_card_threshold_label" comment="Label of the field setting the minimum number of due cards needed before a review reminder fires.">Práh karet:</string>
+    <string name="add_edit_reminder_card_threshold_description" comment="Explanation shown under the card threshold field.">Neposílejte mi oznámení, pokud je méně než tento počet karet ke zkoušení</string>
+    <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Upozornit mě pouze v případě, že dnes nebyly opakovány žádné karty</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
-    <string name="reminder_troubleshooting_summary_error" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when reminders cannot be delivered at all.">Reminders are unavailable.</string>
-    <string name="reminder_troubleshooting_summary_warning" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when reminders may be delayed or suppressed.">Reminders may not work correctly.</string>
-    <string name="reminder_troubleshooting_summary_ok" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when no issues are found.">Your reminders should work as expected.</string>
+    <string name="reminder_troubleshooting_summary_error" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when reminders cannot be delivered at all.">Upomínky nejsou k dispozici.</string>
+    <string name="reminder_troubleshooting_summary_warning" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when reminders may be delayed or suppressed.">Upomínky nemusí fungovat správně.</string>
+    <string name="reminder_troubleshooting_summary_ok" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when no issues are found.">Vaše upomínky by měly fungovat podle očekávání.</string>
     <string name="reminder_troubleshooting_footer" comment="Closing advice at the bottom of the review reminder troubleshooting screen.">Different devices have different notification restriction settings. Check your system settings or search online if issues persist.</string>
     <!-- Troubleshooting check titles -->
     <string name="reminder_troubleshooting_check_notification_permission" comment="Name of a review reminder troubleshooting check: whether the app may post notifications.">Notification permission</string>
diff --git a/common/android/src/main/res/values-cs/16-multimedia-editor.xml b/common/android/src/main/res/values-cs/16-multimedia-editor.xml
index ff67bf06bbf4..95dd2e5bb276 100644
--- a/common/android/src/main/res/values-cs/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-cs/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Chcete oříznout tento obrázek?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Aktuální velikost obrázku je %s MB. Výchozí limit velikosti obrázku je 1 MB. Chcete jej zkomprimovat?</string>
     <string name="select_image_failed">"Výběr obrázku selhal, zkuste to prosím znovu"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Obsah pole</string>
diff --git a/common/android/src/main/res/values-da/01-core.xml b/common/android/src/main/res/values-da/01-core.xml
index 957464ca2006..b3738f9b8775 100644
--- a/common/android/src/main/res/values-da/01-core.xml
+++ b/common/android/src/main/res/values-da/01-core.xml
@@ -95,7 +95,7 @@
     <string name="search_deck" comment="Deck search for selecting it">Deck search</string>
     <string name="empty_deck">Denne stak er tom</string>
     <string name="invalid_deck_name">Ugyldigt staknavn</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
+    <string name="studyoptions_congrats_finished">Tillykke! Du er færdig for i dag.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Deck finished for now! %s</string>
     <string name="studyoptions_no_cards_due">Ingen kort i kø</string>
     <string name="sd_card_not_mounted">Enhedslagring er ikke tilkoblet</string>
@@ -128,7 +128,7 @@
     <string name="read_write_permission_description">tilgå eksisterende noter, kort, notetyper og stakke, og skabe nye</string>
     <!-- Context Menu -->
     <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">Card browser</string>
-    <string name="context_menu_anki_card_label">Anki card</string>
+    <string name="context_menu_anki_card_label">Anki kort</string>
     <!-- Sync conflict -->
     <string name="sync_conflict_message_new">Samlingerne kan ikke kombineres.\nHvilken samling vil du beholde?</string>
     <string name="sync_conflict_keep_local_new" comment="Select AnkiDroid files to keep while syncing">AnkiDroid</string>
@@ -150,7 +150,7 @@
     <string name="new_unsafe_collection">Den nye samling vil blive slettet fra din telefon, hvis du afinstallerer AnkiDroid</string>
     <!-- Permissions screen -->
     <string name="permissions_screen_headline">AnkiDroid behøver nogle tilladelser for at fungere</string>
-    <string name="permissions_screen_optional_headline" comment="Explains that there are optional permissions that can be granted to AnkiDroid.">AnkiDroid works best with these permissions</string>
+    <string name="permissions_screen_optional_headline" comment="Explains that there are optional permissions that can be granted to AnkiDroid.">AnkiDroid fungerer bedst med disse tilladelser</string>
     <string name="storage_access_title">Lageradgang</string>
     <string name="storage_access_summary">Gemmer din samling på et sikkert sted, der ikke vil blive slettet, hvis appen er afinstalleret</string>
     <string name="all_files_access_title" comment="Name of the “All files access” permission from Android 10 and after. See [android.permission.MANAGE_EXTERNAL_STORAGE] on https://developer.android.com/training/data-storage/manage-all-files for context.">Adgang til alle filer</string>
@@ -159,7 +159,7 @@
     <string name="microphone_permission_explanation" comment="Description explaining why AnkiDroid needs the microphone permission, shown on the permissions explanation screen.">Allows you to add sounds to cards and enables voice playback while reviewing</string>
     <string name="notifications_permission_explanation" comment="Description explaining why AnkiDroid needs the notification permission.">Enables background media syncing and allows you to create review reminders</string>
     <string name="heading_required_permissions" comment="Heading for the section of required permissions that the app needs to function, shown in the permissions explanation screen.">Required</string>
-    <string name="heading_optional_permissions" comment="Heading for the section of optional permissions that the app needs to function, shown in the permissions explanation screen.">Optional</string>
+    <string name="heading_optional_permissions" comment="Heading for the section of optional permissions that the app needs to function, shown in the permissions explanation screen.">Valgfri</string>
     <string name="manually_grant_permissions" comment="Pop-up message that is shown to the user when they want to grant an app permission that must be granted via the OS settings screen.">This permission must be manually granted from Settings</string>
     <string name="revoke_permissions" comment="Pop-up message that is shown to the user when they are revoking an app permission.">This permission must be manually revoked from Settings</string>
     <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">Remove account</string>
diff --git a/common/android/src/main/res/values-da/02-strings.xml b/common/android/src/main/res/values-da/02-strings.xml
index 5ef39d56ff02..2160d15d7971 100644
--- a/common/android/src/main/res/values-da/02-strings.xml
+++ b/common/android/src/main/res/values-da/02-strings.xml
@@ -26,7 +26,7 @@
     <!-- Navigation drawer strings -->
     <string name="drawer_open">Åbn panel</string>
     <string name="drawer_close">Luk panel</string>
-    <string name="note_message">Note saved</string>
+    <string name="note_message">Note gemt</string>
     <!-- Note editor screen -->
     <string name="CardEditorCardDeck">Kortstak:</string>
     <string name="CardEditorNoteDeck" comment="Label of the field choosing which deck a note\'s cards go into, in the note editor.">Stak:</string>
@@ -45,12 +45,12 @@
     <string name="save_whiteboard" maxLength="28">Save whiteboard</string>
     <string name="enable_stylus" maxLength="28">Enable stylus writing</string>
     <string name="disable_stylus">Disable stylus writing</string>
-    <string name="eraser" maxLength="28">Eraser</string>
+    <string name="eraser" maxLength="28">Viskelæder</string>
     <string name="add_brush" maxLength="28">Add brush</string>
     <string name="whiteboard_align_left" comment="Option to align the whiteboard toolbar on the left" maxLength="28">Left</string>
     <string name="whiteboard_align_bottom" comment="Option to align the whiteboard toolbar on the bottom" maxLength="28">Bottom</string>
     <string name="whiteboard_align_right" comment="Option to align the whiteboard toolbar on the right" maxLength="28">Right</string>
-    <string name="whiteboard_more_options" comment="Tooltip of the whiteboard \'More\' button" maxLength="28">More options</string>
+    <string name="whiteboard_more_options" comment="Tooltip of the whiteboard \'More\' button" maxLength="28">Flere valgmuligheder</string>
     <string name="whiteboard_remove_brush_message">Are you sure you want to remove this brush from your palette?</string>
     <string name="whiteboard_ink_eraser" comment="Title of the whiteboard Ink eraser">Ink</string>
     <string name="whiteboard_stroke_eraser" comment="Title of the whiteboard Stroke eraser">Stroke</string>
@@ -107,12 +107,12 @@
     <!-- Image cropper -->
     <string name="image_cropper_action_rotate" maxLength="28" comment="Action in image cropper screen">Rotate</string>
     <string name="image_cropper_action_flip" maxLength="28" comment="Action in image cropper screen">Flip</string>
-    <string name="image_cropper_action_flip_horizontally" maxLength="28" comment="Submenu action in image cropper screen">Flip horizontally</string>
-    <string name="image_cropper_action_flip_vertically" maxLength="28" comment="Submenu action in image cropper screen">Flip vertically</string>
+    <string name="image_cropper_action_flip_horizontally" maxLength="28" comment="Submenu action in image cropper screen">Vend vandret</string>
+    <string name="image_cropper_action_flip_vertically" maxLength="28" comment="Submenu action in image cropper screen">Vend lodret</string>
     <!-- Timebox -->
     <string name="timebox_reached_title">Timebox reached</string>
     <plurals name="timebox_reached">
-        <item quantity="one">%1$d card studied in %2$s</item>
+        <item quantity="one">%1$d kort gennemgået på %2$s</item>
         <item quantity="other">%1$d kort gennemgået på %2$s</item>
     </plurals>
     <!-- minutes used in \'[studied in] x minutes\' context, causing inflexion in some languages -->
@@ -137,9 +137,9 @@
     <string name="import_preparing_file">Preparing file for import&#8230;</string>
     <string name="import_message_add" comment="Adding a new deck to the collection (import)">Add</string>
     <string name="import_message_replace_confirm">This will delete your existing collection and replace it with the data of file %s</string>
-    <string name="import_dialog_message_add">Add “%s” to collection? This may take a long time</string>
+    <string name="import_dialog_message_add">Tilføj %s til samling? Dette kan tage lang tid</string>
     <string name="import_log_no_apkg">This isn’t a valid Anki package file</string>
-    <string name="import_title_error" comment="Title of error dialog">Error</string>
+    <string name="import_title_error" comment="Title of error dialog">Fejl</string>
     <string name="import_error_handle_exception">Failed to import file\n\n%s</string>
     <string name="import_error_not_apkg_extension">Filename “%s” doesn’t have .apkg or .colpkg extension</string>
     <string name="import_error_load_imported_database">Anki Database (.anki2) replacements are not yet supported. Please see the manual for replacement instructions.</string>
@@ -171,7 +171,7 @@
     <string name="tag_editor_add_feedback">Touch “%2$s” to confirm adding “%1$s”</string>
     <string name="tag_editor_add_feedback_existing">Eksisterende tag “%1$s” valgt</string>
     <string name="tag_already_exists">Tag already exists</string>
-    <string name="error_name_exists">Name already exists</string>
+    <string name="error_name_exists">Navnet eksisterer allerede</string>
     <string name="warning_find_and_replace">Consider backing up your collection from DeckPicker before using this option!</string>
     <!-- Time spans -->
     <!-- Currently only used if exporting APKG fails -->
@@ -184,8 +184,8 @@
     <!-- The name of the deck which corrupt cards will be moved to -->
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Baggrund</string>
-    <string name="remove_wallpaper_image" maxLength="41">Remove background</string>
-    <string name="remove_background_image">Are you sure you wish to remove the background?</string>
+    <string name="remove_wallpaper_image" maxLength="41">Fjern baggrund</string>
+    <string name="remove_background_image">Er du sikker på, at du vil fjerne baggrunden?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Restore default</string>
     <!-- Whiteboard eraser mode toggle message in Reviewer -->
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Skriftstørrelse</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -259,16 +261,16 @@
     <string name="minimum_value_is" comment="Error message in IncrementerNumberRangePreference. %d is the minimum allowed value">Minimum value is %d</string>
     <!-- Used for credential empty warning message -->
     <string name="invalid_email">Enter a valid email</string>
-    <string name="password_empty">Password is required</string>
+    <string name="password_empty">Adgangskode er påkrævet</string>
     <string name="back_pressed_once">Go back again to exit</string>
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
     <string name="download_deck">Download deck</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Open in browser</string>
-    <string name="try_again">Try again</string>
-    <string name="cancel_download">Cancel download</string>
-    <string name="cancel_download_question_title">Cancel download?</string>
-    <string name="downloading_file">Downloading %s</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Åbn i browser</string>
+    <string name="try_again">Prøv igen</string>
+    <string name="cancel_download">Annuller download</string>
+    <string name="cancel_download_question_title">Annuller download?</string>
+    <string name="downloading_file">Downloader %s</string>
     <string name="import_deck">Import deck</string>
     <string name="something_wrong">Something went wrong, please try again</string>
     <string name="download_failed">Download failed</string>
@@ -276,11 +278,11 @@
     <string name="download_speed_unknown" comment="Placeholder shown when the current download speed is unknown">-/s</string>
     <string name="download_time_unknown" comment="Placeholder when the remaining download time is unknown">-</string>
     <string name="download_speed_label">Speed</string>
-    <string name="download_time_left_label">Time left</string>
+    <string name="download_time_left_label">Tid tilbage</string>
     <string name="deck_download_progress_message">You can use other apps while the download is running</string>
-    <string name="check_network">Please check your network connection</string>
+    <string name="check_network">Tjek venligst din internetforbindelse</string>
     <string name="external_storage_unavailable">Download aborted, the external storage is not available</string>
-    <string name="home" maxLength="28">Home</string>
+    <string name="home" maxLength="28">Hjem</string>
     <!-- Study Screen actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
     <string name="card_buried">Card buried.</string>
@@ -290,7 +292,7 @@
     </plurals>
     <!--  Note Editor Toggle Sticky  -->
     <string name="note_editor_toggle_sticky">Make field %s sticky</string>
-    <string name="scoped_storage_learn_more">Learn More</string>
+    <string name="scoped_storage_learn_more">Få mere at vide</string>
     <string name="search_card_js_api_no_results">Search returned no results</string>
     <!--  JS Addons  -->
     <string name="not_valid_js_addon_package">%s is not a valid JavaScript addon package</string>
@@ -321,10 +323,10 @@
     <!-- Deck Deletion -->
     <string name="deck_shortcut_doesnt_exist">Deck deleted. Please remove the shortcut</string>
     <!-- Browser Options Dialog -->
-    <string name="show_cards" comment="Label for toggle cards button in BrowserOptionsDialog">Cards</string>
-    <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Notes</string>
+    <string name="show_cards" comment="Label for toggle cards button in BrowserOptionsDialog">Kort</string>
+    <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Noter</string>
     <string name="truncate_content_help">Truncate the height of each row of the Browser to show only first 3 lines of content</string>
-    <string name="audio_saved">Recording saved</string>
+    <string name="audio_saved">Optagelse gemt</string>
     <string name="deleting_selected_notes">Deleting selected notes</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tap a voice to listen</string>
     <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Voice should be installed before use</string>
@@ -334,9 +336,9 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
-    <string name="deck_description_field_hint">Description</string>
-    <string name="deck_description_saved">Description updated</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
+    <string name="deck_description_field_hint">Beskrivelse</string>
+    <string name="deck_description_saved">Beskrivelse opdateret</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
     <string name="help_button_content_description">Open help for ‘%s’</string>
     <string name="failed_to_copy">Failed to copy</string>
@@ -345,12 +347,12 @@
         <item quantity="other">%d cards unburied</item>
     </plurals>
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Reposition</string>
-    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Next</string>
+    <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Næste</string>
     <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Back</string>
-    <string name="start_recording">Record</string>
+    <string name="start_recording">Optag</string>
     <string name="stop_recording">Stop</string>
-    <string name="play_recording">Play</string>
-    <string name="next_recording" comment="Description of a button to go to the next recording">Next</string>
+    <string name="play_recording">Afspil</string>
+    <string name="next_recording" comment="Description of a button to go to the next recording">Næste</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Cannot delete card type</string>
     <string name="orphan_note_message">Deleting this card type will leave some notes without any cards.</string>
@@ -375,11 +377,11 @@
     <!-- Whitespace is OK -->
     <string name="list_separator" comment="The character and spacing to display between elements of a list, for example \', \' in \'Apple, Banana, Cherry" tools:ignore="TranslationTypo">, </string>
     <!--Set up date-->
-    <string name="set_due_date_day" comment="Used for setting due date">Day</string>
+    <string name="set_due_date_day" comment="Used for setting due date">Dag</string>
     <string name="set_due_date_date_range">Date range</string>
     <string comment="Shown when retrying a running action" name="already_in_progress">Already in progress</string>
     <!-- Switch profiles screen -->
-    <string name="switch_profile" maxLength="41" comment="Title of the screen where the user switches between profiles">Switch profile</string>
-    <string name="edit_profile" comment="Content description of the button that edits a profile in the profile list">Edit profile</string>
-    <string name="delete_profile" comment="Content description of the button that deletes a profile in the profile list">Delete profile</string>
+    <string name="switch_profile" maxLength="41" comment="Title of the screen where the user switches between profiles">Skift profil</string>
+    <string name="edit_profile" comment="Content description of the button that edits a profile in the profile list">Rediger profil</string>
+    <string name="delete_profile" comment="Content description of the button that deletes a profile in the profile list">Slet profil</string>
 </resources>
diff --git a/common/android/src/main/res/values-da/03-dialogs.xml b/common/android/src/main/res/values-da/03-dialogs.xml
index 9e6fa61e4614..b4380f13a08d 100644
--- a/common/android/src/main/res/values-da/03-dialogs.xml
+++ b/common/android/src/main/res/values-da/03-dialogs.xml
@@ -23,13 +23,13 @@
   ~ SPDX-FileCopyrightText: Copyright (c) 2010 Norbert Nagold <norbert.nagold@gmail.com>
   -->
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="check_db_warning">This may take a long time. Proceed?</string>
+    <string name="check_db_warning">Dette kan tage lang tid. Fortsæt?</string>
     <string name="delete_deck_title">Slet Sæt</string>
     <plurals name="delete_deck_message">
-        <item quantity="one">Delete all cards in %1$s? It contains %2$d card</item>
-        <item quantity="other">Delete all cards in %1$s? It contains %2$d cards</item>
+        <item quantity="one">Slet alle kort i %1$s? Den indeholder %2$d kort</item>
+        <item quantity="other">Slet alle kort i %1$s? Den indeholder %2$d kort</item>
     </plurals>
-    <string name="delete_cram_deck_message">Delete filtered deck %s and send all cards back to their original decks?</string>
+    <string name="delete_cram_deck_message">Slet filtrerede deck %s og send alle kortene tilbage til deres originalle deck?</string>
     <string name="no_tts_available_message">Intet Tekst-Til-Tale sprog tilgængelig</string>
     <string name="tts_no_tts">Don’t speak</string>
     <string name="reposition_card_not_new_error">Udelukkende nye kort kan repositioneres</string>
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -60,7 +60,7 @@
     <string name="restore_backup_choose_another">Vælg anden</string>
     <string name="dialog_cancel">Annullér</string>
     <string name="dialog_ok">OK</string>
-    <string name="dialog_add" comment="Positive dialog action button label to add \'something\'">Add</string>
+    <string name="dialog_add" comment="Positive dialog action button label to add \'something\'">Tilføj</string>
     <string name="restore">Restore</string>
     <string name="dialog_confirm" tools:ignore="UnusedResources">Bekræft</string>
     <string name="dialog_no">Nej</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Alle kort</string>
-    <string name="tags_dialog_option_new_cards">Ny</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Ny</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finder tomme kort&#8230;</string>
@@ -110,13 +110,13 @@
     <!-- Database Integrity Check -->
     <string name="integrity_check_continue_anyway">Continue Anyway</string>
     <string name="integrity_check_insufficient_space">Check Database uses a large amount of temporary storage.\n\nIt is strongly recommended that you have at least %s free space on your device before continuing.</string>
-    <string name="integrity_check_insufficient_space_extra_content">\n\nYou currently have %s free.</string>
+    <string name="integrity_check_insufficient_space_extra_content">\n\nDu har i øjeblikket %s gratis.</string>
     <!-- Card Browser -->
     <!-- AbstractFlashCardViewer -->
     <string name="card_viewer_url_decode_error">Error decoding data from card</string>
     <!-- Deck Options -->
     <!-- Database Errors-->
-    <string name="database_locked_title">Database Locked</string>
+    <string name="database_locked_title">Database Låst</string>
     <string name="database_locked_summary_new" comment="%s is the name of the \'AnkiDroid directory\' setting">Another AnkiDroid app is using this collection. It may conflict even when it is not visibly running.\n\nTo keep using both apps, change the ‘%s’ in one app\'s Advanced settings.\n\nTo use this app now, force-stop the conflicting app.</string>
     <string name="incompatible_database_version_title">Incompatible Database Version</string>
     <string name="incompatible_database_version_summary">The database is a more advanced version than this version of AnkiDroid can work with. Upgrade AnkiDroid or downgrade the database to open it\n\nSupported version: %1$d\nDatabase version: %2$d\n\nThe following restore options will overwrite your current collection, possibly with a compatible database version:</string>
@@ -188,7 +188,7 @@
     <string name="backup_collection_message">You haven\'t backed up your collection in a while. You should do this now to prevent data loss</string>
     <string name="button_backup" maxLength="41">Backup</string>
     <string name="button_disable_reminder">Disable reminder</string>
-    <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Later</string>
+    <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Senere</string>
     <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Don\'t show again</string>
     <string name="dismiss_backup_warning_title">Data loss warning</string>
     <string name="dismiss_backup_warning_new_user">Due to Android privacy changes, your data and automated backups will be deleted from your phone if the app is uninstalled</string>
@@ -205,20 +205,20 @@
         <item quantity="other">Show cards in range</item>
     </plurals>
     <plurals name="set_due_date_label_suffix" comment="a suffix on a text field allowing a user to enter a number of days">
-        <item quantity="one">day</item>
-        <item quantity="other">days</item>
+        <item quantity="one">dag</item>
+        <item quantity="other">dage</item>
     </plurals>
     <plurals name="set_due_date_current_interval">
         <item quantity="one">Current interval: %d day</item>
         <item quantity="other">Current interval: %d days</item>
     </plurals>
     <string name="range_delimiter" comment="Placed between two input boxes to denote a range">–</string>
-    <string name="set_due_date_range_start" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'minimum\' value of this range (inclusive)">From</string>
-    <string name="set_due_date_range_end" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'maximum\' value of this range (inclusive)">To</string>
+    <string name="set_due_date_range_start" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'minimum\' value of this range (inclusive)">Fra</string>
+    <string name="set_due_date_range_end" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'maximum\' value of this range (inclusive)">Til</string>
     <!-- Instant Note Editor -->
     <string name="cloze_note_required">Cloze Type Note Required</string>
     <string name="cloze_not_found_message">No Cloze type note found, open the Note Editor or try again after adding a Cloze type note.</string>
-    <string name="open">Open</string>
+    <string name="open">Åbn</string>
     <string name="change_cloze_number">Change cloze number</string>
     <string name="cloze_number">Cloze number:</string>
     <string name="change_editor_mode">Change editor mode</string>
@@ -228,12 +228,14 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
     <string name="tts_error_dialog_supported_voices_button_text">Voice options</string>
     <!-- import_cache_error_resolutions -->
-    <string name="import_error_resolution_try_again">Re-import the file</string>
+    <string name="import_error_resolution_try_again">Genimporter filen</string>
     <string name="import_error_resolution_free_up_space">Ensure there is sufficient free space on your device</string>
     <string name="import_error_resolution_check_internet">Ensure you are connected to the internet</string>
     <string name="import_error_resolution_copy_to_device">Copy the file to your device and try again with the local file</string>
@@ -261,9 +263,10 @@
     <string name="special_field_card_help" comment="%s: either blank or \' %s\'">The name of the card template%s</string>
     <string name="special_field_type_help" comment="%s: either blank or \' %s\'">The name of the note type%s</string>
     <!-- Change Note Type Dialog -->
-    <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
-    <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <string name="change_note_type_from" comment="Label indicating the original note type before changing it">Fra</string>
+    <string name="change_note_type_to" comment="Label indicating the new note type to change to">Til</string>
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-da/04-network.xml b/common/android/src/main/res/values-da/04-network.xml
index 422855a4376b..1dc2d0195776 100644
--- a/common/android/src/main/res/values-da/04-network.xml
+++ b/common/android/src/main/res/values-da/04-network.xml
@@ -52,7 +52,7 @@
     <string name="sync_sanity_remote">Ekstern</string>
     <string name="one_way_sync_title" maxLength="41">Envejs-synkronisering</string>
     <string name="one_way_sync_confirmation">Envejs-synkronisering anmodet</string>
-    <string name="full_sync_confirmation">The requested change will require a full upload of the database when you next synchronize your collection. If you have reviews or other changes waiting on another device that haven’t been synchronized here yet, they will be lost. Continue?</string>
+    <string name="full_sync_confirmation">Den ønskede ændring vil kræve en fuld upload af databasen, næste gang du synkroniserer din samling. Hvis du har anmeldelser eller andre ændringer, der venter på en anden enhed, der ikke er synkroniseret her endnu, vil de gå tabt. Fortsæt?</string>
     <!-- Deck Picker Sync Icon -->
     <string name="sync_menu_title_one_way_sync">Synkronisering (envejs)</string>
     <string name="sync_menu_title_no_account">Synkronisér (log på)</string>
diff --git a/common/android/src/main/res/values-da/05-feedback.xml b/common/android/src/main/res/values-da/05-feedback.xml
index e1b2b7d36a33..cb690b77b2c0 100644
--- a/common/android/src/main/res/values-da/05-feedback.xml
+++ b/common/android/src/main/res/values-da/05-feedback.xml
@@ -25,13 +25,13 @@
 <resources>
     <!-- Feedback.java -->
     <string name="empty_string"></string>
-    <string name="error_reporting_choice" maxLength="41">Fejlrapporteringstilstand</string>
+    <string name="error_reporting_choice" maxLength="41">Fejlrapporterings tilstand</string>
     <string name="feedback_disclaimer">Ansvarsfraskrivelse: Vi indsamler ingen personlige oplysninger såsom din e-mailadresse, telefonnummer eller din telefons IMEI. Vi indsamler nogle oplysninger om din enhed, såsom producent, model og Android-version, samt arten af ​​de rapporterede fejl og de trin, der førte til, at de opstod.</string>
     <string name="feedback_title">AnkiDroid Feedback</string>
     <string name="feedback_default_text">Angiv venligst din feedback eller oplysninger om arten af eventuelle fejl du rapporterer.</string>
     <string name="feedback_auto_toast_text">AnkiDroid er stødt på et problem; en rapport bliver sendt til udviklerne&#8230;</string>
     <string name="feedback_for_manual_toast_text">En fejlrapport udarbejdes til udviklerne&#8230;</string>
-    <string name="feedback_report">Rapportér</string>
+    <string name="feedback_report">Rapporter</string>
     <string name="feedback_report_automatically">Send fejlmeldinger automatisk</string>
-    <string name="feedback_no_suitable_app_found">No suitable app found</string>
+    <string name="feedback_no_suitable_app_found">Ingen passende app fundet</string>
 </resources>
diff --git a/common/android/src/main/res/values-da/06-statistics.xml b/common/android/src/main/res/values-da/06-statistics.xml
index 003857ec813b..7649f9f83454 100644
--- a/common/android/src/main/res/values-da/06-statistics.xml
+++ b/common/android/src/main/res/values-da/06-statistics.xml
@@ -23,5 +23,5 @@
   ~ SPDX-FileCopyrightText: Copyright (c) 2010 Norbert Nagold <norbert.nagold@gmail.com>
   -->
 <resources>
-    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">Open statistics</string>
+    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">Åbn statistikker</string>
 </resources>
diff --git a/common/android/src/main/res/values-da/07-cardbrowser.xml b/common/android/src/main/res/values-da/07-cardbrowser.xml
index c82b3ce8486c..d82a13d699f6 100644
--- a/common/android/src/main/res/values-da/07-cardbrowser.xml
+++ b/common/android/src/main/res/values-da/07-cardbrowser.xml
@@ -49,11 +49,11 @@
     <string name="card_browser_list_my_searches_new_search_error_dup">Name exists</string>
     <string name="card_browser_list_my_searches_successful_save">Search was saved</string>
     <string name="card_browser_list_my_searches_successful_deleted">Search deleted</string>
-    <string name="no_note_to_edit">No note to edit</string>
-    <string name="card_browser_list_my_searches_remove_content">Delete “%1$s”?</string>
+    <string name="no_note_to_edit">Ingen note at redigere</string>
+    <string name="card_browser_list_my_searches_remove_content">Slet “%1$s”?</string>
     <string name="card_browser_change_display_order" maxLength="28">Change display order</string>
-    <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">Search</string>
-    <string name="card_browser_cram_search" maxLength="28" comment="Menu entry to start a search.">Search</string>
+    <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">Søg</string>
+    <string name="card_browser_cram_search" maxLength="28" comment="Menu entry to start a search.">Søg</string>
     <string name="card_browser_change_display_order_title">Choose display order</string>
     <string name="card_details_tags">Tags</string>
     <string name="manage_browser_column">Manage column</string>
@@ -83,23 +83,23 @@
     <!-- Manage columns dialog -->
     <string name="browse_manage_columns_main_heading">Columns</string>
     <string name="browse_manage_columns">Manage columns</string>
-    <string name="user_active_columns">Active</string>
-    <string name="user_potential_columns">Available</string>
+    <string name="user_active_columns">Aktive</string>
+    <string name="user_potential_columns">Tilgængelige</string>
     <string name="include_column">Include column</string>
     <string name="exclude_column">Exclude column</string>
     <string name="save_changes_message">Please save your changes first</string>
     <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
     <!-- Search history -->
-    <string name="card_browser_see_more">See more</string>
-    <string name="card_browser_see_less">See less</string>
+    <string name="card_browser_see_more">Se mere</string>
+    <string name="card_browser_see_less">Se mindre</string>
     <!-- Sort Order -->
     <string name="card_browser_order_no_sorting_title" comment="Title of the \'no sorting\' row in the Choose Display Order bottom sheet">No sorting</string>
     <string name="card_browser_order_no_sorting_subtitle" comment="Subtitle for the \'no sorting\' row noting that no-sort is faster than sorted queries">Faster</string>
     <string name="card_browser_order_snackbar_sort_by" comment="Snackbar shown after sort changes. %1$s is the column name (e.g. \'Card Type\')">Sort by %1$s</string>
     <string name="card_browser_order_subtitle_text_ascending" comment="Sort direction subtitle for text columns when ascending (A before Z)">A–Z</string>
     <string name="card_browser_order_subtitle_text_descending" comment="Sort direction subtitle for text columns when descending (Z before A)">Z–A</string>
-    <string name="card_browser_order_subtitle_numeric_ascending" comment="Sort direction subtitle for numeric columns when ascending (smallest value first)">Low to high</string>
-    <string name="card_browser_order_subtitle_numeric_descending" comment="Sort direction subtitle for numeric columns when descending (largest value first)">High to low</string>
+    <string name="card_browser_order_subtitle_numeric_ascending" comment="Sort direction subtitle for numeric columns when ascending (smallest value first)">Lav til høj</string>
+    <string name="card_browser_order_subtitle_numeric_descending" comment="Sort direction subtitle for numeric columns when descending (largest value first)">Høj til lav</string>
     <string name="card_browser_order_subtitle_date_ascending" comment="Sort direction subtitle for date columns when ascending (oldest entry first)">Oldest first</string>
     <string name="card_browser_order_subtitle_date_descending" comment="Sort direction subtitle for date columns when descending (newest entry first)">Newest first</string>
     <!-- SortPill labels: a single character on each half hinting at the direction.
@@ -112,7 +112,7 @@
          column name (e.g. "Front, ascending"); these strings are the direction half. -->
     <string name="sort_pill_a11y_ascending" comment="SortPill accessibility: ascending half">Ascending</string>
     <string name="sort_pill_a11y_descending" comment="SortPill accessibility: descending half">Descending</string>
-    <string name="sort_pill_a11y_selected" comment="SortPill accessibility: state announcement when this half is the active sort direction">Selected</string>
+    <string name="sort_pill_a11y_selected" comment="SortPill accessibility: state announcement when this half is the active sort direction">Valgte</string>
     <string name="card_browser_order_section_unavailable" comment="Header: browser columns that cannot be sorted (e.g. Question)">Unavailable</string>
     <string name="card_browser_order_subtitle_use_sort_field" comment="Fix for when the \'Question/Answer\' column is not sortable.">Card content can\'t be sorted. Use Sort Field</string>
     <string name="card_browser_order_subtitle_cards_mode_only" comment="Fix for trying to sort on FSRS columns in Notes mode">Only available in cards mode</string>
diff --git a/common/android/src/main/res/values-da/08-widget.xml b/common/android/src/main/res/values-da/08-widget.xml
index d85de48cde13..abb3c99979c0 100644
--- a/common/android/src/main/res/values-da/08-widget.xml
+++ b/common/android/src/main/res/values-da/08-widget.xml
@@ -34,8 +34,8 @@
         <item quantity="other">%d cards due</item>
     </plurals>
     <plurals name="widget_eta">
-        <item quantity="one">%d minute remaining</item>
-        <item quantity="other">%d minutes remaining</item>
+        <item quantity="one">%d minut tilbage</item>
+        <item quantity="other">%d minutter tilbage</item>
     </plurals>
     <string name="widget_add_note_button">Add new AnkiDroid note</string>
     <string name="deck_picker_widget_description" comment="Title of the Deck Picker Widget. Displayed to the user in Android\'s Widget Selection menu">Deck Picker</string>
diff --git a/common/android/src/main/res/values-da/09-backup.xml b/common/android/src/main/res/values-da/09-backup.xml
index 38b69d34d652..dce58f400d27 100644
--- a/common/android/src/main/res/values-da/09-backup.xml
+++ b/common/android/src/main/res/values-da/09-backup.xml
@@ -32,7 +32,7 @@
     <string name="backup_one_way_sync_from_server">Envejs-synkronisering fra server</string>
     <string name="backup_use_default_folder">Use default collection folder</string>
     <string name="backup_full_sync_from_server_question">Overwrite your collection with the one from AnkiWeb? This will drop all your learning progress and added information since your last sync.</string>
-    <string name="error_handling_title">Error handling</string>
+    <string name="error_handling_title">Fejl håndtering</string>
     <string name="error_handling_options" comment="In a warning message, the label of the suggested action that the user should take">Indstillinger</string>
     <string name="backup_retry_opening">Retry opening</string>
     <string name="backup_error_menu_repair">Reparér database</string>
diff --git a/common/android/src/main/res/values-da/10-preferences.xml b/common/android/src/main/res/values-da/10-preferences.xml
index 79db1009527e..16703248c72c 100644
--- a/common/android/src/main/res/values-da/10-preferences.xml
+++ b/common/android/src/main/res/values-da/10-preferences.xml
@@ -25,7 +25,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- generic strings -->
     <string name="enabled" comment="Generic label for something that is turned on">Enabled</string>
-    <string name="disabled" comment="Generic label for something that is turned off">Disabled</string>
+    <string name="disabled" comment="Generic label for something that is turned off">Deaktiveret</string>
     <plurals name="pref_summ_minutes">
         <item quantity="one">%d min</item>
         <item quantity="other">%d minutter</item>
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -80,7 +80,7 @@
     <string-array name="answer_buttons_position_labels">
         <item>Top</item>
         <item>Bottom</item>
-        <item>None</item>
+        <item>Ingen</item>
     </string-array>
     <string name="gestures" maxLength="41">Enable gestures</string>
     <string name="gestures_summ">Assign gestures to actions such as answering and editing cards.</string>
@@ -130,10 +130,10 @@
     <string name="metered_sync_summary">If disabled, you will be warned if you try to sync on a metered connection</string>
     <string name="backup_limits_frequency">Frequency</string>
     <string name="backup_limits_lifetime">Lifetime</string>
-    <string name="app_theme" maxLength="41">Theme</string>
-    <string name="day_theme" maxLength="41">Day theme</string>
-    <string name="night_theme" maxLength="41">Night theme</string>
-    <string name="language" maxLength="41">Language</string>
+    <string name="app_theme" maxLength="41">Tema</string>
+    <string name="day_theme" maxLength="41">Dag tema</string>
+    <string name="night_theme" maxLength="41">Natte tema</string>
+    <string name="language" maxLength="41">Sprog</string>
     <string name="language_system">System language</string>
     <string name="notification_pref" maxLength="41">Notifikationer</string>
     <string name="notification_pref_title" maxLength="41">Notify when</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-da/16-multimedia-editor.xml b/common/android/src/main/res/values-da/16-multimedia-editor.xml
index 8224fb1875ac..c199a7bc58bd 100644
--- a/common/android/src/main/res/values-da/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-da/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Vil du beskære billedet?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-da/18-standard-models.xml b/common/android/src/main/res/values-da/18-standard-models.xml
index 049f19d09ada..f2818cc2c17f 100644
--- a/common/android/src/main/res/values-da/18-standard-models.xml
+++ b/common/android/src/main/res/values-da/18-standard-models.xml
@@ -17,5 +17,5 @@
 <!-- SPDX-License-Identifier: GPL-3.0-or-later -->
 <resources>
     <!--Fields-->
-    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Back</string>
+    <string name="back_field_name" maxLength="28" comment="Name of the back field of a card">Bagside</string>
 </resources>
diff --git a/common/android/src/main/res/values-de/01-core.xml b/common/android/src/main/res/values-de/01-core.xml
index 0bf1c9885653..e48f190a3f4b 100644
--- a/common/android/src/main/res/values-de/01-core.xml
+++ b/common/android/src/main/res/values-de/01-core.xml
@@ -42,7 +42,7 @@
     <!-- Reviewer -->
     <plurals name="reviewer_window_title" comment="Header of the reviewer, telling the users how many minutes remains before they have seen all cards.">
         <item quantity="one">Noch ca. %d Minute(n)</item>
-        <item quantity="other">Noch ca. %d Minuten</item>
+        <item quantity="other">Noch ca. %d Minute(n)</item>
     </plurals>
     <plurals name="reviewer_window_title_hours_new" comment="Header of the reviewer, telling the users how many minutes remains before they have seen all cards. The second parameter is the number of minutes.">
         <item quantity="one">%1$d Stunde %2$d verbleibend</item>
@@ -127,8 +127,8 @@
     <string name="read_write_permission_label">AnkiDroid-Datenbank lesen und schreiben</string>
     <string name="read_write_permission_description">Zugriff auf bereits vorhandene Notizen, Karten, Notiztypen und Stapel, sowie deren Neuerstellung</string>
     <!-- Context Menu -->
-    <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">Card browser</string>
-    <string name="context_menu_anki_card_label">Anki card</string>
+    <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">Karteikarten suchen</string>
+    <string name="context_menu_anki_card_label">Anki-Karteikarte</string>
     <!-- Sync conflict -->
     <string name="sync_conflict_message_new">Die Sammlungen können nicht zusammengeführt werden.\nWelche Sammlung möchten Sie behalten?</string>
     <string name="sync_conflict_keep_local_new" comment="Select AnkiDroid files to keep while syncing">AnkiDroid</string>
diff --git a/common/android/src/main/res/values-de/02-strings.xml b/common/android/src/main/res/values-de/02-strings.xml
index 6c88eef47f1d..b3d574456123 100644
--- a/common/android/src/main/res/values-de/02-strings.xml
+++ b/common/android/src/main/res/values-de/02-strings.xml
@@ -43,15 +43,15 @@
     <string name="updated_version">Aktualisiert auf Version %s</string>
     <!-- Reviewer.kt (Study Screen) -->
     <string name="save_whiteboard" maxLength="28">Whiteboard speichern</string>
-    <string name="enable_stylus" maxLength="28">Stylus Modus aktivieren</string>
-    <string name="disable_stylus">Stylus Modus deaktivieren</string>
+    <string name="enable_stylus" maxLength="28">Stylus-Modus aktivieren</string>
+    <string name="disable_stylus">Stylus-Modus deaktivieren</string>
     <string name="eraser" maxLength="28">Radierer</string>
     <string name="add_brush" maxLength="28">Pinsel hinzufügen</string>
     <string name="whiteboard_align_left" comment="Option to align the whiteboard toolbar on the left" maxLength="28">Links</string>
     <string name="whiteboard_align_bottom" comment="Option to align the whiteboard toolbar on the bottom" maxLength="28">Unten</string>
     <string name="whiteboard_align_right" comment="Option to align the whiteboard toolbar on the right" maxLength="28">Rechts</string>
     <string name="whiteboard_more_options" comment="Tooltip of the whiteboard \'More\' button" maxLength="28">Mehr Optionen</string>
-    <string name="whiteboard_remove_brush_message">Bist du sicher, dass du diesen Pinsel von der Palette entfernen möchtest</string>
+    <string name="whiteboard_remove_brush_message">Bist du sicher, dass du diesen Pinsel von der Palette entfernen möchtest?</string>
     <string name="whiteboard_ink_eraser" comment="Title of the whiteboard Ink eraser">Tinte</string>
     <string name="whiteboard_stroke_eraser" comment="Title of the whiteboard Stroke eraser">Strich</string>
     <string name="stylus_mode" comment="Title of the menu item that toggles the whiteboard stylus mode" maxLength="28">Stylus-Modus</string>
@@ -185,14 +185,14 @@
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Hintergrund</string>
     <string name="remove_wallpaper_image" maxLength="41">Hintergrund entfernen</string>
-    <string name="remove_background_image">Sind Sie sicher dass sie den Hintergrund entfernen wollen?</string>
+    <string name="remove_background_image">Bist du sicher, dass du den Hintergrund entfernen möchtest?</string>
     <!-- Card Template Browser Appearance -->
     <string name="restore_default" maxLength="28">Standards wiederherstellen</string>
     <!-- Whiteboard eraser mode toggle message in Reviewer -->
     <string name="white_board_eraser_enabled">Radier-Modus aktiviert</string>
     <string name="white_board_eraser_disabled">Radier-Modus deaktiviert</string>
     <string comment="Progress amount e.g. \'28 MB/141 MB\'. %1$s is the current amount, %2$s is the max." name="progress_amount_bytes">%1$s/%2$s</string>
-    <string name="media_file_size_warning_title">Medium zu groß</string>
+    <string name="media_file_size_warning_title">Medien zu groß</string>
     <string name="media_file_size_warning_message" comment="1$s: File name, 2$s: File size, 3$s: The size limit (e.g. 100MB)">Die Datei \"%1$s\" (%2$s) überschreitet das Limit von %3$s für AnkiWeb und kann nicht synchronisiert werden. Trotzdem hinzufügen?</string>
     <string name="media_file_size_add_anyway">Trotzdem hinzufügen?</string>
     <!-- Whiteboard save image message in the Study Screen -->
@@ -201,7 +201,7 @@
     <string name="title_whiteboard_editor" maxLength="28">Whiteboard-Editor</string>
     <string name="user_is_a_robot">Automatischer Test erkannt. Wenn Sie ein Mensch sind, wenden Sie sich an AnkiDroid-Support</string>
     <!-- JS api -->
-    <string name="api_version_developer_contact">Diese Karte verwendet AnkiDroid-Funktionen, die nicht  nicht unterstützt sind. Kontaktieren Sie den Entwickler %1$s oder sehen Sie sich das Wiki an. %2$s</string>
+    <string name="api_version_developer_contact">Diese Karteikarten verwendet AnkiDroid-Funktionen, die nicht unterstützt wird. Kontaktieren Sie den Entwickler %1$s oder sehen Sie sich das Wiki an. %2$s</string>
     <string name="invalid_json_data">Karte hat ungültige Daten angegeben. %s</string>
     <string name="valid_js_api_version">Ungültige AnkiDroid-JS-API-Version. Kontaktieren Sie den Entwickler %s, oder sehen Sie sich das Wiki an</string>
     <string name="update_js_api_version">AnkiDroid-JS-API-Aktualisierung verfügbar. Kontaktieren Sie den Entwickler %s oder sehen Sie sich das Wiki an</string>
@@ -219,16 +219,19 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid kann aufgrund eines Android-Fehlers nicht auf den Speicher zugreifen.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Schriftgröße</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Werkzeug zeigen</string>
-    <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
-    <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
+    <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Kurze Übersicht</string>
+    <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Übersicht ausblenden</string>
     <string name="format_insert_bold">Als fett formatieren</string>
-    <string name="format_insert_italic">Kursiv formatieren</string>
+    <string name="format_insert_italic">Als Kursiv formatieren</string>
     <string name="format_insert_underline">Als Unterstrichen formatieren</string>
     <string name="insert_horizontal_line">Horizontale Linie einfügen</string>
     <string name="insert_heading">Überschift einfügen</string>
     <string name="format_font_size">Schriftgröße ändern</string>
-    <string name="insert_mathjax">Mathjax Formel Eingeben</string>
+    <string name="insert_mathjax">MathJax-Gleichung einfügen</string>
     <string name="note_editor_toolbar_icon">Schaltflächentext</string>
     <string name="before_text">HTML vor Auswahl</string>
     <string name="after_text">HTML nach Auswahl</string>
@@ -236,8 +239,8 @@
     <string name="edit_toolbar_item">Werkzeugleisten Element bearbeiten</string>
     <string name="toolbar_item_explain_edit_or_remove">Geben Sie den HTML-Code ein, der vor und nach dem ausgewählten Text eingefügt werden soll\n\nDrücken Sie lange auf ein Symbol in der Symbolleiste, um es zu entfernen</string>
     <string name="remove_toolbar_item">Werkzeugleisten Element entfernen?</string>
-    <string name="note_editor_toolbar_icon_requirement_error">Button text is required</string>
-    <string name="before_after_text_requirement_error">At least one HTML field is required</string>
+    <string name="note_editor_toolbar_icon_requirement_error">Button-Text ist benötigt</string>
+    <string name="before_after_text_requirement_error">Mindestens ein HTML-Eingabefeld ist erforderlich</string>
     <string name="note_editor_image_too_large">Das Bild ist zu groß, bitte fügen Sie das Bild manuell ein</string>
     <string name="note_editor_video_too_large">Die Videodatei ist zu groß, bitte fügen Sie das Video manuell ein</string>
     <string name="note_editor_audio_too_large">Die Audiodatei ist zu groß, bitte fügen Sie das Audio manuell ein</string>
@@ -246,8 +249,7 @@
     <string name="create_shortcut_error_miui" comment="Keep the message as short, as this is shown in a toast. %s is the app name: \'AnkiDroid\'">Erlauben Sie \"Startbildschrim-Verknüpfungen\" in den Systemeinstellungen damit %s Verknüpfungen hinzufügen kann</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">Ihr Startbildschirm erlaubt AnkiDroid nicht, Verknüpfungen hinzuzufügen</string>
     <string name="create_shortcut_error">Fehler beim Hinzufügen der Verknüpfung: %s</string>
-    <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Sätze groß schreiben</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll-Werkzeugleiste</string>
+    <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Sätze großschreiben</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Zertifikat</string>
@@ -275,8 +277,8 @@
     <string name="download_speed_unit" comment="Download speed. %1$s is an amount of data, e.g. \'1.2 MB\', giving \'1.2 MB/s\'">%1$s/s</string>
     <string name="download_speed_unknown" comment="Placeholder shown when the current download speed is unknown">-/s</string>
     <string name="download_time_unknown" comment="Placeholder when the remaining download time is unknown">-</string>
-    <string name="download_speed_label">Speed</string>
-    <string name="download_time_left_label">Time left</string>
+    <string name="download_speed_label">Geschwindigkeit</string>
+    <string name="download_time_left_label">Übrige Zeit</string>
     <string name="deck_download_progress_message">Während des Herunterladens können Sie andere Apps verwenden</string>
     <string name="check_network">Bitte überprüfen Sie die Netzverbindung</string>
     <string name="external_storage_unavailable">Download abgebrochen, externer Speicher nicht verfügbar</string>
@@ -293,7 +295,7 @@
     <string name="scoped_storage_learn_more">Erfahren Sie mehr</string>
     <string name="search_card_js_api_no_results">Suche lieferte keine Ergebnisse</string>
     <!--  JS Addons  -->
-    <string name="not_valid_js_addon_package">%s ist kein gültiges JavaScript-Erweiterungspaket.</string>
+    <string name="not_valid_js_addon_package">%s ist kein gültiges JavaScript-Erweiterungspaket</string>
     <string name="could_not_create_dir">Verzeichnis %s konnte nicht erstellt werden</string>
     <string name="malicious_archive_entry_outside">Schädliches Archiv. Enthält Eintrag außerhalb des Zielverzeichnisses: %s</string>
     <string name="malicious_archive_exceeds_limit">Schädliches Archiv. Größe überschreitet %1$s oder enthält mehr als %2$d Dateien</string>
@@ -314,14 +316,14 @@
     <string name="intro_get_started" comment="Action to start AnkiDroid for the first time without syncing from AnkiWeb">Los geht’s</string>
     <string name="intro_sync_from_ankiweb">Mit AnkiWeb synchronisieren</string>
     <!-- IntentHandler -->
-    <string name="app_not_initialized_new">AnkiDroid ist noch nicht initialisiert. Bitte öffne die App nochmal und versuche erneut.</string>
+    <string name="app_not_initialized_new">AnkiDroid ist noch nicht initialisiert. Bitte öffne die App nochmal und versuche erneut</string>
     <!-- Deck Creation -->
     <string name="deck_created">Stapel wurde erstellt</string>
     <string name="deck_renamed">Stapel wurde umbenannt</string>
     <!-- Deck Deletion -->
     <string name="deck_shortcut_doesnt_exist">Stapel würde gelöscht. Bitte den Shortcut entfernen</string>
     <!-- Browser Options Dialog -->
-    <string name="show_cards" comment="Label for toggle cards button in BrowserOptionsDialog">Karten</string>
+    <string name="show_cards" comment="Label for toggle cards button in BrowserOptionsDialog">Karteikarten</string>
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Notizen</string>
     <string name="truncate_content_help">Die Höhe jeder Zeile der Kartenübersicht anpassen, sodass nur die ersten 3 Zeilen des Inhalts zu sehen sind.</string>
     <string name="audio_saved">Aufnahme gespeichert</string>
@@ -334,11 +336,11 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Installieren</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Die Text-zu-Sprache Einstellungen konnten nicht geöffnet werden</string>
-    <string name="shared_decks_login_required">Bitte melde dich an, um weitere Stapel herunterzuladen</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Beschreibung</string>
     <string name="deck_description_saved">Beschreibung aktualisiert</string>
     <string name="format_deck_description_as_markdown">Als Markdown formatieren</string>
-    <string name="help_button_content_description">Hilfe für ‘%s ’ öffnen</string>
+    <string name="help_button_content_description">Hilfe für „%s“ öffnen</string>
     <string name="failed_to_copy">Kopieren fehlgeschlagen</string>
     <plurals name="unbury_cards_feedback">
         <item quantity="one">%d Karte nicht mehr aufgeschoben</item>
@@ -347,7 +349,7 @@
     <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Position ändern</string>
     <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Nächste</string>
     <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Zurück</string>
-    <string name="start_recording">Datensatz</string>
+    <string name="start_recording">Aufnahme</string>
     <string name="stop_recording">Stopp</string>
     <string name="play_recording">Play</string>
     <string name="next_recording" comment="Description of a button to go to the next recording">Weiter</string>
@@ -365,8 +367,8 @@
     <string name="edit_front_template" comment="Description of the shortcut that shows the question side of the card template">Vorderseiten template bearbeiten</string>
     <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">Rückseiten template bearbeiten</string>
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Stil bearbeiten</string>
-    <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Template als markdown kopieren</string>
-    <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Browser-erscheinungsbild bearbeiten</string>
+    <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Template als Markdown kopieren</string>
+    <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Browser-Erscheinungsbild bearbeiten</string>
     <string name="missing_user_action_dialog_message" comment="%s is the user action number">Benutzeraktion %s ist in diesem notiztyp nicht festgelegt. Bitte konfigurieren Sie es</string>
     <string name="feature_not_supported_by_study_screen">Diese Karte hat Funktionen, die vom neuen Lernbildschirm noch nicht unterstützt werden.</string>
     <string name="directory_inaccessible_info">Erfahren Sie hier %s mehr darüber, wie Sie den Zugriff wiederherstellen können, oder gehen Sie zu den Einstellungen, um den Sammlungsordner zu aktualisieren.</string>
@@ -379,7 +381,7 @@
     <string name="set_due_date_date_range">Datumsbereich</string>
     <string comment="Shown when retrying a running action" name="already_in_progress">Schon in Arbeit</string>
     <!-- Switch profiles screen -->
-    <string name="switch_profile" maxLength="41" comment="Title of the screen where the user switches between profiles">Switch profile</string>
-    <string name="edit_profile" comment="Content description of the button that edits a profile in the profile list">Edit profile</string>
-    <string name="delete_profile" comment="Content description of the button that deletes a profile in the profile list">Delete profile</string>
+    <string name="switch_profile" maxLength="41" comment="Title of the screen where the user switches between profiles">Profil wechseln</string>
+    <string name="edit_profile" comment="Content description of the button that edits a profile in the profile list">Profil hinzufügen</string>
+    <string name="delete_profile" comment="Content description of the button that deletes a profile in the profile list">Profil löschen</string>
 </resources>
diff --git a/common/android/src/main/res/values-de/03-dialogs.xml b/common/android/src/main/res/values-de/03-dialogs.xml
index 17f58c9c4a83..ec604f6d435f 100644
--- a/common/android/src/main/res/values-de/03-dialogs.xml
+++ b/common/android/src/main/res/values-de/03-dialogs.xml
@@ -45,11 +45,11 @@
     <string name="repair_deck_dialog">Möchten Sie wirklich versuchen, die Datenbank zu reparieren?\n\nBevor der Versuch startet, wird eine Kopie im Unterordner »%s« angelegt.</string>
     <string name="intent_aedict_empty">Kategorie »Standard« ist leer</string>
     <string name="intent_aedict_category">Entfernen Sie alle Notepad-Kategorien um Karten zu AnkiDroid hinzuzufügen oder fügen Sie die Kategorie »Standard« hinzu</string>
-    <string name="custom_study_new_extend">Heutigen Tageshöchstwerts für neue Karten erhöhen („3“) oder verringern („-3“) um</string>
-    <string name="custom_study_rev_extend">Heutigen Tageshöchstwerts für Wiederholungskarten erhöhen („3“) oder verringern („-3“) um</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Karten wiederholen, die in den letzten x Tagen vergessen wurden:</string>
-    <string name="custom_study_ahead_description">Review cards due in the next:</string>
-    <string name="custom_study_preview">Preview new cards added in the last:</string>
+    <string name="custom_study_ahead_description">Karteikarten, die zur Wiederholung fällig sind in den nächsten:</string>
+    <string name="custom_study_preview">Vorschau der neuen Karteikarten. Hinzugefügt:</string>
     <string name="custom_study_tags">Wählen Sie x Karten aus dem Stapel aus:</string>
     <string name="storage_full_title">Speicher voll</string>
     <string name="storage_almost_full_title">Speicher fast voll</string>
@@ -78,16 +78,16 @@
     <string name="dialog_positive_overwrite">Überschreiben</string>
     <string name="dialog_positive_repair">Reparieren</string>
     <string name="dialog_positive_replace">Ersetzen</string>
-    <string name="sync_clock_off_with_current_time">%1$s\n\nCorrect the date and time, or enable automatic date and time, then sync again.\n\nYour device’s current time is: %2$s</string>
+    <string name="sync_clock_off_with_current_time">%1$s\n\nKorrigieren Datum und Uhrzeit oder aktivieren die automatische Datums- und Uhrzeiteinstellung und erneut synchronisieren. Die aktuelle Uhrzeit deines Geräts ist: %2$s</string>
     <string name="dialog_collection_path_not_dir">Der angegebene Pfad ist kein gültiges Verzeichnis</string>
-    <string name="dialog_invalid_custom_certificate">Der angegebene text ergibt kein gültiges PEM-codiertes X509-zertifikat</string>
-    <string name="dialog_invalid_custom_certificate_title">Fehler beim parsen des Zertifikats</string>
+    <string name="dialog_invalid_custom_certificate">Der angegebene Text ergibt kein gültiges PEM-codiertes X509-Zertifikat</string>
+    <string name="dialog_invalid_custom_certificate_title">Fehler beim Parsen des Zertifikats</string>
     <string name="dialog_updated_custom_certificate">Zertifikat aktualisiert</string>
     <!-- Media checking -->
     <string name="check_media_warning">Das kann mit großen Mediensammlungen lange dauern. Fortfahren?</string>
     <string name="check_media_message">Medien werden überprüft &#8230;</string>
     <string name="check_media_adding_missing_tag">Schlagworte werden hinzugefügt&#8230;</string>
-    <string name="check_media_tags_added">Tags added</string>
+    <string name="check_media_tags_added">Schlagwörter hinzugefügt</string>
     <string name="delete_media_message">Medien werden gelöscht &#8230;</string>
     <string name="delete_media_result_title">Löschergebnis</string>
     <plurals name="delete_media_result_message">
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Alle Karten</string>
-    <string name="tags_dialog_option_new_cards">Neue</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Neue</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Fällige</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Leere Karten werden gesucht &#8230;</string>
@@ -106,7 +106,7 @@
     <!-- Multimedia - Audio View -->
     <string name="multimedia_editor_audio_permission_denied">Berechtigung für Audioaufnahme verweigert</string>
     <string name="permission_denied">Zugriff verweigert</string>
-    <string name="microphone_permission_denied_message">Microphone permission denied. Please grant it in the app settings.</string>
+    <string name="microphone_permission_denied_message">Mikrofonzugriff gesperrt. Bitte erlauben dies in den App-Einstellungen.</string>
     <!-- Database Integrity Check -->
     <string name="integrity_check_continue_anyway">Trotzdem fortfahren</string>
     <string name="integrity_check_insufficient_space">»Datenbank überprüfen« verwendet eine große Menge an temporärem Speicher.\n\nMindestens %s freien Speicherplatzes auf Ihrem Gerät werden daher dringend empfohlen, bevor Sie fortfahren.</string>
@@ -117,7 +117,7 @@
     <!-- Deck Options -->
     <!-- Database Errors-->
     <string name="database_locked_title">Datenbank gesperrt</string>
-    <string name="database_locked_summary_new" comment="%s is the name of the \'AnkiDroid directory\' setting">Another AnkiDroid app is using this collection. It may conflict even when it is not visibly running.\n\nTo keep using both apps, change the ‘%s’ in one app\'s Advanced settings.\n\nTo use this app now, force-stop the conflicting app.</string>
+    <string name="database_locked_summary_new" comment="%s is the name of the \'AnkiDroid directory\' setting">Eine weitere AnkiDroid-App verwendet diese Sammlung. Es kann zu Konflikten kommen, selbst wenn diese scheinbar nicht ausgeführt wird. Um beide Apps weiterhin nutzen zu können, ändern das %s in den erweiterten Einstellungen einer der Apps. Um diese App jetzt nutzen zu können, die in Konflikt App stopp erzwingen.</string>
     <string name="incompatible_database_version_title">Inkompatible Datenbankversion</string>
     <string name="incompatible_database_version_summary">Die Datenbank ist eine fortgeschrittenere Version, als diese Version von AnkiDroid verwenden kann. Aktualisieren Sie AnkiDroid oder downgraden Sie die Datenbank um sie zu öffnen\n\nUnterstützte Version: %1$d\nDatenbankversion: %2$d\n\nDie folgenden Wiederherstellungsmöglichkeiten überschreiben Ihre aktuelle Sammlung, möglicherweise mit einer kompatiblen Datenbankversion:</string>
     <!-- Deck Picker Background-->
@@ -139,12 +139,12 @@
     <!-- Locale Selection Dialog -->
     <string name="locale_selection_dialog_title_new">Sprache festlegen</string>
     <string name="locale_selection_dialog_summary">Einige mehrsprachige Tastaturen, wie zum Beispiel GBoard unterstützten das Ändern der Sprache beim Bearbeiten von Text\n\nBitte fordern Sie die „setImeHintLocales“-Funktion Ihres Tastatur-Herstellers an, falls Ihre Tastatur keine Sprache ändert.</string>
-    <string name="locale_selection_dialog_unknown_language" comment="Used for the locales whose name is not displayed when selected and placeholder is language tag">Unknown language [%1$s]</string>
+    <string name="locale_selection_dialog_unknown_language" comment="Used for the locales whose name is not displayed when selected and placeholder is language tag">Unbekannte Sprache [%1$s]</string>
     <!-- Help Dialog -->
     <string name="help_title_using_ankidroid">Verwendung von AnkiDroid</string>
-    <string name="help_item_ankidroid_manual">AnkiDroid Handbuch</string>
-    <string name="help_item_anki_manual">Anki Handbuch</string>
-    <string name="help_item_ankidroid_faq">AnkiDroid FAQ</string>
+    <string name="help_item_ankidroid_manual">AnkiDroid-Handbuch</string>
+    <string name="help_item_anki_manual">Anki-Handbuch</string>
+    <string name="help_item_ankidroid_faq">AnkiDroid-FAQ</string>
     <string name="help_title_get_help">Hilfe erhalten</string>
     <string name="help_item_mailing_list">Mailingliste</string>
     <string name="help_item_reddit">Reddit</string>
@@ -156,14 +156,14 @@
     <string name="help_item_support_other_ankidroid">Weiteres</string>
     <string name="multimedia_editor_trans_translate">Übersetzen</string>
     <string name="help_title_community">Gemeinschaft</string>
-    <string name="help_item_anki_forums">Anki Foren</string>
+    <string name="help_item_anki_forums">Anki-Foren</string>
     <string name="help_item_discord">Discord</string>
     <string name="help_item_facebook">Facebook</string>
     <string name="help_item_twitter">Twitter</string>
     <string name="help_title_privacy">Datenschutz</string>
-    <string name="help_item_ankidroid_privacy_policy">AnkiDroids Datenschutzerklärung</string>
-    <string name="help_item_ankiweb_privacy_policy">AnkiWebs Datenschutzerklärung</string>
-    <string name="help_item_ankiweb_terms_and_conditions">AnkiWebs Nutzungsbedingungen</string>
+    <string name="help_item_ankidroid_privacy_policy">AnkiDroid-Datenschutzerklärung</string>
+    <string name="help_item_ankiweb_privacy_policy">AnkiWeb-Datenschutzerklärung</string>
+    <string name="help_item_ankiweb_terms_and_conditions">AnkiWeb-Nutzungsbedingungen</string>
     <string name="help_title_send_exception">Fehlerbehebungsbericht senden</string>
     <string name="help_dialog_exception_report_debounce">Bericht bereits eingereicht</string>
     <string name="help_dialog_exception_report_sent">Bericht wurde gesendet!</string>
@@ -219,17 +219,19 @@
     <string name="cloze_note_required">Lückentext-Notiztyp Erforderlich</string>
     <string name="cloze_not_found_message">Kein Lückentext-Notiztyp gefunden. Öffnen Sie den Notiz-Editor oder versuchen Sie es erneut, nachdem Sie einen Lückentext-Notiztyp hinzugefügt haben.</string>
     <string name="open">Offen</string>
-    <string name="change_cloze_number">Lückentext nummer ändern</string>
-    <string name="cloze_number">Lückentext nummer:</string>
-    <string name="change_editor_mode">Editor-modus ändern</string>
-    <string name="open_note_editor">Notiz-editor öffnen</string>
-    <string name="change_cloze_mode">Lückentext-modus ändern</string>
+    <string name="change_cloze_number">Lückentext Nummer ändern</string>
+    <string name="cloze_number">Lückentext Nummer:</string>
+    <string name="change_editor_mode">Editor-Modus ändern</string>
+    <string name="open_note_editor">Notiz-Editor öffnen</string>
+    <string name="change_cloze_mode">Lückentext-Modus ändern</string>
     <!-- Outdated WebView dialog -->
     <string name="webview_update_message">Das System-WebView ist veraltet. Einige Funktionen werden nicht korrekt funktionieren. Bitte aktualisieren Sie es.\n\nInstallierte Version: %1$d\nMindestanforderung: %2$d</string>
-    <string name="compress">komprimieren</string>
+    <string name="compress">Komprimieren</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Sprache nicht unterstützt</string>
-    <string name="tts_error_dialog_reason_text">Die Text-Zu-Sprache-Engine <b>%1$s</b> unterstützt die folgende sprache nicht: <b>%2$s</b></string>
+    <string name="tts_error_dialog_reason_text">Die Text-zu-Sprache-Engine <b>%1$s</b> unterstützt die folgende Sprache nicht: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Engine ändern</string>
     <string name="tts_error_dialog_supported_voices_button_text">Spracheinstellungen</string>
     <!-- import_cache_error_resolutions -->
@@ -256,14 +258,15 @@
     <string name="special_field_deck_help" comment="%s: either blank or \' %s\'">Das Komplette Deck der Karte, inklusive der übergeordneten Decks%s</string>
     <string name="special_field_subdeck_help" comment="%s: either blank or \' %s\'">Das Deck der Karte, ohne übergeordneten Decks%s</string>
     <string name="special_field_flag_help">Ausgabe \'%1$s\', wobei %2$s der markierte code (%3$s\-%4$s\) ist</string>
-    <string name="special_field_tags_help" comment="%s: either blank or \' %s\'">Der Tag der Notiz%s</string>
+    <string name="special_field_tags_help" comment="%s: either blank or \' %s\'">Die Tags der Notiz%s</string>
     <string name="special_field_card_id_help" comment="%s: either blank or \' %s\'">Die ID der Karte%s</string>
-    <string name="special_field_card_help" comment="%s: either blank or \' %s\'">Der Name der Karten Vorlage%s</string>
+    <string name="special_field_card_help" comment="%s: either blank or \' %s\'">Der Name der Kartenvorlage%s</string>
     <string name="special_field_type_help" comment="%s: either blank or \' %s\'">Der Name des Notiztypen%s</string>
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">Von</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">Zu</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profilname</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Der Profilname darf nicht leer sein</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Der Profilname darf nur maximal %1$d Zeichen lang sein</string>
diff --git a/common/android/src/main/res/values-de/10-preferences.xml b/common/android/src/main/res/values-de/10-preferences.xml
index 84c2bd441d5b..ae60fdf94b3a 100644
--- a/common/android/src/main/res/values-de/10-preferences.xml
+++ b/common/android/src/main/res/values-de/10-preferences.xml
@@ -24,7 +24,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- generic strings -->
-    <string name="enabled" comment="Generic label for something that is turned on">Enabled</string>
+    <string name="enabled" comment="Generic label for something that is turned on">Aktiviert</string>
     <string name="disabled" comment="Generic label for something that is turned off">Deaktiviert</string>
     <plurals name="pref_summ_minutes">
         <item quantity="one">%d min</item>
@@ -48,15 +48,15 @@
     <string name="pref_cat_workarounds" maxLength="41">Workarounds</string>
     <string name="pref_cat_plugins" maxLength="41">Plug-Ins</string>
     <string name="pref_cat_editing" maxLength="41">Bearbeitung</string>
-    <string name="pref_cat_security" maxLength="41">Security</string>
+    <string name="pref_cat_security" maxLength="41">Sicherheit</string>
     <!-- Card template JavaScript API permissions -->
-    <string name="allow_dangerous_js_api_title" maxLength="41">Globally allow dangerous JavaScript APIs</string>
-    <string name="allow_dangerous_js_api_summ">Allows any card or template to read and modify other cards, or your Anki collection data.\nLeave off unless you trust all cards and templates in your collection.</string>
-    <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
+    <string name="allow_dangerous_js_api_title" maxLength="41">Gefährliche JavaScript-APIs überall zulassen</string>
+    <string name="allow_dangerous_js_api_summ">Dies erlaubt es jeder Karteikarte oder Vorlage, andere Karten oder deine Anki-Sammlungsdaten zu lesen und zu ändern.\nLass es lieber bleiben, es sei denn, du vertraust allen Lernkarten und Vorlagen in deiner Sammlung.</string>
+    <string name="dangerous_js_api_denied_snackbar">Sicherheit: Ein unsicherer JavaScript-Call wurde blockiert.\n Wenn du allen Karteikarten und Vorlagen in deiner Sammlung vertrauen, heben die Sperre in den erweiterten Einstellungen auf.</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
-    <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
-    <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
+    <string name="allow_card_external_launch_title" maxLength="41">Erlauben Karteikarten, andere Apps zu öffnen</string>
+    <string name="allow_card_external_launch_summ">Karteikarten können andere Apps auf deinem Gerät öffnen und dadurch unerwünschte Aktionen auslösen.\nWeblinks können auch dann noch andere Apps öffnen, wenn diese Einstellung deaktiviert ist.\n Lass diese Einstellung deaktiviert, es sei denn, du vertraust allen Karteikarten und Vorlagen in deiner Sammlung.</string>
+    <string name="card_external_launch_denied_snackbar">Sicherheit: Karteikarten wurde daran gesperrt, eine andere App zu starten. Wenn du allen Karteikarten und Vorlagen in deiner Sammlung vertraust, kannst du diese Sperre in den erweiterten Einstellungen aufheben.</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Pinselbreite</string>
     <string name="use_input_tag" maxLength="41">Antwort in Karte eintippen</string>
@@ -108,7 +108,7 @@
     <string name="gestures_three_finger_tap" maxLength="41">Drei-Finger-Tippen</string>
     <string name="gestures_four_finger_tap" maxLength="41">Vier-Finger-Tippen</string>
     <string name="gestures_shake" maxLength="41">Gerät schütteln</string>
-    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ Menü</string>
     <string name="card_browser_enable_external_context_menu_summary">Aktiviert global das Kontextmenü »%s«</string>
     <string name="double_scrolling_gap" maxLength="41">Doppeltes scrollen</string>
     <string name="double_scrolling_gap_summ">Auf eReadern mit doppelter Schrittgröße scrollen</string>
@@ -144,9 +144,9 @@
     <string name="select_locale_title">Sprache wählen</string>
     <string name="software_render" maxLength="41">Karten-Hardware-Rendering deaktivieren</string>
     <string name="software_render_summ">Hardware-Rendering ist schneller, kann aber Probleme haben, insbesondere auf Android 8/8.1. Wenn Sie Teile der Benutzeroberfläche der Karte nicht sehen können, versuchen Sie diese Einstellung.</string>
-    <string name="disable_extended_text_ui" maxLength="41">Disable single-field edit mode</string>
+    <string name="disable_extended_text_ui" maxLength="41">Der Einzelfeld-Bearbeitungsmodus deaktivieren</string>
     <!--See: multimedia_editor_popup_cloze. We can\'t use format strings as this is auto-generated-->
-    <string name="disable_extended_text_ui_summ">Allows \'Cloze deletion\' context menu when in landscape mode.</string>
+    <string name="disable_extended_text_ui_summ">Dies erlaubt das „Lückenlöschung“-Kontextmenü im Querformat.</string>
     <string name="vertical_centering" maxLength="41">Zentriert</string>
     <string name="vertical_centering_summ">Den Inhalt der Karten vertikal zentrieren</string>
     <string name="pref_double_tap_time_interval" maxLength="41">Zeitintervall für Doppeltippen</string>
@@ -158,7 +158,7 @@
     <string name="show_large_answer_buttons" maxLength="41">Große Antwortschaltflächen anzeigen</string>
     <string name="show_large_answer_buttons_summ">Antwort-Fläche in 2 Zeilen anzeigen</string>
     <string name="remove_animations" maxLength="41">Animationen entfernen</string>
-    <string name="remove_animations_summary">Auch Aktiviert wenn Animationen in den Systemeinstellungen entfernt wurden</string>
+    <string name="remove_animations_summary">Auch aktiviert, wenn Animationen in den Systemeinstellungen entfernt wurden</string>
     <string name="show_top_bar" maxLength="41">Obere Leiste anzeigen</string>
     <string name="show_top_bar_summary">Kartenzähler, Antwort-Timer, Flagge und Markierung in der oberen Leiste anzeigen</string>
     <string name="show_progress" maxLength="41">Fällige anzeigen</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">Stapel für neue Karten</string>
     <string name="learn_cutoff" maxLength="41">Grenzwert für vorzeitiges Lernen</string>
     <string name="time_limit" maxLength="41">Zeitlimitwert</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start des nächsten Tages (0 ist Mitternacht, 23 ist 23 Uhr)</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d Stunde nach Mitternacht</item>
@@ -208,7 +216,7 @@
         Falls nicht gesetzt, wird der Standard AnkiWeb Server verwendet.
         <a href="%s">Mehr erfahren</a>
         ]]></string>
-    <string name="custom_sync_server_base_url_title" maxLength="41">Synchronisierungs URL</string>
+    <string name="custom_sync_server_base_url_title" maxLength="41">URL synchronisieren</string>
     <string name="custom_sync_certificate_title" maxLength="41">Benutzerdefiniertes Root-Zertifikat (PEM)</string>
     <!-- Key Bindings -->
     <string name="keyboard">Tastatur</string>
@@ -223,75 +231,76 @@
          ################################## Review reminders ###################################
          ####################################################################################### -->
     <!-- Entry points -->
-    <string name="review_reminders_title" maxLength="41" comment="Name of the review reminders feature. Used as a settings screen title, a toolbar title, and the name of the notification channel review reminders are posted to.">Review reminders</string>
-    <string name="review_reminders_summary_app_wide" comment="The descriptor for reminders that are attached to the whole app rather than a single deck.">App-wide</string>
-    <string name="review_reminders_summary_deck_specific" comment="The descriptor for reminders attached to one particular deck.">Deck-specific</string>
-    <string name="review_reminders_load_error" comment="Error dialog shown when stored review reminders could not be read back. Technical details follow this text.">An error occurred while loading your review reminders, corrupted reminders have been deleted. Details:</string>
+    <string name="review_reminders_title" maxLength="41" comment="Name of the review reminders feature. Used as a settings screen title, a toolbar title, and the name of the notification channel review reminders are posted to.">Erinnerungen anzeigen</string>
+    <string name="review_reminders_summary_app_wide" comment="The descriptor for reminders that are attached to the whole app rather than a single deck.">In der ganzen App</string>
+    <string name="review_reminders_summary_deck_specific" comment="The descriptor for reminders attached to one particular deck.">Deck-spezifisch</string>
+    <string name="review_reminders_load_error" comment="Error dialog shown when stored review reminders could not be read back. Technical details follow this text.">Beim Laden deiner Erinnerungen ist ein Fehler aufgetreten. Beschädigte Erinnerungen wurden gelöscht. Hinweise:</string>
     <!-- Schedule reminders screen -->
-    <string name="schedule_reminders_title" maxLength="28" comment="Name of the menu option for scheduling review reminders for a deck.">Schedule reminders</string>
+    <string name="schedule_reminders_title" maxLength="28" comment="Name of the menu option for scheduling review reminders for a deck.">Erinnerungen planen</string>
     <string name="add_reminder" comment="Label for the add reminder button in the screen for adding and editing review reminders">Erinnerung hinzufügen</string>
-    <string name="you_have_no_review_reminders" comment="Text that appears in the review reminder editing screen when there are no reminders set">Sie haben keine Bewertungserinnerungen</string>
-    <string name="schedule_reminders_troubleshoot_menu" maxLength="28" comment="Text in a menu button which opens a screen for diagnosing why review reminders may not be delivered.">Troubleshoot</string>
-    <string name="schedule_reminders_notification_settings_menu" maxLength="28" comment="Text in a menu button which opens the operating system notification settings for the app.">Notification settings</string>
-    <string name="schedule_reminders_list_content_description" comment="Accessibility description of the list showing scheduled review reminders.">List of scheduled review reminders</string>
-    <string name="schedule_reminders_deck_not_found" comment="Shown in place of a deck name when the deck a review reminder points at no longer exists.">Deck not found</string>
-    <string name="schedule_reminders_unavailable" comment="Pop-up text shown when review reminders cannot be delivered at all, such as due to missing permissions.">Reminders are unavailable</string>
-    <string name="schedule_reminders_fix" comment="Text for the button which, when pressed, opens the review reminder troubleshooting screen for fixing issues with review reminders.">Fix</string>
-    <string name="schedule_reminders_added" comment="Pop-up text which confirms a new review reminder was created.">Successfully added new review reminder</string>
-    <string name="schedule_reminders_deleted" comment="Pop-up text which confirms a review reminder was deleted.">Successfully deleted review reminder</string>
-    <string name="schedule_reminders_edited" comment="Pop-up text which confirms an existing review reminder was changed.">Successfully edited review reminder</string>
+    <string name="you_have_no_review_reminders" comment="Text that appears in the review reminder editing screen when there are no reminders set">Du hast keine Bewertungserinnerungen</string>
+    <string name="schedule_reminders_troubleshoot_menu" maxLength="28" comment="Text in a menu button which opens a screen for diagnosing why review reminders may not be delivered.">Fehlersuche</string>
+    <string name="schedule_reminders_notification_settings_menu" maxLength="28" comment="Text in a menu button which opens the operating system notification settings for the app.">Benachrichtigungseinstellungen</string>
+    <string name="schedule_reminders_list_content_description" comment="Accessibility description of the list showing scheduled review reminders.">Liste der geplante Erinnerungsbenachrichtigungen</string>
+    <string name="schedule_reminders_deck_not_found" comment="Shown in place of a deck name when the deck a review reminder points at no longer exists.">Kein Deck gefunden</string>
+    <string name="schedule_reminders_unavailable" comment="Pop-up text shown when review reminders cannot be delivered at all, such as due to missing permissions.">Erinnerungen sind nicht verfügbar</string>
+    <string name="schedule_reminders_fix" comment="Text for the button which, when pressed, opens the review reminder troubleshooting screen for fixing issues with review reminders.">Reparieren</string>
+    <string name="schedule_reminders_added" comment="Pop-up text which confirms a new review reminder was created.">Neue Bewertungserinnerung erfolgreich hinzugefügt</string>
+    <string name="schedule_reminders_deleted" comment="Pop-up text which confirms a review reminder was deleted.">Bewertungserinnerung erfolgreich gelöscht</string>
+    <string name="schedule_reminders_edited" comment="Pop-up text which confirms an existing review reminder was changed.">Bewertungserinnerung erfolgreich bearbeitet</string>
     <!-- Add / edit reminder dialog -->
     <string name="add_review_reminder" comment="Title of the dialog for creating a new review reminder.">Bewertungserinnerung machen</string>
     <string name="edit_review_reminder" comment="Title of the dialog for editing an existing review reminder.">Eine Bewertungserinnerung editieren</string>
-    <string name="add_edit_reminder_time_label" comment="Label of the field for choosing what time of day a review reminder fires.">Time:</string>
+    <string name="add_edit_reminder_time_label" comment="Label of the field for choosing what time of day a review reminder fires.">Zeit:</string>
     <string name="add_edit_reminder_deck_label" comment="Label of the field for choosing which deck a review reminder applies to.">Deck:</string>
-    <string name="add_edit_reminder_advanced_label" comment="Header of the collapsible section holding extra review reminder customization options.">Advanced settings</string>
-    <string name="add_edit_reminder_card_threshold_label" comment="Label of the field setting the minimum number of due cards needed before a review reminder fires.">Card threshold:</string>
-    <string name="add_edit_reminder_card_threshold_description" comment="Explanation shown under the card threshold field.">Do not send me notifications if there are less than this many cards due</string>
-    <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
-    <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
-    <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
-    <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
-    <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
+    <string name="add_edit_reminder_advanced_label" comment="Header of the collapsible section holding extra review reminder customization options.">Erweiterte Einstellungen</string>
+    <string name="add_edit_reminder_card_threshold_label" comment="Label of the field setting the minimum number of due cards needed before a review reminder fires.">Karteikartenschwelle:</string>
+    <string name="add_edit_reminder_card_threshold_description" comment="Explanation shown under the card threshold field.">Sende mir keine Benachrichtigungen, wenn weniger als diese Anzahl an Karteikarten fällig ist.</string>
+    <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Benachrichtige mich nur, wenn heute keine Rezensionen abgegeben wurden.</string>
+    <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Bitte gib eine ganze Anzahl von Karteikarten ein.</string>
+    <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">Der Karteikartenschwellenwert muss mindestens 0 sein</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
+    <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Diese Erinnerung löschen?</string>
+    <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">Diese Aktion kann nicht rückgängig gemacht werden.</string>
     <!-- Reminder troubleshooting screen -->
-    <string name="reminder_troubleshooting_summary_error" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when reminders cannot be delivered at all.">Reminders are unavailable.</string>
-    <string name="reminder_troubleshooting_summary_warning" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when reminders may be delayed or suppressed.">Reminders may not work correctly.</string>
-    <string name="reminder_troubleshooting_summary_ok" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when no issues are found.">Your reminders should work as expected.</string>
-    <string name="reminder_troubleshooting_footer" comment="Closing advice at the bottom of the review reminder troubleshooting screen.">Different devices have different notification restriction settings. Check your system settings or search online if issues persist.</string>
+    <string name="reminder_troubleshooting_summary_error" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when reminders cannot be delivered at all.">Erinnerungen sind nicht verfügbar.</string>
+    <string name="reminder_troubleshooting_summary_warning" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when reminders may be delayed or suppressed.">Die Erinnerungen funktionieren möglicherweise nicht richtig</string>
+    <string name="reminder_troubleshooting_summary_ok" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when no issues are found.">Deine Erinnerungen sollten wie gewohnt funktionieren.</string>
+    <string name="reminder_troubleshooting_footer" comment="Closing advice at the bottom of the review reminder troubleshooting screen.">Verschiedene Geräte haben unterschiedliche Benachrichtigungsbeschränkugen. Sollten die Fehler weiterhin bestehen, überprüfe die Systemeinstellungen oder suche online.</string>
     <!-- Troubleshooting check titles -->
-    <string name="reminder_troubleshooting_check_notification_permission" comment="Name of a review reminder troubleshooting check: whether the app may post notifications.">Notification permission</string>
-    <string name="reminder_troubleshooting_check_notification_channel" comment="Name of a review reminder troubleshooting check: whether the review reminders notification channel is turned on.">Notification channel</string>
-    <string name="reminder_troubleshooting_check_do_not_disturb" comment="Name of a review reminder troubleshooting check: whether the system Do Not Disturb mode is active.">Do not disturb</string>
-    <string name="reminder_troubleshooting_check_battery_optimization" comment="Name of a review reminder troubleshooting check: whether the system restricts the app\'s background battery usage.">Battery optimization</string>
-    <string name="reminder_troubleshooting_check_power_saving_mode" comment="Name of a review reminder troubleshooting check: whether the system power saving mode is active.">Power saving mode</string>
-    <string name="reminder_troubleshooting_check_exact_alarm_permission" comment="Name of a review reminder troubleshooting check: whether the app has permission to schedule alarms at exact times.">Alarms &amp; reminders permission</string>
+    <string name="reminder_troubleshooting_check_notification_permission" comment="Name of a review reminder troubleshooting check: whether the app may post notifications.">Benachrichtigungenzugriff</string>
+    <string name="reminder_troubleshooting_check_notification_channel" comment="Name of a review reminder troubleshooting check: whether the review reminders notification channel is turned on.">Benachrichtigungskanal</string>
+    <string name="reminder_troubleshooting_check_do_not_disturb" comment="Name of a review reminder troubleshooting check: whether the system Do Not Disturb mode is active.">Bitte nicht stören</string>
+    <string name="reminder_troubleshooting_check_battery_optimization" comment="Name of a review reminder troubleshooting check: whether the system restricts the app\'s background battery usage.">Energieverbrauch optimieren</string>
+    <string name="reminder_troubleshooting_check_power_saving_mode" comment="Name of a review reminder troubleshooting check: whether the system power saving mode is active.">Energiesparmodus</string>
+    <string name="reminder_troubleshooting_check_exact_alarm_permission" comment="Name of a review reminder troubleshooting check: whether the app has permission to schedule alarms at exact times.">Alarme &amp; Erinnerungen Zugriff</string>
     <!-- Troubleshooting check statuses -->
-    <string name="reminder_troubleshooting_status_granted" comment="Status of a review reminder troubleshooting check: the permission has been given.">Granted</string>
-    <string name="reminder_troubleshooting_status_denied" comment="Status of a review reminder troubleshooting check: the permission has not been given.">Denied</string>
-    <string name="reminder_troubleshooting_status_on" comment="Status of a review reminder troubleshooting check: the system setting is active.">On</string>
-    <string name="reminder_troubleshooting_status_off" comment="Status of a review reminder troubleshooting check: the system setting is not active.">Off</string>
-    <string name="reminder_troubleshooting_status_unrestricted" comment="Status of the review reminder battery optimization check: the app may run freely in the background.">Unrestricted</string>
-    <string name="reminder_troubleshooting_status_optimized" comment="Status of the review reminder battery optimization check: the system may delay the app in the background.">Optimized</string>
-    <string name="reminder_troubleshooting_status_restricted" comment="Status of the review reminder battery optimization check: the app is barred from running in the background.">Restricted</string>
+    <string name="reminder_troubleshooting_status_granted" comment="Status of a review reminder troubleshooting check: the permission has been given.">Erlaubt</string>
+    <string name="reminder_troubleshooting_status_denied" comment="Status of a review reminder troubleshooting check: the permission has not been given.">Gesperrt</string>
+    <string name="reminder_troubleshooting_status_on" comment="Status of a review reminder troubleshooting check: the system setting is active.">An</string>
+    <string name="reminder_troubleshooting_status_off" comment="Status of a review reminder troubleshooting check: the system setting is not active.">Aus</string>
+    <string name="reminder_troubleshooting_status_unrestricted" comment="Status of the review reminder battery optimization check: the app may run freely in the background.">Nicht eingeschränkt</string>
+    <string name="reminder_troubleshooting_status_optimized" comment="Status of the review reminder battery optimization check: the system may delay the app in the background.">Verbessert</string>
+    <string name="reminder_troubleshooting_status_restricted" comment="Status of the review reminder battery optimization check: the app is barred from running in the background.">Eingeschränkt</string>
     <!-- Troubleshooting check explanations -->
-    <string name="reminder_troubleshooting_explanation_notification_channel" comment="Explains why review reminders need notification permissions to work correctly.">The review reminder notification channel must be enabled</string>
-    <string name="reminder_troubleshooting_explanation_do_not_disturb" comment="Explains why review reminders may need Do Not Disturb to be disabled to work correctly.">Do Not Disturb may mute reminder notifications</string>
-    <string name="reminder_troubleshooting_explanation_battery_optimized" comment="Explains to the user that AnkiDroid\'s battery usage is optimized, and that battery usage may need to be enabled for review reminders to work correctly.">Battery optimization may delay reminders</string>
-    <string name="reminder_troubleshooting_explanation_battery_restricted" comment="Explains to the user that AnkiDroid\'s battery usage is restricted, and that battery usage may need to be enabled for review reminders to work correctly.">Background usage is disabled. Reminders may not be delivered</string>
-    <string name="reminder_troubleshooting_explanation_power_saving_mode" comment="Explains why review reminders may need power saving mode to be disabled to work correctly.">Power saving mode may prevent timely delivery of reminders</string>
-    <string name="reminder_troubleshooting_explanation_exact_alarm" comment="Explains that AnkiDroid cannot schedule alarms at exact times unless the exact-alarm permission is granted.">Required to schedule reminders at exact times</string>
+    <string name="reminder_troubleshooting_explanation_notification_channel" comment="Explains why review reminders need notification permissions to work correctly.">Der Kanal für Erinnerungsbenachrichtigungen muss aktiviert sein</string>
+    <string name="reminder_troubleshooting_explanation_do_not_disturb" comment="Explains why review reminders may need Do Not Disturb to be disabled to work correctly.">„Bitte nicht stören“ kann Erinnerungsbenachrichtigungen stummschalten</string>
+    <string name="reminder_troubleshooting_explanation_battery_optimized" comment="Explains to the user that AnkiDroid\'s battery usage is optimized, and that battery usage may need to be enabled for review reminders to work correctly.">Die Optimierung des Akkus kann Erinnerungen verzögern.</string>
+    <string name="reminder_troubleshooting_explanation_battery_restricted" comment="Explains to the user that AnkiDroid\'s battery usage is restricted, and that battery usage may need to be enabled for review reminders to work correctly.">Die Hintergrundnutzung ist deaktiviert. Die Erinnerungen werden möglicherweise nicht zugestellt.</string>
+    <string name="reminder_troubleshooting_explanation_power_saving_mode" comment="Explains why review reminders may need power saving mode to be disabled to work correctly.">Der Energiesparmodus kann dazu führen, dass Erinnerungen nicht rechtzeitig angezeigt werden.</string>
+    <string name="reminder_troubleshooting_explanation_exact_alarm" comment="Explains that AnkiDroid cannot schedule alarms at exact times unless the exact-alarm permission is granted.">Dies ist erforderlich, um Erinnerungen zu genauen Zeiten zu planen</string>
     <!-- Troubleshooting check actions -->
-    <string name="reminder_troubleshooting_action_grant_permission" comment="Button resolving a failing review reminder troubleshooting check by asking for a permission.">Grant permission</string>
-    <string name="reminder_troubleshooting_action_enable_notification_channel" comment="Button resolving a failing review reminder troubleshooting check by opening the operating system notification settings screen.">Enable notification channel</string>
-    <string name="reminder_troubleshooting_action_disable_battery_optimization" comment="Button resolving a failing review reminder troubleshooting check by asking the user to exempt the app from battery optimization.">Disable battery optimization</string>
-    <string name="reminder_troubleshooting_action_open_battery_settings" comment="Button resolving a failing review reminder troubleshooting check by opening the operating system battery settings screen.">Open battery settings</string>
+    <string name="reminder_troubleshooting_action_grant_permission" comment="Button resolving a failing review reminder troubleshooting check by asking for a permission.">Zugriff erteilen</string>
+    <string name="reminder_troubleshooting_action_enable_notification_channel" comment="Button resolving a failing review reminder troubleshooting check by opening the operating system notification settings screen.">Benachrichtigungkanal aktivieren</string>
+    <string name="reminder_troubleshooting_action_disable_battery_optimization" comment="Button resolving a failing review reminder troubleshooting check by asking the user to exempt the app from battery optimization.">Akkuoptimierung deaktivieren</string>
+    <string name="reminder_troubleshooting_action_open_battery_settings" comment="Button resolving a failing review reminder troubleshooting check by opening the operating system battery settings screen.">Akkueinstellungen öffnen</string>
     <!-- Notification content -->
-    <string name="review_reminder_notification_title_all_decks" comment="Title of a review reminder notification which is attached to the whole app rather than a single deck.">It\'s time to study your cards</string>
-    <string name="review_reminder_notification_title_deck" comment="Title of a review reminder notification for one deck. The parameter is the deck name; the quotation marks are to clearly separate the user-chosen name from the app\'s own text.">It\'s time to study \"%s\"</string>
-    <string name="review_reminder_notification_snooze_button" comment="Notification button postponing a review reminder by a certain amount of time. The parameter is a duration like \'1h\', \'5m\', etc.">Snooze %s</string>
+    <string name="review_reminder_notification_title_all_decks" comment="Title of a review reminder notification which is attached to the whole app rather than a single deck.">Es ist Zeit, deine Karteikarten zu lernen</string>
+    <string name="review_reminder_notification_title_deck" comment="Title of a review reminder notification for one deck. The parameter is the deck name; the quotation marks are to clearly separate the user-chosen name from the app\'s own text.">Es ist Zeit, zu lernen \"%s\"</string>
+    <string name="review_reminder_notification_snooze_button" comment="Notification button postponing a review reminder by a certain amount of time. The parameter is a duration like \'1h\', \'5m\', etc.">Still %s</string>
     <plurals name="review_reminder_notification_cards_due" comment="Body of a review reminder notification. The parameter is the number of cards due.">
-        <item quantity="one">%d card due</item>
-        <item quantity="other">%d cards due</item>
+        <item quantity="one">Noch %d Karteikarte</item>
+        <item quantity="other">Noch %d Karteikarten</item>
     </plurals>
     <!-- studyoptions -->
     <string name="studyoptions_limit_select_tags">Schlagwörter auswählen</string>
@@ -303,7 +312,7 @@
     <string name="analytics_title" maxLength="41">Funktionsnutzung teilen</string>
     <string name="analytics_summ">Sie können zu AnkiDroid beitragen, indem Sie dem Entwicklerteam Einblick gewähren, welche Funktionen Sie verwenden</string>
     <string name="note_editor_replace_newlines" maxLength="41">Zeilenumbrüche durch HTML ersetzen</string>
-    <string name="note_editor_replace_newlines_summ">In the note editor, convert any instances of &lt;br&gt; to newlines when editing a card.</string>
+    <string name="note_editor_replace_newlines_summ">Im Notizeditor sollten beim Bearbeiten einer Karteikarte alle Vorkommen von &lt;br&gt; in Zeilenumbrüche umgewandelt werden.</string>
     <string name="type_in_answer_focus" maxLength="41">Auf »Antwort eingeben« fokussieren</string>
     <string name="type_in_answer_focus_summ">Automatisch im Lernbildschirm auf »Antwort eingeben« fokussieren</string>
     <!-- About -->
@@ -311,7 +320,7 @@
     <string name="pref_cat_about_title" maxLength="41">Über</string>
     <string name="contributors_title">Mitwirkende</string>
     <string name="about_contributors_description"><![CDATA[Dies sind unsere tollen <a href=\"%1$s\">Mitwirkenden</a>. Sie können AnkiDroid auch durch programmieren, übersetzen, spenden und <a href=\"%2$s\">mehr</a> helfen!]]></string>
-    <string name="about_contributors_description_no_donate"><![CDATA[These are our awesome <a href=\"%1$s\">contributors</a>. You can help AnkiDroid too by programming, translating and <a href=\"%2$s\">more</a>!]]></string>
+    <string name="about_contributors_description_no_donate"><![CDATA[Dies sind unsere großartigen<a href=\"%1$s\"> Mitwirkenden!</a>. Du kannst AnkiDroid auch durch Programmieren, Übersetzen und<a href=\"%2$s\">vieles mehr unterstützen</a>!]]></string>
     <string name="license">Lizenz</string>
     <string name="license_description"><![CDATA[AnkiDroid wird unter den <a href=\"%1$s\">GPL-3.0</a> und <a href=\"%2$s\">AGPL-3.0</a> Lizenzen veröffentlicht, wobei der Quellcode <a href=\"%3$s\">auf GitHub</a> verfügbar ist]]></string>
     <string name="other_licenses"><![CDATA[AnkiDroid verwendet auch Bibliotheken und Symbole von Drittanbietern, die unter verschiedenen Open-Source- <a href=\"%1$s\">-Lizenzen</a> lizenziert sind.]]></string>
@@ -353,8 +362,8 @@
     <string name="pref_cat_experimental" maxLength="41" tools:ignore="UnusedResources">Experimentell</string>
     <string name="readtext_deprecation_warn">AnkiDroid hat einen besseren TTS-Mechanismus eingeführt, der mit anderen Anki-Clients kompatibel ist und mehr Stimmen und Verbesserungen bei der Sprachwiedergabe enthält!\n\nBitte aktualisieren Sie so bald wie möglich, da diese Einstellung bald entfernt wird</string>
     <string name="readtext_reviewer_warn" tools:ignore="UnusedResources">Bitte upgraden Sie auf das neue Text-zu-Sprache-Format</string>
-    <string name="allow_templates_to_record_audio" maxLength="41">Allow templates to record audio</string>
-    <string name="template_is_trying_to_record_audio">This template is trying to record audio</string>
+    <string name="allow_templates_to_record_audio" maxLength="41">Erlauben Vorlagen, um Audio aufzunehmen</string>
+    <string name="template_is_trying_to_record_audio">Diese Vorlage versucht, Audio aufzunehmen</string>
     <string name="pref_fixed_port_title" maxLength="41">localStorage im Lernbildschirm</string>
     <string name="pref_fixed_port_summary">Aktiviert JavaScript localStorage durch Verwendung eines festen Server-Ports im Lernbildschirm</string>
     <!-- Developer options -->
@@ -420,7 +429,7 @@
     <string name="pref__etc__summary__no_collection" comment="Generic preference summary to be shown when a preference is not usable         because the collection does not exist">Keine Sammlung</string>
     <string name="pref__etc__summary__error" comment="Generic preference summary to be shown when there was an error fetching the value.         For example, this is shown when the permission to access collection is lacking">Fehler</string>
     <string name="pref__etc__snackbar__fetching" comment="Generic snackbar message to be shown when user taps on a preference,         the value of which is being fetched">Rufe ab &#8230;</string>
-    <string name="pref__etc__snackbar__calculating" comment="Generic snackbar message to be shown when user taps on a preference,         the value of which, such as folder size on disk, is being calculated">Berechnen &#8230;</string>
+    <string name="pref__etc__snackbar__calculating" comment="Generic snackbar message to be shown when user taps on a preference,         the value of which, such as folder size on disk, is being calculated">Wird berechnet &#8230;</string>
     <string name="pref__etc__snackbar__no_collection" comment="Generic snackbar message to be shown when user taps on a preference         that is not usable because the collection does not exist">Sammlung ist nicht vorhanden</string>
     <string name="hide_system_bars" maxLength="41" comment="Title of a setting that allows to hide the system bars">Systemleisten ausblenden</string>
     <string name="hide_system_bars_none" comment="Setting option to not hide any of the system bars">Keine</string>
@@ -429,7 +438,7 @@
     <string name="hide_system_bars_all_bars" comment="Setting option to hide all the system bars">Alles</string>
     <string name="ignore_display_cutout" maxLength="41">Bildschirmausschnitt ignorieren</string>
     <string name="show_answer_buttons" maxLength="41">Antwortfeld anzeigen</string>
-    <string name="hide_hard_and_easy" maxLength="41">‘Schwer’- und ‘Leicht’-Tasten ausblenden</string>
+    <string name="hide_hard_and_easy" maxLength="41">„Schwer’“- und „Leicht“-Tasten ausblenden</string>
     <string name="reviewer_frame_style" maxLength="41">Rahmenstil</string>
     <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Study Screen">Karte</string>
     <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Study Screen">Box</string>
@@ -443,15 +452,15 @@
     <string name="new_study_screen_summ"><![CDATA[Verbesserter Lernbildschirm, der den aktuellen Bildschirm ersetzen wird. Einige Funktionen des alten Bildschirms wurden geändert oder entfernt. Bitte melden Sie <a href="%1$s">Feedback</a> oder <a href="%2$s">Fehler</a>.]]></string>
     <string name="show_answer_feedback" maxLength="41">Antwort-Feedback anzeigen</string>
     <string name="screen" maxLength="41">Bildschirm</string>
-    <string name="also_assign_binding_to_show_answer" comment="Question shown after assigning binding to an \'Answer\' command, asking whether it should also be assigned to the \'Show answer\'; %1$s is \'Show answer\'">Also assign to ‘%1$s’?</string>
-    <string name="dialog_skip" comment="Skip assigning binding to \'Show answer\'">Skip</string>
-    <string name="dialog_assign" comment="Assign binding to \'Answer\' command">Assign</string>
+    <string name="also_assign_binding_to_show_answer" comment="Question shown after assigning binding to an \'Answer\' command, asking whether it should also be assigned to the \'Show answer\'; %1$s is \'Show answer\'">Auch zu ‚%1$s‘ zuordnen?</string>
+    <string name="dialog_skip" comment="Skip assigning binding to \'Show answer\'">Überspringen</string>
+    <string name="dialog_assign" comment="Assign binding to \'Answer\' command">Zuordnen</string>
     <!--Keyboard shortcuts dialog-->
     <string name="open_settings" comment="Description of the shortcut that opens the app settings">Einstellungen öffnen</string>
     <string name="related_settings_title" comment="Title of the section for related settings">Verwandte Einstellungen</string>
     <!-- External Directory Selection Preference -->
-    <string name="pref_directory_not_set" comment="Summary of the AnkiDroid directory setting when no directory is set">Not set</string>
-    <string name="pref_custom_path" maxLength="41" comment="Dialog button letting the user type a directory path manually">Custom path</string>
-    <string name="pref_enter_custom_path" maxLength="41">Enter custom path</string>
-    <string name="pref_directory_not_writable">Directory is not writable</string>
+    <string name="pref_directory_not_set" comment="Summary of the AnkiDroid directory setting when no directory is set">Nicht gesetzt</string>
+    <string name="pref_custom_path" maxLength="41" comment="Dialog button letting the user type a directory path manually">Benutzerdefinierter Pfad</string>
+    <string name="pref_enter_custom_path" maxLength="41">Benutzerdefinierten Pfad eingeben</string>
+    <string name="pref_directory_not_writable">Das Verzeichnis ist nicht beschreibbar</string>
 </resources>
diff --git a/common/android/src/main/res/values-de/16-multimedia-editor.xml b/common/android/src/main/res/values-de/16-multimedia-editor.xml
index ef8e0bba6865..7144ff792afc 100644
--- a/common/android/src/main/res/values-de/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-de/16-multimedia-editor.xml
@@ -24,7 +24,7 @@
     <string name="multimedia_editor_popup_audio_clip">Audioclip hinzufügen</string>
     <string name="multimedia_editor_popup_video_clip">Videoclip hinzufügen</string>
     <string name="multimedia_editor_popup_audio">Ton aufnehmen</string>
-    <string name="multimedia_editor_popup_cloze">Auslassung erzeugen</string>
+    <string name="multimedia_editor_popup_cloze">Lückenlöschung</string>
     <!-- Field editing general -->
     <!-- these are button names to convert field type -->
     <string name="multimedia_editor_field_editing_audio">Audioaufnahme</string>
@@ -49,7 +49,8 @@
     <string name="multimedia_editor_audio_view_create_failed">Aufnahme-Werkzeugleiste konnte nicht erstellt werden</string>
     <!-- Crop function-->
     <string name="crop_image">Wollen Sie dieses Bild zuschneiden?</string>
-    <string name="crop_button" maxLength="28">Crop</string>
+    <string name="crop_button" maxLength="28">Zuschneiden</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Die aktuelle Bildgröße beträgt %sMB. Die Standardbild Größenbegrenzung beträgt 1 MB. Möchten Sie es komprimieren?</string>
     <string name="select_image_failed">"Bildauswahl fehlgeschlagen, bitte erneut versuchen"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Feldinhalte</string>
diff --git a/common/android/src/main/res/values-el/02-strings.xml b/common/android/src/main/res/values-el/02-strings.xml
index 30ff32f77fb7..15ac1e6b20ed 100644
--- a/common/android/src/main/res/values-el/02-strings.xml
+++ b/common/android/src/main/res/values-el/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Μέγεθος γραμματοσειράς</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Εμφάνιση γραμμής εργαλείων</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Η αρχική σας οθόνη δεν επιτρέπει στο AnkiDroid να προσθέσει συντομεύσεις</string>
     <string name="create_shortcut_error">Σφάλμα κατά την προσθήκη συντόμευσης: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Κεφαλαιοποίηση προτάσεων</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Γραμμή εργαλείων κύλισης</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Διαδίκτυο</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Εγκατάσταση</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Αποτυχία ανοίγματος ρυθμίσεων μετατροπής κειμένου σε ομιλία</string>
-    <string name="shared_decks_login_required">Παρακαλώ συνδεθείτε για να κατεβάσετε περισσότερες τράπουλες</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Περιγραφή</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-el/03-dialogs.xml b/common/android/src/main/res/values-el/03-dialogs.xml
index 061d579c28ca..a77cf2d6acfe 100644
--- a/common/android/src/main/res/values-el/03-dialogs.xml
+++ b/common/android/src/main/res/values-el/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Είστε βέβαιοι ότι θέλετε να επιδιορθώσετε τη βάση δεδομένων;\n\nΠριν να ξεκινήσει η απόπειρα, θα δημιουργηθεί ένα αντίγραφο στον υποφάκελο \'%s\'.</string>
     <string name="intent_aedict_empty">Η κατηγορία «προεπιλεγμένο» είναι κενή</string>
     <string name="intent_aedict_category">Για να προσθέσετε κάρτες στο AnkiDroid, καταργήστε όλες τις κατηγορίες σημειωματάριου (Notepad) ή προσθέστε μία με το όνομα «default»</string>
-    <string name="custom_study_new_extend">Αύξηση / μείωση (“-3”) σημερινού ορίου νέων καρτών κατά</string>
-    <string name="custom_study_rev_extend">Αύξηση / μείωση (“-3”) σημερινού ορίου επαναλήψεων κατά</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Επανάληψη ξεχασμένων καρτών στις τελευταίες x μέρες:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Όλες οι κάρτες</string>
-    <string name="tags_dialog_option_new_cards">Νέο</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Νέο</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Εύρεση κενών καρτών&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">Το σύστημα WebView είναι απαρχαιωμένο. Ορισμένες λειτουργίες δεν θα λειτουργήσουν σωστά. Παρακαλώ ενημερώστε το.\n\nΕγκατεστημένη έκδοση: %1$d\nΕλάχιστη απαιτούμενη έκδοση: %2$d</string>
     <string name="compress">Συμπίεση</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">H γλώσσα δεν υποστηρίζεται</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Αλλαγή μηχανής</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-el/10-preferences.xml b/common/android/src/main/res/values-el/10-preferences.xml
index f5a9ab02cdc2..a2320945ddcf 100644
--- a/common/android/src/main/res/values-el/10-preferences.xml
+++ b/common/android/src/main/res/values-el/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Τράπουλα για νέες κάρτες</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Χρονικό όριο</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Έναρξη επόμενης ημέρας</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d ώρα μετά τα μεσάνυχτα</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-el/16-multimedia-editor.xml b/common/android/src/main/res/values-el/16-multimedia-editor.xml
index 194ae5ae2f48..9a9d7d77e122 100644
--- a/common/android/src/main/res/values-el/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-el/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Θέλετε να περικόψετε αυτή την εικόνα;</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Το τρέχον μέγεθος εικόνας είναι %sMB. Το προεπιλεγμένο όριο μεγέθους εικόνας είναι 1MB. Θέλετε να το περικόψετε;</string>
     <string name="select_image_failed">"Η επιλογή εικόνας απέτυχε, Παρακαλώ προσπαθήστε ξανά"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Περιεχόμενα Πεδίου</string>
diff --git a/common/android/src/main/res/values-eo/02-strings.xml b/common/android/src/main/res/values-eo/02-strings.xml
index e4b607204fed..9d4cdfbb82c5 100644
--- a/common/android/src/main/res/values-eo/02-strings.xml
+++ b/common/android/src/main/res/values-eo/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid ne povas aliri konservejon pro eraro rilata al Android.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Grando de tiparo</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Montri ilarstrion</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Aranĝi kiel grasan</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Via aplikaĵlanĉilo ne permesas al AnkiDroid krei fenestraĵojn</string>
     <string name="create_shortcut_error">Eraro dum krei fenestraĵon: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Majuskligi frazojn</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Rulumi en ilarstrio</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Atestilo</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Rete</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Instali</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Malsukcesis malfermi agordojn pri parolsintezo</string>
-    <string name="shared_decks_login_required">Ensalutu por elŝuti pliajn kartarojn</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Priskribo</string>
     <string name="deck_description_saved">Priskribo aktualigita</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-eo/03-dialogs.xml b/common/android/src/main/res/values-eo/03-dialogs.xml
index 2fc6cad1c3a3..0f5a6ab6ba2c 100644
--- a/common/android/src/main/res/values-eo/03-dialogs.xml
+++ b/common/android/src/main/res/values-eo/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Ĉu vi certe volas ripari la datumbazon?\n\nAntaŭ ol komenci, kopio estos kreita en subdosierujo “%s”.</string>
     <string name="intent_aedict_empty">La ĉefa kategorio estas malplena</string>
     <string name="intent_aedict_category">Por aldoni kartojn al AnkiDroid, forigu ĉiujn kategoriojn de kajero kaj aldonu unu nomitan «default»</string>
-    <string name="custom_study_new_extend">(Mal)pliigi (“-3”) hodiaŭan limigon de novaj kartoj je</string>
-    <string name="custom_study_rev_extend">(Mal)pliigi (“-3”) hodiaŭan limigon de kartoj por ripeti je</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Ripeti kartojn forgesitajn dum tiom da antaŭaj tagoj:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Ĉiuj kartoj</string>
-    <string name="tags_dialog_option_new_cards">Novaj</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Novaj</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Lernendaj</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Serĉado de malplenaj kartoj&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">La operaciuma WebView estas neĝisdata. Kelkaj trajtoj povas ne funkcii ĝuste. Ĝisdatigu ĝin.\n\nInstalita versio: %1$d\nMinimuma postulata versio: %2$d</string>
     <string name="compress">Densigi</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Lingvo nesubtenata</string>
     <string name="tts_error_dialog_reason_text">La lingvo <b>%2$s</b> ne estas subtenata de la parolsintezilo <b>%1$s</b>.</string>
     <string name="tts_error_dialog_change_button_text">Ŝanĝi</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-eo/10-preferences.xml b/common/android/src/main/res/values-eo/10-preferences.xml
index e5c61c311bc3..82c9bba99b37 100644
--- a/common/android/src/main/res/values-eo/10-preferences.xml
+++ b/common/android/src/main/res/values-eo/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Larĝo de streko</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">Kartaro por novaj kartoj</string>
     <string name="learn_cutoff" maxLength="41">Limigo de anticipa lernado</string>
     <string name="time_limit" maxLength="41">Limigo de lernada tempero (timebox)</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Komenco de tago (0 estas la horo 00:00. 23 estas la horo 23:00)</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d horo post noktmezo</item>
@@ -246,6 +254,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-eo/16-multimedia-editor.xml b/common/android/src/main/res/values-eo/16-multimedia-editor.xml
index a1fa17b1f897..c669cffb6c91 100644
--- a/common/android/src/main/res/values-eo/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-eo/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Ĉu vi volas pritondi tiun ĉi bildon?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Bild-grando estas %s MB. Implicita limigo bild-grando estas 1 MB. Ĉu vi volas densigi la bildon?</string>
     <string name="select_image_failed">"Fiaskis konservi bildon, reprovu"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Enhavo de kampo</string>
diff --git a/common/android/src/main/res/values-es-rAR/02-strings.xml b/common/android/src/main/res/values-es-rAR/02-strings.xml
index 3f87ccda87c5..5f204e3501e6 100644
--- a/common/android/src/main/res/values-es-rAR/02-strings.xml
+++ b/common/android/src/main/res/values-es-rAR/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid no puede acceder al almacenamiento debido a un error de Android.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Tamaño de Letra</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Mostrar barra de herramientas</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Tu pantalla de inicio no permite que AnkiDroid añada accesos directos</string>
     <string name="create_shortcut_error">Error al añadir acceso directo: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Poner en mayúsculas las oraciones</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Barra de herramientas de estilo</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Instalar</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Error al abrir la configuración de texto a voz</string>
-    <string name="shared_decks_login_required">Por favor, inicia sesión para descargar más mazos</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Descripción</string>
     <string name="deck_description_saved">Descripción actualizada</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-es-rAR/03-dialogs.xml b/common/android/src/main/res/values-es-rAR/03-dialogs.xml
index 81451403d2ad..63aa4ecaf36f 100644
--- a/common/android/src/main/res/values-es-rAR/03-dialogs.xml
+++ b/common/android/src/main/res/values-es-rAR/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">¿Desea realmente intentar reparar la base de datos?\n\nAntes de comenzar con el intento, una copia será creada en el subdirectorio \'%s\'.</string>
     <string name="intent_aedict_empty">La categoría \'predeterminado\' está vacía</string>
     <string name="intent_aedict_category">Para añadir tarjetas a AnkiDroid elimine todas las categorías de los blocks de notas y agregue una llamada \'predeterminado\'</string>
-    <string name="custom_study_new_extend">Aumentar/disminuir (“-3”) el límite actual de tarjetas en</string>
-    <string name="custom_study_rev_extend">Aumentar/disminuir (“-3”) el límite actual de revisión por</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Repasar tarjetas olvidadas en los últimos x días:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Todas las tarjetas</string>
-    <string name="tags_dialog_option_new_cards">Nuevas</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Nuevas</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Programadas</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Buscando tarjetas vacías&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">El sistema WebView está obsoleto. Algunas funciones no funcionarán correctamente. Por favor, actualízalo.\nnVersión instalada: %1$d\nVersión mínima requerida: %2$d</string>
     <string name="compress">Comprimir</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Este idioma no está disponible.</string>
     <string name="tts_error_dialog_reason_text">El motor de texto a voz <b>%1$s</b> no soporta el siguiente idioma: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Cambiar motor</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-es-rAR/10-preferences.xml b/common/android/src/main/res/values-es-rAR/10-preferences.xml
index 37d757387266..37ae829b4bb7 100644
--- a/common/android/src/main/res/values-es-rAR/10-preferences.xml
+++ b/common/android/src/main/res/values-es-rAR/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Ancho del trazo</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">Mazo para nuevas tarjetas</string>
     <string name="learn_cutoff" maxLength="41">Aprender antes del límite</string>
     <string name="time_limit" maxLength="41">Límite de tiempo para Timebox</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Comienzo del siguiente día</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hora después de la medianoche</item>
@@ -251,6 +259,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-es-rAR/16-multimedia-editor.xml b/common/android/src/main/res/values-es-rAR/16-multimedia-editor.xml
index ed7658d10ed1..e347d30183f1 100644
--- a/common/android/src/main/res/values-es-rAR/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-es-rAR/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">¿Quieres recortar esta imagen?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">El tamaño actual de la imagen es %sMB. El límite de tamaño de imagen por defecto es 1MB. ¿Querés comprimirla?</string>
     <string name="select_image_failed">"Error al seleccionar la imagen. Intentalo de nuevo"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Contenidos de Campo</string>
diff --git a/common/android/src/main/res/values-es-rES/02-strings.xml b/common/android/src/main/res/values-es-rES/02-strings.xml
index 03711c3cadac..da694db4f2f8 100644
--- a/common/android/src/main/res/values-es-rES/02-strings.xml
+++ b/common/android/src/main/res/values-es-rES/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid no puede acceder al almacenamiento debido a un error de Android.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Tamaño de Letra</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Mostrar barra de herramientas</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Tu pantalla de inicio no permite que AnkiDroid añada accesos directos</string>
     <string name="create_shortcut_error">Error al añadir acceso directo: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Poner en mayúsculas las oraciones</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Barra de herramientas de estilo</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Instalar</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Error al abrir la configuración de texto a voz</string>
-    <string name="shared_decks_login_required">Por favor, inicia sesión para descargar más mazos</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Descripción</string>
     <string name="deck_description_saved">Descripción actualizada</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-es-rES/03-dialogs.xml b/common/android/src/main/res/values-es-rES/03-dialogs.xml
index f23e9831c30e..c6b0bed0fd9f 100644
--- a/common/android/src/main/res/values-es-rES/03-dialogs.xml
+++ b/common/android/src/main/res/values-es-rES/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">¿Realmente deseas intentar reparar la base de datos?\n\nAntes de iniciar el intento, se creará una copia en la subcarpeta \'%s\'.</string>
     <string name="intent_aedict_empty">La categoría \'por defecto\' está vacía</string>
     <string name="intent_aedict_category">Para añadir tarjetas AnkiDroid borra todas las categorías del Bloc de notas o agrega una llamada \'por defecto\'</string>
-    <string name="custom_study_new_extend">Aumentar/disminuir (“-3”) el límite actual de tarjetas en</string>
-    <string name="custom_study_rev_extend">Aumentar/disminuir (“-3”) el límite actual de revisión por</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Revisar tarjetas olvidadas en los últimos x días:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Todas las tarjetas</string>
-    <string name="tags_dialog_option_new_cards">Nuevo</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Nuevo</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Pendientes</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Buscando tarjetas vacías&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">El sistema WebView está obsoleto. Algunas funciones no funcionarán correctamente. Por favor, actualízalo.\nnVersión instalada: %1$d\nVersión mínima requerida: %2$d</string>
     <string name="compress">Comprimir</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Este idioma no está disponible.</string>
     <string name="tts_error_dialog_reason_text">El motor de texto a voz <b>%1$s</b> no soporta el siguiente idioma: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Cambiar motor</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-es-rES/10-preferences.xml b/common/android/src/main/res/values-es-rES/10-preferences.xml
index 70a77c3e15c2..98c2c0e122ae 100644
--- a/common/android/src/main/res/values-es-rES/10-preferences.xml
+++ b/common/android/src/main/res/values-es-rES/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Ancho del trazo</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">Mazo para las nuevas tarjetas</string>
     <string name="learn_cutoff" maxLength="41">Aprender por delante del límite</string>
     <string name="time_limit" maxLength="41">Límite de tiempo del Timebox</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Comienzo del día siguiente (0 es medianoche, 23 es 11PM)</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hora después de la medianoche</item>
@@ -251,6 +259,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-es-rES/16-multimedia-editor.xml b/common/android/src/main/res/values-es-rES/16-multimedia-editor.xml
index a0d792032516..31fde85632e7 100644
--- a/common/android/src/main/res/values-es-rES/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-es-rES/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">¿Quieres recortar esta imagen?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">El tamaño actual de la imagen es %sMB. El límite de tamaño de imagen por defecto es 1MB. ¿Deseas comprimirla?</string>
     <string name="select_image_failed">"Error al seleccionar la imagen. Vuelve a intentarlo"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Contenidos del campo</string>
diff --git a/common/android/src/main/res/values-et/02-strings.xml b/common/android/src/main/res/values-et/02-strings.xml
index bb2c4c321405..00f784161b12 100644
--- a/common/android/src/main/res/values-et/02-strings.xml
+++ b/common/android/src/main/res/values-et/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Teksti suurus</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Näita tööriistariba</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Rasvane kiri</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Suurtäht lause alguses</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Keri tööriistariba</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Sertifikaat</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Paigalda</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Teksti kõneks seadete avamine ebaõnnestus</string>
-    <string name="shared_decks_login_required">Palun logi sisse, et laadida alla rohkem kaardipakke</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Kirjeldus</string>
     <string name="deck_description_saved">Kirjeldust on uuendatud</string>
     <string name="format_deck_description_as_markdown">Vorminda kui Markdown</string>
diff --git a/common/android/src/main/res/values-et/03-dialogs.xml b/common/android/src/main/res/values-et/03-dialogs.xml
index 5e8f07cc7e72..12417ea64a02 100644
--- a/common/android/src/main/res/values-et/03-dialogs.xml
+++ b/common/android/src/main/res/values-et/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Kõik kaardid</string>
-    <string name="tags_dialog_option_new_cards">Uus</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Uus</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Tähtaeg</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Tühjade kaartide otsimine&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Tihenda</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Keel pole toetatud</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Muuda mootorit</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-et/10-preferences.xml b/common/android/src/main/res/values-et/10-preferences.xml
index b9310b027cb2..6f0340f70676 100644
--- a/common/android/src/main/res/values-et/10-preferences.xml
+++ b/common/android/src/main/res/values-et/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Joone laius</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Uute kaartide kaardipakk</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Järgmise päeva algus</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d tund pärast südaööd</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-et/16-multimedia-editor.xml b/common/android/src/main/res/values-et/16-multimedia-editor.xml
index 05366b65f4cc..1ceda1cb6438 100644
--- a/common/android/src/main/res/values-et/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-et/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Kas soovid seda pilti kärpida?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Praeguse pildi suurus on %sMB. Vaikimisi pildi suuruse piirang on 1MB. KAs soovid seda kokku pakkida?</string>
     <string name="select_image_failed">"Pildi valimine ebaõnnestus. Palun proovi uuesti"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Välja sisu</string>
diff --git a/common/android/src/main/res/values-eu/02-strings.xml b/common/android/src/main/res/values-eu/02-strings.xml
index 433fb1d03b28..39d27586f0fd 100644
--- a/common/android/src/main/res/values-eu/02-strings.xml
+++ b/common/android/src/main/res/values-eu/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-eu/03-dialogs.xml b/common/android/src/main/res/values-eu/03-dialogs.xml
index ebf8491486b9..de1ed2516481 100644
--- a/common/android/src/main/res/values-eu/03-dialogs.xml
+++ b/common/android/src/main/res/values-eu/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">\"Lehenetsia\" kategoria hutsik dago</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Azkenengo x egunetan ahaztu diren kartak errepasatu:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Txartel guztiak</string>
-    <string name="tags_dialog_option_new_cards">Berria</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Berria</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Epemuga</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-eu/10-preferences.xml b/common/android/src/main/res/values-eu/10-preferences.xml
index 8e6ac4a91535..15d40333a692 100644
--- a/common/android/src/main/res/values-eu/10-preferences.xml
+++ b/common/android/src/main/res/values-eu/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-eu/16-multimedia-editor.xml b/common/android/src/main/res/values-eu/16-multimedia-editor.xml
index c9a7c6eb015e..5dd3d82b62d1 100644
--- a/common/android/src/main/res/values-eu/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-eu/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-fa/01-core.xml b/common/android/src/main/res/values-fa/01-core.xml
index 9a8f2f254e13..65cb4da20c03 100644
--- a/common/android/src/main/res/values-fa/01-core.xml
+++ b/common/android/src/main/res/values-fa/01-core.xml
@@ -82,7 +82,7 @@
     <string name="menu_disable_voice_playback">غیرفعال کردن پخش صدا</string>
     <string name="menu_create_backup" maxLength="28">ایجاد پشتیبان</string>
     <string name="new_dynamic_deck">ایجاد دسته فیلتر شده</string>
-    <string name="directory_inaccessible">فهرست AnkiDroid غیر قابل دسترس است</string>
+    <string name="directory_inaccessible">فهرست AnkiDroid غیرقابل دسترس است</string>
     <!--This is shown when AnkiDroid starts up with no storage permissions.
     The user is taken to the "App Info" screen, and needs to click "Permissions" and
     grant AnkiDroid the \'Storage\' permission. This needs to be a fairly generic message as implementations
@@ -127,8 +127,8 @@
     <string name="read_write_permission_label">بخوان و به پایگاه داده AnkiDroid پیام بده</string>
     <string name="read_write_permission_description">دسترسی به یادداشت‌ها، کارت‌ها، انواع یادداشت‌ها و دسته‌های موجود، و همچنین ایجاد موارد جدید</string>
     <!-- Context Menu -->
-    <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">Card browser</string>
-    <string name="context_menu_anki_card_label">Anki card</string>
+    <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">مرورگر کارت</string>
+    <string name="context_menu_anki_card_label">کارت Anki</string>
     <!-- Sync conflict -->
     <string name="sync_conflict_message_new">مجموعه‌ها نمی‌توانند ترکیب شوند.\nکدام مجموعه را می‌خواهید نگه دارید؟</string>
     <string name="sync_conflict_keep_local_new" comment="Select AnkiDroid files to keep while syncing">انکی دروید</string>
diff --git a/common/android/src/main/res/values-fa/02-strings.xml b/common/android/src/main/res/values-fa/02-strings.xml
index 4df37a8583fa..69287b72c635 100644
--- a/common/android/src/main/res/values-fa/02-strings.xml
+++ b/common/android/src/main/res/values-fa/02-strings.xml
@@ -221,7 +221,10 @@
 خطا.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">اندازه فونت</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">نمایش نوار ابزار</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">قالب‌حروف به‌صورت پررنگ</string>
@@ -249,7 +252,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">صفحه اصلی شما به AnkiDroid اجازه میانبور اضافه کردن نمیدهد</string>
     <string name="create_shortcut_error">خطا در افزودن میانبُر: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">جملات را با حروف بزرگ بنویس</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">پیمایش نوار ابزار</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">لینک</string>
     <string name="dialog_hint_certificate">گواهی امنیتی</string>
@@ -336,7 +338,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">اینترنت</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">نصب شود</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">باز کردن تنظیمات متن به گفتار ناموفق بود</string>
-    <string name="shared_decks_login_required">لطفا وارد حساب کاربری خود شوید که دسته های بیشتری را دانلود کنید</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">توضیحات</string>
     <string name="deck_description_saved">توضیح به‌روز شد</string>
     <string name="format_deck_description_as_markdown">قالب‌بندی به فرمت مارک‌داون</string>
diff --git a/common/android/src/main/res/values-fa/03-dialogs.xml b/common/android/src/main/res/values-fa/03-dialogs.xml
index 42e2eb7fd84d..ecb34c654de2 100644
--- a/common/android/src/main/res/values-fa/03-dialogs.xml
+++ b/common/android/src/main/res/values-fa/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">آیا شما واقعا می خواهید پایگاه داده را تعمیر کنید؟\n\nقبل از شروع , یک کپی در پوشه فرعی \'%s\' به وجود خواهد آمد .</string>
     <string name="intent_aedict_empty">مجموعه \'پیش فرض\' خالی است</string>
     <string name="intent_aedict_category">اضافه کردن کارت به آنکی دروید سبب حذف همه یادداشت های مجموعه ها یا اضافه کردن یک نام پیش فرض به آنها می شود</string>
-    <string name="custom_study_new_extend">محدودیت تعداد کارت های امروز را کم/زیاد (\"-۳\") کن به این اندازه</string>
-    <string name="custom_study_rev_extend">محدودیت تعداد مرور های امروز را کم/زیاد (\"-۳\") کن به این اندازه</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">مرور کارت های فراموش شده در x روز گذشته:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">همه کارتها</string>
-    <string name="tags_dialog_option_new_cards">جدید</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">جدید</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">موعد</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">در حال پیدا کردن کارت های خالی&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">WebView سیستم قدیمی است. برخی ویژگی‌ها به درستی کار نخواهند کرد. لطفاً آن را به‌روزرسانی کنید. \n\nنسخه نصب‌شده: %1$d\nحداقل نسخه مورد نیاز: %2$d</string>
     <string name="compress">فشرده سازی</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">زبان پشتیبانی نشده است</string>
     <string name="tts_error_dialog_reason_text">موتور متن به گفتار <b>%1$s</b> این زبان را همایت نمیکند: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">موتور را تغییر بده</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-fa/10-preferences.xml b/common/android/src/main/res/values-fa/10-preferences.xml
index 5916273c4d34..e14505218848 100644
--- a/common/android/src/main/res/values-fa/10-preferences.xml
+++ b/common/android/src/main/res/values-fa/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">اخطار ایمنی: کد خطرناک جاوااسکریپتمسدود شد.\nچنانچه به همهٔ محتویات و قالب‌های کالکشن خود اعتماد دارید، می‌توانید این گزینه را در تنظیمات پیشرفته فعال کنید.</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">مجوز بازکردن برنامه‌های دیگر توسط کارت‌ها</string>
-    <string name="allow_card_external_launch_summ">کارت‌ها می‌توانند برنامه‌های دیگر را روی دستگاه شما باز کنند که ممکن است به اجرای اقدامات ناخواسته منجر شود.\nاین گزینه را خاموش نگه دارید، مگر اینکه به تمام کارت‌ها و قالب‌های موجود در مجموعهٔ خود اعتماد کامل داشته باشید.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">هشدار امنیتی: کارت از اجرای برنامهٔ دیگر مسدود شد.\nاگر به تمام کارت‌ها و قالب‌های مجموعهٔ خود اعتماد دارید، می‌توانید این محدودیت را در تنظیمات پیشرفته فعال کنید.</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">کلفتی خط</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">دسته برای کارتهای جدید</string>
     <string name="learn_cutoff" maxLength="41">محدودیت های پیش رو را یاد بگیرید</string>
     <string name="time_limit" maxLength="41">محدوده زمانی جعبه زمان</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">شروع روز بعد</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d ساعت پس از نیمه‌شب</item>
@@ -250,6 +258,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-fa/16-multimedia-editor.xml b/common/android/src/main/res/values-fa/16-multimedia-editor.xml
index 3843c6654988..bed35deb5e3d 100644
--- a/common/android/src/main/res/values-fa/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-fa/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">از برش این تصویر اطمینان دارید؟</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">اندازه فعلی تصویر %s مگابایت است. حد پیش‌فرض اندازه تصویر ۱ مگابایت است. آیا می‌خواهید آن را فشرده کنید؟</string>
     <string name="select_image_failed">"انتخاب تصویر انجام نشد، لطفاً دوباره تلاش کنید"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">محتوای قسمت</string>
diff --git a/common/android/src/main/res/values-fi/02-strings.xml b/common/android/src/main/res/values-fi/02-strings.xml
index 98559e68d842..c40ae684b594 100644
--- a/common/android/src/main/res/values-fi/02-strings.xml
+++ b/common/android/src/main/res/values-fi/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid ei voi käyttää tallennustilaa Android-virheen vuoksi.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Fonttikoko</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Näytä työkalupalkki</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Aloitusnäyttösi ei salli AnkiDroidin lisätä pikakuvakkeita</string>
     <string name="create_shortcut_error">Virhe lisättäessä pikakuvaketta: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Aloita lauseet isolla alkukirjaimella</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Vieritä työkalupalkkia</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Asenna</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Teksti puheeksi -asetusten avaaminen epäonnistui</string>
-    <string name="shared_decks_login_required">Kirjaudu sisään ladataksesi lisää pakkoja</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Kuvaus</string>
     <string name="deck_description_saved">Kuvaus päivitetty</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-fi/03-dialogs.xml b/common/android/src/main/res/values-fi/03-dialogs.xml
index c898845b6ef3..57e002ddd655 100644
--- a/common/android/src/main/res/values-fi/03-dialogs.xml
+++ b/common/android/src/main/res/values-fi/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Haluatko varmasti yrittää korjata tietokannan?\n\nEnnen yritystä kopio tietokannasta luodaan alihakemistoon ”%s”.</string>
     <string name="intent_aedict_empty">Oletus-luokka on tyhjä</string>
     <string name="intent_aedict_category">Lisätäksesi kortteja AnkiDroidiin poista kaikki Notepad-kategoriat tai lisää uusi nimellä ”default”</string>
-    <string name="custom_study_new_extend">Korota/alenna (\"-3\") tämän päivän uusien kortien rajaa arvolla</string>
-    <string name="custom_study_rev_extend">Korota/alenna (\"-3\") tämän päivän kerrattavien kortien rajaa arvolla</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Kortteja unohdettu edellisenä x päivänä:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Kaikki kortit</string>
-    <string name="tags_dialog_option_new_cards">Uusi</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Uusi</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Erääntyy</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Etsitään tyhjiä kortteja&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">Järjestelmän WebView on vanhentunut. Jotkin ominaisuudet eivät toimi oikein. Päivitä se.\n\nAsennettu versio: %1$d\nVähimmäinen vaadittu versio: %2$d</string>
     <string name="compress">Pakkaa</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Kieltä ei tueta</string>
     <string name="tts_error_dialog_reason_text">Tekstistä puheeksi -moottori <b>%1$s</b> ei tue kieltä <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Vaihda moottoria</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-fi/10-preferences.xml b/common/android/src/main/res/values-fi/10-preferences.xml
index d959bf8c9ed5..26175ef9a2a3 100644
--- a/common/android/src/main/res/values-fi/10-preferences.xml
+++ b/common/android/src/main/res/values-fi/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Viivan leveys</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">Pakka uusille korteille</string>
     <string name="learn_cutoff" maxLength="41">Ennalta oppimisen aikaraja</string>
     <string name="time_limit" maxLength="41">Edistymisen näyttämisen aikaväli</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Seuraava päivä alkaa</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d tunti keskiyön jälkeen</item>
@@ -250,6 +258,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-fi/16-multimedia-editor.xml b/common/android/src/main/res/values-fi/16-multimedia-editor.xml
index 3d6bb7143836..2fe0e4597b54 100644
--- a/common/android/src/main/res/values-fi/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-fi/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Haluatko rajata kuvan?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Kuvan nykyinen koko on %s Mt. Kuvan kokorajoitus on oletusarvoisesti 1 Mt. Haluatko käyttää pakkausta kuvan pienentämiseksi?</string>
     <string name="select_image_failed">"Kuvan valitseminen epäonnistui – yritä uudelleen"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Kentän sisältö</string>
diff --git a/common/android/src/main/res/values-fil/02-strings.xml b/common/android/src/main/res/values-fil/02-strings.xml
index d34e395646b5..6c8550b8fc15 100644
--- a/common/android/src/main/res/values-fil/02-strings.xml
+++ b/common/android/src/main/res/values-fil/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Laki ng font</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Ipakita ang toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Hindi pinpayagan ang AnkiDroid na maglagay ng gitis sa iyong home screen.</string>
     <string name="create_shortcut_error">Kamalian sa pagdagdag ng gitis: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">I-capitalize ang mga pangungusap</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Na-so-scroll ang toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Mangyaring maglog-in para makapag-download pa ng mga deck</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Paglalarawan</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-fil/03-dialogs.xml b/common/android/src/main/res/values-fil/03-dialogs.xml
index 262c12b00d14..6559d0ddd3ef 100644
--- a/common/android/src/main/res/values-fil/03-dialogs.xml
+++ b/common/android/src/main/res/values-fil/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Gusto mo ba talagang subukan ang pag-aayos ng database? \n\n Bago mo simulan ang pagtatangka, isang kopya ang lilikhain sa mga subfolder \"%s\".</string>
     <string name="intent_aedict_empty">Ang kategoryang \"default\" ay walng laman</string>
     <string name="intent_aedict_category">Upang magdagdag ng mga kard sa AnkiDroid alisin lahat ng mga kategorya ng Notepad o magdagdag ng isa na pinangalanang \"default\"</string>
-    <string name="custom_study_new_extend">Dagdagan/bawasan (\"-3\") ang hangganan ng bagong card ngayong araw ng</string>
-    <string name="custom_study_rev_extend">Dagdagan/bawasan (\"-3\") ang hangganan ng pagrepaso ngayong araw ng</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Ang mga review kard na nakalimutan sa huling x araw:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Lahat ng mga kard</string>
-    <string name="tags_dialog_option_new_cards">Bago</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Bago</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Nakatakda</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Paghahanap ng mga walang laman na kard&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Hindi suportado ang wika</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-fil/10-preferences.xml b/common/android/src/main/res/values-fil/10-preferences.xml
index 1f8df89dca10..33ef18ad2221 100644
--- a/common/android/src/main/res/values-fil/10-preferences.xml
+++ b/common/android/src/main/res/values-fil/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Lapad ng stroke</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck para sa mga bagong card</string>
     <string name="learn_cutoff" maxLength="41">Matuto nang higit na limitasyon</string>
     <string name="time_limit" maxLength="41">Limitasyon ng oras ng Timebox</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Simula ng susunod na araw</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -251,6 +259,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-fil/16-multimedia-editor.xml b/common/android/src/main/res/values-fil/16-multimedia-editor.xml
index 425dd1f0ed32..e3a0141caf7f 100644
--- a/common/android/src/main/res/values-fil/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-fil/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Gusto mo bang i-crop ang larawan</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Bigo na mapili ang larawan. Mangyaring ulitin"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Mga Laman ng Field</string>
diff --git a/common/android/src/main/res/values-fr/02-strings.xml b/common/android/src/main/res/values-fr/02-strings.xml
index 97ad3df7d38e..02fe60bafb8f 100644
--- a/common/android/src/main/res/values-fr/02-strings.xml
+++ b/common/android/src/main/res/values-fr/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid ne peut pas accéder au stockage en raison d\'une erreur Android.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Taille de la police</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Afficher la barre d\'outils</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Formater en gras</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Votre écran d\'accueil ne permet pas à AnkiDroid d\'ajouter des raccourcis</string>
     <string name="create_shortcut_error">Erreur lors de l\'ajout du raccourci : %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Mettre en majuscules les phrases</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Barre d\'outils à défilement</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificat</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Installer</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Impossible d\'ouvrir les paramètres de la synthèse vocale</string>
-    <string name="shared_decks_login_required">Veuillez vous connecter pour télécharger plus de paquets</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description mise à jour</string>
     <string name="format_deck_description_as_markdown">Formater en Markdown</string>
diff --git a/common/android/src/main/res/values-fr/03-dialogs.xml b/common/android/src/main/res/values-fr/03-dialogs.xml
index 53ed4c75b8a8..d9a1ca6b0864 100644
--- a/common/android/src/main/res/values-fr/03-dialogs.xml
+++ b/common/android/src/main/res/values-fr/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Voulez-vous vraiment essayer de réparer la base de données ?\n\nAvant de commencer, une copie sera créée dans le sous-dossier « %s ».</string>
     <string name="intent_aedict_empty">La catégorie « default » est vide</string>
     <string name="intent_aedict_category">Pour ajouter des cartes à AnkiDroid, enlevez toutes les catégories du Bloc-notes, ou créez une catégorie « default »</string>
-    <string name="custom_study_new_extend">Augmentation/diminution (« -3 ») de la limite actuelle de la nouvelle carte</string>
-    <string name="custom_study_rev_extend">Augmentation/diminution (« -3 ») de la limite de révision d\'aujourd\'hui de</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Revoir les cartes oubliées dans les x derniers jours :</string>
     <string name="custom_study_ahead_description">Revoir les cartes dues dans le prochain :</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Toutes les cartes</string>
-    <string name="tags_dialog_option_new_cards">Nouvelle</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Nouvelle</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">À faire</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Recherche de cartes vides en cours&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">La WebView du système est obsolète. Certaines fonctionnalités ne fonctionneront pas correctement. Veuillez la mettre à jour.\n\nVersion installée : %1$d\nVersion minimale requise : %2$d</string>
     <string name="compress">Compresser</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Langue non prise en charge</string>
     <string name="tts_error_dialog_reason_text">Le moteur de synthèse vocale <b>%1$s</b> ne prend pas en charge la langue suivante : <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Changer le moteur</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">Depuis</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">Vers</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Nom du profil</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Le nom du profil ne peut pas être vide</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Le nom du profil doit compter  %1$d caractères ou moins.</string>
diff --git a/common/android/src/main/res/values-fr/10-preferences.xml b/common/android/src/main/res/values-fr/10-preferences.xml
index ce3b39667abc..486cf38c5064 100644
--- a/common/android/src/main/res/values-fr/10-preferences.xml
+++ b/common/android/src/main/res/values-fr/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Sécurité: appel JavaScript non sécurisé bloqué.\nSi vous faites confiance à toutes les cartes et tous les modèles de votre collection, vous pouvez débloquer cette option dans les paramètres avancés.</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Autoriser les cartes à lancer d’autres applications</string>
-    <string name="allow_card_external_launch_summ">Les cartes peuvent ouvrir d\'autres applications sur votre appareil, déclenchant des actions potentiellement indésirables.\nQuitter à moins que vous ne fassiez confiance à toutes les cartes et tous les modèles de votre collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Sécurité : La carte ne peut pas lancer d’autres applications.\nSi vous faites confiance à toutes les cartes et modèles de votre collection, vous pouvez débloquer cette option dans les paramètres avancés.</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Largeur des traits</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">Paquet pour les nouvelles cartes</string>
     <string name="learn_cutoff" maxLength="41">Limite d’apprentissage</string>
     <string name="time_limit" maxLength="41">Limite de temps</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Début du jour suivant (0 est minuit, 23 est 23 h)</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d heure après minuit</item>
@@ -251,6 +259,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-fr/16-multimedia-editor.xml b/common/android/src/main/res/values-fr/16-multimedia-editor.xml
index be617daf47e7..25ce9a93af9a 100644
--- a/common/android/src/main/res/values-fr/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-fr/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Voulez-vous rogner cette image ?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">La taille actuelle de l\'image est de %s Mo. La taille de l\'image par défaut est de 1 Mo. Voulez-vous la compresser ?</string>
     <string name="select_image_failed">"La sélection de l\'image a échoué, veuillez réessayer"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Contenus du champ</string>
diff --git a/common/android/src/main/res/values-fy/02-strings.xml b/common/android/src/main/res/values-fy/02-strings.xml
index 92d4960d6d6a..e8189c6e5422 100644
--- a/common/android/src/main/res/values-fy/02-strings.xml
+++ b/common/android/src/main/res/values-fy/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-fy/03-dialogs.xml b/common/android/src/main/res/values-fy/03-dialogs.xml
index 9192e20d32eb..4ad39b6a17ee 100644
--- a/common/android/src/main/res/values-fy/03-dialogs.xml
+++ b/common/android/src/main/res/values-fy/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">All cards</string>
-    <string name="tags_dialog_option_new_cards">New</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">New</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-fy/10-preferences.xml b/common/android/src/main/res/values-fy/10-preferences.xml
index afbbad215f94..b2952c3dc917 100644
--- a/common/android/src/main/res/values-fy/10-preferences.xml
+++ b/common/android/src/main/res/values-fy/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-fy/16-multimedia-editor.xml b/common/android/src/main/res/values-fy/16-multimedia-editor.xml
index 7ea77315d600..65e87cc595f8 100644
--- a/common/android/src/main/res/values-fy/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-fy/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-ga/02-strings.xml b/common/android/src/main/res/values-ga/02-strings.xml
index 661e8287fdfe..8e386af1e8b8 100644
--- a/common/android/src/main/res/values-ga/02-strings.xml
+++ b/common/android/src/main/res/values-ga/02-strings.xml
@@ -228,7 +228,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -256,7 +259,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -349,7 +351,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-ga/03-dialogs.xml b/common/android/src/main/res/values-ga/03-dialogs.xml
index f12e335131fd..ca6900553d73 100644
--- a/common/android/src/main/res/values-ga/03-dialogs.xml
+++ b/common/android/src/main/res/values-ga/03-dialogs.xml
@@ -51,8 +51,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -105,7 +105,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">All cards</string>
-    <string name="tags_dialog_option_new_cards">New</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">New</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
@@ -252,6 +252,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -287,7 +289,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-ga/10-preferences.xml b/common/android/src/main/res/values-ga/10-preferences.xml
index 8b1262904605..7ddd116e7b2d 100644
--- a/common/android/src/main/res/values-ga/10-preferences.xml
+++ b/common/android/src/main/res/values-ga/10-preferences.xml
@@ -58,7 +58,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -172,6 +172,17 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="two">mins</item>
+        <item quantity="few">mins</item>
+        <item quantity="many">mins</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -258,6 +269,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-ga/16-multimedia-editor.xml b/common/android/src/main/res/values-ga/16-multimedia-editor.xml
index d9a9211644fc..7d3e5ec19a56 100644
--- a/common/android/src/main/res/values-ga/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ga/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-gl/02-strings.xml b/common/android/src/main/res/values-gl/02-strings.xml
index 010d9a70b1e7..3559ba2a029c 100644
--- a/common/android/src/main/res/values-gl/02-strings.xml
+++ b/common/android/src/main/res/values-gl/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">O AnkiDroid non puido acceder ao almacenamento por mor dun erro no Android.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Tamaño da letra</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Amosar barra de ferramentas</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Disposición da barra de ferramentas</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Desprazable</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Amoreada</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Oculta</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Amosar vista previa</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Ocultar vista previa</string>
     <string name="format_insert_bold">Aplicar letra grosa</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">A túa pantalla de inicio non permite que AnkiDroid engada atallos</string>
     <string name="create_shortcut_error">Erro ao engadir atallo: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Comezar frases con maiúscula</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Barra ferramentas deslizábel</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificado</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Instalar</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Non se puido abrir a configuración de texto a voz</string>
-    <string name="shared_decks_login_required">Inicia sesión para descargar máis barallas</string>
+    <string name="shared_decks_ankiweb_login_limit">As barallas compartidas están aloxadas no AnkiWeb, un servizo de balde independente do AnkiDroid. AnkiWeb pídeche que accedas para continuar.</string>
     <string name="deck_description_field_hint">Descrición</string>
     <string name="deck_description_saved">Actualizouse a descrición</string>
     <string name="format_deck_description_as_markdown">Dar formato Markdown</string>
diff --git a/common/android/src/main/res/values-gl/03-dialogs.xml b/common/android/src/main/res/values-gl/03-dialogs.xml
index b12b49d5f97a..3e1a47396863 100644
--- a/common/android/src/main/res/values-gl/03-dialogs.xml
+++ b/common/android/src/main/res/values-gl/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Tes a certeza de querer tentar reparar a base de datos?\n\nAntes de comezar, crearase unha copia no cartafol \"%s\".</string>
     <string name="intent_aedict_empty">A categoría \'predeterminado\' está baleira</string>
     <string name="intent_aedict_category">Para engadir cartóns ao AnkiDroid elimina todas as categorías do caderno de notas ou engade unha chamada \"predefinido\"</string>
-    <string name="custom_study_new_extend">Aumentar/diminuír (“-3”) o límite de novas tarxetas en</string>
-    <string name="custom_study_rev_extend">Aumentar/diminuír (\"-3\") o límite de repasos actual en</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Repasar as tarxetas esquecidas nos últimos x días:</string>
     <string name="custom_study_ahead_description">Repasar as tarxetas pendentes nos vindeiros:</string>
     <string name="custom_study_preview">Previsualizar as tarxetas novas engadidas nos últimos:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Todas as tarxetas</string>
-    <string name="tags_dialog_option_new_cards">Novo</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Novo</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Pendentes</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Buscando tarxetas baleiras&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">O WebView do sistema está desactualizado. Algunhas funcións non funcionarán correctamente. Por favor, actualízao.\n\nVersión instalada: %1$d\nVersión mínima requirida: %2$d</string>
     <string name="compress">Comprimir</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">Non hai ningún motor de texto a voz instalado</string>
+    <string name="tts_no_engine_message">Instala unha aplicación que proporcione un motor de texto a voz para o teu dispositivo.</string>
     <string name="tts_error_dialog_title">Lingua non compatíbel</string>
     <string name="tts_error_dialog_reason_text">O motor de texto a voz <b>%1$s</b> non é compatíbel co seguinte idioma: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Mudar motor</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">Desde</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">Ata</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Renomear perfil</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Nome do perfil</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">O nome do perfil non pode estar baleiro</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">O nome do perfil debe ter %1$d caracteres ou menos</string>
diff --git a/common/android/src/main/res/values-gl/10-preferences.xml b/common/android/src/main/res/values-gl/10-preferences.xml
index c7ef85e2621f..260ce8893885 100644
--- a/common/android/src/main/res/values-gl/10-preferences.xml
+++ b/common/android/src/main/res/values-gl/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Seguranza: Chamada de JavaScript non segura bloqueada.\nSe confías en todas as tarxetas e modelos da túa colección, isto pode desbloquearse na configuración avanzada.</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Permitir que as tarxetas abran outras aplicacións</string>
-    <string name="allow_card_external_launch_summ">As tarxetas poden abrir outras aplicacións no teu dispositivo, o que pode desencadear accións potencialmente non desexadas.\nDeixa esta opción desactivada a menos que confíes en todas as tarxetas e modelos da túa colección.</string>
+    <string name="allow_card_external_launch_summ">As tarxetas poden abrir outras aplicacións no teu dispositivo e desencadear accións potencialmente non desexadas.\nAs ligazóns web poden seguir abrindo outras aplicacións aínda que esta opción estea desactivada.\nDéixaa desactivada a menos que confíes en todas as tarxetas e modelos da túa colección.</string>
     <string name="card_external_launch_denied_snackbar">Seguranza: Tarxeta bloqueada ao tentar iniciar outra aplicación.\nSe confías en todas as tarxetas e modelos da túa colección, isto pode desbloquearse na configuración avanzada.</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Grosor do trazo</string>
@@ -168,7 +168,15 @@
     <string name="show_eta_summ">Amosar o tempo restante</string>
     <string name="use_current" maxLength="41">Baralla para as tarxetas novas</string>
     <string name="learn_cutoff" maxLength="41">Aprender por diante do límite</string>
-    <string name="time_limit" maxLength="41">Límite de tempo do Timebox</string>
+    <string name="time_limit" maxLength="41">Límite de tempo dos bloques</string>
+    <string name="timeboxing" maxLength="41">Bloques de tempo</string>
+    <string name="use_timebox" maxLength="41">Usar bloques de tempo</string>
+    <string name="time_limit_label" maxLength="41">Límite de tempo</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">min</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Os bloques de tempo dividen o teu estudo en sesións máis curtas para axudarche a manter a concentración. Cando se acade o límite de tempo, verás cantas tarxetas estudaches e poderás escoller entre facer unha pausa ou continuar.</string>
     <string name="day_offset_with_description" maxLength="41">Comezo do día seguinte</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hora despois da medianoite</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Notificar se aínda non se fixeron os repasos diarios</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Insire un número entero de tarxetas</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">O límite debe ser polo menos 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Eliminar este recordatorio?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">Esta acción non se pode desfacer.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-gl/16-multimedia-editor.xml b/common/android/src/main/res/values-gl/16-multimedia-editor.xml
index 1835938c1022..0c1ca1f0300e 100644
--- a/common/android/src/main/res/values-gl/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-gl/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Queres recortar esta imaxe?</string>
     <string name="crop_button" maxLength="28">Recortar</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">O tamaño da imaxe é %sMB. O límite por defecto é 1 MB. Queres comprimila?</string>
     <string name="select_image_failed">"Non se puido seleccionar a imaxe. Téntao de novo"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Contido do campo</string>
diff --git a/common/android/src/main/res/values-got/02-strings.xml b/common/android/src/main/res/values-got/02-strings.xml
index 7a12f4847ebc..14c2840f4165 100644
--- a/common/android/src/main/res/values-got/02-strings.xml
+++ b/common/android/src/main/res/values-got/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">𐌼𐌹𐌺𐌹𐌻𐌴𐌹 𐍆𐌰𐌿𐌽𐍄𐌹𐍃</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">𐍄𐍉𐌻𐌰-𐌰𐌽𐍃 𐌱𐌰𐌽𐌳𐍅𐌾𐌰𐌽</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">𐌲𐌰𐍂𐌳𐌰𐍃𐌺𐌰𐌹𐍂𐌼𐍃 𐌸𐌴𐌹𐌽𐍃 𐌽𐌹 𐌰𐌽𐌳𐌻𐌴𐍄𐌹𐌸 𐌰𐌽𐌺𐌴𐌹𐌳𐍂𐌰𐌿𐌳 𐌱𐌹𐌰𐌿𐌺𐌰𐌽 𐌼𐌰𐌿𐍂𐌲𐌹𐍅𐌹𐌲𐌰𐌽𐍃</string>
     <string name="create_shortcut_error">𐌰𐌹𐍂𐌶𐌴𐌹 𐍅𐌰𐍂𐌸 𐌱𐌹𐌰𐌿𐌺𐌰𐌽 𐌼𐌰𐌿𐍂𐌲𐌿𐍅𐌹𐌲: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">𐌲𐌰𐌽𐌰𐍄𐌹</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">𐌲𐌰𐍃𐌿𐌻𐌾𐌰𐌽</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">𐌽𐌹 𐌼𐌰𐌷𐍄𐌰 𐌱𐍉𐌺𐍉-𐌳𐌿-𐍃𐍄𐌹𐌱𐌽𐌰𐌹 𐌻𐌰𐌲𐌴𐌹𐌽𐌹𐌽𐍃 𐌿𐍃𐌻𐌿𐌺𐌰𐌽</string>
-    <string name="shared_decks_login_required">𐌱𐌹𐌳𐌾𐌰𐌼 𐌸𐌿𐌺, 𐌰𐍄𐌲𐌰𐌲𐌲 𐌳𐌿 𐌰𐍄𐌳𐍂𐌰𐌲𐌰𐌽 𐌺𐌰𐍂𐍄𐌰𐌷𐌿𐌶𐌳𐌰 𐌼𐌰𐌽𐌰𐌲𐌹𐌶𐍉𐌽𐌰</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">𐌲𐌰𐍃𐌺𐌴𐌹𐍂𐌴𐌹𐌽𐍃</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-got/03-dialogs.xml b/common/android/src/main/res/values-got/03-dialogs.xml
index ae7773cea04a..fe5fadd4ea1f 100644
--- a/common/android/src/main/res/values-got/03-dialogs.xml
+++ b/common/android/src/main/res/values-got/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">𐍅𐌹𐌻𐌴𐌹𐌶𐌿 𐌱𐌹 𐍃𐌿𐌽𐌾𐌰𐌹 𐌳𐌰𐍄𐌰𐌷𐌿𐌶𐌳 𐌲𐌰𐌱𐍉𐍄𐌾𐌰𐌽?\n\n𐍆𐌰𐌿𐍂𐌸𐌹𐌶𐌴𐌹 𐌳𐌿𐌲𐌹𐌽𐌽𐌰𐌹𐍃 𐍃𐍉𐌺𐌽, 𐌲𐌰𐌲𐌰𐌻𐌴𐌹𐌺𐍉𐌸 𐌹𐌽 𐌿𐍆𐍃𐍄𐌰𐌳𐌰 “%s”.</string>
     <string name="intent_aedict_empty">𐌺𐌿𐌽𐌹 “𐌱𐌹𐌿𐌷𐍄” 𐌻𐌰𐌿𐍃 𐌹𐍃𐍄</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">𐌰𐌻𐌻𐍉𐍃 𐌺𐌰𐍂𐍄𐍉𐍃</string>
-    <string name="tags_dialog_option_new_cards">𐌽𐌹𐍅𐌹</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">𐌽𐌹𐍅𐌹</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">𐌽𐌰𐌿𐌷</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">𐌱𐌹𐌲𐌹𐍄𐌰𐌽𐌳𐌰 𐌻𐌰𐌿𐍃𐍉𐍃 𐌺𐌰𐍂𐍄𐍉𐍃&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">𐌲𐌰𐌸𐍂𐌿𐌺𐌾𐌰𐌽</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">𐍂𐌰𐌶𐌳𐌰 𐍃𐍄𐍉𐌳𐌹𐌳𐌰 𐌽𐌹𐍃𐍄</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">𐌹𐌽𐌲𐌰𐌹𐌽 𐌹𐌽𐌼𐌰𐌹𐌳𐌾𐌰𐌽</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-got/10-preferences.xml b/common/android/src/main/res/values-got/10-preferences.xml
index 776a7cfb9815..76384bd6c909 100644
--- a/common/android/src/main/res/values-got/10-preferences.xml
+++ b/common/android/src/main/res/values-got/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">𐍃𐍄𐍂𐌹𐌺𐌹𐍃 𐌱𐍂𐌰𐌹𐌳𐌴𐌹</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">𐌺𐌰𐍂𐍄𐌰𐌷𐌿𐌶𐌳 𐌺𐌰𐍂𐍄𐍉𐌼 𐌽𐌹𐌿𐌾𐌰𐌹𐌼</string>
     <string name="learn_cutoff" maxLength="41">𐌼𐌰𐍂𐌺𐌰 𐍆𐌰𐌿𐍂𐌰𐌻𐌰𐌹𐍃𐌴𐌹𐌽𐌰𐌹𐍃</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">𐌰𐌽𐌰𐍃𐍄𐍉𐌳𐌴𐌹𐌽𐍃 𐌹𐍆𐍄𐌿𐌼𐌹𐌽𐍃 𐌳𐌰𐌲𐌹𐍃</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d 𐍈𐌴𐌹𐌻𐌰 𐌰𐍆𐌰𐍂 𐌼𐌹𐌳𐌾𐌰𐌽𐌰𐌷𐍄</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-got/16-multimedia-editor.xml b/common/android/src/main/res/values-got/16-multimedia-editor.xml
index 98857e3fd706..1a61a442a66a 100644
--- a/common/android/src/main/res/values-got/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-got/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">𐍅𐌹𐌻𐌴𐌹𐌶𐌿 𐌸𐍉 𐍆𐍂𐌹𐍃𐌰𐌷𐍄 𐌰𐍆𐌼𐌰𐌹𐍄𐌰𐌽?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">𐌼𐌹𐌺𐌹𐌻𐌴𐌹 𐍆𐍂𐌹𐍃𐌰𐌷𐍄𐌰𐌹𐍃 𐌰𐌽𐌳𐍅𐌰𐌹𐍂𐌸𐌰𐌹𐌶𐍉𐍃 %s𐌼𐌱 𐌹𐍃𐍄. 𐌼𐌰𐍂𐌺𐌰 𐌱𐌹𐌿𐌷𐍄𐌰 𐍆𐍂𐌹𐍃𐌰𐌷𐍄𐌰𐌹𐍃 𐌼𐌹𐌺𐌹𐌻𐌴𐌹𐌽𐍃 𐌹𐍃𐍄 1𐌼𐌱. 𐍅𐌹𐌻𐌴𐌹𐌶𐌿 𐌲𐌰𐌸𐍂𐌿𐌺𐌾𐌰𐌽?</string>
     <string name="select_image_failed">"𐌽𐌹 𐌼𐌰𐌷𐍄𐌰 𐍆𐍂𐌹𐍃𐌰𐌷𐍄𐌰𐌹𐍃 𐍅𐌰𐌻𐌾𐌰𐌽, 𐌱𐌹𐌳𐌾𐌰𐌼 𐌸𐌿𐌺 𐌺𐌹𐌿𐍃𐌰𐌽 𐌰𐍆𐍄𐍂𐌰"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">𐍅𐌰𐌹𐍂𐌸𐌹𐍃 𐌱𐍉𐌺𐍉𐍃</string>
diff --git a/common/android/src/main/res/values-gu/02-strings.xml b/common/android/src/main/res/values-gu/02-strings.xml
index 5f1187853b5c..26150d7b3226 100644
--- a/common/android/src/main/res/values-gu/02-strings.xml
+++ b/common/android/src/main/res/values-gu/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">અક્ષર ની જાડાઈ</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">ટૂલબાર બતાવો</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">તમારી હોમ સ્ક્રીન AnkiDroid ને શોર્ટકટ ઉમેરવાની મંજૂરી આપતી નથી</string>
     <string name="create_shortcut_error">શૉર્ટકટ ઉમેરવામાં ભૂલ: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">વાક્યોને કેપિટલાઇઝ કરો</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">ટૂલબારને સ્ક્રોલ કરો</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">ઇન્ટરનેટ</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">ઇન્સ્ટોલ</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">ટેક્સ્ટ થી સ્પીચ સેટિંગ ખોલવામાં અસફળ રહ્યા</string>
-    <string name="shared_decks_login_required">વધુ ડેક ડાઉનલોડ કરવા માટે કૃપા કરીને લૉગ ઇન કરો</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">વર્ણન</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-gu/03-dialogs.xml b/common/android/src/main/res/values-gu/03-dialogs.xml
index fe56827ef3c9..5c6ba6350d5d 100644
--- a/common/android/src/main/res/values-gu/03-dialogs.xml
+++ b/common/android/src/main/res/values-gu/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">શું તમે ખરેખર ડેટાબેઝને રિપેર કરવાનો પ્રયાસ કરવા માંગો છો?\n\nપ્રયાસ શરૂ કરતા પહેલા, સબફોલ્ડર “%s” માં એક નકલ બનાવવામાં આવશે.</string>
     <string name="intent_aedict_empty">કેટેગરી \"ડિફોલ્ટ\" ખાલી છે</string>
     <string name="intent_aedict_category">AnkiDroid માં કાર્ડ ઉમેરવા માટે નોટપેડની બધી કેટેગરી દૂર કરો અથવા \"ડિફોલ્ટ\" નામની એક ઉમેરો</string>
-    <string name="custom_study_new_extend">આજની નવી કાર્ડ મર્યાદામાં વધારો/ઘટાડો (“-3”).</string>
-    <string name="custom_study_rev_extend">આજની સમીક્ષા મર્યાદામાં વધારો/ઘટાડો (“-3”).</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">છેલ્લા x દિવસમાં ભૂલી ગયેલા કાર્ડની સમીક્ષા કરો:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">બધા કાર્ડ</string>
-    <string name="tags_dialog_option_new_cards">નવું</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">નવું</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">બાકી</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">ખાલી કાર્ડ શોધી રહ્યાં છીએ&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">WebView સિસ્ટમ જૂની છે. કેટલીક સુવિધાઓ યોગ્ય રીતે કામ કરશે નહીં. કૃપા કરીને તેને અપડેટ કરો.\n\nઇન્સ્ટોલ કરેલ સંસ્કરણ: %1$d\nન્યૂનતમ આવશ્યક સંસ્કરણ: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">மொழி ஆதரிக்கப்படவில்லை</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-gu/10-preferences.xml b/common/android/src/main/res/values-gu/10-preferences.xml
index 46c50bd437a8..579ee9cbf079 100644
--- a/common/android/src/main/res/values-gu/10-preferences.xml
+++ b/common/android/src/main/res/values-gu/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">સ્ટ્રોક પહોળાઈ</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">નવા કાર્ડ માટે ડેક</string>
     <string name="learn_cutoff" maxLength="41">આગળની મર્યાદા જાણો</string>
     <string name="time_limit" maxLength="41">ટાઈમબોક્સ સમય મર્યાદા</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">બીજા દિવસની શરૂઆત</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -251,6 +259,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-gu/16-multimedia-editor.xml b/common/android/src/main/res/values-gu/16-multimedia-editor.xml
index 2423294e0b10..4c886f505e79 100644
--- a/common/android/src/main/res/values-gu/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-gu/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">શું તમે આ છબી કાપવા માંગો છો?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"છબી પસંદ કરવામાં નિષ્ફળ, કૃપા કરીને ફરી પ્રયાસ કરો"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">புல உள்ளடக்கங்கள்</string>
diff --git a/common/android/src/main/res/values-heb/02-strings.xml b/common/android/src/main/res/values-heb/02-strings.xml
index 8c3751a1aa11..96fe80a5f8df 100644
--- a/common/android/src/main/res/values-heb/02-strings.xml
+++ b/common/android/src/main/res/values-heb/02-strings.xml
@@ -222,7 +222,10 @@
     <string name="ankidroid_init_failed_storage">ל-AnkiDroid אין גישה לאחסון עקב שגיאת אנדרואיד.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">גודל גופן</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">הצגת סרגל הכלים</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">עצב כמודגש</string>
@@ -250,7 +253,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">מסך הבית שלך אינו מאפשר ל- AnkiDroid להוסיף קיצורי דרך</string>
     <string name="create_shortcut_error">שגיאה בהוספת קיצור הדרך: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">סרגל כלים נגרר</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">תעודה</string>
@@ -339,7 +341,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">אינטרנט</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">התקן</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">פתיחת הגדרות טקסט-לדיבור נכשלה</string>
-    <string name="shared_decks_login_required">אנא התחבר כדי להוריד חפיסות נוספות</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">תיאור</string>
     <string name="deck_description_saved">התיאור עודכן</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-heb/03-dialogs.xml b/common/android/src/main/res/values-heb/03-dialogs.xml
index 50023467f474..8e7d8555cc5e 100644
--- a/common/android/src/main/res/values-heb/03-dialogs.xml
+++ b/common/android/src/main/res/values-heb/03-dialogs.xml
@@ -48,8 +48,8 @@
 לפני תחילת ניסיון התיקון, יתבצע שמירת העתק בתקייה %s</string>
     <string name="intent_aedict_empty">הקטגוריה \'ברירת מחדל\' ריקה</string>
     <string name="intent_aedict_category">כדי להוסיף כרטיסים ל-AnkiDroid הסר את כל קטגוריות פנקס הרשימות או הוסף אחת בשם \"ברירת מחדל\"</string>
-    <string name="custom_study_new_extend">הוספה/הורדה(“-3”) הגבלת כרטיסים חדשים להיום ב</string>
-    <string name="custom_study_rev_extend">הוספה/הורדה(“-3”) הגבלת חזרות להיום ב</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">חזרה על כרטיסים נשכחים בx ימים האחרונים</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -100,7 +100,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">כל הכרטיסים</string>
-    <string name="tags_dialog_option_new_cards">חדש</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">חדש</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">מיועד</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">מתבצע איתור כרטיסים ריקים&#8230;</string>
@@ -237,6 +237,8 @@
     <string name="webview_update_message">מערכת WebView מיושנת. חלק מהתכונות לא יפעלו כהלכה. אנא עדכן אותו.\n\nגרסה מותקנת: %1$d\nגרסה מינימום נדרשת: %2$d</string>
     <string name="compress">דחיסה</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">שפה לא נתמכת</string>
     <string name="tts_error_dialog_reason_text">מנוע הטקסט לדיבור <b>%1$s</b> אינו תומך בשפה הבאה: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">החלף מנוע</string>
@@ -272,7 +274,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-heb/10-preferences.xml b/common/android/src/main/res/values-heb/10-preferences.xml
index 35aa7d460762..beb13d9bc836 100644
--- a/common/android/src/main/res/values-heb/10-preferences.xml
+++ b/common/android/src/main/res/values-heb/10-preferences.xml
@@ -56,7 +56,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">עובי הקו</string>
@@ -170,6 +170,15 @@
     <string name="use_current" maxLength="41">חפיסה לכרטיסים חדשים</string>
     <string name="learn_cutoff" maxLength="41">לימוד מעבר למכסה</string>
     <string name="time_limit" maxLength="41">מגבלת זמן בתיבת-זמן</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="two">mins</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">התחל את היום הבא</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d שעה אחרי חצות</item>
@@ -252,6 +261,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-heb/16-multimedia-editor.xml b/common/android/src/main/res/values-heb/16-multimedia-editor.xml
index 600c8f3e4741..d90276c58dae 100644
--- a/common/android/src/main/res/values-heb/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-heb/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">לחתוך את התמונה הזאת?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">גודל התמונה הנוכחי הוא %sMB. מגבלת ברירת המחדל של גודל התמונה היא 1MB. האם אתה רוצה לדחוס אותו?</string>
     <string name="select_image_failed">"בחירת התמונה נכשלה, אנא נסה שוב"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">תוכן השדה</string>
diff --git a/common/android/src/main/res/values-hi/02-strings.xml b/common/android/src/main/res/values-hi/02-strings.xml
index bdb796a8cef7..4acfd8d9469c 100644
--- a/common/android/src/main/res/values-hi/02-strings.xml
+++ b/common/android/src/main/res/values-hi/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">फ़ॉन्ट आकार</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">टूलबार दिखाएं</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">आपकी होम स्क्रीन अंकीड्रॉइड को शॉर्टकट जोड़ने की अनुमति नहीं देती है</string>
     <string name="create_shortcut_error">शॉर्टकट जोड़ने में त्रुटि: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">वाक्यों को बड़े अक्षरों में लिखें</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">स्क्रॉल टूलबार</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">कृपया अधिक डेक डाउनलोड करने के लिए लॉग इन करें</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">विवरण</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-hi/03-dialogs.xml b/common/android/src/main/res/values-hi/03-dialogs.xml
index f8438b975135..9f4c3dcb7886 100644
--- a/common/android/src/main/res/values-hi/03-dialogs.xml
+++ b/common/android/src/main/res/values-hi/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">क्या आप वास्तव में डेटाबेस को सुधारने का प्रयास करना चाहते हैं? \n\nBefore प्रयास प्रारंभ कर रहा है, एक प्रतिलिपि सबफ़ोल्डर \"%s\" में बनाया जाएगा ।</string>
     <string name="intent_aedict_empty">श्रेणी \"डिफ़ॉल्ट\" रिक्त है</string>
     <string name="intent_aedict_category">AnkiDroid में कार्ड जोड़ने के लिए सभी नोटपैड श्रेणियों को हटाएँ या एक \"डिफ़ॉल्ट\" नामक पत्ता जोड़ें</string>
-    <string name="custom_study_new_extend">आज की कार्ड सीमा को बढ़ाएँ / घटाएँ (\"-3\")</string>
-    <string name="custom_study_rev_extend">आज की समीक्षा सीमा बढ़ाएँ / घटाएँ (\"-3\")</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">पिछले x दिनों में भूल गए कार्ड की समीक्षा करें:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">सभी कार्ड</string>
-    <string name="tags_dialog_option_new_cards">नया</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">नया</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">बाकी</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">रिक्त कार्ड ढूंढ रहा है.. ।</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">सिस्टम WebView पुराना हो चुका है. कुछ सुविधाएं ठीक से काम नहीं करेंगी. कृपया इसे अपडेट करें।\n\nस्थापित संस्करण: %1$d\nन्यूनतम आवश्यक संस्करण: %2$d</string>
     <string name="compress">संकुचित करें</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">भाषा समर्थित नहीं है</string>
     <string name="tts_error_dialog_reason_text">टेक्स्ट टू स्पीच इंजन <b>%1$s</b> निम्नलिखित भाषा का समर्थन नहीं करता: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">इंजन बदलें</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-hi/10-preferences.xml b/common/android/src/main/res/values-hi/10-preferences.xml
index 8a0d05ac84bc..73e026079acf 100644
--- a/common/android/src/main/res/values-hi/10-preferences.xml
+++ b/common/android/src/main/res/values-hi/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">अंकन की चौड़ाई</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">नए कार्ड के लिए डेक</string>
     <string name="learn_cutoff" maxLength="41">आगे की सीमा जानें</string>
     <string name="time_limit" maxLength="41">Timebox समय सीमा</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">अगले दिन की शुरुआत (0 आधी रात है, 23 11PM है)</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -247,6 +255,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-hi/16-multimedia-editor.xml b/common/android/src/main/res/values-hi/16-multimedia-editor.xml
index dfd0fcff5c97..43cfde598cc9 100644
--- a/common/android/src/main/res/values-hi/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-hi/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">क्या आप इस प्रतिकृति को क्रॉप करना चाहते हैं?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">वर्तमान छवि का आकार %sMB है. डिफ़ॉल्ट छवि आकार सीमा 1MB है. क्या आप इसे संपीड़ित करना चाहते हैं?</string>
     <string name="select_image_failed">"छवि का चयन विफल रहा, कृपया पुनः प्रयास करें"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">फ़ील्ड सामग्री</string>
diff --git a/common/android/src/main/res/values-hr/02-strings.xml b/common/android/src/main/res/values-hr/02-strings.xml
index 100c2e5734ef..6b38281c2cd7 100644
--- a/common/android/src/main/res/values-hr/02-strings.xml
+++ b/common/android/src/main/res/values-hr/02-strings.xml
@@ -222,7 +222,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid ne može pristupiti prostoru za pohranu zbog greške u Androidu:\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Veličina fonta</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Pokaži alatnu traku</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -250,7 +253,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Vaš kućni ekran ne dozvoljava da AnkiDroid stvara prečace</string>
     <string name="create_shortcut_error">Greška pri dodavanju prečaca: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Veliko slovo na početku</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -339,7 +341,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Instaliraj</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Greška pri otvaranju postavki sinteze govora</string>
-    <string name="shared_decks_login_required">Prijavite se kako biste preuzeli još špilova</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Opis</string>
     <string name="deck_description_saved">Opis ažuriran</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-hr/03-dialogs.xml b/common/android/src/main/res/values-hr/03-dialogs.xml
index 1feee87c4eb2..5aa2d08b13b9 100644
--- a/common/android/src/main/res/values-hr/03-dialogs.xml
+++ b/common/android/src/main/res/values-hr/03-dialogs.xml
@@ -47,8 +47,8 @@
     <string name="repair_deck_dialog">Želite li zaista opraviti bazu podataka?\n\nPrije započinjanja pokušaja, kopija će biti stvorena u podmapi “%s”.</string>
     <string name="intent_aedict_empty">Kategorija “zadano” je prazna</string>
     <string name="intent_aedict_category">Uklonite sve kategorije notesa kako biste dodali kartice u AnkiDroid ili dodajte jednu s nazivom “default”</string>
-    <string name="custom_study_new_extend">Povećaj/umanji (“-3”) današnji limit novih kartica za</string>
-    <string name="custom_study_rev_extend">Povećaj/umanji (“-3”) današnji limit kartica ponavljanja za</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Kartice ponavljanja zaboravljene u zadnjih x dana:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -99,7 +99,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Sve kartice</string>
-    <string name="tags_dialog_option_new_cards">Novo</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Novo</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Traženje praznih kartica&#8230;</string>
@@ -236,6 +236,8 @@
     <string name="webview_update_message">System WebView nije ažuran. Neke značajke neće točno funkcionirati. Ažurirajte ga.\n\nInstalirana verzija: %1$d\nMinimalna potrebna verzija: %2$d</string>
     <string name="compress">Sažmi</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Jezik nije podržan</string>
     <string name="tts_error_dialog_reason_text">Pogon za sintezu govora <b>%1$s</b> ne podržava sljedeći jezik: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Promijeni pogon</string>
@@ -271,7 +273,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-hr/10-preferences.xml b/common/android/src/main/res/values-hr/10-preferences.xml
index 9b688ddf4237..abada4c7bbb0 100644
--- a/common/android/src/main/res/values-hr/10-preferences.xml
+++ b/common/android/src/main/res/values-hr/10-preferences.xml
@@ -56,7 +56,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Debljina poteza</string>
@@ -169,6 +169,15 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="few">mins</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d sat poslije ponoći</item>
@@ -253,6 +262,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-hr/16-multimedia-editor.xml b/common/android/src/main/res/values-hr/16-multimedia-editor.xml
index 8fa34936c4c1..4db1cd73fcf1 100644
--- a/common/android/src/main/res/values-hr/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-hr/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Želite li odrezati ovu sliku?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Trenutna veličina slike je %sMB. Zadano ograničenje na veličinu slike je 1MB. Želite li je komprimirati?</string>
     <string name="select_image_failed">"Greška pri odabiru slike, pokušajte ponovno"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Sadržaj polja</string>
diff --git a/common/android/src/main/res/values-hu/02-strings.xml b/common/android/src/main/res/values-hu/02-strings.xml
index 0623d201e9b5..1f042d347671 100644
--- a/common/android/src/main/res/values-hu/02-strings.xml
+++ b/common/android/src/main/res/values-hu/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Betűméret</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Eszköztár megjelenítése</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">A Kezdőképernyőd nem engedi AnkiDroid közvetlen elérések elhelyezését</string>
     <string name="create_shortcut_error">Hiba történt a közvetlen elérés hozzáadásakor: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Mondatok nagybetűsre</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">görgethető eszközsor</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -335,7 +337,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Telepítés</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">A felolvasás beállítások megnyitása sikertelen</string>
-    <string name="shared_decks_login_required">Több pakli letöltéséhez jelentkezz be</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Megjegyzés</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-hu/03-dialogs.xml b/common/android/src/main/res/values-hu/03-dialogs.xml
index 0e429de6176e..4797dbcc6a78 100644
--- a/common/android/src/main/res/values-hu/03-dialogs.xml
+++ b/common/android/src/main/res/values-hu/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Tényleg megpróbálod megjavítani az adatbázist?\n\nEnnek megkísérlése előtt a program létrehoz egy másolatot a \'%s\' almappában.</string>
     <string name="intent_aedict_empty">Az \"alap\" kategória üres</string>
     <string name="intent_aedict_category">Hogy új kártyákat adhass az AnkiDroid-hoz, távolítsd el az összes Jegyzettömb/Notepad/ kategóriát, vagy adj hozzá egyet \'default\' névvel</string>
-    <string name="custom_study_new_extend">Növeld/csökkentsd (\"-3\") a mai új kártyák korlátját</string>
-    <string name="custom_study_rev_extend">Növeld/csökkentsd (\"-3\") a mai ismétlődő kártyák korlátját</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Az elmúlt x napban elfelejtett kártyák ismétlése:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Minden kártya</string>
-    <string name="tags_dialog_option_new_cards">Új</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Új</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Esedékes</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Üres kártyák keresése&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">A rendszeren található WebView elavult, ezért néhány funkció nem fog megfelelően működni. Kérem frissítse.\n\nA telepített verzió:%1$d\nA legalacsonyabb szükséges verzió:%2$d</string>
     <string name="compress">Tömörít</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Nem támogatott nyelv</string>
     <string name="tts_error_dialog_reason_text">A(z) <b>%1$s</b> szövegfelolvasó nem támogatja a következő nyelvet: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Szövegfelolvasó kiválasztása</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-hu/10-preferences.xml b/common/android/src/main/res/values-hu/10-preferences.xml
index b1cfc703e556..195f710b7a10 100644
--- a/common/android/src/main/res/values-hu/10-preferences.xml
+++ b/common/android/src/main/res/values-hu/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Ceruza vastagsága</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Új kártyák paklija</string>
     <string name="learn_cutoff" maxLength="41">Korai tanulás korlátai</string>
     <string name="time_limit" maxLength="41">Időkorlát érték</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Nap kezdete</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d órával éjfél után</item>
@@ -250,6 +258,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-hu/16-multimedia-editor.xml b/common/android/src/main/res/values-hu/16-multimedia-editor.xml
index df00cdb50921..f1beda33775e 100644
--- a/common/android/src/main/res/values-hu/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-hu/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Meg akarod vágni ezt a képet?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Képválasztás sikertelen. Próbáld újra!"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Mező tartalma</string>
diff --git a/common/android/src/main/res/values-hy/02-strings.xml b/common/android/src/main/res/values-hy/02-strings.xml
index 49af27315c83..4c5b49c6170d 100644
--- a/common/android/src/main/res/values-hy/02-strings.xml
+++ b/common/android/src/main/res/values-hy/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-hy/03-dialogs.xml b/common/android/src/main/res/values-hy/03-dialogs.xml
index 51e999109fa1..b0df63a706f8 100644
--- a/common/android/src/main/res/values-hy/03-dialogs.xml
+++ b/common/android/src/main/res/values-hy/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Վերանայել վերջին X օրում մոռացված քարտերը`</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Բոլոր քարտերը</string>
-    <string name="tags_dialog_option_new_cards">Նոր</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Նոր</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-hy/10-preferences.xml b/common/android/src/main/res/values-hy/10-preferences.xml
index e56be6ce7147..940f059701a2 100644
--- a/common/android/src/main/res/values-hy/10-preferences.xml
+++ b/common/android/src/main/res/values-hy/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Գծի հաստություն</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-hy/16-multimedia-editor.xml b/common/android/src/main/res/values-hy/16-multimedia-editor.xml
index 4b841118d5a5..e429f8c81ff2 100644
--- a/common/android/src/main/res/values-hy/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-hy/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-ind/02-strings.xml b/common/android/src/main/res/values-ind/02-strings.xml
index 97121fc0834b..bc01679ade4d 100644
--- a/common/android/src/main/res/values-ind/02-strings.xml
+++ b/common/android/src/main/res/values-ind/02-strings.xml
@@ -216,7 +216,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid tidak dapat mengakses penyimpanan karena kesalahan Android.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Ukuran font</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Tampilkan toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -244,7 +247,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Layar utama Anda tidak memperbolehkan AnkiDroid untuk menambah pintasan</string>
     <string name="create_shortcut_error">Gagal menambah shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Mengkapitalkan kalimat-kalimat</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Gulir bilah alat</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -329,7 +331,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Pasang</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Gagal membuka pengaturan teks ke suara</string>
-    <string name="shared_decks_login_required">Silakan masuk ke akun untuk mengunduh lebih banyak dek</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Deskripsi</string>
     <string name="deck_description_saved">Deskripsi diperbarui</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-ind/03-dialogs.xml b/common/android/src/main/res/values-ind/03-dialogs.xml
index c724191cbde6..d885d835225a 100644
--- a/common/android/src/main/res/values-ind/03-dialogs.xml
+++ b/common/android/src/main/res/values-ind/03-dialogs.xml
@@ -43,8 +43,8 @@
     <string name="repair_deck_dialog">Apakah Anda benar-benar ingin memperbaiki basis data?\n\nSebelum memulai, salinan akan dibuat ke dalam subfolder \'%s\'.</string>
     <string name="intent_aedict_empty">Kategori \'awalan\' kosong</string>
     <string name="intent_aedict_category">Untuk menambah kartu ke AnkiDroid hapus semua kategori catatan atau tambahkan satu bernama \"bawaan\"</string>
-    <string name="custom_study_new_extend">Tambahkan/kurangi (“-3”) batas kartu baru hari ini sampai</string>
-    <string name="custom_study_rev_extend">Tambahkan/kurangi (“-3”) batas kartu ulasan hari ini sampai</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Ulas kartu yang terlupakan dalam x hari terakhir:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -93,7 +93,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Semua kartu</string>
-    <string name="tags_dialog_option_new_cards">Baru</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Baru</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Jatuh tempo</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Mencari kartu kosong&#8230;</string>
@@ -220,6 +220,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Kompres</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Bahasa tidak didukung</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Ganti engine</string>
@@ -255,7 +257,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-ind/10-preferences.xml b/common/android/src/main/res/values-ind/10-preferences.xml
index 028c96262fac..a8bd0f43a127 100644
--- a/common/android/src/main/res/values-ind/10-preferences.xml
+++ b/common/android/src/main/res/values-ind/10-preferences.xml
@@ -54,7 +54,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Tebal garis</string>
@@ -168,6 +168,13 @@
     <string name="use_current" maxLength="41">Dek untuk kartu baru</string>
     <string name="learn_cutoff" maxLength="41">Batas belajar duluan</string>
     <string name="time_limit" maxLength="41">Batas waktu Timebox</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Dimulainya hari esok</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="other" comment="Consider keeping the unbreakable space after the digit">%d hours past midnight</item>
@@ -249,6 +256,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-ind/16-multimedia-editor.xml b/common/android/src/main/res/values-ind/16-multimedia-editor.xml
index f1610c14f41c..56ac7aec5ddc 100644
--- a/common/android/src/main/res/values-ind/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ind/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Apa kamu ingin memangkas gambar ini?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Memilih gambar gagal, coba lagi"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Konten Kolom</string>
diff --git a/common/android/src/main/res/values-it/02-strings.xml b/common/android/src/main/res/values-it/02-strings.xml
index 304e5cab3bad..5fe473e8d449 100644
--- a/common/android/src/main/res/values-it/02-strings.xml
+++ b/common/android/src/main/res/values-it/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid non può accedere all\'archivio a causa di un errore di Android.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Dimensione Carattere</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Mostra barra strumenti</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Formatta in grassetto</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">La tua schermata iniziale non consente ad AnkiDroid di aggiungere scorciatoie</string>
     <string name="create_shortcut_error">Errore nell\'aggiunta della scorciatoia: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Frasi in maiuscole</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Barra di scorrimento</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Installa</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Non è stato possibile aprire le impostazioni della voce</string>
-    <string name="shared_decks_login_required">Accedi per scaricare altri mazzi</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Descrizione</string>
     <string name="deck_description_saved">Descrizione aggiornata</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-it/03-dialogs.xml b/common/android/src/main/res/values-it/03-dialogs.xml
index 4d0466f2a34e..59c0a4480606 100644
--- a/common/android/src/main/res/values-it/03-dialogs.xml
+++ b/common/android/src/main/res/values-it/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Vuoi veramente provare a riparare il database?\n\nPrima di iniziare il tentativo, verrà creata una copia nella sottocartella \'%s\'.</string>
     <string name="intent_aedict_empty">Categoria \'default\' è vuota</string>
     <string name="intent_aedict_category">Per aggiungere le carte ad AnkiDroid rimuovi tutte le categorie Notepad o aggiungine una chiamata \'default\'</string>
-    <string name="custom_study_new_extend">Aumentare/diminuire (“-3”) il limite odierno di nuove carte di</string>
-    <string name="custom_study_rev_extend">Aumentare/diminuire (“-3”) il limite odierno di revisioni di</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Ripeti carte dimenticate negli ultimi x giorni:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Tutte le carte</string>
-    <string name="tags_dialog_option_new_cards">Nuove</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Nuove</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Ripasso</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Cerco carte vuote&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">La WebView del sistema è obsoleta. Alcune funzioni non funzioneranno correttamente. Per piacere aggiornala. \n\nVersione installata: %1$d\nVersione minima richiesta: %2$d</string>
     <string name="compress">Comprimi</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Lingua non supportata</string>
     <string name="tts_error_dialog_reason_text">Il motore di testo a dialogo <b>%1$s</b> non supporta le seguenti lingue: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Cambia motore</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-it/10-preferences.xml b/common/android/src/main/res/values-it/10-preferences.xml
index 8740b74d6aaa..04d8a100c897 100644
--- a/common/android/src/main/res/values-it/10-preferences.xml
+++ b/common/android/src/main/res/values-it/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Spessore tratto</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">Mazzo per carte nuove</string>
     <string name="learn_cutoff" maxLength="41">Impara oltre il limite</string>
     <string name="time_limit" maxLength="41">Limite di tempo per sessione</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Inizio del giorno successivo (0 è mezzanotte, 23 è 23 ore)</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -251,6 +259,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-it/16-multimedia-editor.xml b/common/android/src/main/res/values-it/16-multimedia-editor.xml
index b5bcb141020b..2339b7fe65d3 100644
--- a/common/android/src/main/res/values-it/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-it/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Vuoi ritagliare questa immagine?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">La dimensione attuale dell\'immagine è %sMB. Il limite di dimensione massimo predefinito è 1MB. Si vuole comprimere l\'immagine?</string>
     <string name="select_image_failed">"Impossibile selezionare l\'immagine, si prega di riprovare"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Contenuti del campo</string>
diff --git a/common/android/src/main/res/values-iw/02-strings.xml b/common/android/src/main/res/values-iw/02-strings.xml
index 8c3751a1aa11..96fe80a5f8df 100644
--- a/common/android/src/main/res/values-iw/02-strings.xml
+++ b/common/android/src/main/res/values-iw/02-strings.xml
@@ -222,7 +222,10 @@
     <string name="ankidroid_init_failed_storage">ל-AnkiDroid אין גישה לאחסון עקב שגיאת אנדרואיד.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">גודל גופן</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">הצגת סרגל הכלים</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">עצב כמודגש</string>
@@ -250,7 +253,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">מסך הבית שלך אינו מאפשר ל- AnkiDroid להוסיף קיצורי דרך</string>
     <string name="create_shortcut_error">שגיאה בהוספת קיצור הדרך: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">סרגל כלים נגרר</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">תעודה</string>
@@ -339,7 +341,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">אינטרנט</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">התקן</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">פתיחת הגדרות טקסט-לדיבור נכשלה</string>
-    <string name="shared_decks_login_required">אנא התחבר כדי להוריד חפיסות נוספות</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">תיאור</string>
     <string name="deck_description_saved">התיאור עודכן</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-iw/03-dialogs.xml b/common/android/src/main/res/values-iw/03-dialogs.xml
index 50023467f474..8e7d8555cc5e 100644
--- a/common/android/src/main/res/values-iw/03-dialogs.xml
+++ b/common/android/src/main/res/values-iw/03-dialogs.xml
@@ -48,8 +48,8 @@
 לפני תחילת ניסיון התיקון, יתבצע שמירת העתק בתקייה %s</string>
     <string name="intent_aedict_empty">הקטגוריה \'ברירת מחדל\' ריקה</string>
     <string name="intent_aedict_category">כדי להוסיף כרטיסים ל-AnkiDroid הסר את כל קטגוריות פנקס הרשימות או הוסף אחת בשם \"ברירת מחדל\"</string>
-    <string name="custom_study_new_extend">הוספה/הורדה(“-3”) הגבלת כרטיסים חדשים להיום ב</string>
-    <string name="custom_study_rev_extend">הוספה/הורדה(“-3”) הגבלת חזרות להיום ב</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">חזרה על כרטיסים נשכחים בx ימים האחרונים</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -100,7 +100,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">כל הכרטיסים</string>
-    <string name="tags_dialog_option_new_cards">חדש</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">חדש</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">מיועד</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">מתבצע איתור כרטיסים ריקים&#8230;</string>
@@ -237,6 +237,8 @@
     <string name="webview_update_message">מערכת WebView מיושנת. חלק מהתכונות לא יפעלו כהלכה. אנא עדכן אותו.\n\nגרסה מותקנת: %1$d\nגרסה מינימום נדרשת: %2$d</string>
     <string name="compress">דחיסה</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">שפה לא נתמכת</string>
     <string name="tts_error_dialog_reason_text">מנוע הטקסט לדיבור <b>%1$s</b> אינו תומך בשפה הבאה: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">החלף מנוע</string>
@@ -272,7 +274,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-iw/10-preferences.xml b/common/android/src/main/res/values-iw/10-preferences.xml
index 35aa7d460762..beb13d9bc836 100644
--- a/common/android/src/main/res/values-iw/10-preferences.xml
+++ b/common/android/src/main/res/values-iw/10-preferences.xml
@@ -56,7 +56,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">עובי הקו</string>
@@ -170,6 +170,15 @@
     <string name="use_current" maxLength="41">חפיסה לכרטיסים חדשים</string>
     <string name="learn_cutoff" maxLength="41">לימוד מעבר למכסה</string>
     <string name="time_limit" maxLength="41">מגבלת זמן בתיבת-זמן</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="two">mins</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">התחל את היום הבא</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d שעה אחרי חצות</item>
@@ -252,6 +261,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-iw/16-multimedia-editor.xml b/common/android/src/main/res/values-iw/16-multimedia-editor.xml
index 600c8f3e4741..d90276c58dae 100644
--- a/common/android/src/main/res/values-iw/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-iw/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">לחתוך את התמונה הזאת?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">גודל התמונה הנוכחי הוא %sMB. מגבלת ברירת המחדל של גודל התמונה היא 1MB. האם אתה רוצה לדחוס אותו?</string>
     <string name="select_image_failed">"בחירת התמונה נכשלה, אנא נסה שוב"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">תוכן השדה</string>
diff --git a/common/android/src/main/res/values-ja/01-core.xml b/common/android/src/main/res/values-ja/01-core.xml
index 66040b2cfbd8..95aed5c13f0a 100644
--- a/common/android/src/main/res/values-ja/01-core.xml
+++ b/common/android/src/main/res/values-ja/01-core.xml
@@ -89,7 +89,7 @@
     <string name="empty_cram_label" maxLength="28">空にする</string>
     <string name="create_subdeck">サブデッキを作成</string>
     <string name="empty_filtered_deck">フィルターデッキを空にしています&#8230;</string>
-    <string name="search_deck" comment="Deck search for selecting it">Deck search</string>
+    <string name="search_deck" comment="Deck search for selecting it">デッキを検索</string>
     <string name="empty_deck">このデッキにはカードがありません</string>
     <string name="invalid_deck_name">無効なデッキ名です</string>
     <string name="studyoptions_congrats_finished">おめでとうございます！ このデッキの今日の課題をすべて達成しました！</string>
diff --git a/common/android/src/main/res/values-ja/02-strings.xml b/common/android/src/main/res/values-ja/02-strings.xml
index e7eacaa1a4fa..44ed2587fd9a 100644
--- a/common/android/src/main/res/values-ja/02-strings.xml
+++ b/common/android/src/main/res/values-ja/02-strings.xml
@@ -142,7 +142,7 @@
     <string name="import_error_load_imported_database">Anki Database (.anki2) の置換はまだサポートされていません。マニュアルを参照してください。</string>
     <string name="import_error_content_provider">選択したファイルを自動インポートできませんでした。手動でインポートする方法については、ユーザーマニュアルを参照してください。\n%s</string>
     <string name="import_error_copy_to_cache_title">一時ファイルの作成に失敗しました</string>
-    <string name="import_error_copy_to_cache_explanation" comment="The substitution is a list of suggested fixes in bullet point form">これはしばしば、ファイルを選択するために使用したアプリのバグによって引き起こされます。以下の対処方法を試してください:\n\n%s</string>
+    <string name="import_error_copy_to_cache_explanation" comment="The substitution is a list of suggested fixes in bullet point form">このエラーは、ファイルを選択するために使用したアプリの不具合が原因である可能性があります。次の対処方法を試してください:\n\n%s</string>
     <string name="import_interrupted">インポートが中断されました: AnkiDroidが閉じられました</string>
     <string name="export_ready_title">エクスポートの準備完了</string>
     <string name="export_send_no_handlers">Ankiパッケージに対応する他のアプリがありません。ファイルを保存します&#8230;</string>
@@ -216,7 +216,10 @@
     <string name="ankidroid_init_failed_storage">Androidのエラーのため、AnkiDroidはストレージにアクセスできません。\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">フォントサイズ</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">ツールバーを表示</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">プレビューを表示</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">プレビューを非表示</string>
     <string name="format_insert_bold">太字</string>
@@ -233,21 +236,20 @@
     <string name="edit_toolbar_item">アイテムを編集</string>
     <string name="toolbar_item_explain_edit_or_remove">選択した文字列の前後に挿入するHTMLをそれぞれ入力してください\n\n作成したツールバーアイテムを編集または削除したい場合は、そのアイテムのボタンを長押ししてください</string>
     <string name="remove_toolbar_item">このツールバーアイテムを削除しますか？</string>
-    <string name="note_editor_toolbar_icon_requirement_error">Button text is required</string>
-    <string name="before_after_text_requirement_error">At least one HTML field is required</string>
+    <string name="note_editor_toolbar_icon_requirement_error">ボタンに表示する文字が必要です</string>
+    <string name="before_after_text_requirement_error">少なくとも1つのHTML入力欄への入力が必要です</string>
     <string name="note_editor_image_too_large">画像が大きすぎます。手動で画像を挿入してください</string>
     <string name="note_editor_video_too_large">動画ファイルが大きすぎます。手動で動画を挿入してください</string>
     <string name="note_editor_audio_too_large">音声ファイルが大きすぎます。手動で音声を挿入してください</string>
     <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Androidのバックアップが進行中です。もう一度やり直してください</string>
     <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">AnkiDroidのショートカットを追加するには、iManagerでの許可が必要な場合があります。</string>
-    <string name="create_shortcut_error_miui" comment="Keep the message as short, as this is shown in a toast. %s is the app name: \'AnkiDroid\'">Allow ‘Home screen shortcuts’ in system settings for %s to add shortcuts</string>
+    <string name="create_shortcut_error_miui" comment="Keep the message as short, as this is shown in a toast. %s is the app name: \'AnkiDroid\'">システム設定で %s のショートカット作成を許可してください</string>
     <string name="create_shortcut_failed" comment="home screen == launcher">ホーム画面へのショートカットの追加が許可されませんでした</string>
     <string name="create_shortcut_error">ショートカット追加のエラー: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">英語入力の際に文頭を大文字</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">ツールバーをスクロール表示</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
-    <string name="dialog_hint_certificate">Certificate</string>
+    <string name="dialog_hint_certificate">証明書</string>
     <!-- IncrementNumberRangePreference -->
     <string name="plus_sign" comment="Label for increment button in IncrementerNumberRangePreference">+</string>
     <string name="minus_sign" comment="Label for decrement button in IncrementerNumberRangePreference">-</string>
@@ -329,7 +331,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">ｲﾝﾀｰﾈｯﾄ</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">ｲﾝｽﾄｰﾙ</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">テキスト読み上げの設定を開けませんでした</string>
-    <string name="shared_decks_login_required">さらにデッキをダウンロードするにはログインしてください</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">デッキ説明文</string>
     <string name="deck_description_saved">説明を更新しました</string>
     <string name="format_deck_description_as_markdown">Markdown形式でフォーマット</string>
diff --git a/common/android/src/main/res/values-ja/03-dialogs.xml b/common/android/src/main/res/values-ja/03-dialogs.xml
index b513dad6dd92..5914bea3c0e6 100644
--- a/common/android/src/main/res/values-ja/03-dialogs.xml
+++ b/common/android/src/main/res/values-ja/03-dialogs.xml
@@ -43,8 +43,8 @@
     <string name="repair_deck_dialog">データベースの修復を試みて本当によろしいですか？\n\n試行の開始前に、サブフォルダ \"%s\" にコピーを作成します。</string>
     <string name="intent_aedict_empty">カテゴリー \"default\" が空です</string>
     <string name="intent_aedict_category">AnkiDroidにカードを登録するため、すべてのNotepadカテゴリを削除するか、\"default\" という名前のカテゴリを追加してください</string>
-    <string name="custom_study_new_extend">上限枚数をいくつ増やしますか？（減らす場合は負の数）</string>
-    <string name="custom_study_rev_extend">上限枚数をいくつ増やしますか？（減らす場合は負の数）</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">（今日を含め）何日の間に [もう一度] と回答したカードを復習しますか？</string>
     <string name="custom_study_ahead_description">何日先まで復習しますか？</string>
     <string name="custom_study_preview">（今日を含め）何日の間に追加した新規カードをプレビューしますか？</string>
@@ -93,7 +93,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">すべて</string>
-    <string name="tags_dialog_option_new_cards">新規</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">新規</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">期日到来済</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">白紙カード（表側に何も表示されないカード）がないか確認しています&#8230;</string>
@@ -103,7 +103,7 @@
     <!-- Multimedia - Audio View -->
     <string name="multimedia_editor_audio_permission_denied">音声録音の権限が付与されませんでした</string>
     <string name="permission_denied">権限が許可されていません</string>
-    <string name="microphone_permission_denied_message">Microphone permission denied. Please grant it in the app settings.</string>
+    <string name="microphone_permission_denied_message">マイクへのアクセスが拒否されました。システムのアプリ設定でマイクを許可してください。</string>
     <!-- Database Integrity Check -->
     <string name="integrity_check_continue_anyway">続ける</string>
     <string name="integrity_check_insufficient_space">データベースのチェックには一時ファイル用のデータ領域が必要です。\n\n続行する前に、お使いのデバイスに少なくとも %s の空き領域を確保してください。</string>
@@ -220,24 +220,26 @@
     <string name="webview_update_message">「AndroidシステムのWebView 」（または「Android System WebView」）が古くなっています。いくつかの機能が正しく動作しません。更新してください。\n\nインストールされているバージョン: %1$d\n最低限必要なバージョン: %2$d</string>
     <string name="compress">圧縮</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">サポートされていない言語</string>
     <string name="tts_error_dialog_reason_text">テキスト読み上げエンジン <b>%1$s</b> は次の言語をサポートしていません: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">エンジンを変更</string>
     <string name="tts_error_dialog_supported_voices_button_text">読み上げオプション</string>
     <!-- import_cache_error_resolutions -->
-    <string name="import_error_resolution_try_again">もう一度ファイルをインポートしてください</string>
-    <string name="import_error_resolution_free_up_space">デバイスに十分な空き容量があることを確認してください</string>
-    <string name="import_error_resolution_check_internet">インターネットに接続されていることを確認してください</string>
-    <string name="import_error_resolution_copy_to_device">Copy the file to your device and try again with the local file</string>
-    <string name="import_error_resolution_select_file">Open the file using your device’s file browser app</string>
+    <string name="import_error_resolution_try_again">ファイルをもう一度インポートする</string>
+    <string name="import_error_resolution_free_up_space">デバイスに十分な空き容量があることを確認する</string>
+    <string name="import_error_resolution_check_internet">インターネットに接続していることを確認する</string>
+    <string name="import_error_resolution_copy_to_device">ファイルをデバイスに保存して、そのファイルでもう一度試す</string>
+    <string name="import_error_resolution_select_file">デバイスのファイル管理用アプリでファイルを開く</string>
     <!-- Post-login dialog -->
     <string name="login_successful">ログインに成功しました</string>
     <string name="sync_now">今すぐ同期しますか？</string>
     <!--Change Note Type Dialog Fragment-->
-    <string name="card_numbers_unchanged">Card numbers will remain unchanged</string>
+    <string name="card_numbers_unchanged">カード番号は変更されません</string>
     <!-- Subset of TR.changeNotetypeToFromCloze -->
-    <string name="extra_cloze_deletions_removed">If changing to a regular note type, and there are more cloze deletions than available card templates, any extra cards will be removed.</string>
-    <string name="different_note_types_selected">Please select notes from only one notetype.</string>
+    <string name="extra_cloze_deletions_removed">通常のノートタイプへ変更する際、穴埋め番号の数がカードテンプレートの数を上回ると、対応するテンプレートがないカードは削除されます。</string>
+    <string name="different_note_types_selected">ノートタイプが共通するノートを選択してください</string>
     <string name="error_no_changes_to_save">保存する変更がありません</string>
     <string name="choose_color">色を選択</string>
     <!-- Special Fields -->
@@ -253,9 +255,10 @@
     <string name="special_field_card_help" comment="%s: either blank or \' %s\'">カードタイプの名前%s</string>
     <string name="special_field_type_help" comment="%s: either blank or \' %s\'">ノートタイプの名前%s</string>
     <!-- Change Note Type Dialog -->
-    <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
-    <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <string name="change_note_type_from" comment="Label indicating the original note type before changing it">変更前</string>
+    <string name="change_note_type_to" comment="Label indicating the new note type to change to">変更後</string>
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">プロファイル名</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">プロファイル名を空にすることはできません</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">プロファイル名は最大 %1$d 文字までです。</string>
diff --git a/common/android/src/main/res/values-ja/07-cardbrowser.xml b/common/android/src/main/res/values-ja/07-cardbrowser.xml
index 404fe7805c35..6231b77b3682 100644
--- a/common/android/src/main/res/values-ja/07-cardbrowser.xml
+++ b/common/android/src/main/res/values-ja/07-cardbrowser.xml
@@ -106,8 +106,8 @@
          column name (e.g. "Front, ascending"); these strings are the direction half. -->
     <string name="sort_pill_a11y_ascending" comment="SortPill accessibility: ascending half">昇順</string>
     <string name="sort_pill_a11y_descending" comment="SortPill accessibility: descending half">降順</string>
-    <string name="sort_pill_a11y_selected" comment="SortPill accessibility: state announcement when this half is the active sort direction">Selected</string>
+    <string name="sort_pill_a11y_selected" comment="SortPill accessibility: state announcement when this half is the active sort direction">選択済み</string>
     <string name="card_browser_order_section_unavailable" comment="Header: browser columns that cannot be sorted (e.g. Question)">使用不可</string>
-    <string name="card_browser_order_subtitle_use_sort_field" comment="Fix for when the \'Question/Answer\' column is not sortable.">Card content can\'t be sorted. Use Sort Field</string>
+    <string name="card_browser_order_subtitle_use_sort_field" comment="Fix for when the \'Question/Answer\' column is not sortable.">問題または解答の表示内容全体では並べ替えできません。並べ替えフィールドを使用してください</string>
     <string name="card_browser_order_subtitle_cards_mode_only" comment="Fix for trying to sort on FSRS columns in Notes mode">カードモードでのみ使用可能です</string>
 </resources>
diff --git a/common/android/src/main/res/values-ja/09-backup.xml b/common/android/src/main/res/values-ja/09-backup.xml
index 1cfbc744f9e7..6331e31f337f 100644
--- a/common/android/src/main/res/values-ja/09-backup.xml
+++ b/common/android/src/main/res/values-ja/09-backup.xml
@@ -30,7 +30,7 @@
     <string name="backup_del_collection">コレクションの削除と新規作成</string>
     <string name="backup_del_collection_question">コレクションを削除して、新しいコレクションを作成しますか？　作成すると、これまでの回答履歴および全カードが削除されます</string>
     <string name="backup_one_way_sync_from_server">AnkiWeb側コレクションからの一方向同期</string>
-    <string name="backup_use_default_folder">Use default collection folder</string>
+    <string name="backup_use_default_folder">既定のコレクションフォルダを使用</string>
     <string name="backup_full_sync_from_server_question">このコレクションを、AnkiWeb上にあるコレクションで上書きしますか？　上書きすると、直近の同期より後にカードに回答した履歴や追加入力した情報はすべて失われます</string>
     <string name="error_handling_title">エラーへの対処</string>
     <string name="error_handling_options" comment="In a warning message, the label of the suggested action that the user should take">オプション</string>
diff --git a/common/android/src/main/res/values-ja/10-preferences.xml b/common/android/src/main/res/values-ja/10-preferences.xml
index f82cbda3174c..6be3cde2a884 100644
--- a/common/android/src/main/res/values-ja/10-preferences.xml
+++ b/common/android/src/main/res/values-ja/10-preferences.xml
@@ -51,10 +51,10 @@
     <!-- Card template JavaScript API permissions -->
     <string name="allow_dangerous_js_api_title" maxLength="41">JavaScript API を包括的に許可</string>
     <string name="allow_dangerous_js_api_summ">すべてのカードやテンプレートに、他のカードやコレクションデータの読み取りや変更を許可します。\nそのような許可をするほどには信頼していないカードやテンプレートがコレクション内にある場合は、オフのままにしてください。</string>
-    <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
+    <string name="dangerous_js_api_denied_snackbar">安全を確保するため、このJavaScriptの実行をブロックしました。\nコレクション内のすべてのカードとテンプレートを信頼している場合、このブロックを解除することができます（[設定] > [高度な設定] > [JavaScript API を包括的に許可]）</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
-    <string name="allow_card_external_launch_title" maxLength="41">カード内で別のアプリの起動を許可</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_title" maxLength="41">カードに別のアプリの起動を許可</string>
+    <string name="allow_card_external_launch_summ">カードが他のアプリを開くことを許可します。便利な反面、ユーザーが意図していない動作を起こす可能性もあります。\nそのような許可をするほどには信頼していないカードやテンプレートがコレクション内にある場合は、オフのままにしてください。\n注：オフにしていても、カード内のWebリンクは他のアプリを開くことができます。</string>
     <string name="card_external_launch_denied_snackbar">安全を確保するため、別のアプリの起動をブロックしました。\nコレクション内のすべてのカードとテンプレートを信頼している場合、ブロックを解除することができます（「設定」→「高度な設定」→「カード内で別のアプリの起動を許可」）</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">線の太さ</string>
@@ -143,9 +143,9 @@
     <string name="select_locale_title">言語を選択</string>
     <string name="software_render" maxLength="41">カードのハードウェアレンダリングを無効にする</string>
     <string name="software_render_summ">ハードウェアによるレンダリングは高速ですが、問題が発生する可能性があります（特にAndroid 8/8.1において）。 カード学習画面のユーザーインターフェースの一部が表示されない場合は、この設定を試してみてください</string>
-    <string name="disable_extended_text_ui" maxLength="41">Disable single-field edit mode</string>
+    <string name="disable_extended_text_ui" maxLength="41">単一フィールド編集モードを無効にする</string>
     <!--See: multimedia_editor_popup_cloze. We can\'t use format strings as this is auto-generated-->
-    <string name="disable_extended_text_ui_summ">Allows \'Cloze deletion\' context menu when in landscape mode.</string>
+    <string name="disable_extended_text_ui_summ">横画面（ランドスケープ表示）でテキストを編集する際、「穴埋め問題」のコンテキストメニューやツールバーが表示されなくなるのを防ぎます</string>
     <string name="vertical_centering" maxLength="41">上下方向の中央寄せ</string>
     <string name="vertical_centering_summ">コンテンツを上下方向の中央に配置します</string>
     <string name="pref_double_tap_time_interval" maxLength="41">連続タップの最短間隔</string>
@@ -167,6 +167,13 @@
     <string name="use_current" maxLength="41">新規カードの既定の追加先デッキ</string>
     <string name="learn_cutoff" maxLength="41">習得学習の前倒し許容時間</string>
     <string name="time_limit" maxLength="41">タイムボックス（学習時間の目標・区切り）</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">日付更新時刻</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="other" comment="Consider keeping the unbreakable space after the digit">%d時</item>
@@ -249,6 +256,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">カードの枚数を入力してください</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">0 以上の値を入力してください</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">このリマインダーを削除しますか？</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">この操作は元に戻せません。</string>
     <!-- Reminder troubleshooting screen -->
@@ -269,15 +277,15 @@
     <string name="reminder_troubleshooting_status_on" comment="Status of a review reminder troubleshooting check: the system setting is active.">オン</string>
     <string name="reminder_troubleshooting_status_off" comment="Status of a review reminder troubleshooting check: the system setting is not active.">オフ</string>
     <string name="reminder_troubleshooting_status_unrestricted" comment="Status of the review reminder battery optimization check: the app may run freely in the background.">このアプリには適用されていません</string>
-    <string name="reminder_troubleshooting_status_optimized" comment="Status of the review reminder battery optimization check: the system may delay the app in the background.">このアプリにも適用しています</string>
+    <string name="reminder_troubleshooting_status_optimized" comment="Status of the review reminder battery optimization check: the system may delay the app in the background.">このアプリも適用されています</string>
     <string name="reminder_troubleshooting_status_restricted" comment="Status of the review reminder battery optimization check: the app is barred from running in the background.">このアプリの使用を制限しています</string>
     <!-- Troubleshooting check explanations -->
     <string name="reminder_troubleshooting_explanation_notification_channel" comment="Explains why review reminders need notification permissions to work correctly.">「学習リマインダー」というカテゴリーの通知を許可する必要があります</string>
-    <string name="reminder_troubleshooting_explanation_do_not_disturb" comment="Explains why review reminders may need Do Not Disturb to be disabled to work correctly.">Do Not Disturb may mute reminder notifications</string>
+    <string name="reminder_troubleshooting_explanation_do_not_disturb" comment="Explains why review reminders may need Do Not Disturb to be disabled to work correctly.">サイレントモードではリマインダー通知がミュートされる可能性があります</string>
     <string name="reminder_troubleshooting_explanation_battery_optimized" comment="Explains to the user that AnkiDroid\'s battery usage is optimized, and that battery usage may need to be enabled for review reminders to work correctly.">バッテリーの最適化により、リマインダーが遅延する可能性があります</string>
     <string name="reminder_troubleshooting_explanation_battery_restricted" comment="Explains to the user that AnkiDroid\'s battery usage is restricted, and that battery usage may need to be enabled for review reminders to work correctly.">バックグラウンドでの使用が制限されています。リマインダーが配信されない可能性があります。</string>
     <string name="reminder_troubleshooting_explanation_power_saving_mode" comment="Explains why review reminders may need power saving mode to be disabled to work correctly.">省電力モードによってリマインダーの通知が遅れる可能性があります</string>
-    <string name="reminder_troubleshooting_explanation_exact_alarm" comment="Explains that AnkiDroid cannot schedule alarms at exact times unless the exact-alarm permission is granted.">Required to schedule reminders at exact times</string>
+    <string name="reminder_troubleshooting_explanation_exact_alarm" comment="Explains that AnkiDroid cannot schedule alarms at exact times unless the exact-alarm permission is granted.">正確な時間にリマインダーをスケジュールするために必要です</string>
     <!-- Troubleshooting check actions -->
     <string name="reminder_troubleshooting_action_grant_permission" comment="Button resolving a failing review reminder troubleshooting check by asking for a permission.">許可を与える</string>
     <string name="reminder_troubleshooting_action_enable_notification_channel" comment="Button resolving a failing review reminder troubleshooting check by opening the operating system notification settings screen.">このカテゴリーの通知を許可</string>
@@ -300,7 +308,7 @@
     <string name="analytics_title" maxLength="41">設定の情報提供を許可する</string>
     <string name="analytics_summ">各機能の使用傾向を開発チームが把握しやすくなり、AnkiDroidの機能向上に役立ちます</string>
     <string name="note_editor_replace_newlines" maxLength="41">改行タグを改行に置き換えて表示</string>
-    <string name="note_editor_replace_newlines_summ">In the note editor, convert any instances of &lt;br&gt; to newlines when editing a card.</string>
+    <string name="note_editor_replace_newlines_summ">「ノートを編集」画面のフィールドで、改行を表すHTMLタグ &lt;br&gt; を表示せず、実際に改行に置き換えた状態で表示します。新たに改行を行った場合も、その箇所に &lt;br&gt; タグを挿入しますが、そのタグは表示しません</string>
     <string name="type_in_answer_focus" maxLength="41">文字入力欄にフォーカス</string>
     <string name="type_in_answer_focus_summ">答えをキーボード入力するタイプのカードを学習画面に表示したときに、あらかじめ文字入力欄を選択してキーボードを表示した状態にします</string>
     <!-- About -->
@@ -308,7 +316,7 @@
     <string name="pref_cat_about_title" maxLength="41">AnkiDroidについて</string>
     <string name="contributors_title">コントリビューター</string>
     <string name="about_contributors_description"><![CDATA[AnkiDroidの開発を支えているのは、一人一人の<a href=\"%1$s\">コントリビューター</a>です。誰もが、プログラミング、翻訳、寄付、<a href=\"%2$s\">その他の方法</a>によってAnkiDroidの開発に貢献するコントリビューターになることができます。]]></string>
-    <string name="about_contributors_description_no_donate"><![CDATA[These are our awesome <a href=\"%1$s\">contributors</a>. You can help AnkiDroid too by programming, translating and <a href=\"%2$s\">more</a>!]]></string>
+    <string name="about_contributors_description_no_donate"><![CDATA[AnkiDroidの開発を支えているのは、一人一人の<a href=\"%1$s\">コントリビューター</a>です。誰もが、プログラミング、翻訳、<a href=\"%2$s\">その他の方法</a>によってAnkiDroidの開発に貢献するコントリビューターになることができます。]]></string>
     <string name="license">ライセンス</string>
     <string name="license_description"><![CDATA[AnkiDroidは<a href=\"%1$s\">GPL-3.0</a>および<a href=\"%2$s\">AGPL-3.0</a>のライセンスの下でリリースされています。<a href=\"%3$s\">ソースコード</a>はGitHubで公開されています。]]></string>
     <string name="other_licenses"><![CDATA[AnkiDroidはさまざまなオープンソース<a href=\"%1$s\">ライセンス</a>に基づき、サードパーティのライブラリやアイコンを使用しています。]]></string>
@@ -350,7 +358,7 @@
     <string name="readtext_deprecation_warn">AnkiDroidは、他のAnkiクライアント（デスクトップ版Anki、AnkiMobile）と互換性がある、より優れたTTS（テキスト読み上げ）システムを導入しました。新システムでは、より多くの音声や、品質の向上した再生機能が利用できます。\n\n従来のTTSシステムを対象とするこのオプションは近い将来に削除され、利用できなくなります。そうなる前に、できるだけ早く、ノートタイプ内のカードテンプレートを新しいTTSシステムに対応したものに変更することをおすすめします。</string>
     <string name="readtext_reviewer_warn" tools:ignore="UnusedResources">テキスト読み上げ（TTS）の新しいフォーマットにアップグレードしてください</string>
     <string name="allow_templates_to_record_audio" maxLength="41">テンプレートに音声の録音を許可</string>
-    <string name="template_is_trying_to_record_audio">This template is trying to record audio</string>
+    <string name="template_is_trying_to_record_audio">このテンプレートは音声を録音しようとしています</string>
     <string name="pref_fixed_port_title" maxLength="41">JavaScriptのlocalStorageを有効にする</string>
     <string name="pref_fixed_port_summary">サーバーの固定ポートを使用することによって、学習画面でJavaScriptのlocalStorage機能を使用できるようにします</string>
     <!-- Developer options -->
@@ -439,14 +447,14 @@
     <string name="new_study_screen_summ"><![CDATA[現行の学習画面の後継となる、改良された学習画面。現行画面のいくつかの機能は変更または削除されました。ぜひ<a href="%1$s">ご意見・ご感想</a>をお寄せください。<a href="%2$s">不具合</a>がある場合もお知らせいただければ幸いです。]]></string>
     <string name="show_answer_feedback" maxLength="41">回答選択時にフィードバック（目印）を表示</string>
     <string name="screen" maxLength="41">画面</string>
-    <string name="also_assign_binding_to_show_answer" comment="Question shown after assigning binding to an \'Answer\' command, asking whether it should also be assigned to the \'Show answer\'; %1$s is \'Show answer\'">Also assign to ‘%1$s’?</string>
-    <string name="dialog_skip" comment="Skip assigning binding to \'Show answer\'">Skip</string>
-    <string name="dialog_assign" comment="Assign binding to \'Answer\' command">Assign</string>
+    <string name="also_assign_binding_to_show_answer" comment="Question shown after assigning binding to an \'Answer\' command, asking whether it should also be assigned to the \'Show answer\'; %1$s is \'Show answer\'">\"%1$s\" も割り当てますか？</string>
+    <string name="dialog_skip" comment="Skip assigning binding to \'Show answer\'">スキップ</string>
+    <string name="dialog_assign" comment="Assign binding to \'Answer\' command">割り当てる</string>
     <!--Keyboard shortcuts dialog-->
     <string name="open_settings" comment="Description of the shortcut that opens the app settings">設定画面を開く</string>
     <string name="related_settings_title" comment="Title of the section for related settings">関連設定</string>
     <!-- External Directory Selection Preference -->
-    <string name="pref_directory_not_set" comment="Summary of the AnkiDroid directory setting when no directory is set">Not set</string>
+    <string name="pref_directory_not_set" comment="Summary of the AnkiDroid directory setting when no directory is set">未設定</string>
     <string name="pref_custom_path" maxLength="41" comment="Dialog button letting the user type a directory path manually">カスタム パス</string>
     <string name="pref_enter_custom_path" maxLength="41">カスタムパスを入力</string>
     <string name="pref_directory_not_writable">ディレクトリが書き込み可能ではありません</string>
diff --git a/common/android/src/main/res/values-ja/16-multimedia-editor.xml b/common/android/src/main/res/values-ja/16-multimedia-editor.xml
index 219cfe14c832..17c0bfc862d9 100644
--- a/common/android/src/main/res/values-ja/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ja/16-multimedia-editor.xml
@@ -49,13 +49,14 @@
     <string name="multimedia_editor_audio_view_create_failed">録音ツールバーを作成できません</string>
     <!-- Crop function-->
     <string name="crop_image">この画像をトリミングしますか？</string>
-    <string name="crop_button" maxLength="28">Crop</string>
+    <string name="crop_button" maxLength="28">クロップ</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">現在の画像サイズは%sMBですが、1MB未満にすることを推奨します。画像サイズを減らすため圧縮しますか？</string>
     <string name="select_image_failed">"画像の選択に失敗しました。もう一度試してください"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">フィールドの内容</string>
     <string name="crop_image_size_notice">画像のサイズが、トリミング用のエディタで処理できる大きさを超えています。画像サイズを変更してから、もう一度試してください。</string>
     <string name="reselect" maxLength="28">再選択</string>
-    <string name="waveform_button_description">Show audio waveform</string>
+    <string name="waveform_button_description">音声の波形を表示</string>
     <string name="field_content_description">フィールドの内容を表示</string>
     <string name="delete_audio_button_description">録音を削除</string>
 </resources>
diff --git a/common/android/src/main/res/values-ka/02-strings.xml b/common/android/src/main/res/values-ka/02-strings.xml
index e6dae9339a83..0ddc60a995b5 100644
--- a/common/android/src/main/res/values-ka/02-strings.xml
+++ b/common/android/src/main/res/values-ka/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">ტექსტის ზომა</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">ინსტრუმენტების პანელის ჩვენება</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">თქვენი საწყისი ეკრანი არ აძლევს AnkiDroid-ს სწრაფი ბმულის დამატების უფლებას</string>
     <string name="create_shortcut_error">შეცდომა სწრაფი ბმულის დამატებისას: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">წინადადებების მთავრულით დაწყება</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">გადაადგილების ხელსაწყოთა ზოლი</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">ინტერნეტი</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">ინსტალაცია</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">მეტი დასტის გადმოსაწერად, გთხოვთ, გაიაროთ ავტორიზაცია</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">აღწერა</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-ka/03-dialogs.xml b/common/android/src/main/res/values-ka/03-dialogs.xml
index 3f269d4b083c..351f8386801d 100644
--- a/common/android/src/main/res/values-ka/03-dialogs.xml
+++ b/common/android/src/main/res/values-ka/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">ნამდვილად გსურთ, სცადოთ მონაცემთა ბაზის შეკეთება?\n\nმცდელობის დაწყებამდე შეიქმნება ასლი ქვესაქაღალდეში: „%s“.</string>
     <string name="intent_aedict_empty">კატეგორია „ნაგულისხმევი“ ცარიელია</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">დღევანდელი ახალი ბარათების ლიმიტის გაზრდა/შემცირება (\"-3\") ამდენით:</string>
-    <string name="custom_study_rev_extend">დღევანდელი გადახედვების ლიმიტის გაზრდა/შემცირება (\"-3\") ამდენით:</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">გასულ x დღეში დავიწყებული ბარათების გადახედვა:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">ყველა ბარათი</string>
-    <string name="tags_dialog_option_new_cards">ახალი</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">ახალი</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">სასწავლო</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">იძებნება ცარიელი ბარათები&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">სისტემის WebView მოძველებულია. ზოგი ფუნქცია სათანადოდ ვერ იმუშავებს. გთხოვთ განაახლოთ.\n\nდაყენებული ვერსია: %1$d\nმინიმალური ვერსია, რომელიც საჭიროა: %2$d</string>
     <string name="compress">კომპრესირება</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">ენა მხარდაჭერილი არაა</string>
     <string name="tts_error_dialog_reason_text">ხმოვან წამკითხველ <b>%1$s-ში</b> არაა მხარდაჭერილი ეს ენა: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">ძრავას შეცვლა</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-ka/10-preferences.xml b/common/android/src/main/res/values-ka/10-preferences.xml
index f130108c6f3e..5c600ab1fd23 100644
--- a/common/android/src/main/res/values-ka/10-preferences.xml
+++ b/common/android/src/main/res/values-ka/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">ხაზის სისქე</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">დასტა ახალი ბარათებისთვის</string>
     <string name="learn_cutoff" maxLength="41">წინასწარი სწავლის ლიმიტი</string>
     <string name="time_limit" maxLength="41">განკუთვნილი დროის ლიმიტი</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">ახალი დღის დასაწყისი</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -251,6 +259,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-ka/16-multimedia-editor.xml b/common/android/src/main/res/values-ka/16-multimedia-editor.xml
index 8f48cd0c7e64..c77bc126dbfc 100644
--- a/common/android/src/main/res/values-ka/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ka/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">გსურთ ამ სურათის ჩამოჭრა?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">სურათის ზომა არის %sMB. სურათის ზომის ნაგულისხმევი ლიმიტი შეადგენს 1MB-ს. გსურთ მისი შეკუმშვა?</string>
     <string name="select_image_failed">"სურათი ვერ მოინიშნა, გთხოვთ ხელახლა სცადოთ"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">ველის შიგთავსი</string>
diff --git a/common/android/src/main/res/values-kk/02-strings.xml b/common/android/src/main/res/values-kk/02-strings.xml
index e07cedd7eb06..de628947adb1 100644
--- a/common/android/src/main/res/values-kk/02-strings.xml
+++ b/common/android/src/main/res/values-kk/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-kk/03-dialogs.xml b/common/android/src/main/res/values-kk/03-dialogs.xml
index 5cc233942cfa..260d56aff597 100644
--- a/common/android/src/main/res/values-kk/03-dialogs.xml
+++ b/common/android/src/main/res/values-kk/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">All cards</string>
-    <string name="tags_dialog_option_new_cards">New</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">New</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-kk/10-preferences.xml b/common/android/src/main/res/values-kk/10-preferences.xml
index fdb3c24b7644..88e7ed68be1f 100644
--- a/common/android/src/main/res/values-kk/10-preferences.xml
+++ b/common/android/src/main/res/values-kk/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-kk/16-multimedia-editor.xml b/common/android/src/main/res/values-kk/16-multimedia-editor.xml
index d9a9211644fc..7d3e5ec19a56 100644
--- a/common/android/src/main/res/values-kk/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-kk/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-km/02-strings.xml b/common/android/src/main/res/values-km/02-strings.xml
index 5814f8b8c865..946527bfdd15 100644
--- a/common/android/src/main/res/values-km/02-strings.xml
+++ b/common/android/src/main/res/values-km/02-strings.xml
@@ -216,7 +216,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -244,7 +247,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -329,7 +331,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">សូមចុះឈ្មោះចូលដើម្បីទាញយកជាន់ច្រើនទៀត</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-km/03-dialogs.xml b/common/android/src/main/res/values-km/03-dialogs.xml
index 1eb26d3ca59d..e7b17590ccc0 100644
--- a/common/android/src/main/res/values-km/03-dialogs.xml
+++ b/common/android/src/main/res/values-km/03-dialogs.xml
@@ -43,8 +43,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -93,7 +93,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">All cards</string>
-    <string name="tags_dialog_option_new_cards">New</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">New</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
@@ -220,6 +220,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">ភាសាមិនត្រូវបានគាំទ្រ</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">ប្ដូរម៉ាស៊ីន</string>
@@ -255,7 +257,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-km/10-preferences.xml b/common/android/src/main/res/values-km/10-preferences.xml
index d7023aaf500b..0f3084e6c0e0 100644
--- a/common/android/src/main/res/values-km/10-preferences.xml
+++ b/common/android/src/main/res/values-km/10-preferences.xml
@@ -54,7 +54,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -168,6 +168,13 @@
     <string name="use_current" maxLength="41">ជាន់់សម្រាប់កាតថ្មី</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="other" comment="Consider keeping the unbreakable space after the digit">%d hours past midnight</item>
@@ -250,6 +257,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-km/16-multimedia-editor.xml b/common/android/src/main/res/values-km/16-multimedia-editor.xml
index d9a9211644fc..7d3e5ec19a56 100644
--- a/common/android/src/main/res/values-km/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-km/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-kn/02-strings.xml b/common/android/src/main/res/values-kn/02-strings.xml
index 81f1b887022d..ac3391e953ec 100644
--- a/common/android/src/main/res/values-kn/02-strings.xml
+++ b/common/android/src/main/res/values-kn/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">ಫಾಂಟ್ ಗಾತ್ರ</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">ಉಪಕರಣಪಟ್ಟಿ ಪ್ರದರ್ಶಿಸಿ</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಸೇರಿಸಲು ನಿಮ್ಮ ಮುಖಪುಟವು ಆಂಕಿಡ್ರಾಯ್ಡ್‌ಗೆ ಅನುಮತಿಸುವುದಿಲ್ಲ</string>
     <string name="create_shortcut_error">ಶಾರ್ಟ್‌ಕಟ್ ಸೇರಿಸುವಲ್ಲಿ ದೋಷ:%s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">ವಾಕ್ಯಗಳನ್ನು ದೊಡ್ಡಕ್ಷರಗೊಳಿಸಿ</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">ಸ್ಕ್ರಾಲ್ ಟೂಲ್ಬಾರ್</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">ಹೆಚ್ಚಿನ ಡೆಕ್‌ಗಳನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ದಯವಿಟ್ಟು ಲಾಗ್ ಇನ್ ಮಾಡಿ</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">ವಿವರಣೆ</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-kn/03-dialogs.xml b/common/android/src/main/res/values-kn/03-dialogs.xml
index 841deda45490..20ec5ad81f34 100644
--- a/common/android/src/main/res/values-kn/03-dialogs.xml
+++ b/common/android/src/main/res/values-kn/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">ಡೇಟಾಬೇಸ್ ಅನ್ನು ಸರಿಪಡಿಸಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?\n\nಪ್ರಯತ್ನವನ್ನು ಪ್ರಾರಂಭಿಸುವ ಮೊದಲು, \"%s\" ಉಪಫೋಲ್ಡರ್‌ನಲ್ಲಿ ನಕಲನ್ನು ರಚಿಸಲಾಗುತ್ತದೆ.</string>
     <string name="intent_aedict_empty">\"ಡೀಫಾಲ್ಟ್\" ವರ್ಗ ಖಾಲಿಯಾಗಿದೆ</string>
     <string name="intent_aedict_category">ಎಲ್ಲಾ ನೋಟ್‌ಪ್ಯಾಡ್ ವಿಭಾಗಗಳನ್ನು ತೆಗೆದುಹಾಕಿ ಅಥವಾ AnkiDroid ಗೆ ಕಾರ್ಡ್‌ಗಳನ್ನು ಸೇರಿಸಲು \"ಡೀಫಾಲ್ಟ್\" ಹೆಸರಿನ ಒಂದನ್ನು ಸೇರಿಸಿ</string>
-    <string name="custom_study_new_extend">ಇಂದಿನ ಹೊಸ ಕಾರ್ಡ್ ಮಿತಿಯನ್ನು ಹೆಚ್ಚಿಸಿ/ಕಡಿಮೆ ಮಾಡಿ (\"-3\").</string>
-    <string name="custom_study_rev_extend">ಇಂದಿನ ಚೆಕ್ ಮಿತಿಯನ್ನು ಹೆಚ್ಚಿಸಿ/ಕಡಿಮೆ ಮಾಡಿ (\"-3\").</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">ಕಳೆದ x ದಿನಗಳಲ್ಲಿ ಮರೆತಿರುವ ರಿವ್ಯೂ ಕಾರ್ಡ್‌ಗಳು:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">ಎಲ್ಲಾ ಕಾರ್ಡ್‌ಗಳು</string>
-    <string name="tags_dialog_option_new_cards">ಹೊಸದು</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">ಹೊಸದು</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">ಕಾರಣ</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">ಖಾಲಿ ಕಾರ್ಡ್‌ಗಳಿಗಾಗಿ ಹುಡುಕಲಾಗುತ್ತಿದೆ&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">ಭಾಷೆ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ</string>
     <string name="tts_error_dialog_reason_text">ಪಠ್ಯದಿಂದ ಧ್ವನಿ ಎಂಜಿನ್ <b>%1$s</b> ಕೆಳಗಿನ ಭಾಷೆಯನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-kn/10-preferences.xml b/common/android/src/main/res/values-kn/10-preferences.xml
index 8e34827515dd..04607bf6bafe 100644
--- a/common/android/src/main/res/values-kn/10-preferences.xml
+++ b/common/android/src/main/res/values-kn/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">ಸ್ಟ್ರೋಕ್ ಅಗಲ</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">ಹೊಸ ಕಾರ್ಡ್‌ಗಳಿಗಾಗಿ ಡೆಕ್</string>
     <string name="learn_cutoff" maxLength="41">ಮಿತಿಗಳನ್ನು ಮುಂಚಿತವಾಗಿ ಕಲಿಯಿರಿ</string>
     <string name="time_limit" maxLength="41">ಟೈಮ್‌ಬಾಕ್ಸ್ ಸಮಯ ಮಿತಿಯಾಗಿದೆ</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">ಮರುದಿನ ಪ್ರಾರಂಭಿಸಿ</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -249,6 +257,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-kn/16-multimedia-editor.xml b/common/android/src/main/res/values-kn/16-multimedia-editor.xml
index 89777a06c650..b1fd7a472457 100644
--- a/common/android/src/main/res/values-kn/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-kn/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">ನೀವು ಈ ಚಿತ್ರವನ್ನು ಕ್ರಾಪ್ ಮಾಡಲು ಬಯಸುವಿರಾ?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"ಇಮೇಜ್ ಆಯ್ಕೆ ವಿಫಲವಾಗಿದೆ, ದಯವಿಟ್ಟು ಮರುಪ್ರಯತ್ನಿಸಿ"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">ಕ್ಷೇತ್ರ ವಿಷಯಗಳು</string>
diff --git a/common/android/src/main/res/values-ko/02-strings.xml b/common/android/src/main/res/values-ko/02-strings.xml
index bdd971f16bae..c3d5f6644d8b 100644
--- a/common/android/src/main/res/values-ko/02-strings.xml
+++ b/common/android/src/main/res/values-ko/02-strings.xml
@@ -217,7 +217,10 @@
     <string name="ankidroid_init_failed_storage">Android 오류로 인해 AnkiDroid가 저장소에 접근할 수 없습니다.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">글꼴 크기</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">도구 모음 표시</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">굵게</string>
@@ -245,7 +248,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">홈 화면에 AnkiDroid 바로 가기를 추가할 수 없습니다.</string>
     <string name="create_shortcut_error">바로가기 생성 오류: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">대문자로 시작</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">도구 모음 스크롤</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">인증서</string>
@@ -330,7 +332,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">인터넷</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">설치</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">TTS 설정 열기 실패</string>
-    <string name="shared_decks_login_required">카드 덱을 더 다운로드하려면 로그인해 주세요</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">설명</string>
     <string name="deck_description_saved">설명이 업데이트되었습니다.</string>
     <string name="format_deck_description_as_markdown">마크다운 형식</string>
diff --git a/common/android/src/main/res/values-ko/03-dialogs.xml b/common/android/src/main/res/values-ko/03-dialogs.xml
index 36dd06bf5611..950a9f6e999b 100644
--- a/common/android/src/main/res/values-ko/03-dialogs.xml
+++ b/common/android/src/main/res/values-ko/03-dialogs.xml
@@ -26,7 +26,7 @@
     <string name="check_db_warning">시간이 오래 걸릴 수 있습니다. 계속할까요?</string>
     <string name="delete_deck_title">덱을 삭제할까요?</string>
     <plurals name="delete_deck_message">
-        <item quantity="other">%1$s의 모든 카드를 삭제할까요? 이는 %2$d개의 카드가 있습니다</item>
+        <item quantity="other">%1$s의 모든 카드를 삭제할까요? 이곳에 %2$d개의 카드가 있습니다</item>
     </plurals>
     <string name="delete_cram_deck_message">필터링된 덱 %s을(를) 삭제하고 모든 카드를 원래 덱으로 돌려보낼까요?</string>
     <string name="no_tts_available_message">문장 읽어주기 기능(TTS)을 사용할 수 없음</string>
@@ -43,8 +43,8 @@
     <string name="repair_deck_dialog">데이터베이스를 복구하시겠습니까?\n\n 복구를 시작하기 전에 지정된 하위폴더에 복사본 파일이 저장됩니다\'%s\'.</string>
     <string name="intent_aedict_empty">\'기본값\' 카테고리가 비어 있습니다</string>
     <string name="intent_aedict_category">AnkiDroid에 카드를 추가하기 위해 모든 메모장 범주 삭제 또는 \'기본값\'으로 지정하기</string>
-    <string name="custom_study_new_extend">오늘의 새로운 카드 제한을 (“-3”) 만큼 증가/감소시키기</string>
-    <string name="custom_study_rev_extend">오늘의 복습 제한을 (“-3”) 만큼 증가/감소시키기</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">최근 x일 동안 잊혀진 복습 카드:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -76,7 +76,7 @@
     <string name="dialog_positive_overwrite">덮어쓰기</string>
     <string name="dialog_positive_repair">복구</string>
     <string name="dialog_positive_replace">대체</string>
-    <string name="sync_clock_off_with_current_time">%1$s\n\nCorrect the date and time, or enable automatic date and time, then sync again.\n\nYour device’s current time is: %2$s</string>
+    <string name="sync_clock_off_with_current_time">%1$s\n\n날짜 및 시간을 올바르게 설정하거나 자동 시간대를 활성화한 후 다시 동기화하세요. \n\n현재 기기 시간: %2$s</string>
     <string name="dialog_collection_path_not_dir">지정된 경로가 올바르지 않습니다.</string>
     <string name="dialog_invalid_custom_certificate">포함된 텍스트가 올바른 PEM 인코딩된 X509 인증서를 가지고 있지 않습니다</string>
     <string name="dialog_invalid_custom_certificate_title">인증서 인식 오류</string>
@@ -85,7 +85,7 @@
     <string name="check_media_warning">미디어가 클 경우 시간이 오래 걸릴 수 있습니다. 계속할까요?</string>
     <string name="check_media_message">미디어 점검 중&#8230;</string>
     <string name="check_media_adding_missing_tag">태그 추가 중&#8230;</string>
-    <string name="check_media_tags_added">Tags added</string>
+    <string name="check_media_tags_added">태그 추가됨</string>
     <string name="delete_media_message">미디어 삭제 중&#8230;</string>
     <string name="delete_media_result_title">삭제 결과</string>
     <plurals name="delete_media_result_message">
@@ -93,7 +93,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">모든 카드</string>
-    <string name="tags_dialog_option_new_cards">신규</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">신규</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">예정</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">빈 카드를 찾는 중&#8230;</string>
@@ -103,7 +103,7 @@
     <!-- Multimedia - Audio View -->
     <string name="multimedia_editor_audio_permission_denied">오디오 녹음 권한이 거부됨</string>
     <string name="permission_denied">권한이 거부되었습니다.</string>
-    <string name="microphone_permission_denied_message">Microphone permission denied. Please grant it in the app settings.</string>
+    <string name="microphone_permission_denied_message">마이크 권한이 거부되었습니다. 설정 앱에서 권한을 허용해주세요.</string>
     <!-- Database Integrity Check -->
     <string name="integrity_check_continue_anyway">Continue Anyway</string>
     <string name="integrity_check_insufficient_space">Check Database uses a large amount of temporary storage.\n\nIt is strongly recommended that you have at least %s free space on your device before continuing.</string>
@@ -114,7 +114,7 @@
     <!-- Deck Options -->
     <!-- Database Errors-->
     <string name="database_locked_title">데이터베이스 잠김</string>
-    <string name="database_locked_summary_new" comment="%s is the name of the \'AnkiDroid directory\' setting">Another AnkiDroid app is using this collection. It may conflict even when it is not visibly running.\n\nTo keep using both apps, change the ‘%s’ in one app\'s Advanced settings.\n\nTo use this app now, force-stop the conflicting app.</string>
+    <string name="database_locked_summary_new" comment="%s is the name of the \'AnkiDroid directory\' setting">다른 AnkiDroid 앱이 이 컬렉션을 사용하고 있습니다. 앱이 실행되고 있지 않아도, 충돌이 발생할 수 있습니다. \n\n두 앱을 계속 사용하려면, 둘 중 하나의 앱의 고급 설정에서 \'%s\'를 변경하세요. \n\n지금 바로 이 앱을 사용하려면, 충돌이 발생하는 다른 앱을 강제 종료하세요.</string>
     <string name="incompatible_database_version_title">Incompatible Database Version</string>
     <string name="incompatible_database_version_summary">The database is a more advanced version than this version of AnkiDroid can work with. Upgrade AnkiDroid or downgrade the database to open it\n\nSupported version: %1$d\nDatabase version: %2$d\n\nThe following restore options will overwrite your current collection, possibly with a compatible database version:</string>
     <!-- Deck Picker Background-->
@@ -136,7 +136,7 @@
     <!-- Locale Selection Dialog -->
     <string name="locale_selection_dialog_title_new">언어 설정</string>
     <string name="locale_selection_dialog_summary">일부 다국어 키보드(예: Gboard)는 텍스트를 편집할 때 언어를 자동으로 변경할 수 있습니다.\n\n사용 중인 키보드에서 언어가 변경되지 않는다면, 키보드 제조사에 \"setImeHintLocales\" 기능 지원을 요청해 주세요.</string>
-    <string name="locale_selection_dialog_unknown_language" comment="Used for the locales whose name is not displayed when selected and placeholder is language tag">Unknown language [%1$s]</string>
+    <string name="locale_selection_dialog_unknown_language" comment="Used for the locales whose name is not displayed when selected and placeholder is language tag">알 수 없는 언어 [%1$s]</string>
     <!-- Help Dialog -->
     <string name="help_title_using_ankidroid">AnkiDroid 사용법</string>
     <string name="help_item_ankidroid_manual">AnkiDroid 매뉴얼</string>
@@ -220,6 +220,8 @@
     <string name="webview_update_message">system WebView 버전이 낮아 일부 기능이 동작하지 않을 수 있습니다. 업데이트가 필요합니다. \n\n현재 버전: %1$d\n최소 필요 버전: %2$d</string>
     <string name="compress">압축</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">언어 미지원</string>
     <string name="tts_error_dialog_reason_text">TTS 엔진 <b>%1$s</b> 가 다음 언어를 지원하지 않습니다: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">엔진 바꾸기</string>
@@ -234,7 +236,7 @@
     <string name="login_successful">로그인 성공</string>
     <string name="sync_now">지금 동기화할까요?</string>
     <!--Change Note Type Dialog Fragment-->
-    <string name="card_numbers_unchanged">Card numbers will remain unchanged</string>
+    <string name="card_numbers_unchanged">카드 개수는 바뀌지 않습니다</string>
     <!-- Subset of TR.changeNotetypeToFromCloze -->
     <string name="extra_cloze_deletions_removed">일반 노트 타입으로 변경할 경우, cloze 개수가 사용 가능한 카드 템플릿 수보다 많으면 초과된 카드는 삭제됩니다</string>
     <string name="different_note_types_selected">한 가지 노트 타입의 노트만 선택해 주세요</string>
@@ -248,15 +250,16 @@
     <string name="special_field_deck_help" comment="%s: either blank or \' %s\'">상위 덱을 포함하여 카드가 속한 전체 덱%s</string>
     <string name="special_field_subdeck_help" comment="%s: either blank or \' %s\'">상위 덱을 제외하고 카드가 속한 현재 덱%s</string>
     <string name="special_field_flag_help">Outputs ‘%1$s’, where %2$s is the flag code (%3$s\–%4$s\)</string>
-    <string name="special_field_tags_help" comment="%s: either blank or \' %s\'">The tags of the note%s</string>
-    <string name="special_field_card_id_help" comment="%s: either blank or \' %s\'">The ID of the card%s</string>
-    <string name="special_field_card_help" comment="%s: either blank or \' %s\'">The name of the card template%s</string>
-    <string name="special_field_type_help" comment="%s: either blank or \' %s\'">The name of the note type%s</string>
+    <string name="special_field_tags_help" comment="%s: either blank or \' %s\'">노트%s의 태그</string>
+    <string name="special_field_card_id_help" comment="%s: either blank or \' %s\'">카드%s의 ID</string>
+    <string name="special_field_card_help" comment="%s: either blank or \' %s\'">카드 템플릿%s의 이름</string>
+    <string name="special_field_type_help" comment="%s: either blank or \' %s\'">노트 타입%s의 이름</string>
     <!-- Change Note Type Dialog -->
-    <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
-    <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <string name="change_note_type_from" comment="Label indicating the original note type before changing it">에서</string>
+    <string name="change_note_type_to" comment="Label indicating the new note type to change to">으로</string>
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">프로필 이름</string>
-    <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
-    <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
+    <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">프로필 이름은 비어 있을 수 없습니다</string>
+    <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">프로필 이름은 %1$d 글자 이하여야 합니다</string>
 </resources>
diff --git a/common/android/src/main/res/values-ko/10-preferences.xml b/common/android/src/main/res/values-ko/10-preferences.xml
index 14eaa1cfe130..afe0fbc22ad5 100644
--- a/common/android/src/main/res/values-ko/10-preferences.xml
+++ b/common/android/src/main/res/values-ko/10-preferences.xml
@@ -24,7 +24,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- generic strings -->
-    <string name="enabled" comment="Generic label for something that is turned on">Enabled</string>
+    <string name="enabled" comment="Generic label for something that is turned on">켜짐</string>
     <string name="disabled" comment="Generic label for something that is turned off">비활성화됨</string>
     <plurals name="pref_summ_minutes">
         <item quantity="other">%d분</item>
@@ -54,7 +54,7 @@
     <string name="dangerous_js_api_denied_snackbar">보안 차단: 안전하지 않은 JavaScript 호출이 차단되었습니다.\n컬렉션의 모든 카드와 템플릿을 신뢰하는 경우, 고급 설정에서 이 차단을 해제할 수 있습니다.</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">카드에서 다른 앱으로 이동 허용</string>
-    <string name="allow_card_external_launch_summ">카드가 다른 앱을 열고, 의도치 않은 작업을 수행할 수 있습니다.\n컬렉션의 카드와 템플릿을 신뢰할 수 없는 경우 비활성화 하세요.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">보안 차단: 다른 앱을 열 수 없습니다.\n컬렉션의 카드와 템플릿을 신뢰하는 경우, 고급 설정에서 차단을 해제할 수 있습니다.</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">획 두께</string>
@@ -167,6 +167,13 @@
     <string name="use_current" maxLength="41">새 카드의 카드 묶음</string>
     <string name="learn_cutoff" maxLength="41">미리 학습하기 시간 설정</string>
     <string name="time_limit" maxLength="41">목표 학습 시간(도달 시 알림)</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">다음 날의 시작</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="other" comment="Consider keeping the unbreakable space after the digit">%d시</item>
@@ -231,8 +238,8 @@
     <string name="schedule_reminders_troubleshoot_menu" maxLength="28" comment="Text in a menu button which opens a screen for diagnosing why review reminders may not be delivered.">Troubleshoot</string>
     <string name="schedule_reminders_notification_settings_menu" maxLength="28" comment="Text in a menu button which opens the operating system notification settings for the app.">Notification settings</string>
     <string name="schedule_reminders_list_content_description" comment="Accessibility description of the list showing scheduled review reminders.">List of scheduled review reminders</string>
-    <string name="schedule_reminders_deck_not_found" comment="Shown in place of a deck name when the deck a review reminder points at no longer exists.">Deck not found</string>
-    <string name="schedule_reminders_unavailable" comment="Pop-up text shown when review reminders cannot be delivered at all, such as due to missing permissions.">Reminders are unavailable</string>
+    <string name="schedule_reminders_deck_not_found" comment="Shown in place of a deck name when the deck a review reminder points at no longer exists.">덱 없음</string>
+    <string name="schedule_reminders_unavailable" comment="Pop-up text shown when review reminders cannot be delivered at all, such as due to missing permissions.">리마인더 사용 불가</string>
     <string name="schedule_reminders_fix" comment="Text for the button which, when pressed, opens the review reminder troubleshooting screen for fixing issues with review reminders.">Fix</string>
     <string name="schedule_reminders_added" comment="Pop-up text which confirms a new review reminder was created.">Successfully added new review reminder</string>
     <string name="schedule_reminders_deleted" comment="Pop-up text which confirms a review reminder was deleted.">Successfully deleted review reminder</string>
@@ -240,14 +247,15 @@
     <!-- Add / edit reminder dialog -->
     <string name="add_review_reminder" comment="Title of the dialog for creating a new review reminder.">복습 리마인더 추가</string>
     <string name="edit_review_reminder" comment="Title of the dialog for editing an existing review reminder.">복습 리마인더 편집</string>
-    <string name="add_edit_reminder_time_label" comment="Label of the field for choosing what time of day a review reminder fires.">Time:</string>
-    <string name="add_edit_reminder_deck_label" comment="Label of the field for choosing which deck a review reminder applies to.">Deck:</string>
-    <string name="add_edit_reminder_advanced_label" comment="Header of the collapsible section holding extra review reminder customization options.">Advanced settings</string>
-    <string name="add_edit_reminder_card_threshold_label" comment="Label of the field setting the minimum number of due cards needed before a review reminder fires.">Card threshold:</string>
+    <string name="add_edit_reminder_time_label" comment="Label of the field for choosing what time of day a review reminder fires.">시간:</string>
+    <string name="add_edit_reminder_deck_label" comment="Label of the field for choosing which deck a review reminder applies to.">덱:</string>
+    <string name="add_edit_reminder_advanced_label" comment="Header of the collapsible section holding extra review reminder customization options.">고급 설정</string>
+    <string name="add_edit_reminder_card_threshold_label" comment="Label of the field setting the minimum number of due cards needed before a review reminder fires.">카드 한도:</string>
     <string name="add_edit_reminder_card_threshold_description" comment="Explanation shown under the card threshold field.">Do not send me notifications if there are less than this many cards due</string>
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-ko/16-multimedia-editor.xml b/common/android/src/main/res/values-ko/16-multimedia-editor.xml
index 2f8a5164fdc4..d2a5b1790a4f 100644
--- a/common/android/src/main/res/values-ko/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ko/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">이 이미지를 자르시겠습니까?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">현재의 이미지의 크기는 %sMB 입니다. 기본 이미지 크기의 한도는 1MB입니다. 이미지를 압축하시겠습니까?</string>
     <string name="select_image_failed">"이미지 선택 실패, 재시도하세요"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">필드 내용</string>
diff --git a/common/android/src/main/res/values-ku/02-strings.xml b/common/android/src/main/res/values-ku/02-strings.xml
index acc90e531169..e00b2e818c73 100644
--- a/common/android/src/main/res/values-ku/02-strings.xml
+++ b/common/android/src/main/res/values-ku/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-ku/03-dialogs.xml b/common/android/src/main/res/values-ku/03-dialogs.xml
index eb7d19bd02d5..f6fb0d5b3cb6 100644
--- a/common/android/src/main/res/values-ku/03-dialogs.xml
+++ b/common/android/src/main/res/values-ku/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">All cards</string>
-    <string name="tags_dialog_option_new_cards">New</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">New</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-ku/10-preferences.xml b/common/android/src/main/res/values-ku/10-preferences.xml
index cbeb8e721571..ffce61630df5 100644
--- a/common/android/src/main/res/values-ku/10-preferences.xml
+++ b/common/android/src/main/res/values-ku/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-ku/16-multimedia-editor.xml b/common/android/src/main/res/values-ku/16-multimedia-editor.xml
index 5145ad3045b9..8b793bd48efa 100644
--- a/common/android/src/main/res/values-ku/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ku/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">دەتەوێت ئەم وێنەیە ببڕیت؟</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"دیاریکردنی وێنە سەرکەوتوو نەبوو، تکایە دووبارە هەوڵ بدەرەوە"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">ناوەڕۆکی خانەکان</string>
diff --git a/common/android/src/main/res/values-ky/02-strings.xml b/common/android/src/main/res/values-ky/02-strings.xml
index e07cedd7eb06..de628947adb1 100644
--- a/common/android/src/main/res/values-ky/02-strings.xml
+++ b/common/android/src/main/res/values-ky/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-ky/03-dialogs.xml b/common/android/src/main/res/values-ky/03-dialogs.xml
index 419776370d60..531249f544c9 100644
--- a/common/android/src/main/res/values-ky/03-dialogs.xml
+++ b/common/android/src/main/res/values-ky/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">All cards</string>
-    <string name="tags_dialog_option_new_cards">New</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">New</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-ky/10-preferences.xml b/common/android/src/main/res/values-ky/10-preferences.xml
index fdb3c24b7644..88e7ed68be1f 100644
--- a/common/android/src/main/res/values-ky/10-preferences.xml
+++ b/common/android/src/main/res/values-ky/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-ky/16-multimedia-editor.xml b/common/android/src/main/res/values-ky/16-multimedia-editor.xml
index d9a9211644fc..7d3e5ec19a56 100644
--- a/common/android/src/main/res/values-ky/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ky/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-lt/02-strings.xml b/common/android/src/main/res/values-lt/02-strings.xml
index a2a67e3d8239..5f8e4180af10 100644
--- a/common/android/src/main/res/values-lt/02-strings.xml
+++ b/common/android/src/main/res/values-lt/02-strings.xml
@@ -225,7 +225,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Šrifto dydis</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Rodyti įrankių juostą</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -253,7 +256,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Jūsų pagrindinis ekranas neleidžia \"AnkiDroid\" pridėti nuorodų</string>
     <string name="create_shortcut_error">Klaida pridedant nuorodą: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Sakinių rašymas didžiąja raide</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Slinkimo įrankių juosta</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -344,7 +346,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internetas</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Įdiekite</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Nepavyko atidaryti teksto į kalbą nustatymų</string>
-    <string name="shared_decks_login_required">Prisijunkite, jei norite atsisiųsti daugiau kortelių rinkinių</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Aprašymas</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-lt/03-dialogs.xml b/common/android/src/main/res/values-lt/03-dialogs.xml
index ef5b83c12236..2228b816f02e 100644
--- a/common/android/src/main/res/values-lt/03-dialogs.xml
+++ b/common/android/src/main/res/values-lt/03-dialogs.xml
@@ -49,8 +49,8 @@
     <string name="repair_deck_dialog">Ar tikrai norite taisyti duomenų bazę?\n\nPrieš tai atliekant, poaplankyje „%s“ bus sukurta kopija.</string>
     <string name="intent_aedict_empty">Kategorija „numatytieji“ yra tuščia</string>
     <string name="intent_aedict_category">Norėdami „AnkiDroid“ programoje pridėti kortelių, pašalinkite visas „Notepad“ kategorijas arba pridėkite vieną, kuri vadintųsi „numatytoji“</string>
-    <string name="custom_study_new_extend">Padidinti/sumažinti (\"-3\") šiandienos naują kortelės limitą</string>
-    <string name="custom_study_rev_extend">Padidinti / sumažinti (\"-3\") šiandienos peržiūros ribą</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Peržiūrėti korteles, kurios buvo pamirštos per paskutines x dienų:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -102,7 +102,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Visos kortelės</string>
-    <string name="tags_dialog_option_new_cards">Naujos</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Naujos</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Numatytos</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Ieškomos tuščios kortelės&#8230;</string>
@@ -244,6 +244,8 @@
     <string name="webview_update_message">Sistemos \"WebView\" yra pasenusi. Kai kurios funkcijos neveikia tinkamai. Atnaujinkite ją.\n\nĮdiegta versija: %1$d\nMinimali reikalaujama versija: %2$d</string>
     <string name="compress">Suspauskite</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Kalba nepalaikoma</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Keisti variklį</string>
@@ -279,7 +281,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-lt/10-preferences.xml b/common/android/src/main/res/values-lt/10-preferences.xml
index 9a83d4779b07..053fba30661e 100644
--- a/common/android/src/main/res/values-lt/10-preferences.xml
+++ b/common/android/src/main/res/values-lt/10-preferences.xml
@@ -57,7 +57,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Linijos plotis</string>
@@ -171,6 +171,16 @@
     <string name="use_current" maxLength="41">Rinkinys naujoms kortelėms</string>
     <string name="learn_cutoff" maxLength="41">Mokymosi į priekį apribojimas</string>
     <string name="time_limit" maxLength="41">Mokymuisi numatyto laiko apribojimas</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="few">mins</item>
+        <item quantity="many">mins</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Sekančios dienos pradžia</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -256,6 +266,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-lt/16-multimedia-editor.xml b/common/android/src/main/res/values-lt/16-multimedia-editor.xml
index b2f749f80cd2..e8b83e77893a 100644
--- a/common/android/src/main/res/values-lt/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-lt/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Ar norite apkarpyti šį paveikslėlį?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Dabartinis vaizdo dydis yra %sMB. Numatytoji vaizdo dydžio riba yra 1 MB. Ar norite jį suspausti?</string>
     <string name="select_image_failed">"Pasirinkti vaizdą nepavyko, bandykite dar kartą"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Laukelio turinys</string>
diff --git a/common/android/src/main/res/values-lv/02-strings.xml b/common/android/src/main/res/values-lv/02-strings.xml
index 1274c4afaadd..d7a852ec0d74 100644
--- a/common/android/src/main/res/values-lv/02-strings.xml
+++ b/common/android/src/main/res/values-lv/02-strings.xml
@@ -222,7 +222,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Burtu lielums</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Rādīt rīkjoslu</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -250,7 +253,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Sākuma ekrāns neļauj AnkiDroid pievienot saīsnes</string>
     <string name="create_shortcut_error">Kļūda saīsnes pievienošanā: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Sākt teikumus ar lielo burtu</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Ritināma rīkjosla</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -339,7 +341,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internets</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Uzstādīt</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Neizdevās atvērt teksta pārveidošanas runā iestatījumus</string>
-    <string name="shared_decks_login_required">Lūgums pieteikteis, lai lejupielādētu vairāk kavu</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Apraksts</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-lv/03-dialogs.xml b/common/android/src/main/res/values-lv/03-dialogs.xml
index b2e1f2d5609c..c776ecd3a946 100644
--- a/common/android/src/main/res/values-lv/03-dialogs.xml
+++ b/common/android/src/main/res/values-lv/03-dialogs.xml
@@ -47,8 +47,8 @@
     <string name="repair_deck_dialog">Vai tiešām mēģināt salabot datubāzi?\n\nPirms mēģinājuna uzsākšanas apakšmapē \"%s\" tiks izveidota kopija.</string>
     <string name="intent_aedict_empty">Kategorija \"noklusējums\" ir tukša</string>
     <string name="intent_aedict_category">Lai AnkiDroid pievienotu kartītes, jānoņem visas piezīmju grāmatiņu kategorijas vai jāpievieno viena ar nosaukumu \"default\"</string>
-    <string name="custom_study_new_extend">Palielināt/samazināt (\"-3\") šodienas jauno kartīšu skaitu par</string>
-    <string name="custom_study_rev_extend">Palielināt/samazināt (\"-3\") šodienas izskatīšanas ierobežojumu par</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Parskatīt kartītes, kas ir aizmirstas pēdējās x dienās:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -99,7 +99,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Visas kartītes</string>
-    <string name="tags_dialog_option_new_cards">Jauns</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Jauns</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Pienācis laiks</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Meklē tukšās kartītes&#8230;</string>
@@ -236,6 +236,8 @@
     <string name="webview_update_message">Sistēmas WebView ir novecojis. Dažas iespējas nedarbosies pareizi. Lūgums to atjaunināt.\n\nUzstādītā versija: %1$d\nMazākā nepieciešamā versija: %2$d</string>
     <string name="compress">Saspiest</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Valoda netiek atbalstīta</string>
     <string name="tts_error_dialog_reason_text">Teksta pārvēršanas runā dzinējs <b>%1$s</b> nenodrošina šo valodu: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Mainīt dzinēju</string>
@@ -271,7 +273,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-lv/10-preferences.xml b/common/android/src/main/res/values-lv/10-preferences.xml
index 050354862f6e..29965ab4233d 100644
--- a/common/android/src/main/res/values-lv/10-preferences.xml
+++ b/common/android/src/main/res/values-lv/10-preferences.xml
@@ -56,7 +56,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Svītras platums</string>
@@ -170,6 +170,15 @@
     <string name="use_current" maxLength="41">Jauno kartīšu kava</string>
     <string name="learn_cutoff" maxLength="41">Apgūšanas uz priekšu ierobežojums</string>
     <string name="time_limit" maxLength="41">Apgūšanai atvēlētā laika ierobežojums</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="zero">mins</item>
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Nākamās dienas sākums</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="zero">%d stundas pēc pusnakts</item>
@@ -253,6 +262,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-lv/16-multimedia-editor.xml b/common/android/src/main/res/values-lv/16-multimedia-editor.xml
index cfe8be9b5878..c6d921e61bf2 100644
--- a/common/android/src/main/res/values-lv/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-lv/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Vai apcirpt šo attēlu?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Pašreizējais attēla lielums ir % MB. Noklusējuma attēla izmēra ierobežojums ir 1 MB. Vai saspiest to?</string>
     <string name="select_image_failed">"Attēla atlasīšana neizdevās, lūgums mēģināt vēlreiz"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Lauka saturs</string>
diff --git a/common/android/src/main/res/values-mk/02-strings.xml b/common/android/src/main/res/values-mk/02-strings.xml
index 44672c9d88cf..db6834e255e0 100644
--- a/common/android/src/main/res/values-mk/02-strings.xml
+++ b/common/android/src/main/res/values-mk/02-strings.xml
@@ -220,7 +220,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -248,7 +251,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -335,7 +337,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-mk/03-dialogs.xml b/common/android/src/main/res/values-mk/03-dialogs.xml
index 0aa16e6972c9..ce2cd6916c55 100644
--- a/common/android/src/main/res/values-mk/03-dialogs.xml
+++ b/common/android/src/main/res/values-mk/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Дали навистина сакате да се обидете да ја поправите базата на податоци?\n\nПред да го започнете обидот, копијата ќе биде креирана во подпапката \"%s\".</string>
     <string name="intent_aedict_empty">Категоријата \"default\" е празна</string>
     <string name="intent_aedict_category">За да додадете картички на AnkiDroid, отстранете ги сите обележени категории или додадете еден по име \"default\"</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Преглед на картички заборавени во последните x денови:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Сие картички</string>
-    <string name="tags_dialog_option_new_cards">Ново</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Ново</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Доспеано</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Наоѓање празни картички&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-mk/10-preferences.xml b/common/android/src/main/res/values-mk/10-preferences.xml
index 27d982363615..da760314c639 100644
--- a/common/android/src/main/res/values-mk/10-preferences.xml
+++ b/common/android/src/main/res/values-mk/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-mk/16-multimedia-editor.xml b/common/android/src/main/res/values-mk/16-multimedia-editor.xml
index 20893b39bd31..cc5e3033c34e 100644
--- a/common/android/src/main/res/values-mk/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-mk/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-ml/02-strings.xml b/common/android/src/main/res/values-ml/02-strings.xml
index 28cf14f2ed70..0b22bd135b16 100644
--- a/common/android/src/main/res/values-ml/02-strings.xml
+++ b/common/android/src/main/res/values-ml/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">അക്ഷര വലിപ്പം</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">ടൂൾബാർ കാണിക്കുക</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">കുറുക്കുവഴികൾ ചേർക്കാൻ നിങ്ങളുടെ ഹോം സ്‌ക്രീൻ AnkiDroid-നെ അനുവദിക്കുന്നില്ല</string>
     <string name="create_shortcut_error">കുറുക്കുവഴി ചേർക്കുന്നതിൽ പിശക്: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">വാക്യങ്ങൾ വലിയക്ഷരമാക്കുക</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">ടൂൾബാർ സ്ക്രോൾ ചെയ്യുക</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">കൂടുതൽ ഡെക്കുകൾ ഡൗൺലോഡ് ചെയ്യാൻ ലോഗിൻ ചെയ്യുക</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">വിവരണം</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-ml/03-dialogs.xml b/common/android/src/main/res/values-ml/03-dialogs.xml
index 6e809b20d0dc..74692a571dee 100644
--- a/common/android/src/main/res/values-ml/03-dialogs.xml
+++ b/common/android/src/main/res/values-ml/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">ഡാറ്റാബേസ് നന്നാക്കാൻ നിങ്ങൾ ശരിക്കും ആഗ്രഹിക്കുന്നുണ്ടോ? \n\n ശ്രമം ആരംഭിക്കുന്നതിന് മുമ്പ്, “%s” എന്ന സബ്ഫോൾഡറിൽ ഒരു പകർപ്പ് സൃഷ്ടിക്കപ്പെടും.</string>
     <string name="intent_aedict_empty">വിഭാഗം “സ്ഥിരസ്ഥിതി” ശൂന്യമാണ്</string>
     <string name="intent_aedict_category">AnkiDroid- ലേക്ക് കാർഡുകൾ ചേർക്കുന്നതിന് എല്ലാ നോട്ട്പാഡ് വിഭാഗങ്ങളും നീക്കംചെയ്യുക അല്ലെങ്കിൽ “സ്ഥിരസ്ഥിതി” എന്ന് പേരുള്ള ഒന്ന് ചേർക്കുക</string>
-    <string name="custom_study_new_extend">ഇന്നത്തെ പുതിയ കാർഡ് പരിധി വർദ്ധിപ്പിക്കുക / കുറയ്ക്കുക (“-3”)</string>
-    <string name="custom_study_rev_extend">ഇന്നത്തെ അവലോകന പരിധി വർദ്ധിപ്പിക്കുക / കുറയ്ക്കുക (“-3”)</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">കഴിഞ്ഞ x ദിവസങ്ങളിൽ മറന്ന അവലോകന കാർഡുകൾ:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">എല്ലാ കാർഡുകളും</string>
-    <string name="tags_dialog_option_new_cards">പുതിയത്</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">പുതിയത്</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">കാരണം</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">ശൂന്യമായ കാർഡുകൾ കണ്ടെത്തുന്നു&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">കംപ്രസ് ചെയ്യുക</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">ഭാഷ പിന്തുണയ്ക്കുന്നില്ല</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-ml/10-preferences.xml b/common/android/src/main/res/values-ml/10-preferences.xml
index f34937a88d04..b46f1a851707 100644
--- a/common/android/src/main/res/values-ml/10-preferences.xml
+++ b/common/android/src/main/res/values-ml/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">സ്ട്രോക്ക് വീതി</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">പുതിയ കാർഡുകൾക്കുള്ള ഡെക്ക്</string>
     <string name="learn_cutoff" maxLength="41">സമയത്തിന് മുമ്പേ പഠിക്കുക</string>
     <string name="time_limit" maxLength="41">ടൈംബോക്സ് സമയ പരിധി</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">അടുത്ത ദിവസം തുടക്കം</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -251,6 +259,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-ml/16-multimedia-editor.xml b/common/android/src/main/res/values-ml/16-multimedia-editor.xml
index 5bff36dad526..359a5fa27abf 100644
--- a/common/android/src/main/res/values-ml/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ml/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">നിങ്ങൾക്ക് ഈ ചിത്രം ക്രോപ്പ് ചെയ്യണോ?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"ചിത്രം തിരഞ്ഞെടുക്കുന്നതിൽ പരാജയപ്പെട്ടു, വീണ്ടും ശ്രമിക്കുക
 "</string>
diff --git a/common/android/src/main/res/values-mn/02-strings.xml b/common/android/src/main/res/values-mn/02-strings.xml
index 48b6e5c33816..d51188d0b2b8 100644
--- a/common/android/src/main/res/values-mn/02-strings.xml
+++ b/common/android/src/main/res/values-mn/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-mn/03-dialogs.xml b/common/android/src/main/res/values-mn/03-dialogs.xml
index 2fd452352beb..91e27c64310c 100644
--- a/common/android/src/main/res/values-mn/03-dialogs.xml
+++ b/common/android/src/main/res/values-mn/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">All cards</string>
-    <string name="tags_dialog_option_new_cards">New</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">New</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-mn/10-preferences.xml b/common/android/src/main/res/values-mn/10-preferences.xml
index 25da17c616a3..fd27ed7ddf6c 100644
--- a/common/android/src/main/res/values-mn/10-preferences.xml
+++ b/common/android/src/main/res/values-mn/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-mn/16-multimedia-editor.xml b/common/android/src/main/res/values-mn/16-multimedia-editor.xml
index d9a9211644fc..7d3e5ec19a56 100644
--- a/common/android/src/main/res/values-mn/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-mn/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-mr/02-strings.xml b/common/android/src/main/res/values-mr/02-strings.xml
index cfad2958fe10..a1704ed0c9c0 100644
--- a/common/android/src/main/res/values-mr/02-strings.xml
+++ b/common/android/src/main/res/values-mr/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">अक्षराचा आकार</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">टूलबार दर्शवा</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">आपली मुख्य स्क्रीन AnkiDroid ला शॉर्टकट जोडण्याची परवानगी देत ​​नाही</string>
     <string name="create_shortcut_error">शॉर्टकट जोडताना त्रुटी:%s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">वाक्य भांडवल करा</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">टूलबार स्क्रोल करा</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">कृपया अधिक डेक डाउनलोड करण्यासाठी लॉग इन करा</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">वर्णन</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-mr/03-dialogs.xml b/common/android/src/main/res/values-mr/03-dialogs.xml
index 026ee562ae4c..996738744c57 100644
--- a/common/android/src/main/res/values-mr/03-dialogs.xml
+++ b/common/android/src/main/res/values-mr/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">आपण खरोखर डेटाबेस दुरुस्त करण्याचा प्रयत्न करू इच्छिता? \N\n प्रयत्न सुरू करण्यापूर्वी, एक प्रत सबफोल्डर \"%s\" मध्ये तयार केली जाईल.</string>
     <string name="intent_aedict_empty">वर्ग “डीफॉल्ट” रिक्त आहे</string>
     <string name="intent_aedict_category">AnkiDroid वर कार्डे जोडण्यासाठी सर्व नोटपॅड श्रेण्या काढा किंवा “डीफॉल्ट” नावाची एक जोडा</string>
-    <string name="custom_study_new_extend">आजची नवीन कार्ड मर्यादा वाढवा / कमी करा (“-3”)</string>
-    <string name="custom_study_rev_extend">आजची पुनरावलोकन मर्यादा वाढवा / कमी करा (“-3”)</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">गेल्या x दिवसात विसरलेल्या कार्डांचे पुनरावलोकन करा:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">सर्व कार्डे</string>
-    <string name="tags_dialog_option_new_cards">नवीन</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">नवीन</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">देय</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">रिक्त कार्ड शोधत आहे &#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">WebView प्रणाली जुनी आहे. काही वैशिष्ट्ये योग्यरित्या कार्य करू शकत नाहीत. कृपया ते अपडेट करा.\n\nस्थापित आवृत्ती: %1$d\nकिमान आवश्यक आवृत्ती: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-mr/10-preferences.xml b/common/android/src/main/res/values-mr/10-preferences.xml
index 0b89634533ab..338f399d3115 100644
--- a/common/android/src/main/res/values-mr/10-preferences.xml
+++ b/common/android/src/main/res/values-mr/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">स्ट्रोक रून्दी</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">नवीन कार्डांसाठी डेक</string>
     <string name="learn_cutoff" maxLength="41">पुढे मर्यादा जाणून घ्या</string>
     <string name="time_limit" maxLength="41">टाइमबॉक्स वेळ मर्यादा</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">पुढील दिवसाची सुरुवात (0 मध्यरात्री आहे, 23 11PM आहेत)</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -249,6 +257,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-mr/16-multimedia-editor.xml b/common/android/src/main/res/values-mr/16-multimedia-editor.xml
index 3064601bfe8f..08ba61e60c60 100644
--- a/common/android/src/main/res/values-mr/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-mr/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">आपण ही प्रतिमा क्रॉप करू इच्छिता?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"प्रतिमा निवडा अयशस्वी, कृपया पुन्हा प्रयत्न करा"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">फील्ड सामग्री</string>
diff --git a/common/android/src/main/res/values-ms/02-strings.xml b/common/android/src/main/res/values-ms/02-strings.xml
index ab2c4e2a65f5..9298f35ad2d1 100644
--- a/common/android/src/main/res/values-ms/02-strings.xml
+++ b/common/android/src/main/res/values-ms/02-strings.xml
@@ -216,7 +216,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Saiz tulisan</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Lihat Bar Alat</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -244,7 +247,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Skrin laman utama anda melarang AnkiDroid menambah pintasan</string>
     <string name="create_shortcut_error">Ralat menambah pintasan: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Guna huruf besar awal kata dalam ayat</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Tatal bar alat</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -329,7 +331,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-ms/03-dialogs.xml b/common/android/src/main/res/values-ms/03-dialogs.xml
index 88352a0aedb8..2ac69f735284 100644
--- a/common/android/src/main/res/values-ms/03-dialogs.xml
+++ b/common/android/src/main/res/values-ms/03-dialogs.xml
@@ -43,8 +43,8 @@
     <string name="repair_deck_dialog">Adakah anda pasti mahu membaiki pangkalan data?\n\nSebelum mencuba, satu salinan akan dibuat dalam subfolder “%s”.</string>
     <string name="intent_aedict_empty">Kategori “lalai” kosong</string>
     <string name="intent_aedict_category">Untuk tambah kad ke AnkiDroid buang semua kategori Papan Nota atau tambah satu bernama “default”</string>
-    <string name="custom_study_new_extend">Tambahkan/Kurangkan (“-3”) had kad baru hari ini sebanyak</string>
-    <string name="custom_study_rev_extend">Tambahkan/Kurangkan (“-3”) had semakan hari ini sebanyak</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Semak kad terlupa dalam x hari:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -93,7 +93,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Semua kad</string>
-    <string name="tags_dialog_option_new_cards">Baru</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Baru</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Tunggakan</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Mencari kad kosong&#8230;</string>
@@ -220,6 +220,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -255,7 +257,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-ms/10-preferences.xml b/common/android/src/main/res/values-ms/10-preferences.xml
index 2555b02600be..f79e7497da82 100644
--- a/common/android/src/main/res/values-ms/10-preferences.xml
+++ b/common/android/src/main/res/values-ms/10-preferences.xml
@@ -54,7 +54,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Lebar garisan</string>
@@ -168,6 +168,13 @@
     <string name="use_current" maxLength="41">Dek untuk kad baru</string>
     <string name="learn_cutoff" maxLength="41">Had belajar awal</string>
     <string name="time_limit" maxLength="41">Had kotak masa</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Mula hari esok</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="other" comment="Consider keeping the unbreakable space after the digit">%d hours past midnight</item>
@@ -250,6 +257,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-ms/16-multimedia-editor.xml b/common/android/src/main/res/values-ms/16-multimedia-editor.xml
index cf6d88749acb..ffd76d15d6d6 100644
--- a/common/android/src/main/res/values-ms/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ms/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Adakah anda mahu memotong gambar ini?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Gagal pilih gambar, sila cuba lagi"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Kandungan Medan</string>
diff --git a/common/android/src/main/res/values-my/02-strings.xml b/common/android/src/main/res/values-my/02-strings.xml
index ac9d1a29c432..398df891f201 100644
--- a/common/android/src/main/res/values-my/02-strings.xml
+++ b/common/android/src/main/res/values-my/02-strings.xml
@@ -216,7 +216,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -244,7 +247,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -329,7 +331,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-my/03-dialogs.xml b/common/android/src/main/res/values-my/03-dialogs.xml
index 37cee4efeabf..2c30261fc882 100644
--- a/common/android/src/main/res/values-my/03-dialogs.xml
+++ b/common/android/src/main/res/values-my/03-dialogs.xml
@@ -43,8 +43,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -93,7 +93,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">All cards</string>
-    <string name="tags_dialog_option_new_cards">New</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">New</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
@@ -220,6 +220,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -255,7 +257,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-my/10-preferences.xml b/common/android/src/main/res/values-my/10-preferences.xml
index f99256881487..fe8e89a3eb20 100644
--- a/common/android/src/main/res/values-my/10-preferences.xml
+++ b/common/android/src/main/res/values-my/10-preferences.xml
@@ -54,7 +54,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -168,6 +168,13 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="other" comment="Consider keeping the unbreakable space after the digit">%d hours past midnight</item>
@@ -250,6 +257,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-my/16-multimedia-editor.xml b/common/android/src/main/res/values-my/16-multimedia-editor.xml
index d9a9211644fc..7d3e5ec19a56 100644
--- a/common/android/src/main/res/values-my/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-my/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-nl/02-strings.xml b/common/android/src/main/res/values-nl/02-strings.xml
index c5f79a5669fc..dfb1ef46c32f 100644
--- a/common/android/src/main/res/values-nl/02-strings.xml
+++ b/common/android/src/main/res/values-nl/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid heeft geen toegang tot opslag vanwege een Android fout.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Lettergrootte</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Werkbalk weergeven</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Maak dikgedrukt</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Uw startscherm staat niet toe dat AnkiDroid snelkoppelingen toevoegt</string>
     <string name="create_shortcut_error">Fout bij het toevoegen van de snelkoppeling: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Zinnen in hoofdletters</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll werkbalk</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificaat</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Installeer</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Tekst-naar-spraak-instellingen kunnen niet worden geopend</string>
-    <string name="shared_decks_login_required">Log in om meer sets te downloaden</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Beschrijving</string>
     <string name="deck_description_saved">Beschrijving bijgewerkt</string>
     <string name="format_deck_description_as_markdown">Markeer</string>
diff --git a/common/android/src/main/res/values-nl/03-dialogs.xml b/common/android/src/main/res/values-nl/03-dialogs.xml
index 434f91b33f16..03208bf89e88 100644
--- a/common/android/src/main/res/values-nl/03-dialogs.xml
+++ b/common/android/src/main/res/values-nl/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Weet u zeker dat wilt proberen de database te repareren?\n\nVoordat dit wordt geprobeerd, wordt een kopie gemaakt in de submap \'%s\'.</string>
     <string name="intent_aedict_empty">Categorie \'standaard\' is leeg</string>
     <string name="intent_aedict_category">Om kaarten aan AnkiDroid toe te voegen verwijder je alle Notepad categorieën of voeg een toe met de naam \'standaard\'</string>
-    <string name="custom_study_new_extend">De nieuwe kaartlimiet van vandaag verhogen/verlagen (\"-3\") met</string>
-    <string name="custom_study_rev_extend">De nieuwe overhoringslimiet van vandaag verhogen/verlagen (\"-3\") met</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Herhaal kaarten vergeten in de laatste x dagen:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Alle kaarten</string>
-    <string name="tags_dialog_option_new_cards">Nieuw</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Nieuw</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Te doen</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Lege kaarten aan het zoeken&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">De systeem WebView is verouderd. Sommige functies zullen niet correct werken. Gelieve te updaten.\n\nGeïnstalleerde versie: %1$d\nMinimale vereiste versie: %2$d</string>
     <string name="compress">Comprimeren</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Taal niet ondersteund</string>
     <string name="tts_error_dialog_reason_text">De tekst naar spraak engine <b>%1$s</b> ondersteunt de volgende taal niet: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">Van</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">Tot</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profielnaam</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profielnaam mag niet leeg zijn</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profielnaam moet %1$d tekens of minder zijn</string>
diff --git a/common/android/src/main/res/values-nl/10-preferences.xml b/common/android/src/main/res/values-nl/10-preferences.xml
index fc138adbe311..96ff04fba0bd 100644
--- a/common/android/src/main/res/values-nl/10-preferences.xml
+++ b/common/android/src/main/res/values-nl/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Kaarten toestaan andere apps te starten</string>
-    <string name="allow_card_external_launch_summ">Kaarten kunnen andere apps op jouw apparaat openen, waardoor mogelijk ongewenste acties kunnen worden uitgevoerd.\nBlijf hier af tenzij je alle kaarten en sjablonen vertrouwt in jouw collectie.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Lijnbreedte</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">Set voor nieuwe kaarten</string>
     <string name="learn_cutoff" maxLength="41">Max vooruit leren</string>
     <string name="time_limit" maxLength="41">Stel een tijdslimiet in</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Begin van de volgende dag (0 is middernacht, 23 is 11PM)</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d Uur na middernacht</item>
@@ -250,6 +258,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-nl/16-multimedia-editor.xml b/common/android/src/main/res/values-nl/16-multimedia-editor.xml
index b8d1c8962ca9..1f06dbc07a4b 100644
--- a/common/android/src/main/res/values-nl/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-nl/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Wilt u deze afbeelding bijsnijden?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">De huidige afbeeldingsgrootte is %sMB. De standaard afbeeldingsgrootte is 1 MB. Wilt u deze comprimeren?</string>
     <string name="select_image_failed">"Selectie van afbeelding is mislukt, probeer opnieuw"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Veld inhoud</string>
diff --git a/common/android/src/main/res/values-nn/02-strings.xml b/common/android/src/main/res/values-nn/02-strings.xml
index 389c45d0e877..7dbd1511fc69 100644
--- a/common/android/src/main/res/values-nn/02-strings.xml
+++ b/common/android/src/main/res/values-nn/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Skriftstørrelse</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Vis verktøylinje</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internett</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Installer</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-nn/03-dialogs.xml b/common/android/src/main/res/values-nn/03-dialogs.xml
index 053aa6e149c0..c068ef063a9a 100644
--- a/common/android/src/main/res/values-nn/03-dialogs.xml
+++ b/common/android/src/main/res/values-nn/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Vil du virkelig prøve å reparere databasen?\n\nEn kopi vil bli opprettet i undermappen \'%s\' før forsøket starter.</string>
     <string name="intent_aedict_empty">Kategorien \'standard\' er tom</string>
     <string name="intent_aedict_category">For å legge kort til AnkiDroid, fjern alle notisblokk-kategorier eller legg til en som heter \'default\'</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Alle kort</string>
-    <string name="tags_dialog_option_new_cards">Nye</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Nye</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Forfaller</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Leter etter tomme kort&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-nn/10-preferences.xml b/common/android/src/main/res/values-nn/10-preferences.xml
index 893d3b47aee2..1362422f833b 100644
--- a/common/android/src/main/res/values-nn/10-preferences.xml
+++ b/common/android/src/main/res/values-nn/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Strektykkelse</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Stokk for nye kort</string>
     <string name="learn_cutoff" maxLength="41">Grense for forhåndsøving</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start på neste dag</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-nn/16-multimedia-editor.xml b/common/android/src/main/res/values-nn/16-multimedia-editor.xml
index 97afaf62c91a..2fb733a2c968 100644
--- a/common/android/src/main/res/values-nn/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-nn/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-no/02-strings.xml b/common/android/src/main/res/values-no/02-strings.xml
index ffe60c19320a..ae3bc0051c7c 100644
--- a/common/android/src/main/res/values-no/02-strings.xml
+++ b/common/android/src/main/res/values-no/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Skriftstørrelse</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Vis verktøylinje</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-no/03-dialogs.xml b/common/android/src/main/res/values-no/03-dialogs.xml
index 1e20d2920af5..efcc4e096e82 100644
--- a/common/android/src/main/res/values-no/03-dialogs.xml
+++ b/common/android/src/main/res/values-no/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Vil du virkelig prøve å reparere databasen?\n\nEn kopi vil bli opprettet i undermappen \'%s\' før forsøket starter.</string>
     <string name="intent_aedict_empty">Kategorien \'standard\' er tom</string>
     <string name="intent_aedict_category">For å legge kort til AnkiDroid, fjern alle notisblokk-kategorier eller legg til en som heter \'default\'</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Alle kort</string>
-    <string name="tags_dialog_option_new_cards">Nye</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Nye</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Forfaller</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Leter etter tomme kort&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-no/10-preferences.xml b/common/android/src/main/res/values-no/10-preferences.xml
index 17bc467004f5..7b167640fdea 100644
--- a/common/android/src/main/res/values-no/10-preferences.xml
+++ b/common/android/src/main/res/values-no/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Strektykkelse</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Stokk for nye kort</string>
     <string name="learn_cutoff" maxLength="41">Grense for forhåndsøving</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start på neste dag</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-no/16-multimedia-editor.xml b/common/android/src/main/res/values-no/16-multimedia-editor.xml
index 97afaf62c91a..2fb733a2c968 100644
--- a/common/android/src/main/res/values-no/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-no/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-or/02-strings.xml b/common/android/src/main/res/values-or/02-strings.xml
index 0b92f969cc9f..5edca6ff598c 100644
--- a/common/android/src/main/res/values-or/02-strings.xml
+++ b/common/android/src/main/res/values-or/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">ଫଣ୍ଟ ଆକାର</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">ଉପକରଣ-ଦଣ୍ଡିକା ଦେଖାଇବା</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">ଆପଣଙ୍କ ଗୃହସ୍କ୍ରୀନ୍ AnkiDroidକୁ ସର୍ଟ୍‌କଟ୍ ଯୋଡ଼ିବାର ଅନୁମତି ଦିଏ ନାହିଁ</string>
     <string name="create_shortcut_error">ସର୍ଟ୍‌କଟ୍ ଯୋଡ଼ିବାରେ ତ୍ରୁଟି: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">ବାକ୍ୟଗୁଡ଼ିକରେ ବଡ଼ ଅକ୍ଷର କରିବା</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">ସ୍କ୍ରୋଲ୍ ହେଉଥିବା ଉପକରଣ-ଦଣ୍ଡିକା</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">ଆହୁରି କେରୀ ଡାଉନଲୋଡ୍ କରିବାକୁ ଦୟାକରି ଲଗ୍ ଇନ୍ କରନ୍ତୁ</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">ବର୍ଣ୍ଣନା</string>
     <string name="deck_description_saved">ବର୍ଣ୍ଣନା ଅଦ୍ୟତନ କରାଗଲା</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-or/03-dialogs.xml b/common/android/src/main/res/values-or/03-dialogs.xml
index 5177385c9cfe..87d8845bbd2b 100644
--- a/common/android/src/main/res/values-or/03-dialogs.xml
+++ b/common/android/src/main/res/values-or/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">ଆପଣ ପ୍ରକୃତରେ ଡାଟାବେସ୍ ମରାମତି କରିବାକୁ ଚେଷ୍ଟା କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?\n\nପ୍ରୟାସ ଆରମ୍ଭ କରିବା ପୂର୍ବରୁ, “%s” ଉପଫୋଲ୍ଡର୍ ରେ ଏକ କପି ସୃଷ୍ଟି ହେବ।</string>
     <string name="intent_aedict_empty">ବର୍ଗ “ଡିଫଲ୍ଟ” ଖାଲି ଅଛି</string>
     <string name="intent_aedict_category">AnkiDroid ରେ ପତ୍ର ଯୋଡ଼ିବା ପାଇଁ ସମସ୍ତ Notepad ବର୍ଗଗୁଡ଼ିକୁ ଅପସାରଣ କରନ୍ତୁ କିମ୍ବା “ଡିଫଲ୍ଟ” ନାମକ ଏକ ବର୍ଗ ଯୋଡ଼ନ୍ତୁ</string>
-    <string name="custom_study_new_extend">ଆଜିର ନୂତନ ପତ୍ର ସୀମା ରେ ବୃଦ୍ଧି/ହ୍ରାସ (“-3”) କରନ୍ତୁ</string>
-    <string name="custom_study_rev_extend">ଆଜିର ସମୀକ୍ଷା ସୀମା ରେ ବୃଦ୍ଧି/ହ୍ରାସ (“-3”) କରନ୍ତୁ</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">ଗତ x ଦିନରେ ଭୁଲିଯାଇଥିବା ପତ୍ରର ସମୀକ୍ଷା କରନ୍ତୁ:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">ସବୁ ପତ୍ର</string>
-    <string name="tags_dialog_option_new_cards">ନୂଆ</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">ନୂଆ</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">ବାକି</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">ଖାଲି ପତ୍ର ଖୋଜାହେଉଛି&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">ଭାଷା ସମର୍ଥିତ ନୁହେଁ</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-or/10-preferences.xml b/common/android/src/main/res/values-or/10-preferences.xml
index 70189639d661..fdd72ce97970 100644
--- a/common/android/src/main/res/values-or/10-preferences.xml
+++ b/common/android/src/main/res/values-or/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">ଗାର ଓସାର</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">ନୂଆ ପତ୍ର ପାଇଁ କେରୀ</string>
     <string name="learn_cutoff" maxLength="41">ଆଗୁଆ ଶିଖିବା ସମୟସୀମା</string>
     <string name="time_limit" maxLength="41">ଟାଇମ୍ ବକ୍ସ ସମୟ ସୀମା</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">ପରଵର୍ତ୍ତୀ ଦିନର ଆରମ୍ଭ</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">ମଧ୍ୟରାତ୍ରିରୁ %d ଘଣ୍ଟା ପରେ</item>
@@ -251,6 +259,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-or/16-multimedia-editor.xml b/common/android/src/main/res/values-or/16-multimedia-editor.xml
index 7df6c5ac070f..6ba19b42acca 100644
--- a/common/android/src/main/res/values-or/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-or/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">ଆପଣ ଏହି ପ୍ରତିଛବି କ୍ରପ୍ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"ପ୍ରତିଛବି ଚୟନ ବିଫଳ ହୋଇଛି, ଦୟାକରି ପୁନଃଚେଷ୍ଟା କରିବା"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">କ୍ଷେତ୍ର ବିଷୟବସ୍ତୁ</string>
diff --git a/common/android/src/main/res/values-pa/02-strings.xml b/common/android/src/main/res/values-pa/02-strings.xml
index ccee318ec9d3..dca361f633b8 100644
--- a/common/android/src/main/res/values-pa/02-strings.xml
+++ b/common/android/src/main/res/values-pa/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">ਫੌਂਟ ਦਾ ਆਕਾਰ</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">ਟੂਲਬਾਰ ਦਿਖਾਓ</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">ਤੁਹਾਡੀ ਹੋਮ ਸਕ੍ਰੀਨ AnkiDroid ਨੂੰ ਸ਼ਾਰਟਕੱਟ ਜੋੜਨ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਦਿੰਦੀ</string>
     <string name="create_shortcut_error">ਸ਼ਾਰਟਕੱਟ ਜੋੜਨ ਵਿੱਚ ਤਰੁੱਟੀ: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">ਵਾਕਾਂ ਨੂੰ ਵੱਡਾ ਕਰੋ</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">ਸਕ੍ਰੋਲ ਟੂਲਬਾਰ</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">ਕਿਰਪਾ ਕਰਕੇ ਹੋਰ ਡੇਕ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ ਲੌਗ ਇਨ ਕਰੋ</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">ਵਰਣਨ</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-pa/03-dialogs.xml b/common/android/src/main/res/values-pa/03-dialogs.xml
index da7e02ae4d0a..72dc0900943e 100644
--- a/common/android/src/main/res/values-pa/03-dialogs.xml
+++ b/common/android/src/main/res/values-pa/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">ਸ਼੍ਰੇਣੀ \"ਡਿਫਾਲਟ\" ਖਾਲੀ ਹੈ</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">ਅੱਜ ਦੀ ਨਵੀਂ ਕਾਰਡ ਸੀਮਾ ਵਧਾਓ/ਘਟਾਓ (“-3”)</string>
-    <string name="custom_study_rev_extend">ਅੱਜ ਦੀ ਸਮੀਖਿਆ ਸੀਮਾ ਵਧਾਓ/ਘਟਾਓ (“-3”)</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">ਅੱਜ ਦੀ ਸਮੀਖਿਆ ਸੀਮਾ ਵਧਾਓ/ਘਟਾਓ (“-3”)</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">ਸਾਰੇ ਕਾਰਡ</string>
-    <string name="tags_dialog_option_new_cards">ਨਵਾਂ</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">ਨਵਾਂ</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">ਬਕਾਇਆ</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">ਖਾਲੀ ਕਾਰਡ ਲੱਭੇ ਜਾ ਰਹੇ ਹਨ&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">ਸਿਸਟਮ WebView ਪੁਰਾਣਾ ਹੈ। ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ। ਕਿਰਪਾ ਕਰਕੇ ਇਸਨੂੰ ਅੱਪਡੇਟ ਕਰੋ।\n\nਸਥਾਪਿਤ ਸੰਸਕਰਣ: %1$d\nਘੱਟੋ-ਘੱਟ ਲੋੜੀਂਦਾ ਸੰਸਕਰਣ: %2$d</string>
     <string name="compress">ਸੰਕੁਚਿਤ ਕਰੋ</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">ਭਾਸ਼ਾ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ</string>
     <string name="tts_error_dialog_reason_text">ਟੈਕਸਟ ਟੂ ਸਪੀਚ ਇੰਜਣ <b>%1$s</b> ਅੱਗੇ ਦਿੱਤੀ ਭਾਸ਼ਾ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦਾ ਹੈ: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">ਇੰਜਣ ਬਦਲੋ</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-pa/10-preferences.xml b/common/android/src/main/res/values-pa/10-preferences.xml
index a8d7225331df..ec01d6d1df4c 100644
--- a/common/android/src/main/res/values-pa/10-preferences.xml
+++ b/common/android/src/main/res/values-pa/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">ਸਟ੍ਰੋਕ ਚੌੜਾਈ</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">ਨਵੇਂ ਕਾਰਡਾਂ ਲਈ ਡੈੱਕ</string>
     <string name="learn_cutoff" maxLength="41">ਅੱਗੇ ਦੀ ਸੀਮਾ ਸਿੱਖੋ</string>
     <string name="time_limit" maxLength="41">ਟਾਈਮਬਾਕਸ ਸਮਾਂ ਸੀਮਾ</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">ਅਗਲੇ ਦਿਨ ਦੀ ਸ਼ੁਰੂਆਤ</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -250,6 +258,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-pa/16-multimedia-editor.xml b/common/android/src/main/res/values-pa/16-multimedia-editor.xml
index 5409c4b0edb9..f6a3e508f019 100644
--- a/common/android/src/main/res/values-pa/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-pa/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">ਕੀ ਤੁਸੀਂ ਇਸ ਚਿੱਤਰ ਨੂੰ ਕੱਟਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">ਮੌਜੂਦਾ ਚਿੱਤਰ ਦਾ ਆਕਾਰ %sMB ਹੈ। ਪੂਰਵ-ਨਿਰਧਾਰਤ ਚਿੱਤਰ ਆਕਾਰ ਸੀਮਾ 1MB ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸਨੂੰ ਸੰਕੁਚਿਤ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">ਖੇਤਰ ਸਮੱਗਰੀ</string>
diff --git a/common/android/src/main/res/values-pl/02-strings.xml b/common/android/src/main/res/values-pl/02-strings.xml
index 725741d6e713..091f64f41915 100644
--- a/common/android/src/main/res/values-pl/02-strings.xml
+++ b/common/android/src/main/res/values-pl/02-strings.xml
@@ -225,7 +225,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid nie może uzyskać dostępu do pamięci z powodu błędu Androida.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Rozmiar czcionki</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Pokaż pasek narzędzi</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Pokaż podgląd</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Ukryj podgląd</string>
     <string name="format_insert_bold">Pogrubienie</string>
@@ -253,7 +256,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Twój launcher nie pozwala AnkiDroid dodawać skrótów</string>
     <string name="create_shortcut_error">Błąd dodawania skrótu: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Zaczynaj zdania dużą literą</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Przewijany pasek narzędzi</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">Adres URL</string>
     <string name="dialog_hint_certificate">Certyfikat</string>
@@ -344,7 +346,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Zainstaluj</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Nie udało się otworzyć ustawień przekształcania tekstu na mowę</string>
-    <string name="shared_decks_login_required">Zaloguj się, aby pobrać więcej talii</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Opis</string>
     <string name="deck_description_saved">Opis zaktualizowany</string>
     <string name="format_deck_description_as_markdown">Formatuj jako Markdown</string>
diff --git a/common/android/src/main/res/values-pl/03-dialogs.xml b/common/android/src/main/res/values-pl/03-dialogs.xml
index 7b94b8c507b3..7115e1edf724 100644
--- a/common/android/src/main/res/values-pl/03-dialogs.xml
+++ b/common/android/src/main/res/values-pl/03-dialogs.xml
@@ -49,8 +49,8 @@
     <string name="repair_deck_dialog">Czy na pewno chcesz próbować naprawić bazę danych? \n\nPrzed próbą naprawy zostanie utworzona kopia w katalogu \'%s\'.</string>
     <string name="intent_aedict_empty">Kategoria \'Domyślne\' jest pusta</string>
     <string name="intent_aedict_category">Aby dodać karty do AnkiDroid, usuń wszystkie kategorie Notatnika lub dodaj jedną o nazwie \'Domyślne\'</string>
-    <string name="custom_study_new_extend">Zwiększ/zmniejsz (“-3”) dzisiejszy limit nowych kart</string>
-    <string name="custom_study_rev_extend">Zwiększ/zmniejsz (“-3”) dzisiejszy limit powtórek</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Przejrzyj zapomniane karty z ostatnich x dni:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -102,7 +102,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Wszystkie karty</string>
-    <string name="tags_dialog_option_new_cards">Nowe</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Nowe</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Do przejrzenia</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Wyszukiwanie pustych kart&#8230;</string>
@@ -244,6 +244,8 @@
     <string name="webview_update_message">System WebView jest nieaktualny. Niektóre funkcje nie będą działać poprawnie. Zaktualizuj go.\n\nZainstalowana wersja: %1$d\nMinimalna wymagana wersja: %2$d</string>
     <string name="compress">Kompresuj</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Ten język nie jest obsługiwany</string>
     <string name="tts_error_dialog_reason_text">Silnik zamiany tekstu na mowę <b>%1$s</b> nie obsługuje następującego języka: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Zmień silnik</string>
@@ -279,7 +281,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Nazwa profilu</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Nazwa profilu nie może być pusta</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Nazwa profilu musi mieć %1$d znaków lub mniej</string>
diff --git a/common/android/src/main/res/values-pl/10-preferences.xml b/common/android/src/main/res/values-pl/10-preferences.xml
index fa073ec462c3..8ea0b2c96b75 100644
--- a/common/android/src/main/res/values-pl/10-preferences.xml
+++ b/common/android/src/main/res/values-pl/10-preferences.xml
@@ -57,7 +57,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Szerokość kreski</string>
@@ -170,6 +170,16 @@
     <string name="use_current" maxLength="41">Talia dla nowych kart</string>
     <string name="learn_cutoff" maxLength="41">Limit nauki z wyprzedzeniem</string>
     <string name="time_limit" maxLength="41">Ograniczenie czasu</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="few">mins</item>
+        <item quantity="many">mins</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Początek nowego dnia</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d godzina po północy</item>
@@ -255,6 +265,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-pl/16-multimedia-editor.xml b/common/android/src/main/res/values-pl/16-multimedia-editor.xml
index 5ed791f75770..41bddd662adf 100644
--- a/common/android/src/main/res/values-pl/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-pl/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Czy chcesz przyciąć ten obraz?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Aktualny rozmiar obrazu to %sMB. Domyślny limit rozmiaru obrazu to 1 MB. Czy chcesz skompresować obraz?</string>
     <string name="select_image_failed">"Wybieranie obrazu nie powiodło się, spróbuj ponownie"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Zawartość pola</string>
diff --git a/common/android/src/main/res/values-pt-rBR/01-core.xml b/common/android/src/main/res/values-pt-rBR/01-core.xml
index 4cb85de5f241..1f036cb396b4 100644
--- a/common/android/src/main/res/values-pt-rBR/01-core.xml
+++ b/common/android/src/main/res/values-pt-rBR/01-core.xml
@@ -128,7 +128,7 @@
     <string name="read_write_permission_description">acessar notas, cartões, tipos de notas e baralhos existentes, bem como criar novos</string>
     <!-- Context Menu -->
     <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">Card browser</string>
-    <string name="context_menu_anki_card_label">Anki card</string>
+    <string name="context_menu_anki_card_label">Cartão do Anki</string>
     <!-- Sync conflict -->
     <string name="sync_conflict_message_new">As coleções não podem ser combinadas.\nQual coleção deseja manter?</string>
     <string name="sync_conflict_keep_local_new" comment="Select AnkiDroid files to keep while syncing">AnkiDroid</string>
diff --git a/common/android/src/main/res/values-pt-rBR/02-strings.xml b/common/android/src/main/res/values-pt-rBR/02-strings.xml
index c66f0b1db481..4e9d1a59b337 100644
--- a/common/android/src/main/res/values-pt-rBR/02-strings.xml
+++ b/common/android/src/main/res/values-pt-rBR/02-strings.xml
@@ -214,12 +214,15 @@
     <string name="card_viewer_could_not_find_image">Erro de Conteúdo do Card: Falha ao carregar ‘%s\'</string>
     <!-- Deck Picker -->
     <string name="search_decks" maxLength="28">Pesquisar baralhos</string>
-    <string name="ankidroid_init_failed_webview_title">Fatal error</string>
+    <string name="ankidroid_init_failed_webview_title">Erro fatal</string>
     <string name="ankidroid_init_failed_webview">AnkiDroid depende do System WebView que não está disponível. Isso pode acontecer se o sistema está instalando atualizações. Por favor, tente novamente em alguns minutos.\n\n%s</string>
     <string name="ankidroid_init_failed_storage">AnkiDroid não pode acessar o armazenamento devido a um erro do Android.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Tamanho da fonte</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Mostrar barra de ferramentas</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Formatar como Negrito</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Sua tela de início não permite que AnkiDroid adicione atalhos</string>
     <string name="create_shortcut_error">Erro ao adicionar atalho: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Iniciar frases em letra maíuscula</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Rolar a barra de funções</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificado</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Instalar</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Falha ao abrir configurações de texto para fala</string>
-    <string name="shared_decks_login_required">Faça login para baixar mais baralhos</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Descrição</string>
     <string name="deck_description_saved">Descrição atualizada</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-pt-rBR/03-dialogs.xml b/common/android/src/main/res/values-pt-rBR/03-dialogs.xml
index 9f90decfe774..fa5e1a90d520 100644
--- a/common/android/src/main/res/values-pt-rBR/03-dialogs.xml
+++ b/common/android/src/main/res/values-pt-rBR/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Você realmente deseja tentar reparar o banco de dados?\n\nAntes de iniciar a tentativa, uma cópia será criada na subpasta \"%s\".</string>
     <string name="intent_aedict_empty">Categoria \'padrão\' está vazia</string>
     <string name="intent_aedict_category">Para adicionar cartões ao AnkiDroid, remova todas as categorias das notas ou adicione uma com o nome \'default\'</string>
-    <string name="custom_study_new_extend">Aumentar/diminuir (\"-3\") limite de novos cards de hoje.</string>
-    <string name="custom_study_rev_extend">Aumentar/diminuir (\"-3\") o limite de revisões de hoje.</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Revisar cards esquecidos nos últimos x dias:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Todos os cards</string>
-    <string name="tags_dialog_option_new_cards">Novos</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Novos</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Pendentes</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Buscando cartões vazios&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">O sistema do WebView está desatualizado. Alguns recursos não funcionarão corretamente. Por favor, atualize-o.\n\nVersão instalada %1$d\nVersão mínima necessária: %2$d</string>
     <string name="compress">Comprimir</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Idioma não suportado</string>
     <string name="tts_error_dialog_reason_text">O mecanismo de texto para fala <b>%1$s</b> não suporta o seguinte idioma: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Alterar mecanismo</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">De</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">Para</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Nome do perfil</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Nome do perfil não pode estar vazio</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-pt-rBR/07-cardbrowser.xml b/common/android/src/main/res/values-pt-rBR/07-cardbrowser.xml
index c6b348466c50..aea81b3a6c63 100644
--- a/common/android/src/main/res/values-pt-rBR/07-cardbrowser.xml
+++ b/common/android/src/main/res/values-pt-rBR/07-cardbrowser.xml
@@ -95,7 +95,7 @@
     <!-- Sort Order -->
     <string name="card_browser_order_no_sorting_title" comment="Title of the \'no sorting\' row in the Choose Display Order bottom sheet">No sorting</string>
     <string name="card_browser_order_no_sorting_subtitle" comment="Subtitle for the \'no sorting\' row noting that no-sort is faster than sorted queries">Faster</string>
-    <string name="card_browser_order_snackbar_sort_by" comment="Snackbar shown after sort changes. %1$s is the column name (e.g. \'Card Type\')">Sort by %1$s</string>
+    <string name="card_browser_order_snackbar_sort_by" comment="Snackbar shown after sort changes. %1$s is the column name (e.g. \'Card Type\')">Ordenar por %1$s</string>
     <string name="card_browser_order_subtitle_text_ascending" comment="Sort direction subtitle for text columns when ascending (A before Z)">A–Z</string>
     <string name="card_browser_order_subtitle_text_descending" comment="Sort direction subtitle for text columns when descending (Z before A)">Z–A</string>
     <string name="card_browser_order_subtitle_numeric_ascending" comment="Sort direction subtitle for numeric columns when ascending (smallest value first)">Low to high</string>
diff --git a/common/android/src/main/res/values-pt-rBR/10-preferences.xml b/common/android/src/main/res/values-pt-rBR/10-preferences.xml
index 6542bc66cdae..5c9daac0a639 100644
--- a/common/android/src/main/res/values-pt-rBR/10-preferences.xml
+++ b/common/android/src/main/res/values-pt-rBR/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Largura do traço</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">Baralho para novos cards</string>
     <string name="learn_cutoff" maxLength="41">Aprender antes do limite</string>
     <string name="time_limit" maxLength="41">Limite de tempo de Timebox</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Início do dia seguinte</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hora depois da meia-noite</item>
@@ -251,6 +259,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-pt-rBR/16-multimedia-editor.xml b/common/android/src/main/res/values-pt-rBR/16-multimedia-editor.xml
index f540b3d06e04..902d9e0e0550 100644
--- a/common/android/src/main/res/values-pt-rBR/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-pt-rBR/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Você quer recortar esta imagem?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">O tamanho atual da imagem é de %sMB. O tamanho padrão da imagem é de 1MB. Você deseja comprimi-la?</string>
     <string name="select_image_failed">"A seleção de imagem falhou. Por favor, tente novamente."</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Conteúdos do campo</string>
diff --git a/common/android/src/main/res/values-pt-rPT/02-strings.xml b/common/android/src/main/res/values-pt-rPT/02-strings.xml
index 88db54cfefa0..bb8e757e1f59 100644
--- a/common/android/src/main/res/values-pt-rPT/02-strings.xml
+++ b/common/android/src/main/res/values-pt-rPT/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Tamanho da letra</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Mostrar Barra de Ferramentas</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">O seu ecrã de início não permite que o AnkiDroid adicione atalhos.</string>
     <string name="create_shortcut_error">Erro ao adicionar atalho: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Frases começam por maiúscula</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Barra Ferramentas deslizável</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Instalar</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Não foi possível abrir as definições relativas à conversão de texto para voz.</string>
-    <string name="shared_decks_login_required">Por favor, inicie sessão para transferir mais baralhos</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Descrição</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-pt-rPT/03-dialogs.xml b/common/android/src/main/res/values-pt-rPT/03-dialogs.xml
index c345b3824d8b..cb58fcde0e95 100644
--- a/common/android/src/main/res/values-pt-rPT/03-dialogs.xml
+++ b/common/android/src/main/res/values-pt-rPT/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Realmente deseja tentar reparar a base de dados?\n\nAntes de iniciar a tentativa, será criada uma cópia na subpasta \'%s\'.</string>
     <string name="intent_aedict_empty">A categoria \'predefinida\' está vazia</string>
     <string name="intent_aedict_category">Para adicionar fichas na AnkiDroid remova todas as categorias de notas ou adicione uma com o nome \'predefinida\'</string>
-    <string name="custom_study_new_extend">Aumentar/diminuir (\"-3\") o limite de novas fichas, de hoje, em</string>
-    <string name="custom_study_rev_extend">Aumentar/diminuir (\"-3\") o limite de fichas a rever, de hoje, em</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Rever fichas esquecidas nos últimos x dias:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Todas as fichas</string>
-    <string name="tags_dialog_option_new_cards">Nova</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Nova</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Pendentes</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">A encontrar fichas vazias&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">O sistema WebView está desatualizado. Alguns recursos não funcionarão corretamente. Atualize-o.\n\nVersão instalada: %1$d\nVersão mínima necessária: %2$d</string>
     <string name="compress">Comprimir</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Língua não suportada</string>
     <string name="tts_error_dialog_reason_text">O sistema de conversão de texto para fala <b>%1$s</b> não suporta a língua: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Mudar sistema</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-pt-rPT/10-preferences.xml b/common/android/src/main/res/values-pt-rPT/10-preferences.xml
index aab4e7c231a0..eac45a29bd26 100644
--- a/common/android/src/main/res/values-pt-rPT/10-preferences.xml
+++ b/common/android/src/main/res/values-pt-rPT/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Espessura do traço</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Baralho para as fichas novas</string>
     <string name="learn_cutoff" maxLength="41">Limite para antecipação de aprendizagem</string>
     <string name="time_limit" maxLength="41">Limite de tempo para Timebox</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Início do próximo dia</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hora depois da meia-noite</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-pt-rPT/16-multimedia-editor.xml b/common/android/src/main/res/values-pt-rPT/16-multimedia-editor.xml
index 8f9a56a61763..e3d07a8a9ada 100644
--- a/common/android/src/main/res/values-pt-rPT/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-pt-rPT/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Quer recortar esta imagem?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">O tamanho da imagem é %sMB. O limite é de  1MB. Deseja comprimi-la?</string>
     <string name="select_image_failed">"A seleção de imagem falhou, por favor tente novamente"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Conteúdo do Campo</string>
diff --git a/common/android/src/main/res/values-ro/02-strings.xml b/common/android/src/main/res/values-ro/02-strings.xml
index 447bdc12bab2..c0ab0b355488 100644
--- a/common/android/src/main/res/values-ro/02-strings.xml
+++ b/common/android/src/main/res/values-ro/02-strings.xml
@@ -222,7 +222,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -250,7 +253,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -339,7 +341,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-ro/03-dialogs.xml b/common/android/src/main/res/values-ro/03-dialogs.xml
index c6dcfdbcc6fd..98200c6673b6 100644
--- a/common/android/src/main/res/values-ro/03-dialogs.xml
+++ b/common/android/src/main/res/values-ro/03-dialogs.xml
@@ -47,8 +47,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -99,7 +99,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">All cards</string>
-    <string name="tags_dialog_option_new_cards">New</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">New</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
@@ -236,6 +236,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -271,7 +273,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-ro/10-preferences.xml b/common/android/src/main/res/values-ro/10-preferences.xml
index b5a75edd77d2..d284f0351170 100644
--- a/common/android/src/main/res/values-ro/10-preferences.xml
+++ b/common/android/src/main/res/values-ro/10-preferences.xml
@@ -56,7 +56,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -170,6 +170,15 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="few">mins</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -254,6 +263,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-ro/16-multimedia-editor.xml b/common/android/src/main/res/values-ro/16-multimedia-editor.xml
index d8496759f5d9..3a7626cb499f 100644
--- a/common/android/src/main/res/values-ro/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ro/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Dorești să decupezi această imagine?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Selectarea imaginii a eșuat. Vă rugăm reîncercați"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Conținutul câmpului</string>
diff --git a/common/android/src/main/res/values-ru/01-core.xml b/common/android/src/main/res/values-ru/01-core.xml
index 84ad8acc7958..312c322a0e63 100644
--- a/common/android/src/main/res/values-ru/01-core.xml
+++ b/common/android/src/main/res/values-ru/01-core.xml
@@ -138,7 +138,7 @@
     <string name="read_write_permission_description">доступ к колодам, карточкам, записям, их типам, а также создание новых</string>
     <!-- Context Menu -->
     <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">Обозреватель карточек</string>
-    <string name="context_menu_anki_card_label">Anki card</string>
+    <string name="context_menu_anki_card_label">Карточка Anki</string>
     <!-- Sync conflict -->
     <string name="sync_conflict_message_new">Коллекции не могут быть объединены.\nКакую коллекцию вы хотите оставить?</string>
     <string name="sync_conflict_keep_local_new" comment="Select AnkiDroid files to keep while syncing">AnkiDroid</string>
diff --git a/common/android/src/main/res/values-ru/02-strings.xml b/common/android/src/main/res/values-ru/02-strings.xml
index 54afb3bbab07..4408a45be59b 100644
--- a/common/android/src/main/res/values-ru/02-strings.xml
+++ b/common/android/src/main/res/values-ru/02-strings.xml
@@ -225,7 +225,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid не может получить доступ к хранилищу из-за ошибки Android.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Размер шрифта</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Показать панель инструментов</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Жирный</string>
@@ -253,7 +256,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Ваш домашний экран не позволяет AnkiDroid добавлять ярлыки</string>
     <string name="create_shortcut_error">Ошибка при добавлении ярлыка: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Предложение с заглавной буквы</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Прокрутка панели</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Сертификат</string>
@@ -281,8 +283,8 @@
     <string name="download_speed_unit" comment="Download speed. %1$s is an amount of data, e.g. \'1.2 MB\', giving \'1.2 MB/s\'">%1$s/s</string>
     <string name="download_speed_unknown" comment="Placeholder shown when the current download speed is unknown">-/s</string>
     <string name="download_time_unknown" comment="Placeholder when the remaining download time is unknown">-</string>
-    <string name="download_speed_label">Speed</string>
-    <string name="download_time_left_label">Time left</string>
+    <string name="download_speed_label">Скорость</string>
+    <string name="download_time_left_label">Пройденное время</string>
     <string name="deck_download_progress_message">Вы можете использовать другие приложения во время загрузки</string>
     <string name="check_network">Проверьте подключение к Интернету</string>
     <string name="external_storage_unavailable">Загрузка прервана, внешняя память недоступна</string>
@@ -344,7 +346,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Интернет</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Загрузить</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Не удалось открыть настройки синтеза речи</string>
-    <string name="shared_decks_login_required">Пожалуйста, войдите, чтобы скачать больше колод</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Описание</string>
     <string name="deck_description_saved">Описание обновлено</string>
     <string name="format_deck_description_as_markdown">Форматировать в Markdown</string>
@@ -391,7 +393,7 @@
     <string name="set_due_date_date_range">Диапазон дат</string>
     <string comment="Shown when retrying a running action" name="already_in_progress">уже выполняется</string>
     <!-- Switch profiles screen -->
-    <string name="switch_profile" maxLength="41" comment="Title of the screen where the user switches between profiles">Switch profile</string>
-    <string name="edit_profile" comment="Content description of the button that edits a profile in the profile list">Edit profile</string>
-    <string name="delete_profile" comment="Content description of the button that deletes a profile in the profile list">Delete profile</string>
+    <string name="switch_profile" maxLength="41" comment="Title of the screen where the user switches between profiles">Сменить профиль</string>
+    <string name="edit_profile" comment="Content description of the button that edits a profile in the profile list">Редактировать профиль</string>
+    <string name="delete_profile" comment="Content description of the button that deletes a profile in the profile list">Удалить профиль</string>
 </resources>
diff --git a/common/android/src/main/res/values-ru/03-dialogs.xml b/common/android/src/main/res/values-ru/03-dialogs.xml
index 47dc0e0d94b0..c04fa767364e 100644
--- a/common/android/src/main/res/values-ru/03-dialogs.xml
+++ b/common/android/src/main/res/values-ru/03-dialogs.xml
@@ -49,8 +49,8 @@
     <string name="repair_deck_dialog">Вы действительно хотите починить базу данных?\n\nПеред восстановлением копия базы данных будет помещена в папку «%s».</string>
     <string name="intent_aedict_empty">Категория «default» пуста</string>
     <string name="intent_aedict_category">Чтобы добавить карточки в AnkiDroid, удалите все категории «Notepad» или создайте категорию «default»</string>
-    <string name="custom_study_new_extend">Увеличить или уменьшить («-3») лимит новых на сегодня</string>
-    <string name="custom_study_rev_extend">Увеличить или уменьшить («-3») лимит повторяемых на сегодня</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Забытые за сколько дней повторить:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -103,7 +103,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Все карточки</string>
-    <string name="tags_dialog_option_new_cards">Новые</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Новые</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">К просмотру</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Поиск пустых карточек&#8230;</string>
@@ -245,6 +245,8 @@
     <string name="webview_update_message">Системный WebView устарел. Некоторые функции не будут работать корректно. Пожалуйста, обновите его.\n\nУстановленная версия: %1$d\nМинимальная требуемая версия: %2$d</string>
     <string name="compress">Сжать</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Язык не поддерживается</string>
     <string name="tts_error_dialog_reason_text">TTS движок <b>%1$s</b> не поддерживает язык: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Изменить движок</string>
@@ -280,7 +282,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-ru/10-preferences.xml b/common/android/src/main/res/values-ru/10-preferences.xml
index 7d8119364938..b1ce8677808b 100644
--- a/common/android/src/main/res/values-ru/10-preferences.xml
+++ b/common/android/src/main/res/values-ru/10-preferences.xml
@@ -57,7 +57,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Толщина линии</string>
@@ -170,6 +170,16 @@
     <string name="use_current" maxLength="41">Колода для новых карточек</string>
     <string name="learn_cutoff" maxLength="41">Лимит опережения</string>
     <string name="time_limit" maxLength="41">Лимит учебного блока</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="few">mins</item>
+        <item quantity="many">mins</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Начало нового дня</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d час после полуночи</item>
@@ -254,6 +264,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-ru/11-arrays.xml b/common/android/src/main/res/values-ru/11-arrays.xml
index f7d91701f4da..7838e9b9b99a 100644
--- a/common/android/src/main/res/values-ru/11-arrays.xml
+++ b/common/android/src/main/res/values-ru/11-arrays.xml
@@ -35,7 +35,7 @@
     <!-- day_theme_labels -->
     <string name="day_theme_light">Светлая</string>
     <string name="day_theme_plain">Простая</string>
-    <string name="day_theme_eink">E-Ink</string>
+    <string name="day_theme_eink">Электронные чернила</string>
     <!-- night_theme_labels -->
     <string name="night_theme_black">Чёрная</string>
     <string name="night_theme_dark">Тёмная</string>
diff --git a/common/android/src/main/res/values-ru/16-multimedia-editor.xml b/common/android/src/main/res/values-ru/16-multimedia-editor.xml
index 3b195ca0b772..51225e3b6c50 100644
--- a/common/android/src/main/res/values-ru/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ru/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Обрезать это изображение?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Размер изображения — %sМБ. По умолчанию ограничение размера 1МБ. Сжать его?</string>
     <string name="select_image_failed">"Не удалось выбрать изображение. Попробуйте снова"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Содержимое поля</string>
diff --git a/common/android/src/main/res/values-sat/02-strings.xml b/common/android/src/main/res/values-sat/02-strings.xml
index 9970041730f2..ddcd46fc03fc 100644
--- a/common/android/src/main/res/values-sat/02-strings.xml
+++ b/common/android/src/main/res/values-sat/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">ᱪᱤᱠᱤ ᱢᱟᱯ</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">ᱴᱩᱞᱵᱟᱨ ᱫᱮᱠᱷᱟᱣᱢᱮ</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">ᱟᱢᱟᱜ ᱚᱲᱟᱜ ᱥᱠᱨᱤᱱ AnkiDroid ᱥᱚᱴᱠᱚᱴ ᱵᱟᱝ ᱥᱮᱞᱮᱫ ᱪᱷᱚᱭᱟᱭ</string>
     <string name="create_shortcut_error">ᱥᱚᱴᱠᱚᱴ ᱥᱮᱞᱮᱫ ᱵᱷᱩᱞ: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">ᱟᱹᱭᱟᱹᱛ ᱢᱟᱨᱟᱝ ᱪᱷᱚᱭ ᱢᱮ</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">ᱥᱠᱨᱚᱞ ᱴᱩᱞᱵᱟᱨ</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">ᱮᱴᱟᱜ ᱰᱮᱠ ᱠᱚ ᱰᱟᱩᱱᱞᱚᱰ ᱞᱟᱹᱜᱤᱫ ᱞᱚᱜᱤᱱ ᱢᱮ</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">ᱞᱟᱹᱱᱟᱹᱤ</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-sat/03-dialogs.xml b/common/android/src/main/res/values-sat/03-dialogs.xml
index ffbe916de5e7..f704fabf04b7 100644
--- a/common/android/src/main/res/values-sat/03-dialogs.xml
+++ b/common/android/src/main/res/values-sat/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">ᱟᱢ ᱫᱚ ᱱᱚᱶᱟ database ᱥᱟᱡᱟᱣ ᱥᱮᱱᱟᱢ ᱠᱟᱱᱟ ᱥᱮ ? \n\nᱮᱛᱷᱚᱵ ᱢᱟᱲᱟᱝ ᱨᱮ, ᱢᱤᱫᱴᱟᱝ ᱠᱚᱯᱤ \&quot;%s\&quot; ᱥᱚᱵᱼᱯᱷᱚᱞᱰᱟᱨ ᱨᱮ ᱛᱮᱭᱨᱚᱜᱽᱟ ᱱᱟᱦ ᱾</string>
     <string name="intent_aedict_empty">ᱴᱩᱢᱟᱹᱞ \&quot;default\&quot; ᱠᱷᱟᱹᱞᱤ ᱜᱮᱭᱟ</string>
     <string name="intent_aedict_category">AnkiDroid ᱛᱮ ᱠᱟᱰ ᱥᱮᱞᱮᱫ ᱞᱟᱹᱜᱤᱫ Notepad ᱴᱩᱢᱟᱹᱞ ᱵᱷᱮᱜᱟᱨ ᱠᱟᱜ ᱢᱮ ᱟᱨ ᱵᱟᱝᱠᱷᱟᱱ “default” ᱧᱩᱛᱩᱢ ᱠᱟᱜ ᱢᱮ</string>
-    <string name="custom_study_new_extend">ᱵᱚᱰᱷᱟᱣ/ᱠᱚᱢᱢᱮ (“-3”) ᱛᱮᱦᱚᱸᱧᱟᱜᱽ ᱱᱟᱶᱟ ᱠᱟᱰ ᱥᱤᱢᱟᱹ</string>
-    <string name="custom_study_rev_extend">ᱵᱚᱰᱷᱟᱣ/ᱠᱚᱢᱢᱮ (“-3”) ᱛᱮᱦᱚᱸᱧᱟᱜᱽ ᱨᱤᱵᱷᱤᱣ ᱞᱤᱢᱤᱴ</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">ᱨᱤᱵᱷᱭᱩ ᱠᱟᱰ x ᱫᱤᱱ ᱨᱮ ᱦᱤᱲᱤᱧᱟᱜ ᱠᱚᱺ</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">ᱡᱷᱚᱛᱚ ᱠᱟᱰ ᱠᱚ</string>
-    <string name="tags_dialog_option_new_cards">ᱱᱟᱶᱟ</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">ᱱᱟᱶᱟ</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">ᱮᱢᱚᱜ ᱥᱚᱢᱚᱭ</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">ᱠᱷᱟᱹᱞᱤ ᱠᱟᱰ ᱯᱟᱱᱛᱮ ᱪᱟᱹᱞᱩ ᱠᱟᱱᱟ&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">ᱠᱚᱢᱯᱨᱮᱥ</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">ᱯᱟᱹᱨᱥᱤ ᱵᱟᱭ ᱥᱚᱦᱚᱫᱚᱜ ᱠᱟᱱᱟ</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">ᱢᱚᱴᱚᱨ ᱵᱚᱫᱚᱞ ᱢᱮ</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-sat/10-preferences.xml b/common/android/src/main/res/values-sat/10-preferences.xml
index aa8c0a47a6a7..cdc3dd6c1014 100644
--- a/common/android/src/main/res/values-sat/10-preferences.xml
+++ b/common/android/src/main/res/values-sat/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">ᱥᱴᱨᱚᱠ ᱨᱮᱭᱟᱜ ᱚᱥᱟᱨ</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">ᱱᱟᱶᱟ ᱠᱟᱰ ᱠᱚ ᱞᱟᱹᱜᱤᱫ ᱰᱮᱠ</string>
     <string name="learn_cutoff" maxLength="41">ᱢᱟᱲᱟᱝ ᱥᱮᱫ ᱯᱟᱲᱦᱟᱣ ᱪᱮᱫᱚᱜ</string>
     <string name="time_limit" maxLength="41">ᱥᱚᱢᱚᱭ ᱵᱟᱠᱥᱚ ᱚᱠᱛᱚ ᱥᱤᱢᱟᱹ</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">ᱜᱟᱯᱟ ᱫᱤᱱ ᱟᱜ ᱮᱛᱦᱚᱵ</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -251,6 +259,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-sat/16-multimedia-editor.xml b/common/android/src/main/res/values-sat/16-multimedia-editor.xml
index b372d499dd8a..a4070a783c11 100644
--- a/common/android/src/main/res/values-sat/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-sat/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">ᱟᱢ ᱪᱤᱛᱟᱹᱨ ᱠᱷᱟᱴᱚ ᱥᱟᱱᱟᱮᱫ ᱢᱮᱭᱟ ᱥᱮ ᱵᱟᱝ-ᱟ  ?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">ᱱᱤᱛᱚᱜᱟᱜ ᱪᱤᱛᱟᱹᱨ ᱢᱟᱨᱟᱝ ᱫᱚ %sMB ᱠᱟᱱᱟ. ᱰᱤᱯᱷᱚᱞᱴ ᱪᱤᱛᱟᱹᱨ ᱢᱟᱨᱟᱝ ᱜᱚᱴᱟ ᱫᱚ 1MB ᱠᱟᱱᱟ. ᱟᱢ ᱱᱚᱶᱟ ᱠᱚᱢᱯᱨᱮᱥ (compress) ᱠᱮᱭᱟᱢ ᱥᱮ?</string>
     <string name="select_image_failed">"ᱪᱤᱛᱹᱨ ᱵᱟᱪᱷᱟᱣ ᱦᱩᱰᱟᱹᱜ, ᱫᱚᱭᱚᱠᱟᱛᱮ ᱫᱩᱦᱰᱟᱹ ᱪᱮᱥᱴᱟᱭ ᱢᱮ"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">ᱯᱷᱤᱞᱰ ᱥᱟᱦᱴᱟ</string>
diff --git a/common/android/src/main/res/values-sc/01-core.xml b/common/android/src/main/res/values-sc/01-core.xml
index 318693d57152..85b596f1b62c 100644
--- a/common/android/src/main/res/values-sc/01-core.xml
+++ b/common/android/src/main/res/values-sc/01-core.xml
@@ -60,7 +60,7 @@
     <string name="ease_button_hard" maxLength="41" comment="In the reviewer, in the answer side. Label of the button that used by the user to state finding the correct answer was hard.">Difìtzile</string>
     <string name="ease_button_good" maxLength="41" comment="In the reviewer, in the answer side. Label of the button that used by the user to state their answer was good.">Bonu</string>
     <string name="ease_button_easy" maxLength="41" comment="In the reviewer, in the answer side. Label of the button that used by the user to state that finding the answer to the question was easy.">Fàtzile</string>
-    <string name="show_answer_hint_long_press" comment="In the reviewer, hint is shown when touching the show answer button and the user has the long-press accessibility setting enabled">\'%s\' is enabled</string>
+    <string name="show_answer_hint_long_press" comment="In the reviewer, hint is shown when touching the show answer button and the user has the long-press accessibility setting enabled">«%s» est abilitadu</string>
     <!-- General -->
     <string name="undo" maxLength="28" comment="When tapping on this text, the last action is undone.">Annulla</string>
     <string name="redo" maxLength="28" comment="Menu entry that allows to redo action that was just undone.">Torra a fàghere</string>
@@ -80,9 +80,9 @@
                                              %s</string>
     <string name="menu_search" maxLength="28">Chirca in %1$s</string>
     <string name="menu_unmark_note">Boga sa marcadura a sa nota</string>
-    <string name="menu_enable_voice_playback" maxLength="28">Abìlita sa riprodutzione vocale</string>
+    <string name="menu_enable_voice_playback" maxLength="28">Abìlita riprodutzione vocale</string>
     <string name="menu_disable_voice_playback">Disabìlita sa riprodutzione vocale</string>
-    <string name="menu_create_backup" maxLength="28">Create backup</string>
+    <string name="menu_create_backup" maxLength="28">Crea una còpia de seguresa</string>
     <string name="new_dynamic_deck">Crea unu matzu filtradu</string>
     <string name="directory_inaccessible">Sa cartella de AnkiDroid no est atzessìbile</string>
     <!--This is shown when AnkiDroid starts up with no storage permissions.
@@ -94,10 +94,10 @@
     <string name="empty_cram_label" maxLength="28">Isbòida</string>
     <string name="create_subdeck">Crea unu suta-matzu</string>
     <string name="empty_filtered_deck">Isboidende su matzu filtradu&#8230;</string>
-    <string name="search_deck" comment="Deck search for selecting it">Deck search</string>
+    <string name="search_deck" comment="Deck search for selecting it">Chirca in su matzu</string>
     <string name="empty_deck">Custu matzu est bòidu</string>
     <string name="invalid_deck_name">Nùmene de su matzu non vàlidu</string>
-    <string name="studyoptions_congrats_finished">Congratulations! You have finished for today.</string>
+    <string name="studyoptions_congrats_finished">Bene meda! Pro oe as agabbadu.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Matzu acabbadu pro como! %s</string>
     <string name="studyoptions_no_cards_due">Peruna carta de revisionare como</string>
     <string name="sd_card_not_mounted">Sa memòria de su dispositivu no est montada</string>
@@ -130,8 +130,8 @@
     <string name="read_write_permission_label">Leghe e iscrie in sa base de datos de AnkiDroid</string>
     <string name="read_write_permission_description">atzede a sas notas, a sas cartas, a sas castas de notas e a sos matzos chi esistint giai, e crea·nde de noos</string>
     <!-- Context Menu -->
-    <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">Card browser</string>
-    <string name="context_menu_anki_card_label">Anki card</string>
+    <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">Esploradore de cartas</string>
+    <string name="context_menu_anki_card_label">Carta de Anki</string>
     <!-- Sync conflict -->
     <string name="sync_conflict_message_new">Sas colletziones non si podent cumbinare.\n
     Cale colletzione cheres mantènnere·?</string>
@@ -154,25 +154,25 @@
     <string name="new_unsafe_collection">Sa colletzione noa s\'at a iscantzellare dae su telèfonu tuo si as a disinstallare AnkiDroid</string>
     <!-- Permissions screen -->
     <string name="permissions_screen_headline">AnkiDroid tenet bisòngiu de unos cantos permissos pro funtzionare</string>
-    <string name="permissions_screen_optional_headline" comment="Explains that there are optional permissions that can be granted to AnkiDroid.">AnkiDroid works best with these permissions</string>
+    <string name="permissions_screen_optional_headline" comment="Explains that there are optional permissions that can be granted to AnkiDroid.">AnkiDroid funtzionat mègius cun custos permissos</string>
     <string name="storage_access_title">Atzessu a sa memòria</string>
     <string name="storage_access_summary">Sarvat sa colletzione tua in unu logu seguru chi non s\'at a iscantzellare si as a disinstallare s\'aplicatzione</string>
     <string name="all_files_access_title" comment="Name of the “All files access” permission from Android 10 and after. See [android.permission.MANAGE_EXTERNAL_STORAGE] on https://developer.android.com/training/data-storage/manage-all-files for context.">Atzessu a totu sos archìvios</string>
     <string name="image_occlusion">Oclusione de s\'immàgine</string>
-    <string name="microphone" comment="Title of the microphone permission in the permissions explanation screen.">Microphone</string>
-    <string name="microphone_permission_explanation" comment="Description explaining why AnkiDroid needs the microphone permission, shown on the permissions explanation screen.">Allows you to add sounds to cards and enables voice playback while reviewing</string>
-    <string name="notifications_permission_explanation" comment="Description explaining why AnkiDroid needs the notification permission.">Enables background media syncing and allows you to create review reminders</string>
-    <string name="heading_required_permissions" comment="Heading for the section of required permissions that the app needs to function, shown in the permissions explanation screen.">Required</string>
-    <string name="heading_optional_permissions" comment="Heading for the section of optional permissions that the app needs to function, shown in the permissions explanation screen.">Optional</string>
-    <string name="manually_grant_permissions" comment="Pop-up message that is shown to the user when they want to grant an app permission that must be granted via the OS settings screen.">This permission must be manually granted from Settings</string>
-    <string name="revoke_permissions" comment="Pop-up message that is shown to the user when they are revoking an app permission.">This permission must be manually revoked from Settings</string>
+    <string name="microphone" comment="Title of the microphone permission in the permissions explanation screen.">Micròfonu</string>
+    <string name="microphone_permission_explanation" comment="Description explaining why AnkiDroid needs the microphone permission, shown on the permissions explanation screen.">Permitit de agiùnghere sonos a sas cartas e ativat sa riprodutzione de sa boghe durante sa revisione</string>
+    <string name="notifications_permission_explanation" comment="Description explaining why AnkiDroid needs the notification permission.">Permitit sa sincronizatzione de sos mèdios in s\'isfundu e ti permitit de creare promemòrias pro sa revisione</string>
+    <string name="heading_required_permissions" comment="Heading for the section of required permissions that the app needs to function, shown in the permissions explanation screen.">Netzessàriu</string>
+    <string name="heading_optional_permissions" comment="Heading for the section of optional permissions that the app needs to function, shown in the permissions explanation screen.">Optzionale</string>
+    <string name="manually_grant_permissions" comment="Pop-up message that is shown to the user when they want to grant an app permission that must be granted via the OS settings screen.">Custu permissu bolet cuntzessu a manu dae sas Impostatziones</string>
+    <string name="revoke_permissions" comment="Pop-up message that is shown to the user when they are revoking an app permission.">Custu permissu bolet revocadu a manu dae sas Impostatziones</string>
     <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">Boga su contu</string>
     <!-- Instant Note Editor -->
     <string name="instant_card" comment="Used in the Android system context menu/share dialog to quickly create a note. This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. ">Carta istantànea</string>
     <!-- Internet Permissions -->
-    <string name="internet_access_title" comment="used for notifying user to unable internet access">Internet</string>
-    <string name="permission_access_summary">Required for the app to work</string>
-    <string name="permission_required_message">Please grant AnkiDroid the ‘%s’ permission to continue</string>
+    <string name="internet_access_title" comment="used for notifying user to unable internet access">Ìnternet</string>
+    <string name="permission_access_summary">Netzessàriu pro chi s’aplicatzione funtzionet</string>
+    <string name="permission_required_message">Pro praghere, fruni a AnkiDroid su permissu ‘%s’ pro sighire</string>
     <!-- Multiple profile -->
-    <string name="add_profile">Add profile</string>
+    <string name="add_profile">Agiunghe unu profilu</string>
 </resources>
diff --git a/common/android/src/main/res/values-sc/02-strings.xml b/common/android/src/main/res/values-sc/02-strings.xml
index 4de97120f90a..044166cf0a60 100644
--- a/common/android/src/main/res/values-sc/02-strings.xml
+++ b/common/android/src/main/res/values-sc/02-strings.xml
@@ -221,7 +221,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Mannària de su caràtere</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Ammustra sa barra de sas ainas</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -249,7 +252,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">S\'ischermada printzipale tua non permitet a AnkiDroid de annànghere incurtzadas</string>
     <string name="create_shortcut_error">Errore annanghende s\'incurtzada: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Pone in majùsculu sas fràsias</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Barra de iscurrimentu</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -336,7 +338,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Intra pro iscarrigare prus matzos</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Descritzione</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-sc/03-dialogs.xml b/common/android/src/main/res/values-sc/03-dialogs.xml
index 77c3d88b7a74..5f3a3a08746e 100644
--- a/common/android/src/main/res/values-sc/03-dialogs.xml
+++ b/common/android/src/main/res/values-sc/03-dialogs.xml
@@ -50,8 +50,8 @@
                    In antis de incumintzare cun sa proa s\'at a creare una còpia in sa suta-cartella “%s”.</string>
     <string name="intent_aedict_empty">Sa categoria “default” est bòida</string>
     <string name="intent_aedict_category">Pro annànghere cartas a AnkiDroid boga totu sas categorias de Notepad o annanghe·nde una ponende·li “default” comente nùmene</string>
-    <string name="custom_study_new_extend">Ismànnia/mìnima (“-3”) su lìmite de cartas noas de oe de</string>
-    <string name="custom_study_rev_extend">Ismànnia/mìnima (“-3”) su lìmite de revisiones de oe de</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Revisiona sas cartas ismentigadas in sas ùrtimas x dies:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -101,7 +101,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Totu sas cartas</string>
-    <string name="tags_dialog_option_new_cards">Noas</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Noas</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">De revisionare</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Agatende sas cartas bòidas&#8230;</string>
@@ -242,6 +242,8 @@
     <string name="webview_update_message">Su sistema WebView no est atualizadu. Unas cantas funtzionalidades no ant a funtzionare comente si tocat. Pro praghere atualiza·lu.\n\Versione installada: %1$d\nVersione mìnima netzessària: %2$d</string>
     <string name="compress">Cumprime</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Limba non suportada</string>
     <string name="tts_error_dialog_reason_text">Su motore de sìntesi vocale <b>%1$s</b> non suportat custa limba: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Càmbia motore</string>
@@ -277,8 +279,9 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
-    <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
+    <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Nùmene de su profilu</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
 </resources>
diff --git a/common/android/src/main/res/values-sc/10-preferences.xml b/common/android/src/main/res/values-sc/10-preferences.xml
index bb04a698099b..1da27cec7333 100644
--- a/common/android/src/main/res/values-sc/10-preferences.xml
+++ b/common/android/src/main/res/values-sc/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Grussària de su tratu</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">Matzu pro sas cartas noas</string>
     <string name="learn_cutoff" maxLength="41">Lìmite pro s\'antitzipatzione de s\'imparu</string>
     <string name="time_limit" maxLength="41">Lìmite de tempus pro sessione</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Incumintzu de sa die chi benit</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -251,6 +259,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-sc/16-multimedia-editor.xml b/common/android/src/main/res/values-sc/16-multimedia-editor.xml
index 32ea3dbfda79..d368977fcadd 100644
--- a/common/android/src/main/res/values-sc/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-sc/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Cheres segare cust\'immàgine?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Sa mannària atuale de s\'immàgine est de %sMB. Su lìmite predefinidu de mannària pro sas immàgines est de 1MB. La cheres cumprìmere?</string>
     <string name="select_image_failed">"Seletzione de s\'immàgine fallida. Torra a proare"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Cuntenutos de su campu</string>
diff --git a/common/android/src/main/res/values-sk/02-strings.xml b/common/android/src/main/res/values-sk/02-strings.xml
index 50a801c0cc0b..19a010f30fa6 100644
--- a/common/android/src/main/res/values-sk/02-strings.xml
+++ b/common/android/src/main/res/values-sk/02-strings.xml
@@ -225,7 +225,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Veľkosť fontu</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Zobraziť lištu nástrojov</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Formátovať ako tučné</string>
@@ -253,7 +256,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Vaša domovská obrazovka neumožňuje, aby AnkiDroid pridal zástupcov</string>
     <string name="create_shortcut_error">Chyba pri pridávaní odkazu: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Písať vety s veľkým začiatočným písmenom</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Posun lišty nástrojov</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certifikát</string>
@@ -344,7 +346,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Inštalovať</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Popis</string>
     <string name="deck_description_saved">Popis aktualizovaný</string>
     <string name="format_deck_description_as_markdown">Formátovať ako Markdown</string>
diff --git a/common/android/src/main/res/values-sk/03-dialogs.xml b/common/android/src/main/res/values-sk/03-dialogs.xml
index c85cfe504b7f..96485e65dce2 100644
--- a/common/android/src/main/res/values-sk/03-dialogs.xml
+++ b/common/android/src/main/res/values-sk/03-dialogs.xml
@@ -49,8 +49,8 @@
     <string name="repair_deck_dialog">Naozaj chcete skúsiť opraviť databázu?\n\nPred začatím pokusu o opravenie bude vytvorená kópia v podpriečinku \"%s\".</string>
     <string name="intent_aedict_empty">Kategória \"predvolený\" je prázdna</string>
     <string name="intent_aedict_category">Ak chcete pridať kartičky do AnkiDroid, odstráňte všetky kategórie poznámkového bloku alebo pridajte jednu s názvom \"predvolený\"</string>
-    <string name="custom_study_new_extend">Zvýšiť/znížiť („-3”) dnešný limit nových kartičiek o</string>
-    <string name="custom_study_rev_extend">Zvýšiť/znížiť („-3”) dnešný limit kartičiek na zopakovanie o</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Zopakovať si kartičky zabudnuté za posledných x dní:</string>
     <string name="custom_study_ahead_description">Zopakovať kartičky na skúšanie za:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -102,7 +102,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Všetky kartičky</string>
-    <string name="tags_dialog_option_new_cards">Nové</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Nové</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Na preskúšanie</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Hľadanie prázdnych kartičiek&#8230;</string>
@@ -244,6 +244,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -279,7 +281,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">Z</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">Na</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-sk/10-preferences.xml b/common/android/src/main/res/values-sk/10-preferences.xml
index 413491d467f0..02d21fec6d33 100644
--- a/common/android/src/main/res/values-sk/10-preferences.xml
+++ b/common/android/src/main/res/values-sk/10-preferences.xml
@@ -57,7 +57,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Povoliť kartičkám spúšťanie iných aplikácií</string>
-    <string name="allow_card_external_launch_summ">Kartičky môžu otvoriť iné aplikácie vo vašom zariadení, potencionálne spúšťajúc nechcenú aktivitu.\nPonechajte vypnuté s výnimkou že veríte všetkým kartičkám a šablónam vo vašej kolekcii.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Hrúbka ťahu</string>
@@ -171,6 +171,16 @@
     <string name="use_current" maxLength="41">Balíček pre nové kartičky</string>
     <string name="learn_cutoff" maxLength="41">Limit pre učenie sa dopredu</string>
     <string name="time_limit" maxLength="41">Hodnota časového limitu</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="few">mins</item>
+        <item quantity="many">mins</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Začiatok ďalšieho dňa</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hodina po polnoci</item>
@@ -256,6 +266,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-sk/16-multimedia-editor.xml b/common/android/src/main/res/values-sk/16-multimedia-editor.xml
index c45225ab6e0e..266890ed98f7 100644
--- a/common/android/src/main/res/values-sk/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-sk/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Chcete tento obrázok orezať?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Chyba pri zvolenom obrázku, prosím skúste znovu"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-sl/02-strings.xml b/common/android/src/main/res/values-sl/02-strings.xml
index 09ffcc236941..b47c3fe98b53 100644
--- a/common/android/src/main/res/values-sl/02-strings.xml
+++ b/common/android/src/main/res/values-sl/02-strings.xml
@@ -225,7 +225,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -253,7 +256,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -344,7 +346,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-sl/03-dialogs.xml b/common/android/src/main/res/values-sl/03-dialogs.xml
index ab63154f572b..e2cbbb1a00cc 100644
--- a/common/android/src/main/res/values-sl/03-dialogs.xml
+++ b/common/android/src/main/res/values-sl/03-dialogs.xml
@@ -49,8 +49,8 @@
     <string name="repair_deck_dialog">Ali res želite popraviti podatkovno zbirko?\n\nPred poizkusom bo v mapi \"%s\" ustvarjena kopija.</string>
     <string name="intent_aedict_empty">Kategorija \"privzeta\" je prazna</string>
     <string name="intent_aedict_category">Za dodajanje kartic v AnkiDroid odstranite vse kategorija beležnice ali dodajte eno z imenom \"privzeta\"</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Preglej kartice, ki so bile v zadnjih x-ih dneh pozabljene:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -102,7 +102,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Vse kartice</string>
-    <string name="tags_dialog_option_new_cards">Nove</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Nove</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Zapadle</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Iskanje praznih kartic &#8230;</string>
@@ -244,6 +244,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -279,7 +281,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-sl/10-preferences.xml b/common/android/src/main/res/values-sl/10-preferences.xml
index 32408263d57f..dba383a9216a 100644
--- a/common/android/src/main/res/values-sl/10-preferences.xml
+++ b/common/android/src/main/res/values-sl/10-preferences.xml
@@ -57,7 +57,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Debelina črte</string>
@@ -171,6 +171,16 @@
     <string name="use_current" maxLength="41">Komplet za nove kartice</string>
     <string name="learn_cutoff" maxLength="41">Omejitev vnaprejšnjega učenja</string>
     <string name="time_limit" maxLength="41">Omejitev časovnega obdobja</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="two">mins</item>
+        <item quantity="few">mins</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -256,6 +266,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-sl/16-multimedia-editor.xml b/common/android/src/main/res/values-sl/16-multimedia-editor.xml
index 79278e6c35b2..89f6b8d753a4 100644
--- a/common/android/src/main/res/values-sl/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-sl/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-sq/02-strings.xml b/common/android/src/main/res/values-sq/02-strings.xml
index a2164602533c..10ba1cd1b5ad 100644
--- a/common/android/src/main/res/values-sq/02-strings.xml
+++ b/common/android/src/main/res/values-sq/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-sq/03-dialogs.xml b/common/android/src/main/res/values-sq/03-dialogs.xml
index e24237713803..77926dc324b9 100644
--- a/common/android/src/main/res/values-sq/03-dialogs.xml
+++ b/common/android/src/main/res/values-sq/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Dëshiron vërtet të provosh të riparosh bazën e të dhënave?\n\nPara fillimit të përpjekjes, do të krijohet një kopje në nënfolderin \"%s\".</string>
     <string name="intent_aedict_empty">Kategoria \"e parazgjedhur\" është bosh</string>
     <string name="intent_aedict_category">Për të shtuar karta në AnkiDroid, hiqni të gjitha kategoritë e Notepad ose shtoni një të quajtur \"default\"</string>
-    <string name="custom_study_new_extend">Rrit/zvogëlo (“-3”) kufirin e ri të kartës së sotme me</string>
-    <string name="custom_study_rev_extend">Rrit/zvogëlo (“-3”) kufirin e sotëm të rishikimit me</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Rishikoni kartat e harruara në x ditët e fundit:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Të gjitha kartat</string>
-    <string name="tags_dialog_option_new_cards">Të rejat</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Të rejat</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Pritet</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Po gjen karta boshe&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-sq/10-preferences.xml b/common/android/src/main/res/values-sq/10-preferences.xml
index 39b6f08a3552..5311ec678924 100644
--- a/common/android/src/main/res/values-sq/10-preferences.xml
+++ b/common/android/src/main/res/values-sq/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-sq/16-multimedia-editor.xml b/common/android/src/main/res/values-sq/16-multimedia-editor.xml
index d9a9211644fc..7d3e5ec19a56 100644
--- a/common/android/src/main/res/values-sq/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-sq/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-sr/02-strings.xml b/common/android/src/main/res/values-sr/02-strings.xml
index f49a3c196ab6..7c1375bd2953 100644
--- a/common/android/src/main/res/values-sr/02-strings.xml
+++ b/common/android/src/main/res/values-sr/02-strings.xml
@@ -222,7 +222,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -250,7 +253,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -339,7 +341,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-sr/03-dialogs.xml b/common/android/src/main/res/values-sr/03-dialogs.xml
index 5a3732918124..53add6397788 100644
--- a/common/android/src/main/res/values-sr/03-dialogs.xml
+++ b/common/android/src/main/res/values-sr/03-dialogs.xml
@@ -47,8 +47,8 @@
     <string name="repair_deck_dialog">Да ли заиста желите да обновите базу података?\n\nДо почетка обнављања, копија базе података ће бити смештена у фасциклу \'%s\'.</string>
     <string name="intent_aedict_empty">Категорија \'подразумевано\' је празна</string>
     <string name="intent_aedict_category">При додавању карата AnkiDroid уклања све категорије бележница или додаје једну са именом \'default\'</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Понови заборављено за последњих х дана:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -99,7 +99,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Све картице</string>
-    <string name="tags_dialog_option_new_cards">Нове</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Нове</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Рок</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
@@ -236,6 +236,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -271,7 +273,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-sr/10-preferences.xml b/common/android/src/main/res/values-sr/10-preferences.xml
index 6192c39eefff..463fddda0bd2 100644
--- a/common/android/src/main/res/values-sr/10-preferences.xml
+++ b/common/android/src/main/res/values-sr/10-preferences.xml
@@ -56,7 +56,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Ширина капи</string>
@@ -170,6 +170,15 @@
     <string name="use_current" maxLength="41">Шпил за нове картице</string>
     <string name="learn_cutoff" maxLength="41">Учити више од задатог лимита</string>
     <string name="time_limit" maxLength="41">Ограничење времена</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="few">mins</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -254,6 +263,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-sr/16-multimedia-editor.xml b/common/android/src/main/res/values-sr/16-multimedia-editor.xml
index 9edd3b8451e0..06b888f62efc 100644
--- a/common/android/src/main/res/values-sr/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-sr/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-sv/01-core.xml b/common/android/src/main/res/values-sv/01-core.xml
index 169a0ab21d4c..d31bc7347076 100644
--- a/common/android/src/main/res/values-sv/01-core.xml
+++ b/common/android/src/main/res/values-sv/01-core.xml
@@ -125,10 +125,10 @@
     <string name="template_for_current_card_deleted">Korttypen för det aktuella kortet har tagits bort.</string>
     <!-- Permissions -->
     <string name="read_write_permission_label">Läs och skriv till AnkiDroid-databasen</string>
-    <string name="read_write_permission_description">åtkomst till befintliga noter, kort, nottyper och kortlekar, samt att skapa nya</string>
+    <string name="read_write_permission_description">åtkomst till befintliga anteckningar, kort, anteckningstyper och kortlekar, samt att skapa nya</string>
     <!-- Context Menu -->
-    <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">Card browser</string>
-    <string name="context_menu_anki_card_label">Anki card</string>
+    <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">Kortbläddrare</string>
+    <string name="context_menu_anki_card_label">Anki-kort</string>
     <!-- Sync conflict -->
     <string name="sync_conflict_message_new">Samlingarna kan inte kombineras.\nVilken samling vill du behålla?</string>
     <string name="sync_conflict_keep_local_new" comment="Select AnkiDroid files to keep while syncing">AnkiDroid</string>
diff --git a/common/android/src/main/res/values-sv/02-strings.xml b/common/android/src/main/res/values-sv/02-strings.xml
index 04c13af072c8..ddf8bf0dc401 100644
--- a/common/android/src/main/res/values-sv/02-strings.xml
+++ b/common/android/src/main/res/values-sv/02-strings.xml
@@ -69,11 +69,11 @@
     <string name="leech_notification">Kort markerat som igel</string>
     <string name="webview_crash_unknown">Okänt fel</string>
     <string name="webview_crash_unknwon_detailed">Detta orsakades av ett internt fel i WebView</string>
-    <string name="webview_crash_oom">Out of memory</string>
+    <string name="webview_crash_oom">Slut på minne</string>
     <string name="webview_crash_oom_details">WebView avslutades av systemet. Detta händer vanligtvis när programmet får slut på minne, ofta på grund av stora teckensnitt eller media.</string>
     <string name="webview_crash_nonfatal">WebViewern kraschade. Orsak: %s</string>
-    <string name="webview_crash_fatal">Fatal error: WebView renderer crashed. Cause: %s</string>
-    <string name="webview_crash_loop_dialog_title">System WebView rendering failure</string>
+    <string name="webview_crash_fatal">Allvarligt fel: WebView-renderaren har kraschat. Orsak: %s</string>
+    <string name="webview_crash_loop_dialog_title">Fel vid rendering i System WebView</string>
     <string name="webview_crash_loop_dialog_content">WebViewern kunde inte hämta kortet \'%1$s\'.\n %2$s</string>
     <string name="slide_to_cancel" comment="Message shown when pressing the record button">Svep för att avbryta</string>
     <string name="filter_by_flags" maxLength="41">Flaggor</string>
@@ -85,18 +85,18 @@
     <string name="custom_study_loading_tags">Bygger lista över taggar&#8230;</string>
     <!-- Study options -->
     <plurals name="studyoptions_buried_count">
-        <item quantity="one">+%d begravda</item>
-        <item quantity="other">+%d buried</item>
+        <item quantity="one">+%d begravt</item>
+        <item quantity="other">+%d begravda</item>
     </plurals>
     <string name="studyoptions_total_new_label">Totalt antal nya kort</string>
     <string name="studyoptions_total_label">Totalt antal kort</string>
     <!-- Card editor -->
-    <string name="cardeditor_title_edit_card" maxLength="28">Redigera not</string>
+    <string name="cardeditor_title_edit_card" maxLength="28">Redigera anteckning</string>
     <string name="discard">Kasta</string>
     <string name="note_editor_no_cards_created">Inga kort skapade. Vänligen fyll i fler fält</string>
-    <string name="note_editor_no_cards_created_all_fields">Den aktuella nottypen gav inga kort.\nVälj en annan nottyp, eller klicka på ‘Kort’ och lägg till ett fältbyte</string>
-    <string name="note_editor_insert_cloze_no_cloze_note_type">Textluckor fungerar bara för nottypen Lucktext</string>
-    <string name="saving_facts">Sparar not</string>
+    <string name="note_editor_no_cards_created_all_fields">Den aktuella anteckningstypen producerade inga kort.\nVälj en annan anteckningstyp, eller klicka på ‘Kort’ och lägg till ett fältbyte</string>
+    <string name="note_editor_insert_cloze_no_cloze_note_type">Textluckor fungerar bara för anteckningstypen Lucktext</string>
+    <string name="saving_facts">Sparar anteckning</string>
     <string name="saving_model">Sparar anteckningstyp</string>
     <string name="save" maxLength="28">Spara</string>
     <string name="close">Stäng</string>
@@ -121,7 +121,7 @@
         <item quantity="other">%1$d minuter</item>
     </plurals>
     <string name="fact_adder_intent_title" comment="Label of the \'Add Note\' window. This title can\'t be seen in AnkiDroid directly.">AnkiDroid-kort</string>
-    <string name="note_editor_copy_note" maxLength="28">Kopiera not</string>
+    <string name="note_editor_copy_note" maxLength="28">Kopiera anteckning</string>
     <string name="card_editor_reposition_card" comment="reposition a card in the new queue" maxLength="28">Ompositionera</string>
     <string name="card_editor_reset_card" maxLength="28">Återställ framsteg</string>
     <string name="card_editor_reschedule_card" comment="Action to reschedule a card" maxLength="28">Omplanera</string>
@@ -206,7 +206,7 @@
     <string name="valid_js_api_version">Ogiltig version av AnkiDroid JS API. Kontakta utvecklare %s, eller visa wiki</string>
     <string name="update_js_api_version">AnkiDroid JS API uppdatering tillgänglig. Kontakta utvecklare %s, eller visa wiki</string>
     <string name="reviewer_invalid_api_version_visit_documentation">Visa</string>
-    <string name="anki_js_error_code">(Error code: %d)</string>
+    <string name="anki_js_error_code">(Felkod: %d)</string>
     <!-- About AnkiDroid screen -->
     <string name="about_ankidroid_successfully_copied_debug_info">Kopierat till urklipp</string>
     <string name="about_ankidroid_error_copy_debug_info">Fel vid kopiering av felsökningsinformation till urklipp</string>
@@ -214,14 +214,17 @@
     <string name="card_viewer_could_not_find_image">Kortet innehållsfel: Det gick inte att läsa in ‘%s’</string>
     <!-- Deck Picker -->
     <string name="search_decks" maxLength="28">Sök kortlekar</string>
-    <string name="ankidroid_init_failed_webview_title">Fatal error</string>
+    <string name="ankidroid_init_failed_webview_title">Allvarligt fel</string>
     <string name="ankidroid_init_failed_webview">AnkiDroid använder sig av System WebView vilket inte är tillgängligt. Detta kan hända om systemet håller på att installera uppdateringar. Försök igen om några minuter.\n\n%s</string>
     <string name="ankidroid_init_failed_storage">AnkiDroid kan inte komma åt lagring på grund av ett Android-fel.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Teckenstorlek</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Visa verktygsfält</string>
-    <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
-    <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
+    <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Visa förhandsvisning</string>
+    <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Göm förhandsvisning</string>
     <string name="format_insert_bold">Formatera som fet</string>
     <string name="format_insert_italic">Formatera som kursiv</string>
     <string name="format_insert_underline">Formatera som understruken</string>
@@ -236,8 +239,8 @@
     <string name="edit_toolbar_item">Redigera objekt i verktygsfältet</string>
     <string name="toolbar_item_explain_edit_or_remove">Ange HTML som ska infogas före och efter den markerade texten\n\nTryck länge på ett verktyg för att redigera eller ta bort det</string>
     <string name="remove_toolbar_item">Ta bort objekt från verktygsfältet?</string>
-    <string name="note_editor_toolbar_icon_requirement_error">Button text is required</string>
-    <string name="before_after_text_requirement_error">At least one HTML field is required</string>
+    <string name="note_editor_toolbar_icon_requirement_error">Knapptext krävs</string>
+    <string name="before_after_text_requirement_error">Åtminstone ett HTML-fält krävs</string>
     <string name="note_editor_image_too_large">Bilden är för stor, lägg till bilden manuellt</string>
     <string name="note_editor_video_too_large">Videofilen är för stor, lägg till videon manuellt</string>
     <string name="note_editor_audio_too_large">Ljudfilen är för stor, lägg till ljudet manuellt</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Din startskärm tillåter inte AnkiDroid att lägga till genvägar</string>
     <string name="create_shortcut_error">Kunde inte lägga till genväg: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Versalisera meningar</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Rulla verktygsfält</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certifikat</string>
@@ -265,18 +267,18 @@
     <string name="percentage">%s%%</string>
     <string name="download_deck">Hämta kortlek</string>
     <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Öppna i webbläsare</string>
-    <string name="try_again">Try again</string>
+    <string name="try_again">Försök igen</string>
     <string name="cancel_download">Avbryt hämtning</string>
     <string name="cancel_download_question_title">Avbryt hämtning?</string>
     <string name="downloading_file">Hämtar %s</string>
-    <string name="import_deck">Import deck</string>
+    <string name="import_deck">Importera kortlek</string>
     <string name="something_wrong">Något gick fel, vänligen försök igen</string>
     <string name="download_failed">Hämtning misslyckades</string>
     <string name="download_speed_unit" comment="Download speed. %1$s is an amount of data, e.g. \'1.2 MB\', giving \'1.2 MB/s\'">%1$s/s</string>
     <string name="download_speed_unknown" comment="Placeholder shown when the current download speed is unknown">-/s</string>
     <string name="download_time_unknown" comment="Placeholder when the remaining download time is unknown">-</string>
-    <string name="download_speed_label">Speed</string>
-    <string name="download_time_left_label">Time left</string>
+    <string name="download_speed_label">Hastighet</string>
+    <string name="download_time_left_label">Återstående tid</string>
     <string name="deck_download_progress_message">Du kan använda andra appar medan nedladdningen pågår</string>
     <string name="check_network">Kontrollera din nätverksanslutning</string>
     <string name="external_storage_unavailable">Nedladdningen avbruten, det externa lagringsutrymmet är inte tillgängligt</string>
@@ -312,7 +314,7 @@
     <string name="intro_ankidroid_tagline_one">Studera mindre</string>
     <string name="intro_ankidroid_tagline_two">Kom ihåg mer</string>
     <string name="intro_short_ankidroid_explanation">Ankis kortschema sparar tid genom att stärka dina svagaste punkter och bevara dina starkaste</string>
-    <string name="intro_get_started" comment="Action to start AnkiDroid for the first time without syncing from AnkiWeb">Get started</string>
+    <string name="intro_get_started" comment="Action to start AnkiDroid for the first time without syncing from AnkiWeb">Kom igång</string>
     <string name="intro_sync_from_ankiweb">Synka från AnkiWeb</string>
     <!-- IntentHandler -->
     <string name="app_not_initialized_new">AnkiDroid är inte initierat än. Öppna AnkiDroid och försök igen</string>
@@ -323,10 +325,10 @@
     <string name="deck_shortcut_doesnt_exist">Kortlek raderad. Ta bort genvägen</string>
     <!-- Browser Options Dialog -->
     <string name="show_cards" comment="Label for toggle cards button in BrowserOptionsDialog">Kort</string>
-    <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Noter</string>
+    <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Anteckningar</string>
     <string name="truncate_content_help">Begränsa varje rads höjd i webbläsaren till de första 3 innehållsraderna</string>
     <string name="audio_saved">Inspelning sparad</string>
-    <string name="deleting_selected_notes">Raderar markerade noter</string>
+    <string name="deleting_selected_notes">Raderar markerade anteckningar</string>
     <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tryck på en röst för att lyssna</string>
     <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Röst bör installeras innan den används</string>
     <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Använd ändå</string>
@@ -335,7 +337,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Installera</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Det gick inte att öppna text till talinställningarna</string>
-    <string name="shared_decks_login_required">Logga in för att ladda ner fler kortlekar</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Beskrivning</string>
     <string name="deck_description_saved">Beskrivningen har uppdaterats</string>
     <string name="format_deck_description_as_markdown">Formatera som markdown</string>
@@ -354,15 +356,15 @@
     <string name="next_recording" comment="Description of a button to go to the next recording">Nästa</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
     <string name="orphan_note_title">Kan inte ta bort korttyp</string>
-    <string name="orphan_note_message">Om du tar bort denna kort typ så kommer det finnas noter utan kort.</string>
+    <string name="orphan_note_message">Om du tar bort denna korttyp så kommer det finnas anteckningar utan kort.</string>
     <string name="voice_not_supported">Röstfunktionalitet är stöttas inte. Försök en annan eller installera en röst motor.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Deck picker</string>
+    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Kortleksväljare</string>
     <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Ta bort kortlek utan konfirmation</string>
-    <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Note editor</string>
-    <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Välj nottyp</string>
+    <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Redigerare för anteckningar</string>
+    <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Välj anteckningstyp</string>
     <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">Taggredigerare</string>
-    <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">Card template editor</string>
+    <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">Redigerare för kortmallar</string>
     <string name="edit_front_template" comment="Description of the shortcut that shows the question side of the card template">Ändra framsidesmallen</string>
     <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">Ändra baksidesmallen</string>
     <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Ändra stil</string>
@@ -380,7 +382,7 @@
     <string name="set_due_date_date_range">Datumintervall</string>
     <string comment="Shown when retrying a running action" name="already_in_progress">Pågår redan</string>
     <!-- Switch profiles screen -->
-    <string name="switch_profile" maxLength="41" comment="Title of the screen where the user switches between profiles">Switch profile</string>
-    <string name="edit_profile" comment="Content description of the button that edits a profile in the profile list">Edit profile</string>
-    <string name="delete_profile" comment="Content description of the button that deletes a profile in the profile list">Delete profile</string>
+    <string name="switch_profile" maxLength="41" comment="Title of the screen where the user switches between profiles">Byt profil</string>
+    <string name="edit_profile" comment="Content description of the button that edits a profile in the profile list">Redigera profil</string>
+    <string name="delete_profile" comment="Content description of the button that deletes a profile in the profile list">Radera profil</string>
 </resources>
diff --git a/common/android/src/main/res/values-sv/03-dialogs.xml b/common/android/src/main/res/values-sv/03-dialogs.xml
index 75fabbb8105d..29a207649ae5 100644
--- a/common/android/src/main/res/values-sv/03-dialogs.xml
+++ b/common/android/src/main/res/values-sv/03-dialogs.xml
@@ -41,15 +41,15 @@
     <string name="answering_error_title">Databasfel</string>
     <string name="answering_error_message">Ett fel uppstod när data skrevs till samlingen. Detta kan bero på en korrupt databas eller otillräckligt diskutrymme.\n\nOm detta händer flera gånger, vänligen kontrollera databasen, reparera samlingen eller återställ den från en säkerhetskopia. Klicka på \'alternativ\' för det.\n\nAnnars kan detta också bero på en bug i AnkiDroid; vänligen rapportera felet så vi kan kontrollera detta.</string>
     <string name="answering_error_report">Rapportera fel</string>
-    <string name="storage_full_message">There is not enough free storage space to open AnkiDroid. Free up some space to continue.</string>
+    <string name="storage_full_message">Det finns inte nog med lagringsutrymme för att öppna AnkiDroid. Frigör lite utrymme för att fortsätta.</string>
     <string name="repair_deck_dialog">Vill du verkligen försöka reparera databasen?\n\nEn kopia kommer att skapas i mappen \'%s\' innan.</string>
     <string name="intent_aedict_empty">Kategori \'default\' är tom</string>
     <string name="intent_aedict_category">För att lägga till kort till AnkiDroid, ta bort alla Notepadkategorier eller lägg till en som heter \'default\'</string>
-    <string name="custom_study_new_extend">Öka/minska (”-3”) dagens nya kortgräns med</string>
-    <string name="custom_study_rev_extend">Öka/minska (“-3”) dagens repetitionsgräns med</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Repetera kort som är glömda under de senaste x dagarna:</string>
-    <string name="custom_study_ahead_description">Review cards due in the next:</string>
-    <string name="custom_study_preview">Preview new cards added in the last:</string>
+    <string name="custom_study_ahead_description">Repetera kort som förfaller inom de närmaste:</string>
+    <string name="custom_study_preview">Förhandsvisa nya kort som lagts till under de senaste:</string>
     <string name="custom_study_tags">Välj x kort från kortleken:</string>
     <string name="storage_full_title">Lagring full</string>
     <string name="storage_almost_full_title">Lagring nästan full</string>
@@ -70,7 +70,7 @@
     <string name="dialog_exit" comment="Label for a button which will exit/finish the current screen">Avsluta</string>
     <string name="dialog_continue">Fortsätt</string>
     <string name="dialog_processing">Bearbetar&#8230;</string>
-    <string name="dialog_allow">Allow</string>
+    <string name="dialog_allow">Tillåt</string>
     <string name="dialog_positive_create" comment="Create a new collection, probably erasing the previous one, may be necessary in case of error.">Skapa</string>
     <string name="dialog_positive_delete" maxLength="28">Radera</string>
     <!-- Currently unsued, should be useful in the future -->
@@ -78,16 +78,16 @@
     <string name="dialog_positive_overwrite">Skriv över</string>
     <string name="dialog_positive_repair">Reparera</string>
     <string name="dialog_positive_replace">Ersätt</string>
-    <string name="sync_clock_off_with_current_time">%1$s\n\nCorrect the date and time, or enable automatic date and time, then sync again.\n\nYour device’s current time is: %2$s</string>
+    <string name="sync_clock_off_with_current_time">%1$s\n\nKorrigera datum och tid, eller slå på automatisk datum och tid, och synkronisera sedan igen.\n\nDin enhets nuvarande tid är:%2$s</string>
     <string name="dialog_collection_path_not_dir">Den valda sökvägen är ogiltig</string>
-    <string name="dialog_invalid_custom_certificate">The provided text does not resolve to a valid PEM-encoded X509 certificate</string>
+    <string name="dialog_invalid_custom_certificate">Den angivna texten kan inte omvandlas till ett giltigt PEM-kodat X509-certifikat</string>
     <string name="dialog_invalid_custom_certificate_title">Kunde inte tolka certifikatet</string>
     <string name="dialog_updated_custom_certificate">Certifikat uppdaterat</string>
     <!-- Media checking -->
     <string name="check_media_warning">Detta kan ta lång tid med stora mediasamlingar. Fortsätt?</string>
     <string name="check_media_message">Kontrollerar media&#8230;</string>
     <string name="check_media_adding_missing_tag">Lägger till taggar&#8230;</string>
-    <string name="check_media_tags_added">Tags added</string>
+    <string name="check_media_tags_added">Taggar tillagda</string>
     <string name="delete_media_message">Tar bort media&#8230;</string>
     <string name="delete_media_result_title">Raderingsresultat</string>
     <plurals name="delete_media_result_message">
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Alla kort</string>
-    <string name="tags_dialog_option_new_cards">Ny</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Ny</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Kö</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Hittar tomma kort&#8230;</string>
@@ -106,7 +106,7 @@
     <!-- Multimedia - Audio View -->
     <string name="multimedia_editor_audio_permission_denied">Behörighet för ljudinspelning nekad</string>
     <string name="permission_denied">Åtkomst nekad</string>
-    <string name="microphone_permission_denied_message">Microphone permission denied. Please grant it in the app settings.</string>
+    <string name="microphone_permission_denied_message">Åtkomst till mikrofonen ej tillåten. Bevilja åtkomst i appens inställningar.</string>
     <!-- Database Integrity Check -->
     <string name="integrity_check_continue_anyway">Fortsätt ändå</string>
     <string name="integrity_check_insufficient_space">Databaskontrollen använder en stor mängd tillfällig lagring.\n\nDet rekommenderas starkt att du har minst %s ledigt utrymme på din enhet innan du fortsätter.</string>
@@ -117,7 +117,7 @@
     <!-- Deck Options -->
     <!-- Database Errors-->
     <string name="database_locked_title">Databas låst</string>
-    <string name="database_locked_summary_new" comment="%s is the name of the \'AnkiDroid directory\' setting">Another AnkiDroid app is using this collection. It may conflict even when it is not visibly running.\n\nTo keep using both apps, change the ‘%s’ in one app\'s Advanced settings.\n\nTo use this app now, force-stop the conflicting app.</string>
+    <string name="database_locked_summary_new" comment="%s is the name of the \'AnkiDroid directory\' setting">En annan AnkiDroid-app använder denna samling. Det kan uppstå konflikter även när den inte verkar köras.\n\nFör att fortsätta använda båda apparna, ändra \'%s\' i en av apparnas Avancerade inställningar.\n\nFör att använda denna app nu, tvångsavsluta den andra appen.</string>
     <string name="incompatible_database_version_title">Inkompatibel databasversion</string>
     <string name="incompatible_database_version_summary">Databasen är en mer avancerad version än denna version av AnkiDroid kan arbeta med. Uppgradera AnkiDroid eller nedgradera databasen för att öppna den\n\nVersion som stöds: %1$d\nDatabasversion: %2$d\n\nFöljande återställningsalternativ kommer att skriva över din nuvarande samling, eventuellt med en kompatibel databasversion:</string>
     <!-- Deck Picker Background-->
@@ -139,7 +139,7 @@
     <!-- Locale Selection Dialog -->
     <string name="locale_selection_dialog_title_new">Ställ in språk</string>
     <string name="locale_selection_dialog_summary">Vissa flerspråkiga tangentbord, till exempel GBoard har stöd för att ändra språk vid redigering av text\n\nVänligen begär funktionen ”setImeHintLocales” från din tangentbordstillverkare om ditt tangentbord inte ändrar språk.</string>
-    <string name="locale_selection_dialog_unknown_language" comment="Used for the locales whose name is not displayed when selected and placeholder is language tag">Unknown language [%1$s]</string>
+    <string name="locale_selection_dialog_unknown_language" comment="Used for the locales whose name is not displayed when selected and placeholder is language tag">Okänt språk [%1$s]</string>
     <!-- Help Dialog -->
     <string name="help_title_using_ankidroid">Hur man använder AnkiDroid</string>
     <string name="help_item_ankidroid_manual">AnkiDroid-handboken</string>
@@ -169,7 +169,7 @@
     <string name="help_dialog_exception_report_sent">Rapporten har skickats!</string>
     <!--Sync-->
     <plurals name="sync_automatic_sync_needs_more_time">
-        <item quantity="one" comment="Consider keeping the unbreakable space after the digit">An automatic sync may be triggered in %d second</item>
+        <item quantity="one" comment="Consider keeping the unbreakable space after the digit">En automatisk synkronisering kan utlösas om %d sekund</item>
         <item quantity="other" comment="Consider keeping the unbreakable space after the digit">En automatisk synkronisering kan utlösas om %d sekunder</item>
     </plurals>
     <string name="metered_sync_data_warning">Din internetleverantör kan ta ut pengar för dataanvändning</string>
@@ -209,7 +209,7 @@
         <item quantity="other">dagar</item>
     </plurals>
     <plurals name="set_due_date_current_interval">
-        <item quantity="one">Current interval: %d day</item>
+        <item quantity="one">Nuvarande intervall: %d dag</item>
         <item quantity="other">Nuvarande intervall: %d dagar</item>
     </plurals>
     <string name="range_delimiter" comment="Placed between two input boxes to denote a range">–</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">Systemet WebView är föråldrad. Vissa funktioner fungerar inte korrekt. Vänligen uppdatera det.\n\nInstallerad version: %1$d\nMinsta nödvändiga version: %2$d</string>
     <string name="compress">Komprimera</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Språket är inte stöttat</string>
     <string name="tts_error_dialog_reason_text">Text-till-talmotorn <b>%1$s</b> stöder inte följande språk: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Ändra motor</string>
@@ -244,27 +246,28 @@
     <!--Change Note Type Dialog Fragment-->
     <string name="card_numbers_unchanged">Kortnumren kommer att bli oförändrade</string>
     <!-- Subset of TR.changeNotetypeToFromCloze -->
-    <string name="extra_cloze_deletions_removed">If changing to a regular note type, and there are more cloze deletions than available card templates, any extra cards will be removed.</string>
-    <string name="different_note_types_selected">Please select notes from only one notetype.</string>
-    <string name="error_no_changes_to_save">No changes to save</string>
-    <string name="choose_color">Choose color</string>
+    <string name="extra_cloze_deletions_removed">Om du byter till en vanlig anteckningstyp och det finns fler textluckor än tillgängliga kortmallar, kommer eventuella återstående kort att tas bort.</string>
+    <string name="different_note_types_selected">Välj endast anteckningar från en anteckningstyp.</string>
+    <string name="error_no_changes_to_save">Inga ändringar att spara</string>
+    <string name="choose_color">Välj färg</string>
     <!-- Special Fields -->
-    <string name="standard_fields_tab_header" comment="Tab header for inserting non-special fields: {{Front}}">Fields</string>
-    <string name="special_fields_tab_header" comment="Tab header for inserting special fields: {{Deck}}">Special</string>
+    <string name="standard_fields_tab_header" comment="Tab header for inserting non-special fields: {{Front}}">Fält</string>
+    <string name="special_fields_tab_header" comment="Tab header for inserting special fields: {{Deck}}">Speciella fält</string>
     <string name="special_field_example_suffix"><![CDATA[: ‘<b>%1$s</b>’]]></string>
-    <string name="special_field_front_side_help">The front template content. Audio is not automatically played</string>
-    <string name="special_field_deck_help" comment="%s: either blank or \' %s\'">The full deck of the card, including parent decks%s</string>
-    <string name="special_field_subdeck_help" comment="%s: either blank or \' %s\'">The current deck of the card, excluding parent decks%s</string>
-    <string name="special_field_flag_help">Outputs ‘%1$s’, where %2$s is the flag code (%3$s\–%4$s\)</string>
-    <string name="special_field_tags_help" comment="%s: either blank or \' %s\'">The tags of the note%s</string>
-    <string name="special_field_card_id_help" comment="%s: either blank or \' %s\'">The ID of the card%s</string>
-    <string name="special_field_card_help" comment="%s: either blank or \' %s\'">The name of the card template%s</string>
-    <string name="special_field_type_help" comment="%s: either blank or \' %s\'">The name of the note type%s</string>
+    <string name="special_field_front_side_help">Innehållet i den främre mallen. Ljud spelas ej upp automatiskt</string>
+    <string name="special_field_deck_help" comment="%s: either blank or \' %s\'">Kortets kompletta kortlek, inklusive överordnade kortlekar%s</string>
+    <string name="special_field_subdeck_help" comment="%s: either blank or \' %s\'">Kortets nuvarande kortlek, exklusive överordnade kortlekar%s</string>
+    <string name="special_field_flag_help">Visar \'%1$s\', där %2$s är flaggans kod (%3$s\-%4$s\)</string>
+    <string name="special_field_tags_help" comment="%s: either blank or \' %s\'">Anteckningens taggar%s</string>
+    <string name="special_field_card_id_help" comment="%s: either blank or \' %s\'">Kortets ID%s</string>
+    <string name="special_field_card_help" comment="%s: either blank or \' %s\'">Kortmallens namn%s</string>
+    <string name="special_field_type_help" comment="%s: either blank or \' %s\'">Anteckningstypens namn%s</string>
     <!-- Change Note Type Dialog -->
-    <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
-    <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
-    <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
-    <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
-    <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
+    <string name="change_note_type_from" comment="Label indicating the original note type before changing it">Från</string>
+    <string name="change_note_type_to" comment="Label indicating the new note type to change to">Till</string>
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
+    <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profilnamn</string>
+    <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profilnamnet kan inte vara tomt</string>
+    <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profilnamn måste vara %1$d eller färre tecken</string>
 </resources>
diff --git a/common/android/src/main/res/values-sv/07-cardbrowser.xml b/common/android/src/main/res/values-sv/07-cardbrowser.xml
index 4b43184a625d..4f7e6a4a1418 100644
--- a/common/android/src/main/res/values-sv/07-cardbrowser.xml
+++ b/common/android/src/main/res/values-sv/07-cardbrowser.xml
@@ -29,14 +29,14 @@
         <item quantity="other">%d kort visas</item>
     </plurals>
     <plurals name="card_browser_subtitle_notes_mode">
-        <item quantity="one">%d not visas</item>
-        <item quantity="other">%d noter visas</item>
+        <item quantity="one">%d anteckning visas</item>
+        <item quantity="other">%d anteckningar visas</item>
     </plurals>
     <plurals name="card_browser_delete_notes">
-        <item quantity="one">Radera not</item>
-        <item quantity="other">Radera noter</item>
+        <item quantity="one">Radera anteckning</item>
+        <item quantity="other">Radera anteckningar</item>
     </plurals>
-    <string name="delete_card_title">Radera not?</string>
+    <string name="delete_card_title">Radera anteckning?</string>
     <string name="card_browser_show_marked" maxLength="28">Filtrera markerade</string>
     <string name="card_browser_show_suspended" maxLength="28">Filtrera låsta</string>
     <string name="card_browser_search_by_tag" maxLength="28">Filtrera efter etikett</string>
@@ -48,8 +48,8 @@
     <string name="card_browser_list_my_searches_new_search_error_empty_name">Du kan inte spara en sökning utan ett namn</string>
     <string name="card_browser_list_my_searches_new_search_error_dup">Namnet finns</string>
     <string name="card_browser_list_my_searches_successful_save">Sökningen har sparats</string>
-    <string name="card_browser_list_my_searches_successful_deleted">Search deleted</string>
-    <string name="no_note_to_edit">Ingen not att ändra</string>
+    <string name="card_browser_list_my_searches_successful_deleted">Sökningen har raderats</string>
+    <string name="no_note_to_edit">Ingen anteckning att ändra</string>
     <string name="card_browser_list_my_searches_remove_content">Ta bort ”%1$s”?</string>
     <string name="card_browser_change_display_order" maxLength="28">Ändra visningsordning</string>
     <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">Sök</string>
@@ -70,8 +70,8 @@
         <item quantity="other">Exportera kort</item>
     </plurals>
     <plurals name="card_browser_export_notes">
-        <item quantity="one">Exportera not</item>
-        <item quantity="other">Exportera noter</item>
+        <item quantity="one">Exportera anteckning</item>
+        <item quantity="other">Exportera anteckningar</item>
     </plurals>
     <plurals name="card_browser_cards_deleted">
         <item quantity="one">%d kort raderat</item>
@@ -87,33 +87,33 @@
     <string name="user_potential_columns">Tillgänglig</string>
     <string name="include_column">Inkludera kolumn</string>
     <string name="exclude_column">Exkludera kolumn</string>
-    <string name="save_changes_message">Please save your changes first</string>
-    <string name="browser_find_replace_loading_fields">Retrieving fields names&#8230;</string>
+    <string name="save_changes_message">Spara dina ändringar först</string>
+    <string name="browser_find_replace_loading_fields">Hämtar fältnamn&#8230;</string>
     <!-- Search history -->
-    <string name="card_browser_see_more">See more</string>
-    <string name="card_browser_see_less">See less</string>
+    <string name="card_browser_see_more">Visa fler</string>
+    <string name="card_browser_see_less">Visa färre</string>
     <!-- Sort Order -->
-    <string name="card_browser_order_no_sorting_title" comment="Title of the \'no sorting\' row in the Choose Display Order bottom sheet">No sorting</string>
-    <string name="card_browser_order_no_sorting_subtitle" comment="Subtitle for the \'no sorting\' row noting that no-sort is faster than sorted queries">Faster</string>
-    <string name="card_browser_order_snackbar_sort_by" comment="Snackbar shown after sort changes. %1$s is the column name (e.g. \'Card Type\')">Sort by %1$s</string>
-    <string name="card_browser_order_subtitle_text_ascending" comment="Sort direction subtitle for text columns when ascending (A before Z)">A–Z</string>
-    <string name="card_browser_order_subtitle_text_descending" comment="Sort direction subtitle for text columns when descending (Z before A)">Z–A</string>
-    <string name="card_browser_order_subtitle_numeric_ascending" comment="Sort direction subtitle for numeric columns when ascending (smallest value first)">Low to high</string>
-    <string name="card_browser_order_subtitle_numeric_descending" comment="Sort direction subtitle for numeric columns when descending (largest value first)">High to low</string>
-    <string name="card_browser_order_subtitle_date_ascending" comment="Sort direction subtitle for date columns when ascending (oldest entry first)">Oldest first</string>
-    <string name="card_browser_order_subtitle_date_descending" comment="Sort direction subtitle for date columns when descending (newest entry first)">Newest first</string>
+    <string name="card_browser_order_no_sorting_title" comment="Title of the \'no sorting\' row in the Choose Display Order bottom sheet">Ingen sortering</string>
+    <string name="card_browser_order_no_sorting_subtitle" comment="Subtitle for the \'no sorting\' row noting that no-sort is faster than sorted queries">Snabbare</string>
+    <string name="card_browser_order_snackbar_sort_by" comment="Snackbar shown after sort changes. %1$s is the column name (e.g. \'Card Type\')">Sortera efter %1$s</string>
+    <string name="card_browser_order_subtitle_text_ascending" comment="Sort direction subtitle for text columns when ascending (A before Z)">A-Ö</string>
+    <string name="card_browser_order_subtitle_text_descending" comment="Sort direction subtitle for text columns when descending (Z before A)">Ö-A</string>
+    <string name="card_browser_order_subtitle_numeric_ascending" comment="Sort direction subtitle for numeric columns when ascending (smallest value first)">Låg till hög</string>
+    <string name="card_browser_order_subtitle_numeric_descending" comment="Sort direction subtitle for numeric columns when descending (largest value first)">Hög till låg</string>
+    <string name="card_browser_order_subtitle_date_ascending" comment="Sort direction subtitle for date columns when ascending (oldest entry first)">Äldst först</string>
+    <string name="card_browser_order_subtitle_date_descending" comment="Sort direction subtitle for date columns when descending (newest entry first)">Nyast först</string>
     <!-- SortPill labels: a single character on each half hinting at the direction.
          Translators: pick the first/last character of your locale\'s sort order. -->
     <string name="sort_pill_label_text_ascending" comment="SortPill standard half marker for text columns. Use a 1-char glyph that suggests the start of the alphabet.">A</string>
-    <string name="sort_pill_label_text_descending" comment="SortPill reverse half marker for text columns. Use a 1-char glyph that suggests the end of the alphabet.">Z</string>
+    <string name="sort_pill_label_text_descending" comment="SortPill reverse half marker for text columns. Use a 1-char glyph that suggests the end of the alphabet.">Ö</string>
     <string name="sort_pill_label_numeric_ascending" comment="SortPill standard half marker for numeric columns. Use a 1-char glyph that suggests the smallest value.">1</string>
     <string name="sort_pill_label_numeric_descending" comment="SortPill reverse half marker for numeric columns. Use a 1-char glyph that suggests the largest value.">9</string>
     <!-- SortPill accessibility descriptions, used by TalkBack. The host should prepend the
          column name (e.g. "Front, ascending"); these strings are the direction half. -->
-    <string name="sort_pill_a11y_ascending" comment="SortPill accessibility: ascending half">Ascending</string>
-    <string name="sort_pill_a11y_descending" comment="SortPill accessibility: descending half">Descending</string>
-    <string name="sort_pill_a11y_selected" comment="SortPill accessibility: state announcement when this half is the active sort direction">Selected</string>
-    <string name="card_browser_order_section_unavailable" comment="Header: browser columns that cannot be sorted (e.g. Question)">Unavailable</string>
-    <string name="card_browser_order_subtitle_use_sort_field" comment="Fix for when the \'Question/Answer\' column is not sortable.">Card content can\'t be sorted. Use Sort Field</string>
-    <string name="card_browser_order_subtitle_cards_mode_only" comment="Fix for trying to sort on FSRS columns in Notes mode">Only available in cards mode</string>
+    <string name="sort_pill_a11y_ascending" comment="SortPill accessibility: ascending half">Stigande</string>
+    <string name="sort_pill_a11y_descending" comment="SortPill accessibility: descending half">Fallande</string>
+    <string name="sort_pill_a11y_selected" comment="SortPill accessibility: state announcement when this half is the active sort direction">Valda</string>
+    <string name="card_browser_order_section_unavailable" comment="Header: browser columns that cannot be sorted (e.g. Question)">Ej tillgänglig</string>
+    <string name="card_browser_order_subtitle_use_sort_field" comment="Fix for when the \'Question/Answer\' column is not sortable.">Kortets innehåll kan inte sorteras. Använd sorteringsfält</string>
+    <string name="card_browser_order_subtitle_cards_mode_only" comment="Fix for trying to sort on FSRS columns in Notes mode">Endast tillgänglig i kortläge</string>
 </resources>
diff --git a/common/android/src/main/res/values-sv/08-widget.xml b/common/android/src/main/res/values-sv/08-widget.xml
index 742d8141f096..11503f7a9e3a 100644
--- a/common/android/src/main/res/values-sv/08-widget.xml
+++ b/common/android/src/main/res/values-sv/08-widget.xml
@@ -37,7 +37,7 @@
         <item quantity="one">%d minuter kvar</item>
         <item quantity="other">%d minuter kvar</item>
     </plurals>
-    <string name="widget_add_note_button">Lägg till ny AnkiDroid not</string>
+    <string name="widget_add_note_button">Lägg till ny AnkiDroid-anteckning</string>
     <string name="deck_picker_widget_description" comment="Title of the Deck Picker Widget. Displayed to the user in Android\'s Widget Selection menu">Kortleks väljare</string>
     <string name="card_analysis_extra_widget_description">Kort Analys</string>
     <!-- Strings to explain usage in Deck Picker and Card Analysis Widget Configuration screen -->
@@ -47,8 +47,8 @@
     <string name="deck_removed_from_widget" comment="Snackbar when deck is removed from widget">Kortlek borttagen</string>
     <string name="deck_already_selected_message" comment="Snackbar when user try to select the same deck again">Denna kortlek har redan blivit vald</string>
     <plurals name="deck_limit_reached">
-        <item quantity="one" comment="Consider keeping the unbreakable space after the digit">You can select up to %d deck.</item>
-        <item quantity="other" comment="Consider keeping the unbreakable space after the digit">You can select up to %d decks.</item>
+        <item quantity="one" comment="Consider keeping the unbreakable space after the digit">Du kan välja upp till %d kortlek.</item>
+        <item quantity="other" comment="Consider keeping the unbreakable space after the digit">Du kan välja upp till %d kortlekar.</item>
     </plurals>
     <string name="empty_widget_state" comment="To denote the widget is empty">Kortlek saknas. Tryck för att konfigurera.</string>
     <string name="empty_collection_state_in_widget" comment="To denote the collection is empty">Samlingen är tom, använd appen för att lägga till kortlekar och omkonfigurera</string>
diff --git a/common/android/src/main/res/values-sv/09-backup.xml b/common/android/src/main/res/values-sv/09-backup.xml
index 6458404798f9..1aef9f81d98e 100644
--- a/common/android/src/main/res/values-sv/09-backup.xml
+++ b/common/android/src/main/res/values-sv/09-backup.xml
@@ -24,13 +24,13 @@
   -->
 <resources>
     <string name="backup_deck_no_storage_left">Säkerhetskopiering kunde inte utföras på grund av otillräckligt lagringsutrymme. Frigör utrymme eller minska djupet på säkerhetskopian.</string>
-    <string name="storage_warning" comment="Consider keeping the unbreakable space after the digit">Less than %d MB space on your storage left.\nFree some space to avoid data loss.</string>
+    <string name="storage_warning" comment="Consider keeping the unbreakable space after the digit">Mindre än %d MB lagringsutrymme kvar på ditt lagringsutrymme.\nFrigör utrymme för att undvika dataförlust.</string>
     <string name="backup_restore" maxLength="28">Återställ från säkerhetskopia</string>
     <string name="backup_new_collection">Ny samling</string>
     <string name="backup_del_collection">Ta bort samling och skapa en ny</string>
     <string name="backup_del_collection_question">Är du säker att du vill ta bort denna samling och skapa en ny? Detta kommer ta bort alla framsteg samt radera alla kort!</string>
     <string name="backup_one_way_sync_from_server">Envägssynkning från servern</string>
-    <string name="backup_use_default_folder">Use default collection folder</string>
+    <string name="backup_use_default_folder">Använd standardmapp för samling</string>
     <string name="backup_full_sync_from_server_question">Är du säker att du vill skriva över din samling med den från AnkiWeb? Detta kommer ta bort alla framsteg och ändrad information sedan din senaste synkning!</string>
     <string name="error_handling_title">Felhantering</string>
     <string name="error_handling_options" comment="In a warning message, the label of the suggested action that the user should take">Alternativ</string>
diff --git a/common/android/src/main/res/values-sv/10-preferences.xml b/common/android/src/main/res/values-sv/10-preferences.xml
index 42e56d36505f..aec6582c5422 100644
--- a/common/android/src/main/res/values-sv/10-preferences.xml
+++ b/common/android/src/main/res/values-sv/10-preferences.xml
@@ -24,7 +24,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- generic strings -->
-    <string name="enabled" comment="Generic label for something that is turned on">Enabled</string>
+    <string name="enabled" comment="Generic label for something that is turned on">Aktiverad</string>
     <string name="disabled" comment="Generic label for something that is turned off">Inaktiverad</string>
     <plurals name="pref_summ_minutes">
         <item quantity="one">%d min</item>
@@ -47,16 +47,16 @@
     <string name="pref_cat_advanced" maxLength="41">Avancerat</string>
     <string name="pref_cat_workarounds" maxLength="41">Specialfunktioner</string>
     <string name="pref_cat_plugins" maxLength="41">Plugins</string>
-    <string name="pref_cat_editing" maxLength="41">Editing</string>
-    <string name="pref_cat_security" maxLength="41">Security</string>
+    <string name="pref_cat_editing" maxLength="41">Redigering</string>
+    <string name="pref_cat_security" maxLength="41">Säkerhet</string>
     <!-- Card template JavaScript API permissions -->
-    <string name="allow_dangerous_js_api_title" maxLength="41">Globally allow dangerous JavaScript APIs</string>
-    <string name="allow_dangerous_js_api_summ">Allows any card or template to read and modify other cards, or your Anki collection data.\nLeave off unless you trust all cards and templates in your collection.</string>
-    <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
+    <string name="allow_dangerous_js_api_title" maxLength="41">Tillåt farliga JavaScript API:er globalt</string>
+    <string name="allow_dangerous_js_api_summ">Tillåter alla kort eller mallar att läsa och ändra andra kort, eller din Anki-samlings data.\nLåt vara inaktiverad om du inte litar på alla kort och mallar i din samling.</string>
+    <string name="dangerous_js_api_denied_snackbar">Säkerhet: Osäkert JavaScript-anrop blockerades.\nOm du litar på alla kort och mallar i din samling kan detta tillåtas under avancerade inställningar.</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
-    <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
-    <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
+    <string name="allow_card_external_launch_title" maxLength="41">Tillåt kort att starta andra appar</string>
+    <string name="allow_card_external_launch_summ">Kort kan öppna andra appar på din enhet, vilket kan utlösa potentiellt oönskade åtgärder.\nWebblänkar kan fortfarande öppna andra appar när denna inställning är inaktiverad.\nLåt vara inaktiverad om du inte litar på alla kort och mallar i din samling.</string>
+    <string name="card_external_launch_denied_snackbar">Säkerhet: Kortet blockerades från att starta en annan app.\nOm du litar på alla kort och mallar i din samling kan detta tillåtas under avancerade inställningar.</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Streckbredd</string>
     <string name="use_input_tag" maxLength="41">Skriv svar i kortet</string>
@@ -70,7 +70,7 @@
     <string name="button_size" maxLength="41">Storlek på svarsknapp</string>
     <string name="card_browser_font_size" maxLength="41">Typsnittsstorlek i kortbläddrare</string>
     <string name="card_browser_hide_media" maxLength="41">Visa filnamn i kortbläddraren</string>
-    <string name="card_browser_hide_media_summary">Display audio filenames in the card browser question/answer fields</string>
+    <string name="card_browser_hide_media_summary">Visa mediefilnamn i kortbläddrarens fråga/svarsfält</string>
     <string name="col_path" maxLength="41">AnkiDroid sökväg</string>
     <string name="fullscreen_review" maxLength="41">Fullskärmsläge</string>
     <string name="full_screen_off" comment="Value of the fullscreen mode preference meaning fullscreen is not used">Av</string>
@@ -86,7 +86,7 @@
     <string name="gestures_summ">Koppla gester till handlingar, som t ex att svara på eller redigera kort.</string>
     <string name="gestures_corner_touch" maxLength="41">9-punkters pekning</string>
     <string name="gestures_corner_touch_summary">Tillåt tryckgester i skärmhörnen</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Show keyboard shortcuts</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Visa kortkommandon</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Fullskärm navigationsmeny</string>
     <string name="gestures_fullscreen_nav_drawer_summary">Öppna navigationsmeny när du swipar höger var som helst på skärmen</string>
     <string name="gestures_none" maxLength="41" comment="No gestures">Ingen</string>
@@ -104,11 +104,11 @@
     <string name="gestures_corner_tap_middle_center" maxLength="41">Tryck vid mitten</string>
     <string name="gestures_corner_tap_bottom_left" maxLength="41">Tryck längst ner till vänster</string>
     <string name="gestures_corner_tap_bottom_right" maxLength="41">Tryck längst ner till höger</string>
-    <string name="gestures_two_finger_tap" maxLength="41">Two-finger tap</string>
-    <string name="gestures_three_finger_tap" maxLength="41">Three-finger tap</string>
-    <string name="gestures_four_finger_tap" maxLength="41">Four-finger tap</string>
+    <string name="gestures_two_finger_tap" maxLength="41">Tryck med två fingrar</string>
+    <string name="gestures_three_finger_tap" maxLength="41">Tryck med tre fingrar</string>
+    <string name="gestures_four_finger_tap" maxLength="41">Tryck med fyra fingrar</string>
     <string name="gestures_shake" maxLength="41">Skaka enhet</string>
-    <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ menu</string>
+    <string name="card_browser_enable_external_context_menu" maxLength="41">\'%s\'-meny</string>
     <string name="card_browser_enable_external_context_menu_summary">Aktiverar sammanhangsmenyn ‘%s’ globalt</string>
     <string name="double_scrolling_gap" maxLength="41">Dubbelrullning</string>
     <string name="double_scrolling_gap_summ">Aktivera detta om du vill dubbla scroll gap med eReader</string>
@@ -138,15 +138,15 @@
     <string name="notification_pref_title" maxLength="41">Meddela när</string>
     <string name="never_notify">Meddela aldrig</string>
     <string name="notify_when_pending">Det finns olästa meddelanden</string>
-    <string name="notification_minimum_cards_due" comment="Consider keeping the unbreakable space after the digit">More than %d cards due</string>
+    <string name="notification_minimum_cards_due" comment="Consider keeping the unbreakable space after the digit">Fler än %d kort förfaller</string>
     <string name="notification_minimum_cards_due_vibrate" maxLength="41">Vibrera</string>
     <string name="notification_minimum_cards_due_blink" maxLength="41">Blinka</string>
     <string name="select_locale_title">Välj språk</string>
     <string name="software_render" maxLength="41">Inaktivera kort hårdvarurendering</string>
     <string name="software_render_summ">Hårdvarurendering är snabbare men kan få problem, särskilt på Android 8/8.1. Om du inte kan se delar av kortgranskningsgränssnittet, prova den här inställningen.</string>
-    <string name="disable_extended_text_ui" maxLength="41">Disable single-field edit mode</string>
+    <string name="disable_extended_text_ui" maxLength="41">Inaktivera redigeringsläge för enstaka fält</string>
     <!--See: multimedia_editor_popup_cloze. We can\'t use format strings as this is auto-generated-->
-    <string name="disable_extended_text_ui_summ">Allows \'Cloze deletion\' context menu when in landscape mode.</string>
+    <string name="disable_extended_text_ui_summ">Tillåter snabbmenyn för \'Lucktext\' i liggande läge.</string>
     <string name="vertical_centering" maxLength="41">Centrera</string>
     <string name="vertical_centering_summ">Vertikal centrering av kortinnehåll</string>
     <string name="pref_double_tap_time_interval" maxLength="41">Dubbeltryck tidsintervall</string>
@@ -156,11 +156,11 @@
     <string name="show_estimates" maxLength="41">Visa tid på knappar</string>
     <string name="show_estimates_summ">Visa nästa repetitionstid på svarsknapparna</string>
     <string name="show_large_answer_buttons" maxLength="41">Visa stora svarsknappar</string>
-    <string name="show_large_answer_buttons_summ">Show answer button in 2 rows</string>
-    <string name="remove_animations" maxLength="41">Remove animations</string>
-    <string name="remove_animations_summary">Also enabled if animations are removed on the system settings</string>
+    <string name="show_large_answer_buttons_summ">Visa svarsknappen i 2 rader</string>
+    <string name="remove_animations" maxLength="41">Ta bort animationer</string>
+    <string name="remove_animations_summary">Aktiveras även om animationerna har tagits bort i systeminställningarna</string>
     <string name="show_top_bar" maxLength="41">Visa översta verktygsfältet</string>
-    <string name="show_top_bar_summary">Show card counts, answer timer, flag and mark in top bar</string>
+    <string name="show_top_bar_summary">Visa korträknare, svarstimer, flagga och markering i översta raden</string>
     <string name="show_progress" maxLength="41">Visa återstående</string>
     <string name="show_progress_summ">Visa antal återstående kort</string>
     <string name="show_eta" maxLength="41">Visa ETA</string>
@@ -168,10 +168,18 @@
     <string name="use_current" maxLength="41">Kortlek för nya kort</string>
     <string name="learn_cutoff" maxLength="41">Gräns för att lära i förväg</string>
     <string name="time_limit" maxLength="41">Tidsgräns</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Början av nästa dag</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
-        <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
-        <item quantity="other" comment="Consider keeping the unbreakable space after the digit">%d hours past midnight</item>
+        <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d timme efter midnatt</item>
+        <item quantity="other" comment="Consider keeping the unbreakable space after the digit">%d timmar efter midnatt</item>
     </plurals>
     <string name="pref_keep_screen_on" maxLength="41">Håll skärm på</string>
     <string name="pref_keep_screen_on_summ">Inaktivera skärmtimeout</string>
@@ -188,14 +196,14 @@
     <string name="thirdparty_apps_title" maxLength="41">Tredjeparts API-appar</string>
     <string name="thirdparty_apps_summary">Se en lista över alla applikationer som använder AnkiDroids API, exempelvis ordböcker och händiga verktyg.</string>
     <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Recensioner</string>
-    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Previews</string>
-    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Toggle backside only</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Förhandsvisningar</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Aktivera endast baksidan</string>
     <!-- Appearance settings -->
-    <string name="pref_cat_reviewer" maxLength="41">Study Screen</string>
+    <string name="pref_cat_reviewer" maxLength="41">Studeringsskärm</string>
     <string name="show_deck_title" maxLength="41">Visa kortlekens titel</string>
     <string name="accessibility" maxLength="41">Tillgänglighet</string>
     <string name="exit_via_double_tap_back" maxLength="41">Tryck bakåt 2 ggr för att gå bakåt/sluta</string>
-    <string name="exit_via_double_tap_back_summ">To avoid accidentally leaving the study screen or the app</string>
+    <string name="exit_via_double_tap_back_summ">För att undvika att lämna studeringsskärmen eller appen av misstag</string>
     <!-- Allow all files in media imports -->
     <string name="media_import_allow_all_files" maxLength="41">Tillåt alla filer i medieimport</string>
     <string name="media_import_allow_all_files_summ">Om Android inte känner igen en mediafil</string>
@@ -208,14 +216,14 @@
         Om den inte är angiven kommer standardservern, AnkiWeb, att användas istället.
         <a href="%s">Lär dig mer</a>
         ]]></string>
-    <string name="custom_sync_server_base_url_title" maxLength="41">Sync URL</string>
-    <string name="custom_sync_certificate_title" maxLength="41">Custom root certificate (PEM)</string>
+    <string name="custom_sync_server_base_url_title" maxLength="41">URL för synkronisering</string>
+    <string name="custom_sync_certificate_title" maxLength="41">Anpassat rotcertifikat (PEM)</string>
     <!-- Key Bindings -->
     <string name="keyboard">Tangentbord</string>
     <string name="bluetooth">Bluetooth</string>
     <string name="answer_buttons" maxLength="41">Svarsknappar</string>
     <string name="card" maxLength="41" comment="Generic term to refer to a card">Kort</string>
-    <string name="note" maxLength="41">Not</string>
+    <string name="note" maxLength="41">Anteckning</string>
     <string name="navigation" maxLength="41">Navigering</string>
     <string name="media" maxLength="41">Media</string>
     <string name="misc" maxLength="41">Övrigt</string>
@@ -223,75 +231,76 @@
          ################################## Review reminders ###################################
          ####################################################################################### -->
     <!-- Entry points -->
-    <string name="review_reminders_title" maxLength="41" comment="Name of the review reminders feature. Used as a settings screen title, a toolbar title, and the name of the notification channel review reminders are posted to.">Review reminders</string>
-    <string name="review_reminders_summary_app_wide" comment="The descriptor for reminders that are attached to the whole app rather than a single deck.">App-wide</string>
-    <string name="review_reminders_summary_deck_specific" comment="The descriptor for reminders attached to one particular deck.">Deck-specific</string>
-    <string name="review_reminders_load_error" comment="Error dialog shown when stored review reminders could not be read back. Technical details follow this text.">An error occurred while loading your review reminders, corrupted reminders have been deleted. Details:</string>
+    <string name="review_reminders_title" maxLength="41" comment="Name of the review reminders feature. Used as a settings screen title, a toolbar title, and the name of the notification channel review reminders are posted to.">Granska påminnelser</string>
+    <string name="review_reminders_summary_app_wide" comment="The descriptor for reminders that are attached to the whole app rather than a single deck.">Gäller hela appen</string>
+    <string name="review_reminders_summary_deck_specific" comment="The descriptor for reminders attached to one particular deck.">Kortleksspecifika</string>
+    <string name="review_reminders_load_error" comment="Error dialog shown when stored review reminders could not be read back. Technical details follow this text.">Ett fel uppstod när dina granskningspåminnelser laddades, skadade påminnelser har tagits bort. Detaljer:</string>
     <!-- Schedule reminders screen -->
-    <string name="schedule_reminders_title" maxLength="28" comment="Name of the menu option for scheduling review reminders for a deck.">Schedule reminders</string>
+    <string name="schedule_reminders_title" maxLength="28" comment="Name of the menu option for scheduling review reminders for a deck.">Schemalägg påminnelser</string>
     <string name="add_reminder" comment="Label for the add reminder button in the screen for adding and editing review reminders">Lägg till påminnelse</string>
-    <string name="you_have_no_review_reminders" comment="Text that appears in the review reminder editing screen when there are no reminders set">You have no review reminders</string>
-    <string name="schedule_reminders_troubleshoot_menu" maxLength="28" comment="Text in a menu button which opens a screen for diagnosing why review reminders may not be delivered.">Troubleshoot</string>
-    <string name="schedule_reminders_notification_settings_menu" maxLength="28" comment="Text in a menu button which opens the operating system notification settings for the app.">Notification settings</string>
-    <string name="schedule_reminders_list_content_description" comment="Accessibility description of the list showing scheduled review reminders.">List of scheduled review reminders</string>
-    <string name="schedule_reminders_deck_not_found" comment="Shown in place of a deck name when the deck a review reminder points at no longer exists.">Deck not found</string>
-    <string name="schedule_reminders_unavailable" comment="Pop-up text shown when review reminders cannot be delivered at all, such as due to missing permissions.">Reminders are unavailable</string>
-    <string name="schedule_reminders_fix" comment="Text for the button which, when pressed, opens the review reminder troubleshooting screen for fixing issues with review reminders.">Fix</string>
-    <string name="schedule_reminders_added" comment="Pop-up text which confirms a new review reminder was created.">Successfully added new review reminder</string>
-    <string name="schedule_reminders_deleted" comment="Pop-up text which confirms a review reminder was deleted.">Successfully deleted review reminder</string>
-    <string name="schedule_reminders_edited" comment="Pop-up text which confirms an existing review reminder was changed.">Successfully edited review reminder</string>
+    <string name="you_have_no_review_reminders" comment="Text that appears in the review reminder editing screen when there are no reminders set">Du har inga granskningspåminnelser</string>
+    <string name="schedule_reminders_troubleshoot_menu" maxLength="28" comment="Text in a menu button which opens a screen for diagnosing why review reminders may not be delivered.">Felsök</string>
+    <string name="schedule_reminders_notification_settings_menu" maxLength="28" comment="Text in a menu button which opens the operating system notification settings for the app.">Aviseringsinställningar</string>
+    <string name="schedule_reminders_list_content_description" comment="Accessibility description of the list showing scheduled review reminders.">Lista över schemalagda granskningspåminnelser</string>
+    <string name="schedule_reminders_deck_not_found" comment="Shown in place of a deck name when the deck a review reminder points at no longer exists.">Kortleken hittades inte</string>
+    <string name="schedule_reminders_unavailable" comment="Pop-up text shown when review reminders cannot be delivered at all, such as due to missing permissions.">Påminnelser är inte tillgängliga</string>
+    <string name="schedule_reminders_fix" comment="Text for the button which, when pressed, opens the review reminder troubleshooting screen for fixing issues with review reminders.">Åtgärda</string>
+    <string name="schedule_reminders_added" comment="Pop-up text which confirms a new review reminder was created.">Ny granskningspåminnelse har lagts till</string>
+    <string name="schedule_reminders_deleted" comment="Pop-up text which confirms a review reminder was deleted.">Granskningspåminnelsen har tagits bort</string>
+    <string name="schedule_reminders_edited" comment="Pop-up text which confirms an existing review reminder was changed.">Granskningspåminnelsen har redigerats</string>
     <!-- Add / edit reminder dialog -->
-    <string name="add_review_reminder" comment="Title of the dialog for creating a new review reminder.">Add review reminder</string>
-    <string name="edit_review_reminder" comment="Title of the dialog for editing an existing review reminder.">Edit review reminder</string>
-    <string name="add_edit_reminder_time_label" comment="Label of the field for choosing what time of day a review reminder fires.">Time:</string>
-    <string name="add_edit_reminder_deck_label" comment="Label of the field for choosing which deck a review reminder applies to.">Deck:</string>
-    <string name="add_edit_reminder_advanced_label" comment="Header of the collapsible section holding extra review reminder customization options.">Advanced settings</string>
-    <string name="add_edit_reminder_card_threshold_label" comment="Label of the field setting the minimum number of due cards needed before a review reminder fires.">Card threshold:</string>
-    <string name="add_edit_reminder_card_threshold_description" comment="Explanation shown under the card threshold field.">Do not send me notifications if there are less than this many cards due</string>
-    <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
-    <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
-    <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
-    <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
-    <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
+    <string name="add_review_reminder" comment="Title of the dialog for creating a new review reminder.">Lägg till granskningspåminnelse</string>
+    <string name="edit_review_reminder" comment="Title of the dialog for editing an existing review reminder.">Redigera granskningspåminnelse</string>
+    <string name="add_edit_reminder_time_label" comment="Label of the field for choosing what time of day a review reminder fires.">Tid:</string>
+    <string name="add_edit_reminder_deck_label" comment="Label of the field for choosing which deck a review reminder applies to.">Kortlek:</string>
+    <string name="add_edit_reminder_advanced_label" comment="Header of the collapsible section holding extra review reminder customization options.">Avancerade inställningar:</string>
+    <string name="add_edit_reminder_card_threshold_label" comment="Label of the field setting the minimum number of due cards needed before a review reminder fires.">Kortets tröskel:</string>
+    <string name="add_edit_reminder_card_threshold_description" comment="Explanation shown under the card threshold field.">Skicka inte aviseringar om färre än så här många kort förfaller</string>
+    <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Avisera mig endast om inga granskningar har gjorts idag</string>
+    <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Ange ett helt antal kort</string>
+    <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">Tröskeln måste vara minst 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
+    <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Ta bort denna påminnelse?</string>
+    <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">Denna åtgärd kan inte ångras.</string>
     <!-- Reminder troubleshooting screen -->
-    <string name="reminder_troubleshooting_summary_error" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when reminders cannot be delivered at all.">Reminders are unavailable.</string>
-    <string name="reminder_troubleshooting_summary_warning" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when reminders may be delayed or suppressed.">Reminders may not work correctly.</string>
-    <string name="reminder_troubleshooting_summary_ok" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when no issues are found.">Your reminders should work as expected.</string>
-    <string name="reminder_troubleshooting_footer" comment="Closing advice at the bottom of the review reminder troubleshooting screen.">Different devices have different notification restriction settings. Check your system settings or search online if issues persist.</string>
+    <string name="reminder_troubleshooting_summary_error" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when reminders cannot be delivered at all.">Påminnelser är inte tillgängliga.</string>
+    <string name="reminder_troubleshooting_summary_warning" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when reminders may be delayed or suppressed.">Påminnelser kanske inte fungerar korrekt.</string>
+    <string name="reminder_troubleshooting_summary_ok" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when no issues are found.">Dina påminnelser borde fungera som förväntat.</string>
+    <string name="reminder_troubleshooting_footer" comment="Closing advice at the bottom of the review reminder troubleshooting screen.">Olika enheter har olika begränsningar för aviseringar. Kontrollera dina systeminställningar eller sök online om problem kvarstår.</string>
     <!-- Troubleshooting check titles -->
-    <string name="reminder_troubleshooting_check_notification_permission" comment="Name of a review reminder troubleshooting check: whether the app may post notifications.">Notification permission</string>
-    <string name="reminder_troubleshooting_check_notification_channel" comment="Name of a review reminder troubleshooting check: whether the review reminders notification channel is turned on.">Notification channel</string>
-    <string name="reminder_troubleshooting_check_do_not_disturb" comment="Name of a review reminder troubleshooting check: whether the system Do Not Disturb mode is active.">Do not disturb</string>
-    <string name="reminder_troubleshooting_check_battery_optimization" comment="Name of a review reminder troubleshooting check: whether the system restricts the app\'s background battery usage.">Battery optimization</string>
-    <string name="reminder_troubleshooting_check_power_saving_mode" comment="Name of a review reminder troubleshooting check: whether the system power saving mode is active.">Power saving mode</string>
-    <string name="reminder_troubleshooting_check_exact_alarm_permission" comment="Name of a review reminder troubleshooting check: whether the app has permission to schedule alarms at exact times.">Alarms &amp; reminders permission</string>
+    <string name="reminder_troubleshooting_check_notification_permission" comment="Name of a review reminder troubleshooting check: whether the app may post notifications.">Åtkomst för aviseringar</string>
+    <string name="reminder_troubleshooting_check_notification_channel" comment="Name of a review reminder troubleshooting check: whether the review reminders notification channel is turned on.">Aviseringskanal</string>
+    <string name="reminder_troubleshooting_check_do_not_disturb" comment="Name of a review reminder troubleshooting check: whether the system Do Not Disturb mode is active.">Stör ej</string>
+    <string name="reminder_troubleshooting_check_battery_optimization" comment="Name of a review reminder troubleshooting check: whether the system restricts the app\'s background battery usage.">Batterioptimering</string>
+    <string name="reminder_troubleshooting_check_power_saving_mode" comment="Name of a review reminder troubleshooting check: whether the system power saving mode is active.">Energisparläge</string>
+    <string name="reminder_troubleshooting_check_exact_alarm_permission" comment="Name of a review reminder troubleshooting check: whether the app has permission to schedule alarms at exact times.">Behörighet för alarm &amp; påminnelser</string>
     <!-- Troubleshooting check statuses -->
-    <string name="reminder_troubleshooting_status_granted" comment="Status of a review reminder troubleshooting check: the permission has been given.">Granted</string>
-    <string name="reminder_troubleshooting_status_denied" comment="Status of a review reminder troubleshooting check: the permission has not been given.">Denied</string>
-    <string name="reminder_troubleshooting_status_on" comment="Status of a review reminder troubleshooting check: the system setting is active.">On</string>
-    <string name="reminder_troubleshooting_status_off" comment="Status of a review reminder troubleshooting check: the system setting is not active.">Off</string>
-    <string name="reminder_troubleshooting_status_unrestricted" comment="Status of the review reminder battery optimization check: the app may run freely in the background.">Unrestricted</string>
-    <string name="reminder_troubleshooting_status_optimized" comment="Status of the review reminder battery optimization check: the system may delay the app in the background.">Optimized</string>
-    <string name="reminder_troubleshooting_status_restricted" comment="Status of the review reminder battery optimization check: the app is barred from running in the background.">Restricted</string>
+    <string name="reminder_troubleshooting_status_granted" comment="Status of a review reminder troubleshooting check: the permission has been given.">Beviljad</string>
+    <string name="reminder_troubleshooting_status_denied" comment="Status of a review reminder troubleshooting check: the permission has not been given.">Nekad</string>
+    <string name="reminder_troubleshooting_status_on" comment="Status of a review reminder troubleshooting check: the system setting is active.">På</string>
+    <string name="reminder_troubleshooting_status_off" comment="Status of a review reminder troubleshooting check: the system setting is not active.">Av</string>
+    <string name="reminder_troubleshooting_status_unrestricted" comment="Status of the review reminder battery optimization check: the app may run freely in the background.">Obegränsad</string>
+    <string name="reminder_troubleshooting_status_optimized" comment="Status of the review reminder battery optimization check: the system may delay the app in the background.">Optimerad</string>
+    <string name="reminder_troubleshooting_status_restricted" comment="Status of the review reminder battery optimization check: the app is barred from running in the background.">Begränsad</string>
     <!-- Troubleshooting check explanations -->
-    <string name="reminder_troubleshooting_explanation_notification_channel" comment="Explains why review reminders need notification permissions to work correctly.">The review reminder notification channel must be enabled</string>
-    <string name="reminder_troubleshooting_explanation_do_not_disturb" comment="Explains why review reminders may need Do Not Disturb to be disabled to work correctly.">Do Not Disturb may mute reminder notifications</string>
-    <string name="reminder_troubleshooting_explanation_battery_optimized" comment="Explains to the user that AnkiDroid\'s battery usage is optimized, and that battery usage may need to be enabled for review reminders to work correctly.">Battery optimization may delay reminders</string>
-    <string name="reminder_troubleshooting_explanation_battery_restricted" comment="Explains to the user that AnkiDroid\'s battery usage is restricted, and that battery usage may need to be enabled for review reminders to work correctly.">Background usage is disabled. Reminders may not be delivered</string>
-    <string name="reminder_troubleshooting_explanation_power_saving_mode" comment="Explains why review reminders may need power saving mode to be disabled to work correctly.">Power saving mode may prevent timely delivery of reminders</string>
-    <string name="reminder_troubleshooting_explanation_exact_alarm" comment="Explains that AnkiDroid cannot schedule alarms at exact times unless the exact-alarm permission is granted.">Required to schedule reminders at exact times</string>
+    <string name="reminder_troubleshooting_explanation_notification_channel" comment="Explains why review reminders need notification permissions to work correctly.">Aviseringskanalen för granskningspåminnelser måste vara aktiverad</string>
+    <string name="reminder_troubleshooting_explanation_do_not_disturb" comment="Explains why review reminders may need Do Not Disturb to be disabled to work correctly.">Stör ej kan tysta påminnelser</string>
+    <string name="reminder_troubleshooting_explanation_battery_optimized" comment="Explains to the user that AnkiDroid\'s battery usage is optimized, and that battery usage may need to be enabled for review reminders to work correctly.">Batterioptimering kan fördröja påminnelser</string>
+    <string name="reminder_troubleshooting_explanation_battery_restricted" comment="Explains to the user that AnkiDroid\'s battery usage is restricted, and that battery usage may need to be enabled for review reminders to work correctly.">Bakgrundsanvändning är inaktiverad. Påminnelser kanske inte levereras</string>
+    <string name="reminder_troubleshooting_explanation_power_saving_mode" comment="Explains why review reminders may need power saving mode to be disabled to work correctly.">Energisparläge kan förhindra tidsenlig leverans av påminnelser</string>
+    <string name="reminder_troubleshooting_explanation_exact_alarm" comment="Explains that AnkiDroid cannot schedule alarms at exact times unless the exact-alarm permission is granted.">Krävs för att schemalägga påminnelser vid exakta tider</string>
     <!-- Troubleshooting check actions -->
-    <string name="reminder_troubleshooting_action_grant_permission" comment="Button resolving a failing review reminder troubleshooting check by asking for a permission.">Grant permission</string>
-    <string name="reminder_troubleshooting_action_enable_notification_channel" comment="Button resolving a failing review reminder troubleshooting check by opening the operating system notification settings screen.">Enable notification channel</string>
-    <string name="reminder_troubleshooting_action_disable_battery_optimization" comment="Button resolving a failing review reminder troubleshooting check by asking the user to exempt the app from battery optimization.">Disable battery optimization</string>
-    <string name="reminder_troubleshooting_action_open_battery_settings" comment="Button resolving a failing review reminder troubleshooting check by opening the operating system battery settings screen.">Open battery settings</string>
+    <string name="reminder_troubleshooting_action_grant_permission" comment="Button resolving a failing review reminder troubleshooting check by asking for a permission.">Bevilja åtkomst</string>
+    <string name="reminder_troubleshooting_action_enable_notification_channel" comment="Button resolving a failing review reminder troubleshooting check by opening the operating system notification settings screen.">Aktivera aviseringskanal</string>
+    <string name="reminder_troubleshooting_action_disable_battery_optimization" comment="Button resolving a failing review reminder troubleshooting check by asking the user to exempt the app from battery optimization.">Inaktivera batterioptimering</string>
+    <string name="reminder_troubleshooting_action_open_battery_settings" comment="Button resolving a failing review reminder troubleshooting check by opening the operating system battery settings screen.">Öppna batteriinställningar</string>
     <!-- Notification content -->
-    <string name="review_reminder_notification_title_all_decks" comment="Title of a review reminder notification which is attached to the whole app rather than a single deck.">It\'s time to study your cards</string>
-    <string name="review_reminder_notification_title_deck" comment="Title of a review reminder notification for one deck. The parameter is the deck name; the quotation marks are to clearly separate the user-chosen name from the app\'s own text.">It\'s time to study \"%s\"</string>
-    <string name="review_reminder_notification_snooze_button" comment="Notification button postponing a review reminder by a certain amount of time. The parameter is a duration like \'1h\', \'5m\', etc.">Snooze %s</string>
+    <string name="review_reminder_notification_title_all_decks" comment="Title of a review reminder notification which is attached to the whole app rather than a single deck.">Det är dags att studera dina kort</string>
+    <string name="review_reminder_notification_title_deck" comment="Title of a review reminder notification for one deck. The parameter is the deck name; the quotation marks are to clearly separate the user-chosen name from the app\'s own text.">Det är dags att studera \"%s\"</string>
+    <string name="review_reminder_notification_snooze_button" comment="Notification button postponing a review reminder by a certain amount of time. The parameter is a duration like \'1h\', \'5m\', etc.">Snooza %s</string>
     <plurals name="review_reminder_notification_cards_due" comment="Body of a review reminder notification. The parameter is the number of cards due.">
-        <item quantity="one">%d card due</item>
-        <item quantity="other">%d cards due</item>
+        <item quantity="one">%d kort förfaller</item>
+        <item quantity="other">%d kort förfaller</item>
     </plurals>
     <!-- studyoptions -->
     <string name="studyoptions_limit_select_tags">Välj etiketter</string>
@@ -303,18 +312,18 @@
     <string name="analytics_title" maxLength="41">Dela funktionsanvändning</string>
     <string name="analytics_summ">Du kan bidra till AnkiDroid genom att hjälpa utvecklingslaget se vilka funktioner som används</string>
     <string name="note_editor_replace_newlines" maxLength="41">Ersätt radbrytningar med HTML</string>
-    <string name="note_editor_replace_newlines_summ">In the note editor, convert any instances of &lt;br&gt; to newlines when editing a card.</string>
+    <string name="note_editor_replace_newlines_summ">Konvertera alla förekomster av &lt;br&gt; till radbrytningar när du redigerar ett kort i anteckningsredigeraren</string>
     <string name="type_in_answer_focus" maxLength="41">Fokusera på ‘skriv in svar’</string>
-    <string name="type_in_answer_focus_summ">Automatically focus the ‘type in answer’ field in the study screen</string>
+    <string name="type_in_answer_focus_summ">Fokusera automatiskt på fältet \'skriv in svar\' i studeringsskärmen</string>
     <!-- About -->
     <string name="open_changelog">Öppna ändringslogg</string>
     <string name="pref_cat_about_title" maxLength="41">Om appen</string>
     <string name="contributors_title">Bidragsgivare</string>
     <string name="about_contributors_description"><![CDATA[Dessa är våra fantastiska <a href=\"%1$s\">bidragsgivare</a>. Du kan också hjälpa AnkiDroid genom att utveckla, översätta, donera och <a href=\"%2$s\">mer</a>!]]></string>
-    <string name="about_contributors_description_no_donate"><![CDATA[These are our awesome <a href=\"%1$s\">contributors</a>. You can help AnkiDroid too by programming, translating and <a href=\"%2$s\">more</a>!]]></string>
+    <string name="about_contributors_description_no_donate"><![CDATA[Dessa är våra fantastiska <a href=\"%1$s\">bidragsgivare</a>. Du kan också hjälpa AnkiDroid genom att utveckla, översätta, donera och <a href=\"%2$s\">mer</a>!]]></string>
     <string name="license">Programvarulicens</string>
     <string name="license_description"><![CDATA[AnkiDroid släpps under licenserna <a href=\"%1$s\">GPL-3.0</a> och <a href=\"%2$s\">AGPL-3.0</a>, med källkoden tillgänglig <a href=\"%3$s\">på GitHub</a>]]></string>
-    <string name="other_licenses"><![CDATA[AnkiDroid also uses third-party libraries and icons, which are licensed under various open source <a href=\"%1$s\">licenses</a>]]></string>
+    <string name="other_licenses"><![CDATA[AnkiDroid använder också tredjepartsbibliotek och ikoner, som licensieras under olika open source <a href=\"%1$s\">licenser</a>.]]></string>
     <string name="donate_description"><![CDATA[Du kan stödja AnkiDroids utveckling genom att <a href=\"%1$s\">donera</a>. Alla donationer uppskattas enormt!]]></string>
     <!-- Controls -->
     <string name="binding_add_gesture">Lägg till gest</string>
@@ -323,7 +332,7 @@
     <string name="binding_add_axis">Lägg till joystick/rörelsekänslig handkontroll</string>
     <string name="axis_picker_move_joystick">Manövrera en joystick/rörelsekänslig handkontroll</string>
     <string name="user_actions" maxLength="41">Användaråtgärder</string>
-    <string name="user_actions_summary" maxLength="41">Trigger JavaScript from the study screen</string>
+    <string name="user_actions_summary" maxLength="41">Utlös JavaScript från studieskärmen</string>
     <string name="user_action_1" maxLength="28">Användaråtgärd 1</string>
     <string name="user_action_2" maxLength="28">Användaråtgärd 2</string>
     <string name="user_action_3" maxLength="28">Användaråtgärd 3</string>
@@ -333,11 +342,11 @@
     <string name="user_action_7" maxLength="28">Användaråtgärd 7</string>
     <string name="user_action_8" maxLength="28">Användaråtgärd 8</string>
     <string name="user_action_9" maxLength="28">Användaråtgärd 9</string>
-    <string name="toggle_auto_advance" maxLength="28">Toggle auto advance</string>
-    <string name="enable_auto_advance" maxLength="28">Enable auto advance</string>
-    <string name="disable_auto_advance" maxLength="28">Disable auto advance</string>
-    <string name="enable_voice_recording" maxLength="28">Enable voice recording</string>
-    <string name="disable_voice_recording" maxLength="28">Disable voice recording</string>
+    <string name="toggle_auto_advance" maxLength="28">Aktivera/inaktivera automatisk bläddring</string>
+    <string name="enable_auto_advance" maxLength="28">Aktivera automatisk bläddring</string>
+    <string name="disable_auto_advance" maxLength="28">Inaktivera automatisk bläddring</string>
+    <string name="enable_voice_recording" maxLength="28">Aktivera röstinspelning</string>
+    <string name="disable_voice_recording" maxLength="28">Inaktivera röstinspelning</string>
     <!-- Select card side -->
     <string name="card_side_selection_title">Välj kortsida</string>
     <string name="card_side_question">Fråga</string>
@@ -352,15 +361,15 @@
     <string name="pref_cat_experimental" maxLength="41" tools:ignore="UnusedResources">Experimentellt</string>
     <string name="readtext_deprecation_warn">AnkiDroid har infört en bättre TTS-funktion som är kompatibel med andra Anki-klienter och innehåller fler röster och förbättringar av språkuppspelning!\n\nVänligen uppgradera så snart som möjligt, eftersom denna inställning snart kommer att tas bort</string>
     <string name="readtext_reviewer_warn" tools:ignore="UnusedResources">Vänligen uppgradera till det nya text-till-tal-formatet</string>
-    <string name="allow_templates_to_record_audio" maxLength="41">Allow templates to record audio</string>
-    <string name="template_is_trying_to_record_audio">This template is trying to record audio</string>
-    <string name="pref_fixed_port_title" maxLength="41">localStorage in Study Screen</string>
-    <string name="pref_fixed_port_summary">Enables JavaScript localStorage by using a fixed server port in the Study Screen</string>
+    <string name="allow_templates_to_record_audio" maxLength="41">Tillåt mallar att spela in ljud</string>
+    <string name="template_is_trying_to_record_audio">Denna mall försöker spela in ljud</string>
+    <string name="pref_fixed_port_title" maxLength="41">localStorage i studieskärmen</string>
+    <string name="pref_fixed_port_summary">Aktiverar JavaScript localStorage genom att använda en fast serverport i studieskärmen</string>
     <!-- Developer options -->
     <string name="pref_cat_dev_options" maxLength="41">Utvecklaralternativ</string>
     <string name="dev_options_enabled_pref" maxLength="41">Aktivera utvecklaralternativ</string>
     <string name="disable_dev_options">Inaktivera utvecklaralternativ</string>
-    <string name="dev_options_warning">Please be sure before enabling developer options. These options are dangerous and could break the app or corrupt your collection.\n\nNote that these options are not suited for most users and therefore are not translated, so they are in English.</string>
+    <string name="dev_options_warning">Var säker innan du aktiverar utvecklarinställningar. Dessa inställningar är farliga och kan förstöra appen eller skada din samling.\n\nObservera att dessa inställningar inte är lämpade för de flesta användare och översätts därför inte, och är alltså på engelska.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
@@ -427,31 +436,31 @@
     <string name="hide_system_bars_status_bar" comment="Setting option to hide the system status bar (the top one with clock, battery status, etc)">Statusfält</string>
     <string name="hide_system_bars_navigation_bar" comment="Setting option to hide the system navigation bar (the bottom one that can go back, to home, etc)">Navigeringsfält</string>
     <string name="hide_system_bars_all_bars" comment="Setting option to hide all the system bars">Alla</string>
-    <string name="ignore_display_cutout" maxLength="41">Ignore display cutout</string>
-    <string name="show_answer_buttons" maxLength="41">Show answer buttons</string>
-    <string name="hide_hard_and_easy" maxLength="41">Hide ‘Hard’ and ‘Easy’ buttons</string>
-    <string name="reviewer_frame_style" maxLength="41">Frame style</string>
+    <string name="ignore_display_cutout" maxLength="41">Ignorera skärmutsnitt</string>
+    <string name="show_answer_buttons" maxLength="41">Visa svarsknappar</string>
+    <string name="hide_hard_and_easy" maxLength="41">Dölj knapparna \'Svår\' och \'Lätt\'</string>
+    <string name="reviewer_frame_style" maxLength="41">Ramstil</string>
     <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Study Screen">Kort</string>
     <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Study Screen">Låda</string>
-    <string name="reviewer_toolbar_top" maxLength="41" comment="Setting to put the toolbar on the top of the study screen">Top</string>
-    <string name="reviewer_toolbar_bottom" maxLength="41" comment="Setting to put the toolbar on the bottom of the study screen">Bottom</string>
+    <string name="reviewer_toolbar_top" maxLength="41" comment="Setting to put the toolbar on the top of the study screen">Överst</string>
+    <string name="reviewer_toolbar_bottom" maxLength="41" comment="Setting to put the toolbar on the bottom of the study screen">Nederst</string>
     <string name="reviewer_toolbar_none" maxLength="41" comment="Setting to remove the toolbar from the study screen">Ingen</string>
     <string name="toolbar" maxLength="41">Verktygsfält</string>
-    <string name="toolbar_actions" maxLength="41">Toolbar actions</string>
-    <string name="toolbar_position" maxLength="28">Toolbar position</string>
-    <string name="new_study_screen" maxLength="41">New study screen</string>
-    <string name="new_study_screen_summ"><![CDATA[Improved study screen that will succeed the current one. Some features of the old screen have been changed or removed. Please report any <a href="%1$s">feedback</a> or <a href="%2$s">bugs</a>.]]></string>
-    <string name="show_answer_feedback" maxLength="41">Show answer feedback</string>
-    <string name="screen" maxLength="41">Screen</string>
-    <string name="also_assign_binding_to_show_answer" comment="Question shown after assigning binding to an \'Answer\' command, asking whether it should also be assigned to the \'Show answer\'; %1$s is \'Show answer\'">Also assign to ‘%1$s’?</string>
-    <string name="dialog_skip" comment="Skip assigning binding to \'Show answer\'">Skip</string>
-    <string name="dialog_assign" comment="Assign binding to \'Answer\' command">Assign</string>
+    <string name="toolbar_actions" maxLength="41">Åtgärder i verktygsfältet</string>
+    <string name="toolbar_position" maxLength="28">Verktygsfältets position</string>
+    <string name="new_study_screen" maxLength="41">Ny studieskärm</string>
+    <string name="new_study_screen_summ"><![CDATA[Förbättrad studieskärm som kommer att ersätta den nuvarande. Vissa funktioner från den gamla skärmen har ändrats eller tagits bort. Rapportera all <a href="%1$s">feedback</a> eller <a href="%2$s">buggar</a>.]]></string>
+    <string name="show_answer_feedback" maxLength="41">Visa svarsfeedback</string>
+    <string name="screen" maxLength="41">Skärm</string>
+    <string name="also_assign_binding_to_show_answer" comment="Question shown after assigning binding to an \'Answer\' command, asking whether it should also be assigned to the \'Show answer\'; %1$s is \'Show answer\'">Tilldela även till \'%1$s\'?</string>
+    <string name="dialog_skip" comment="Skip assigning binding to \'Show answer\'">Hoppa över</string>
+    <string name="dialog_assign" comment="Assign binding to \'Answer\' command">Tilldela</string>
     <!--Keyboard shortcuts dialog-->
     <string name="open_settings" comment="Description of the shortcut that opens the app settings">Öppna inställningar</string>
-    <string name="related_settings_title" comment="Title of the section for related settings">Related settings</string>
+    <string name="related_settings_title" comment="Title of the section for related settings">Relaterade inställningar</string>
     <!-- External Directory Selection Preference -->
-    <string name="pref_directory_not_set" comment="Summary of the AnkiDroid directory setting when no directory is set">Not set</string>
-    <string name="pref_custom_path" maxLength="41" comment="Dialog button letting the user type a directory path manually">Custom path</string>
-    <string name="pref_enter_custom_path" maxLength="41">Enter custom path</string>
-    <string name="pref_directory_not_writable">Directory is not writable</string>
+    <string name="pref_directory_not_set" comment="Summary of the AnkiDroid directory setting when no directory is set">Ej inställd</string>
+    <string name="pref_custom_path" maxLength="41" comment="Dialog button letting the user type a directory path manually">Anpassad sökväg</string>
+    <string name="pref_enter_custom_path" maxLength="41">Ange anpassad sökväg</string>
+    <string name="pref_directory_not_writable">Katalogen är inte skrivbar</string>
 </resources>
diff --git a/common/android/src/main/res/values-sv/16-multimedia-editor.xml b/common/android/src/main/res/values-sv/16-multimedia-editor.xml
index d111ac4cf5ef..f4e782512879 100644
--- a/common/android/src/main/res/values-sv/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-sv/16-multimedia-editor.xml
@@ -49,7 +49,8 @@
     <string name="multimedia_editor_audio_view_create_failed">Kan inte skapa verktygsfältet för inspelaren</string>
     <!-- Crop function-->
     <string name="crop_image">Vill du beskära den här bilden?</string>
-    <string name="crop_button" maxLength="28">Crop</string>
+    <string name="crop_button" maxLength="28">Beskär</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Den nuvarande bildstorlek är %s MB. Gränsen för bildstorlek är 1 MB. Vill du komprimera bilden?</string>
     <string name="select_image_failed">"Det gick inte att välja bild. Försök igen"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Fältinnehåll</string>
diff --git a/common/android/src/main/res/values-sv/17-model-manager.xml b/common/android/src/main/res/values-sv/17-model-manager.xml
index 526819a04251..a6b47afd6764 100644
--- a/common/android/src/main/res/values-sv/17-model-manager.xml
+++ b/common/android/src/main/res/values-sv/17-model-manager.xml
@@ -22,13 +22,13 @@
     <string name="model_editor_label" comment="Label of the window to edit the fields of a note type. This text can\'t be found in Ankidroid directly">Hantera fält</string>
     <!--Toasts-->
     <string name="toast_last_model">Du kan inte radera din sista anteckningstyp</string>
-    <string name="toast_last_field">Nottyper måste ha åtminstone ett fält</string>
+    <string name="toast_last_field">Anteckningstyper måste ha minst ett fält</string>
     <string name="toast_empty_name">Du måste ange ett namn</string>
     <string name="toast_duplicate_field">Fältnamnet används redan</string>
     <!--Plurals-->
     <plurals name="model_browser_of_type">
-        <item quantity="one">%d not</item>
-        <item quantity="other">%d noter</item>
+        <item quantity="one">%d anteckning</item>
+        <item quantity="other">%d anteckningar</item>
     </plurals>
     <!--Browser-->
     <string name="model_browser_delete">Ta bort anteckningstyp</string>
diff --git a/common/android/src/main/res/values-ta/02-strings.xml b/common/android/src/main/res/values-ta/02-strings.xml
index 912a187e10da..c6bc08374c3f 100644
--- a/common/android/src/main/res/values-ta/02-strings.xml
+++ b/common/android/src/main/res/values-ta/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">எழுத்துரு அளவு</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">கருவிப்பட்டியைக் காட்டு</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">உங்கள் முகப்புத் திரை AnkiDroid குறுக்குவழிகளைச் சேர்க்க அனுமதிக்காது</string>
     <string name="create_shortcut_error">குறுக்குவழியைச் சேர்ப்பதில் பிழை: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">வாக்கியங்களை பெரியதாக்கு</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">ஸ்க்ரோல் கருவிப்பட்டி</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">மேலும் தளங்களைப் பதிவிறக்க உள்நுழையவும்</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">விளக்கம்</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-ta/03-dialogs.xml b/common/android/src/main/res/values-ta/03-dialogs.xml
index 56e7c3f03a24..58de28057228 100644
--- a/common/android/src/main/res/values-ta/03-dialogs.xml
+++ b/common/android/src/main/res/values-ta/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">நீங்கள் உண்மையில் தரவுத்தளத்தைச் சரிசெய்ய முயற்சிக்க விரும்புகிறீர்களா?\n\nமுயற்சியைத் தொடங்கும் முன், \"%s\" என்ற துணைக் கோப்புறையில் ஒரு நகல் உருவாக்கப்படும்.</string>
     <string name="intent_aedict_empty">\"இயல்புநிலை\" வகை காலியாக உள்ளது</string>
     <string name="intent_aedict_category">AnkiDroid இல் கார்டுகளைச் சேர்க்க அனைத்து நோட்பேட் வகைகளையும் அகற்றவும் அல்லது \"இயல்புநிலை\" என்று பெயரிடப்பட்ட ஒன்றைச் சேர்க்கவும்</string>
-    <string name="custom_study_new_extend">இன்றைய புதிய அட்டை வரம்பை அதிகரிக்க/குறைக்கவும் (\"-3\").</string>
-    <string name="custom_study_rev_extend">இன்றைய மதிப்பாய்வு வரம்பை அதிகரிக்கவும்/குறைக்கவும் (\"-3\").</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">கடந்த x நாட்களில் மறக்கப்பட்ட மதிப்பாய்வு அட்டைகள்:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">அனைத்து அட்டைகளும்</string>
-    <string name="tags_dialog_option_new_cards">புதிய</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">புதிய</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">இறுதி தேதி</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">வெற்று அட்டைகளைக் கண்டறிகிறது&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">WebView அமைப்பு காலாவதியானது. சில அம்சங்கள் சரியாக வேலை செய்யாது. தயவுசெய்து அதைப் புதுப்பிக்கவும்.\n\nநிறுவப்பட்ட பதிப்பு: %1$d\nகுறைந்தபட்ச தேவையான பதிப்பு: %2$d</string>
     <string name="compress">சுருக்கவும்</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">மொழி ஆதரிக்கப்படவில்லை</string>
     <string name="tts_error_dialog_reason_text">உரையிலிருந்து பேச்சு இயந்திரம் <b>%1$s</b> பின்வரும் மொழியை ஆதரிக்காது: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">இயந்திரத்தை மாற்றவும்</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-ta/10-preferences.xml b/common/android/src/main/res/values-ta/10-preferences.xml
index 7c8fb98359a0..c6fb370667ce 100644
--- a/common/android/src/main/res/values-ta/10-preferences.xml
+++ b/common/android/src/main/res/values-ta/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">ஸ்ட்ரோக் அகலம்</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">புதிய அட்டைகளுக்கான டெக்</string>
     <string name="learn_cutoff" maxLength="41">நேரத்திற்கு முன்பே கற்றுக்கொள்ளுங்கள்</string>
     <string name="time_limit" maxLength="41">டைம்பாக்ஸ் நேர வரம்பு</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">அடுத்த நாள் தொடங்குகிறது</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -251,6 +259,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-ta/16-multimedia-editor.xml b/common/android/src/main/res/values-ta/16-multimedia-editor.xml
index 4337e6c569ca..fb1d39f49ef4 100644
--- a/common/android/src/main/res/values-ta/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ta/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">இந்தப் படத்தைச் செதுக்க விரும்புகிறீர்களா?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">தற்போதைய படத்தின் அளவு %sMB. இயல்புநிலை பட அளவு வரம்பு 1MB. அதைச் சுருக்க வேண்டுமா?</string>
     <string name="select_image_failed">"படத்தைத் தேர்ந்தெடுக்க முடியவில்லை, மீண்டும் முயற்சிக்கவும்"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">புல உள்ளடக்கங்கள்</string>
diff --git a/common/android/src/main/res/values-te/01-core.xml b/common/android/src/main/res/values-te/01-core.xml
index 634cebcf47e4..939322d76767 100644
--- a/common/android/src/main/res/values-te/01-core.xml
+++ b/common/android/src/main/res/values-te/01-core.xml
@@ -97,7 +97,7 @@
     <string name="invalid_deck_name">చెల్లని డెక్ పేరు</string>
     <string name="studyoptions_congrats_finished">అభినందనలు! ఈ రోజుకి  మీరు పూర్తి చేసారు.</string>
     <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">ప్రస్తుతానికి డెక్ పూర్తయింది! %s</string>
-    <string name="studyoptions_no_cards_due">ఎక్కువ కార్డులు లేవు</string>
+    <string name="studyoptions_no_cards_due">ఇప్పటికే చేయాల్సిన చీటిలు లేవు</string>
     <string name="sd_card_not_mounted">పరికర నిల్వ మౌంట్ చేయబడలేదు</string>
     <string name="button_sync" comment="Text of the sync button" maxLength="28">సమకాలీకరణ</string>
     <string name="cancel_sync_confirm" tools:ignore="UnusedResources">మీరు సమకాలీకరణను రద్దు చేయాలనుకుంటున్నారా?</string>
@@ -108,7 +108,7 @@
     <string name="export_deck" maxLength="28">ఎగుమతి డెక్</string>
     <string name="export_collection">ఎగుమతి సేకరణ</string>
     <!-- Card template editor -->
-    <string name="title_activity_template_editor">కార్డ్ రకాలు</string>
+    <string name="title_activity_template_editor">చీటి రకాలు</string>
     <string name="card_template_editor_deck_override" maxLength="28">డెక్ ఓవర్‌రైడ్</string>
     <string name="card_template_editor_insert_field" maxLength="28">ఫీల్డ్‌ను చొప్పించండి</string>
     <string name="card_template_editor_select_field">ఫీల్డ్‌ను ఎంచుకోండి</string>
@@ -121,11 +121,11 @@
         <item quantity="one">తొలగించు \"%2$s\" కార్డు రకం, మరియు దాని %1$d కార్డు?</item>
         <item quantity="other">తొలగించు \"%2$s\" కార్డు రకం, మరియు దాని %1$d కార్డులు?</item>
     </plurals>
-    <string name="card_template_editor_save_error">కార్డ్ టెంప్లేట్ మార్పులను సేవ్ చేయడం సాధ్యపడలేదు: %s</string>
-    <string name="template_for_current_card_deleted">ప్రస్తుత కార్డ్ కోసం కార్డ్ రకం తొలగించబడింది.</string>
+    <string name="card_template_editor_save_error">చీటి టెంప్లేట్ మార్పులను సేవ్ చేయడం సాధ్యపడలేదు: %s</string>
+    <string name="template_for_current_card_deleted">ప్రస్తుత చీటి కోసం చీటి రకం తొలగించబడింది.</string>
     <!-- Permissions -->
     <string name="read_write_permission_label">AnkiDroid డేటాబేస్కు చదవండి మరియు వ్రాయండి</string>
-    <string name="read_write_permission_description">పొందు ప్రస్తుతం ఉన్న గమనికలు, కార్డులు, నోట్ రకాలు మరియు డెక్స్, కొత్త వాటిని సృష్టించడం</string>
+    <string name="read_write_permission_description">పొందు ప్రస్తుతం ఉన్న గమనికలు, చీటీలు, నోట్ రకాలు మరియు డెక్స్, కొత్త వాటిని సృష్టించడం</string>
     <!-- Context Menu -->
     <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">Card browser</string>
     <string name="context_menu_anki_card_label">Anki card</string>
@@ -154,7 +154,7 @@
     <string name="storage_access_title">నిల్వ యాక్సెస్</string>
     <string name="storage_access_summary">యాప్‌ని అన్‌ఇన్‌స్టాల్ చేస్తే తొలగించబడని సురక్షిత ప్రదేశంలో మీ సేకరణను సేవ్ చేస్తుంది</string>
     <string name="all_files_access_title" comment="Name of the “All files access” permission from Android 10 and after. See [android.permission.MANAGE_EXTERNAL_STORAGE] on https://developer.android.com/training/data-storage/manage-all-files for context.">అన్ని ఫైల్‌ల యాక్సెస్</string>
-    <string name="image_occlusion">చిత్రం ముగింపు</string>
+    <string name="image_occlusion">చిత్ర అక్లూషన్</string>
     <string name="microphone" comment="Title of the microphone permission in the permissions explanation screen.">మైక్రోఫోన్</string>
     <string name="microphone_permission_explanation" comment="Description explaining why AnkiDroid needs the microphone permission, shown on the permissions explanation screen.">మీ కార్డులకు సౌండ్ జోడించడానికి అనుమతిస్తది ఇంకా రివ్యూ చేసేటప్పుడు వాయిస్ ప్లేబాక్ కి అనుమతిస్తది</string>
     <string name="notifications_permission_explanation" comment="Description explaining why AnkiDroid needs the notification permission.">బ్యాక్గ్రౌండ్ మీడియా సింకింగ్ ను ప్రారంభింస్తుంది మరియు రివ్యూ రిమైండర్‌లను సృష్టించడానికి మిమ్మల్ని అనుమతిస్తుంది</string>
@@ -164,7 +164,7 @@
     <string name="revoke_permissions" comment="Pop-up message that is shown to the user when they are revoking an app permission.">This permission must be manually revoked from Settings</string>
     <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">ఖాతాను తీసివేయండి</string>
     <!-- Instant Note Editor -->
-    <string name="instant_card" comment="Used in the Android system context menu/share dialog to quickly create a note. This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. ">తక్షణ కార్డ్</string>
+    <string name="instant_card" comment="Used in the Android system context menu/share dialog to quickly create a note. This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. ">తక్షణ చీటి</string>
     <!-- Internet Permissions -->
     <string name="internet_access_title" comment="used for notifying user to unable internet access">Internet</string>
     <string name="permission_access_summary">Required for the app to work</string>
diff --git a/common/android/src/main/res/values-te/02-strings.xml b/common/android/src/main/res/values-te/02-strings.xml
index c7b1263c7385..21fd0c2aee2f 100644
--- a/common/android/src/main/res/values-te/02-strings.xml
+++ b/common/android/src/main/res/values-te/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">ఫాంట్ పరిమాణం</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">టూల్ బార్ చూపించు</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">మీ హోమ్ స్క్రీన్‌కి సత్వరమార్గాలను జోడించడానికి AnkiDroid మిమ్మల్ని అనుమతించదు</string>
     <string name="create_shortcut_error">సత్వరమార్గాన్ని జోడించడంలో లోపం: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">వాక్యాలను క్యాపిటలైజ్ చేయండి</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">స్క్రోల్ టూల్‌బార్</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">దయచేసి మరిన్ని డెక్‌లను డౌన్‌లోడ్ చేయడానికి లాగిన్ చేయండి</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">వివరణ</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-te/03-dialogs.xml b/common/android/src/main/res/values-te/03-dialogs.xml
index f7b1cff2a824..375448afe834 100644
--- a/common/android/src/main/res/values-te/03-dialogs.xml
+++ b/common/android/src/main/res/values-te/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">మీరు నిజంగా డాటాబేస్ రిపేరు చేయాలనుకుంటున్నారా? \n\n ప్రయత్నం ప్రారంభించటానికి ముందు, \"కాపీ\" ఫోల్డర్ \"%s\" లో సృష్టించబడుతుంది.</string>
     <string name="intent_aedict_empty">\"default\" వర్గం ఖాళీగా ఉంది</string>
     <string name="intent_aedict_category">AnkiDroid కు కార్డులు జోడించడానికి అన్ని నోట్ప్యాడ్లో కేతగిరీలు తొలగించండి లేదా \"default\" కు ఒక పేరును జోడించండి</string>
-    <string name="custom_study_new_extend">నేటి కొత్త కార్డ్ పరిమితిని పెంచండి/తగ్గించండి (\"-3\").</string>
-    <string name="custom_study_rev_extend">నేటి సమీక్ష పరిమితిని పెంచడం/తగ్గించడం (\"-3\").</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">గత x రోజుల్లో రిజిస్టర్డ్ కార్డులను మర్చిపోయారు:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">అన్ని కార్డులు</string>
-    <string name="tags_dialog_option_new_cards">కొత్త</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">కొత్త</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">గడువు</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">ఖాళీ కార్డ్లు కనుగొనడం&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">సిస్టమ్ WebView పాతది. కొన్ని ఫీచర్‌లు సరిగ్గా పని చేయవు. దయచేసి దీన్ని అప్‌డేట్ చేయండి.\n\nఇన్‌స్టాల్ చేసిన వెర్షన్: %1$d\nకనీసం అవసరమైన వెర్షన్: %2$d</string>
     <string name="compress">కుదించుము</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">భాషకు మద్దతు లేదు</string>
     <string name="tts_error_dialog_reason_text">టెక్స్ట్ టు స్పీచ్ ఇంజిన్ <b>%1$s</b> కింది భాషకు మద్దతు ఇవ్వదు: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">ఇంజిన్ మార్చండి</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-te/10-preferences.xml b/common/android/src/main/res/values-te/10-preferences.xml
index 9ee094580530..92dadb79bc47 100644
--- a/common/android/src/main/res/values-te/10-preferences.xml
+++ b/common/android/src/main/res/values-te/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">స్ట్రోక్ వెడల్పు</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">కొత్త కార్డుల కోసం డెక్</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">టైమ్బాక్స్ సమయం పరిమితి</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">మరుసటి రోజు ప్రారంభించండి</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -249,6 +257,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-te/16-multimedia-editor.xml b/common/android/src/main/res/values-te/16-multimedia-editor.xml
index dcf0f3cd33b1..1730cb6dad14 100644
--- a/common/android/src/main/res/values-te/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-te/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">మీరు ఈ చిత్రాన్ని కత్తిరించాలనుకుంటున్నారా?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">ప్రస్తుత చిత్రం పరిమాణం %sMB. డిఫాల్ట్ చిత్రం పరిమాణం పరిమితి 1MB. మీరు దానిని కుదించాలనుకుంటున్నారా?</string>
     <string name="select_image_failed">"చిత్రాన్ని ఎంచుకోవడంలో విఫలమైంది, దయచేసి మళ్లీ ప్రయత్నించండి"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">ఫీల్డ్ విషయాలు</string>
diff --git a/common/android/src/main/res/values-tgl/02-strings.xml b/common/android/src/main/res/values-tgl/02-strings.xml
index 8aee0de4fb73..78f26927f836 100644
--- a/common/android/src/main/res/values-tgl/02-strings.xml
+++ b/common/android/src/main/res/values-tgl/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-tgl/03-dialogs.xml b/common/android/src/main/res/values-tgl/03-dialogs.xml
index 71c25287c16e..d9ff28d27db6 100644
--- a/common/android/src/main/res/values-tgl/03-dialogs.xml
+++ b/common/android/src/main/res/values-tgl/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Gusto ma bang subukan ang pag-aayos ng database?\n\nBago simulan ang pagtatangka, isang kopya ang lilikhain sa subfolder na \"%s\".</string>
     <string name="intent_aedict_empty">Walang laman ang kategoryang \"default\"</string>
     <string name="intent_aedict_category">Upang magdagdag ng mga baraha sa AnkiDroid alisin ang lahat ng mga kategorya ng Notepad o magdagdag ng isa na pinangalanang \"default\"</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Ang mga baraha na sinusuri ay nakalimutan sa huling x na mga araw:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Lahat ng mga kard</string>
-    <string name="tags_dialog_option_new_cards">Bago</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Bago</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Marapat</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Paghahanap ng mga walang laman na kard&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-tgl/10-preferences.xml b/common/android/src/main/res/values-tgl/10-preferences.xml
index 0166ce51ec3a..14f31fde4dd6 100644
--- a/common/android/src/main/res/values-tgl/10-preferences.xml
+++ b/common/android/src/main/res/values-tgl/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Lapad ng stroke</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck para sa mga bagong card</string>
     <string name="learn_cutoff" maxLength="41">Matuto nang higit na limitasyon</string>
     <string name="time_limit" maxLength="41">Limitasyon ng oras ng Timebox</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-tgl/16-multimedia-editor.xml b/common/android/src/main/res/values-tgl/16-multimedia-editor.xml
index d9a9211644fc..7d3e5ec19a56 100644
--- a/common/android/src/main/res/values-tgl/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-tgl/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-th/02-strings.xml b/common/android/src/main/res/values-th/02-strings.xml
index a9bc31800d4a..1ac519dfc69e 100644
--- a/common/android/src/main/res/values-th/02-strings.xml
+++ b/common/android/src/main/res/values-th/02-strings.xml
@@ -216,7 +216,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -244,7 +247,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -329,7 +331,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-th/03-dialogs.xml b/common/android/src/main/res/values-th/03-dialogs.xml
index a7ee68237d37..2661ed2cc735 100644
--- a/common/android/src/main/res/values-th/03-dialogs.xml
+++ b/common/android/src/main/res/values-th/03-dialogs.xml
@@ -43,8 +43,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -93,7 +93,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">All cards</string>
-    <string name="tags_dialog_option_new_cards">New</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">New</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
@@ -220,6 +220,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -255,7 +257,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-th/10-preferences.xml b/common/android/src/main/res/values-th/10-preferences.xml
index ffc29951a8a6..74c4408602ad 100644
--- a/common/android/src/main/res/values-th/10-preferences.xml
+++ b/common/android/src/main/res/values-th/10-preferences.xml
@@ -54,7 +54,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -168,6 +168,13 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="other" comment="Consider keeping the unbreakable space after the digit">%d hours past midnight</item>
@@ -250,6 +257,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-th/16-multimedia-editor.xml b/common/android/src/main/res/values-th/16-multimedia-editor.xml
index 5993ac10159e..165d0f390296 100644
--- a/common/android/src/main/res/values-th/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-th/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-ti/02-strings.xml b/common/android/src/main/res/values-ti/02-strings.xml
index e07cedd7eb06..de628947adb1 100644
--- a/common/android/src/main/res/values-ti/02-strings.xml
+++ b/common/android/src/main/res/values-ti/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-ti/03-dialogs.xml b/common/android/src/main/res/values-ti/03-dialogs.xml
index 2fd452352beb..91e27c64310c 100644
--- a/common/android/src/main/res/values-ti/03-dialogs.xml
+++ b/common/android/src/main/res/values-ti/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">All cards</string>
-    <string name="tags_dialog_option_new_cards">New</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">New</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-ti/10-preferences.xml b/common/android/src/main/res/values-ti/10-preferences.xml
index fdb3c24b7644..88e7ed68be1f 100644
--- a/common/android/src/main/res/values-ti/10-preferences.xml
+++ b/common/android/src/main/res/values-ti/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-ti/16-multimedia-editor.xml b/common/android/src/main/res/values-ti/16-multimedia-editor.xml
index d9a9211644fc..7d3e5ec19a56 100644
--- a/common/android/src/main/res/values-ti/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ti/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-tr/02-strings.xml b/common/android/src/main/res/values-tr/02-strings.xml
index 8c0628ea2dae..e9554b7672af 100644
--- a/common/android/src/main/res/values-tr/02-strings.xml
+++ b/common/android/src/main/res/values-tr/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid bir Android hatasından dolayı depolamaya erişemiyor.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Yazı tipi boyutu</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Araç çubuğunu göster</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Önizlemeyi göster</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Önizlemeyi gizle</string>
     <string name="format_insert_bold">Kalın olarak şekillendir</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Ana ekranın, kısayol ekleyebilmesi için AnkiDroid\'e izin vermiyor</string>
     <string name="create_shortcut_error">Kısayolu eklerken hata: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Cümlelerin baş harflerini büyült</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Araç çubuğunu kaydır</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Sertifika</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">İnternet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Yükle</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Metin okuma ayarları açılamadı</string>
-    <string name="shared_decks_login_required">Daha fazla deste indirmek için lütfen giriş yapın</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Açıklama</string>
     <string name="deck_description_saved">Açıklama güncellendi</string>
     <string name="format_deck_description_as_markdown">Markdown olarak formatla</string>
diff --git a/common/android/src/main/res/values-tr/03-dialogs.xml b/common/android/src/main/res/values-tr/03-dialogs.xml
index 3813e666d329..0fbd097424f4 100644
--- a/common/android/src/main/res/values-tr/03-dialogs.xml
+++ b/common/android/src/main/res/values-tr/03-dialogs.xml
@@ -45,11 +45,11 @@
     <string name="repair_deck_dialog">Veritabanını onarmayı gerçekten denemek istiyor musunuz?\n\nGirişime başlamadan önce, \"%s\" altklasöründe bir kopya oluşturulacak.</string>
     <string name="intent_aedict_empty">\"Varsayılan\" kategorisi boş</string>
     <string name="intent_aedict_category">AnkiDroid\'e kart eklemek için bütün Not Defteri kategorilerini kaldırın veya \"default\" isminde bir tane ekleyin</string>
-    <string name="custom_study_new_extend">Bugünün yeni kart sınırını şu kadar arttırın/azaltın (“-3”)</string>
-    <string name="custom_study_rev_extend">Bugünün gözden geçirme sınırını şu kadar arttırın/azaltın (“-3”)</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Son x gündeki unutulan kartları izle:</string>
     <string name="custom_study_ahead_description">Şu kadar zaman içinde sırası gelecek kartları çalış:</string>
-    <string name="custom_study_preview">Preview new cards added in the last:</string>
+    <string name="custom_study_preview">Son (day) içinde eklenen yeni kartları önizle</string>
     <string name="custom_study_tags">Desteden x kart seç:</string>
     <string name="storage_full_title">Depolama alanı dolu</string>
     <string name="storage_almost_full_title">Depolama alanı nerdeyse dolu</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Tüm kartlar</string>
-    <string name="tags_dialog_option_new_cards">Yeni</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Yeni</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Sırası gelmiş</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Boş kartlar aranıyor&#8230;</string>
@@ -139,7 +139,7 @@
     <!-- Locale Selection Dialog -->
     <string name="locale_selection_dialog_title_new">Dili Ayarla</string>
     <string name="locale_selection_dialog_summary">GBoard gibi bazı çok dilli klavyeler, metin düzenlerken dil değiştirmeyi destekler\n\nKlavyeniz dili değiştirmiyorsa lütfen klavye üreticinizden “setImeHintLocales” özelliğini isteyin.</string>
-    <string name="locale_selection_dialog_unknown_language" comment="Used for the locales whose name is not displayed when selected and placeholder is language tag">Unknown language [%1$s]</string>
+    <string name="locale_selection_dialog_unknown_language" comment="Used for the locales whose name is not displayed when selected and placeholder is language tag">Bilinmeyen dil [%1$s]</string>
     <!-- Help Dialog -->
     <string name="help_title_using_ankidroid">AnkiDroid kullanımı</string>
     <string name="help_item_ankidroid_manual">AnkiDroid kullanım kılavuzu</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">Sistem WebView\'su güncel değil. Bazı özellikler doğru çalışmayacak. Lütfen güncelleyin.\n\nYüklü sürüm: %1$d\nGereken en düşük sürüm: %2$d</string>
     <string name="compress">Sıkıştır</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Dil desteklenmiyor</string>
     <string name="tts_error_dialog_reason_text"><b>%1$s</b> metin okuma motoru şu dili desteklemiyor: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Motor değiştir</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">Bundan</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">Buna</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profil adı</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profil adı boş olamaz</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profil adı %1$d veya daha az karakter olmalıdır</string>
diff --git a/common/android/src/main/res/values-tr/10-preferences.xml b/common/android/src/main/res/values-tr/10-preferences.xml
index 043485bb4a9f..89ccdae4ca19 100644
--- a/common/android/src/main/res/values-tr/10-preferences.xml
+++ b/common/android/src/main/res/values-tr/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Güvenlik: Güvensiz JavaScript çağrısı engellendi.\nEğer koleksiyonunuzdaki bütün kartlara ve şablonlara güveniyorsanız, bu engel ileri düzey ayarlardan kaldırılabilir.</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Kartların uygulama başlatmasına izin ver</string>
-    <string name="allow_card_external_launch_summ">Kartlar cihazınızdaki başka uygulamaları açıp potansiyel olarak istenmeyen eylemleri tetikleyebilirler.\nKoleksiyonunuzdaki bütün kartlara ve şablonlara güvenmediğiniz sürece kapalı bırakın.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Güvenlik: Kartın başka bir uygulamayı başlatması engellendi.\nEğer koleksiyonunuzdaki bütün kartlara ve şablonlara güveniyorsanız, bu engel ileri düzey ayarlardan kaldırılabilir.</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Kontur genişliği</string>
@@ -168,6 +168,14 @@
     <string name="use_current" maxLength="41">Yeni kartlar için deste</string>
     <string name="learn_cutoff" maxLength="41">Önceden öğrenme sınırı</string>
     <string name="time_limit" maxLength="41">Zaman sınırı</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Sonraki günün başlangıcı (0 geceyarısı, 23 akşam 11)</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">Geceyarısından %d saat sonra</item>
@@ -250,6 +258,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Sadece bugün hiç çalışmadıysam bildirim gönder</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Lütfen tam bir kart sayısı girin</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">Eşik en az 0 olmalıdır</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Bu hatırlatıcı silinsin mi?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">Bu eylem geri alınamaz.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-tr/16-multimedia-editor.xml b/common/android/src/main/res/values-tr/16-multimedia-editor.xml
index 96467225af65..f18c839746c3 100644
--- a/common/android/src/main/res/values-tr/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-tr/16-multimedia-editor.xml
@@ -49,7 +49,8 @@
     <string name="multimedia_editor_audio_view_create_failed">Kaydedici araç çubuğu oluşturulamıyor</string>
     <!-- Crop function-->
     <string name="crop_image">Bu resmi kırpmak istiyor musunuz?</string>
-    <string name="crop_button" maxLength="28">Crop</string>
+    <string name="crop_button" maxLength="28">Kırp</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Şu anki resim boyutu %s MB. Varsayılan resim boyut sınırı 1 MB. Resmi sıkıştırmak ister misiniz?</string>
     <string name="select_image_failed">"Resim seçilemedi, Lütfen tekrar deneyin"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Alan İçeriği</string>
diff --git a/common/android/src/main/res/values-tt/02-strings.xml b/common/android/src/main/res/values-tt/02-strings.xml
index 10a36fff7bfb..76c91fbf9210 100644
--- a/common/android/src/main/res/values-tt/02-strings.xml
+++ b/common/android/src/main/res/values-tt/02-strings.xml
@@ -217,7 +217,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Шрифт үлчәме</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -245,7 +248,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -330,7 +332,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Тасвирлама</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-tt/03-dialogs.xml b/common/android/src/main/res/values-tt/03-dialogs.xml
index 6b7d75a00fdc..9dc39561defd 100644
--- a/common/android/src/main/res/values-tt/03-dialogs.xml
+++ b/common/android/src/main/res/values-tt/03-dialogs.xml
@@ -43,8 +43,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -93,7 +93,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">All cards</string>
-    <string name="tags_dialog_option_new_cards">Яңа</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Яңа</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Finding empty cards&#8230;</string>
@@ -220,6 +220,8 @@
     <string name="webview_update_message">The system WebView is outdated. Some features won’t work correctly. Please update it.\n\nInstalled version: %1$d\nMinimum required version: %2$d</string>
     <string name="compress">Compress</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -255,7 +257,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-tt/10-preferences.xml b/common/android/src/main/res/values-tt/10-preferences.xml
index 82f141d51097..7dcb2b8c4fb8 100644
--- a/common/android/src/main/res/values-tt/10-preferences.xml
+++ b/common/android/src/main/res/values-tt/10-preferences.xml
@@ -54,7 +54,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Stroke width</string>
@@ -168,6 +168,13 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="other" comment="Consider keeping the unbreakable space after the digit">%d hours past midnight</item>
@@ -250,6 +257,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-tt/16-multimedia-editor.xml b/common/android/src/main/res/values-tt/16-multimedia-editor.xml
index 80ca8de9a495..45de34040a5c 100644
--- a/common/android/src/main/res/values-tt/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-tt/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values-ug/02-strings.xml b/common/android/src/main/res/values-ug/02-strings.xml
index b02ceb6f1247..555814a67b8c 100644
--- a/common/android/src/main/res/values-ug/02-strings.xml
+++ b/common/android/src/main/res/values-ug/02-strings.xml
@@ -219,7 +219,10 @@
     <string name="ankidroid_init_failed_storage">Android خاتالىقى سەۋەبىدىن AnkiDroid ساقلىغۇچنى زىيارەت قىلالمايدۇ.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">خەت چوڭلۇقى</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">قورال بالداقنى كۆرسەت</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">ئالدىن كۆزىتىشنى كۆرسەت</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">ئالدىن كۆزىتىشنى يوشۇر</string>
     <string name="format_insert_bold">توم پىچىم</string>
@@ -236,8 +239,8 @@
     <string name="edit_toolbar_item">قورال بالداق تۈرىنى تەھرىر</string>
     <string name="toolbar_item_explain_edit_or_remove">تاللانغان تېكىستتىن ئىلگىرى ۋە كېيىن قىستۇرىدىغان HTML كىرگۈزۈلىدۇ\n\nقورال بالداق ئۇزۇن بېسىلسا ئۇنى تەھرىرلىگىلى ياكى چىقىرىۋەتكىلى بولىدۇ</string>
     <string name="remove_toolbar_item">قورال بالداق تۈرىنى چىقىرىۋېتەمدۇ؟</string>
-    <string name="note_editor_toolbar_icon_requirement_error">Button text is required</string>
-    <string name="before_after_text_requirement_error">At least one HTML field is required</string>
+    <string name="note_editor_toolbar_icon_requirement_error">توپچە تېكىستى زۆرۈر</string>
+    <string name="before_after_text_requirement_error">كەم دېگەندە بىر HTML بۆلىكى زۆرۈر</string>
     <string name="note_editor_image_too_large">سۈرەت بەك چوڭ، سۈرەتنى قولدا قىستۇرۇڭ</string>
     <string name="note_editor_video_too_large">سىن ھۆججىتى بەك چوڭ، سىننى قولدا قىستۇرۇڭ</string>
     <string name="note_editor_audio_too_large">ئۈن ھۆججىتى بەك چوڭ، ئۈننى قولدا قىستۇرۇڭ</string>
@@ -247,7 +250,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">باش ئېكرانىڭىز AnkiDroid نىڭ تېزلەتمە قوشۇشىغا يول قويمايدۇ</string>
     <string name="create_shortcut_error">تېزلەتمە قوشۇش خاتالىقى: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">چوڭ ھەرپلىك جۈملە</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">قورال بالداقنى دومىلات</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">گۇۋاھنامە</string>
@@ -275,8 +277,8 @@
     <string name="download_speed_unit" comment="Download speed. %1$s is an amount of data, e.g. \'1.2 MB\', giving \'1.2 MB/s\'">%1$s/s</string>
     <string name="download_speed_unknown" comment="Placeholder shown when the current download speed is unknown">-/s</string>
     <string name="download_time_unknown" comment="Placeholder when the remaining download time is unknown">-</string>
-    <string name="download_speed_label">Speed</string>
-    <string name="download_time_left_label">Time left</string>
+    <string name="download_speed_label">سۈرئەت</string>
+    <string name="download_time_left_label">قالغان ۋاقىت</string>
     <string name="deck_download_progress_message">اچۈشۈرۈۋاتقاندا باشقا ئەپنى ئىشلىتەلەيسىز</string>
     <string name="check_network">تور باغلىنىشىنى تەكشۈرۈڭ</string>
     <string name="external_storage_unavailable">چۈشۈرۈش بىكار قىلىندى، سىرتقا ساقلىغۇچنى ئىشلەتكىلى بولمايدۇ</string>
@@ -334,7 +336,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">ئىنتېرنېت</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">ئورنات</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">تېكىستتىن ئاۋازغا تەڭشىكىنى ئاچالمىدى</string>
-    <string name="shared_decks_login_required">تېخىمۇ كۆپ دەستە چۈشۈرۈش ئۈچۈن تىزىمغا كىرىڭ</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">چۈشەندۈرۈش</string>
     <string name="deck_description_saved">چۈشەندۈرۈش يېڭىلاندى</string>
     <string name="format_deck_description_as_markdown">Markdown سۈپىتىدە پىچىملاندۇرىدۇ</string>
diff --git a/common/android/src/main/res/values-ug/03-dialogs.xml b/common/android/src/main/res/values-ug/03-dialogs.xml
index 95838bc3112b..aa1888b823ec 100644
--- a/common/android/src/main/res/values-ug/03-dialogs.xml
+++ b/common/android/src/main/res/values-ug/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">سانداننى ھەقىقەتەن ئوڭشامسىز؟\n\nباشلاشتىن ئىلگىرى، بىر نۇسخا كۆچۈرۈلمىسى «%s» تارماق قىسقۇچقا قۇرۇلىدۇ.</string>
     <string name="intent_aedict_empty">سەھىپە «كۆڭۈلدىكى» بوش</string>
     <string name="intent_aedict_category">AnkiDroid قا كارتا قوشۇشتا بارلىق خاتىرە دەپتەر سەھىپىنى چىقىرىۋېتىدۇ ياكى «كۆڭۈلدىكى» ئاتىدا بىرنى قوشىدۇ</string>
-    <string name="custom_study_new_extend">بۈگۈنكى يېڭى كارتا چېكىنى («3-»)ئاشۇرىدۇ/كېمەيتىدۇ</string>
-    <string name="custom_study_rev_extend">بۈگۈنكى تەكرارلايدىغان كارتا چېكىنى («3-»)ئاشۇرىدۇ/كېمەيتىدۇ</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">ئۆتكەن x كۈندە ئۇنتۇلغان كارتىنى تەكرارلايدۇ:</string>
     <string name="custom_study_ahead_description">كېيىنكى كارتىنى تەكرارلاش مۆھلىتى:</string>
     <string name="custom_study_preview">يېقىنقى كۈندە قوشقان يېڭى كارتىنى ئالدىن كۆزىتىدۇ:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">ھەممە كارتا</string>
-    <string name="tags_dialog_option_new_cards">يېڭى</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">يېڭى</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">مۆھلەت</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">بوش كارتىنى ئىزدەۋاتىدۇ&#8230;</string>
@@ -117,7 +117,7 @@
     <!-- Deck Options -->
     <!-- Database Errors-->
     <string name="database_locked_title">ساندان قۇلۇپلانغان</string>
-    <string name="database_locked_summary_new" comment="%s is the name of the \'AnkiDroid directory\' setting">Another AnkiDroid app is using this collection. It may conflict even when it is not visibly running.\n\nTo keep using both apps, change the ‘%s’ in one app\'s Advanced settings.\n\nTo use this app now, force-stop the conflicting app.</string>
+    <string name="database_locked_summary_new" comment="%s is the name of the \'AnkiDroid directory\' setting">باشقا AnkiDroid ئەپ بۇ توپلامنى ئىشلىتىۋاتىدۇ. ئۇ كۆرۈنمەي ئىجرا قىلىۋاتقان بولسىمۇ توقۇنۇش كېلىپ چىقىشى مۇمكىن.\n\nبۇ ئىككى ئەپنى ئىشلىتىشنى داۋاملاشتۇرۇش ئۈچۈن، بىر ئەپنىڭ ئالىي تەڭشىكىدە «%s» نى ئۆزگەرتىڭ.\n\nبۇ ئەپنى ھازىر ئىشلىتىشتە، توقۇنۇشقان ئەپنى مەجبۇرىي توختىتىڭ.</string>
     <string name="incompatible_database_version_title">ماسلاشمايدىغان ساندان نەشرى</string>
     <string name="incompatible_database_version_summary">بۇ ساندان AnkiDroid تا ئىشلەيدىغان نەشرىدىن ئالىي نەشرى ئىكەن. ئۇنى ئېچىش ئۈچۈن AnkiDroid نى يۈكسەلتىڭ ياكى ساندان نەشرىنى تۆۋەنلىتىڭ\n\nقوللايدىغان نەشرى: %1$d\nساندان نەشرى: %2$d\n\nتۆۋەندىكى ئەسلىگە كەلتۈرۈش تاللانمىسى نۆۋەتتىكى توپلامنى قاپلىۋېتىدۇ، ماسلىشىشى مۇمكىن بولغان ساندان نەشرى:</string>
     <!-- Deck Picker Background-->
@@ -139,7 +139,7 @@
     <!-- Locale Selection Dialog -->
     <string name="locale_selection_dialog_title_new">تىل تەڭشەك</string>
     <string name="locale_selection_dialog_summary">بەزى GBoard قا ئوخشاش كۆپ تىللىق ھەرپتاختا تېكىست تەھرىرلەۋاتقاندا تىل ئالماشتۇرۇشنى قوللايدۇ\n\nئەگەر ھەرپتاختىڭىز تىل ئالماشتۇرۇشنى قوللىمىسا ھەرپتاختا تارقاتقۇچىغا «كىرگۈزگۈچ تەھرىرلىگۈچنىڭ يەرلىك ئەسكەرتىش تەڭشەك» ئىقتىدارىنى ئىلتىماس قىلىڭ.</string>
-    <string name="locale_selection_dialog_unknown_language" comment="Used for the locales whose name is not displayed when selected and placeholder is language tag">Unknown language [%1$s]</string>
+    <string name="locale_selection_dialog_unknown_language" comment="Used for the locales whose name is not displayed when selected and placeholder is language tag">يوچۇن تىل [%1$s]</string>
     <!-- Help Dialog -->
     <string name="help_title_using_ankidroid">AnkiDroid نى ئىشلىتىش</string>
     <string name="help_item_ankidroid_manual">AnkiDroid قوللانمىسى</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">سىستېما WebView نىڭ ۋاقتى ئۆتكەن. بەزى ئىقتىدارلار نورمال ئىشلىمەيدۇ. يېڭىلاڭ.\n\nئورنىتىلغان نەشرى: %1$d\nزۆرۈر بولغان ئەڭ تۆۋەن نەشرى: %2$d</string>
     <string name="compress">پىرېس</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">تىلنى قوللىمايدۇ</string>
     <string name="tts_error_dialog_reason_text">تېكىستتىن ئاۋازغا موتورى b&gt;%1$s&lt;/b&gt; تۆۋەندىكى تىلنى قوللىمايدۇ: &lt;b&gt;%2$s&lt;/b&gt;</string>
     <string name="tts_error_dialog_change_button_text">موتورنى ئۆزگەرت</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">نەدىن</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">نەگە</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">تەرجىمىھال ئىسمى</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">تەرجىمىھال ئىسمى بوش قالمايدۇ</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">تەرجىمىھال ئىسمى چوقۇم %1$d ھەر ياكى ئۇنىڭدىن قىسقا بولىدۇ</string>
diff --git a/common/android/src/main/res/values-ug/10-preferences.xml b/common/android/src/main/res/values-ug/10-preferences.xml
index 8f2616080bcc..42e5add2085f 100644
--- a/common/android/src/main/res/values-ug/10-preferences.xml
+++ b/common/android/src/main/res/values-ug/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">بىخەتەرلىك: بىخەتەر بولمىغان JavaScript چاقىرىشى توسۇلدى.\nئەگەر توپلىمىڭىزدىكى بارلىق كارتا ۋە قېلىپقا ئىشەنسىڭىز، ئالىي تەڭشەكتە بۇ توسۇشنى چىقىرىۋېتەلەيسىز</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">كارتىنىڭ باشقا ئەپنى قوزغىتىشىغا يول قويىدۇ</string>
-    <string name="allow_card_external_launch_summ">كارتا ئۈسكۈنىڭىزدىكى باشقا ئەپنى ئاچالايدۇ، يوشۇرۇن ئويلاشمىغان مەشغۇلاتنى قوزغىتىشى مۇمكىن.\nتوپلىمىڭىزدىكى بارلىق كارتا ۋە قېلىپقا ئىشەنسىڭىز ئوچۇق، بولمىسا تاقاق قالدۇرۇڭ.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">بىخەتەرلىك: كارتىنىڭ باشقا ئەپنى قوزغىتىشىنى توستى.\nئەگەر توپلىمىڭىزدىكى بارلىق كارتا ۋە قېلىپقا ئىشەنسىڭىز، ئالىي تەڭشەكتە بۇ توسۇشنى چىقىرىۋېتەلەيسىز</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">سىزىق توملۇقى</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">يېڭى كارتا دەستىسى</string>
     <string name="learn_cutoff" maxLength="41">ئالدىن ئۆگىنىش چېكى</string>
     <string name="time_limit" maxLength="41">ۋاقىت قۇتىسىنىڭ ۋاقىت چېكى</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">كېيىنكى كۈنى باشلايدۇ</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">يېرىم كېچىدىن %d سائەت ئۆتتى</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">ئەگەر بۈگۈن تەكرارلاشنىنى تاماملىمىغان بولسام ئاندىن مېنى ئەسكەرت</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">تولۇق كارتا نومۇرىنى كىرگۈزۈڭ</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">بوسۇغا قىممىتى كەم دېگەندە 0 بولۇشى كېرەك</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">بۇ ئەسكەرتىشنى ئۆچۈرەمدۇ؟</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">بۇ مەشغۇلاتتىن يېنىۋالغىلى بولمايدۇ.</string>
     <!-- Reminder troubleshooting screen -->
@@ -312,7 +321,7 @@
     <string name="pref_cat_about_title" maxLength="41">ھەققىدە</string>
     <string name="contributors_title">تۆھپىكار</string>
     <string name="about_contributors_description"><![CDATA[بۇلار بىزنىڭ قالتىس <a href=\"%1$s\">تۆھپىكارلىرىمىز</a>. پىروگرامما تۈزۈش، تەرجىمە قىلىش، ئىئانە قىلىش ۋە  <a href=\"%2$s\">تېخىمۇ كۆپ</a> ئۇسۇللار ئارقىلىق AnkiDroid غا ياردەم قىلالايسىز!]]></string>
-    <string name="about_contributors_description_no_donate"><![CDATA[These are our awesome <a href=\"%1$s\">contributors</a>. You can help AnkiDroid too by programming, translating and <a href=\"%2$s\">more</a>!]]></string>
+    <string name="about_contributors_description_no_donate"><![CDATA[بۇلار بىزنىڭ قالتىس <a href=\"%1$s\">تۆھپىكارلىرىمىز</a>. پىروگرامما تۈزۈش، تەرجىمە قىلىش ۋە  <a href=\"%2$s\">تېخىمۇ كۆپ</a> ئۇسۇل ئارقىلىق AnkiDroid غا ياردەم قىلالايسىز!]]></string>
     <string name="license">ئىجازەتنامە</string>
     <string name="license_description"><![CDATA[مەزكۇر AnkiDroid نى <a href=\"%1$s\">GPL-3.0</a> ۋە <a href=\"%2$s\">AGPL-3.0</a> ئىجازىتىدە تارقىتىدۇ، ئەسلى مەنبە كودى <a href=\"%3$s\">GitHub</a> تا بار]]></string>
     <string name="other_licenses"><![CDATA[AnkiDroid نۇرغۇن ئوچۇق كودلۇق <a href=\"%1$s\">ئىجازەت</a>تە تارقىتىلىدىغان ئۈچىنچى تەرەپ ئامبار ۋە سىنبەلگىنىمۇ ئىشلىتىدۇ]]></string>
diff --git a/common/android/src/main/res/values-ug/16-multimedia-editor.xml b/common/android/src/main/res/values-ug/16-multimedia-editor.xml
index f6fea8af256e..0cf5ada46b73 100644
--- a/common/android/src/main/res/values-ug/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ug/16-multimedia-editor.xml
@@ -49,7 +49,8 @@
     <string name="multimedia_editor_audio_view_create_failed">خاتىرىلىگۈچ قورال بالداقنى قۇرالمايدۇ</string>
     <!-- Crop function-->
     <string name="crop_image">بۇ سۈرەتنى قايچىلامسىز؟</string>
-    <string name="crop_button" maxLength="28">Crop</string>
+    <string name="crop_button" maxLength="28">كەس</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">نۆۋەتتىكى سۈرەتنىڭ چوڭلۇقى ‏‎%s‪‎‏MB‬. كۆۈلدىكى سۈرەت چوڭلۇقىنىڭ چېكى ‪1MB‬. پىرىسلامسىز؟</string>
     <string name="select_image_failed">"سۈرەت تاللىيالمىدى، قايتا سىناڭ"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">بۆلەك مەزمۇنى</string>
diff --git a/common/android/src/main/res/values-uk/02-strings.xml b/common/android/src/main/res/values-uk/02-strings.xml
index 8076543b3bd2..482095cb74a6 100644
--- a/common/android/src/main/res/values-uk/02-strings.xml
+++ b/common/android/src/main/res/values-uk/02-strings.xml
@@ -225,7 +225,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid не може отримати доступ до сховища через помилку Android.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Розмір шрифту</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Показувати панель інструментів</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Форматувати як жирний</string>
@@ -253,7 +256,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Ваш головний екран не дозволяє AnkiDroid додати ярлики</string>
     <string name="create_shortcut_error">Помилка при створенні ярлика: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Підняти регістр речень</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Панель прокручування</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Сертифікат</string>
@@ -344,7 +346,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Інтернет</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Завантажити</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Не вдалося відкрити налаштування синтезу мовлення</string>
-    <string name="shared_decks_login_required">Ввійдіть, будь ласка, до акаунту, щоб завантажити більше колод</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Опис</string>
     <string name="deck_description_saved">Опис оновлено</string>
     <string name="format_deck_description_as_markdown">Форматувати як Markdown</string>
diff --git a/common/android/src/main/res/values-uk/03-dialogs.xml b/common/android/src/main/res/values-uk/03-dialogs.xml
index b0527cf3ed4d..a66f9c94e33d 100644
--- a/common/android/src/main/res/values-uk/03-dialogs.xml
+++ b/common/android/src/main/res/values-uk/03-dialogs.xml
@@ -49,8 +49,8 @@
     <string name="repair_deck_dialog">Ви дійсно бажаєте спробувати відновити базу даних?\n\nПеред початком спроби в підкаталозі \'%s\' буде створена копія.</string>
     <string name="intent_aedict_empty">Категорія  \"стандартна\"  порожня</string>
     <string name="intent_aedict_category">Щоб додати картки до AnkiDroid, видаліть всі категорії Notepad або додайте категорію \'default\'</string>
-    <string name="custom_study_new_extend">Збільшення/зменшення («-3») сьогоднішньої межі на нові картки</string>
-    <string name="custom_study_rev_extend">Збільшення/зменшення («-3») сьогоднішнього ліміту на повторення</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Повторити картки забуті за останні x днів:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -102,7 +102,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Усі картки</string>
-    <string name="tags_dialog_option_new_cards">Нові</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Нові</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">На черзі</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Пошук порожніх карток&#8230;</string>
@@ -244,6 +244,8 @@
     <string name="webview_update_message">Системний WebView застарілий. Деякі функції не будуть правильно працювати. Оновіть його, будь ласка.\n\nВстановлена версія: %1$d\nЯк мінімум потрібна версія: %2$d</string>
     <string name="compress">Стиснути</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Мова не підтримується</string>
     <string name="tts_error_dialog_reason_text">Рушій перетворення тексту в мовлення <b>%1$s</b> не підтримує наступну мову: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Змінити рушій</string>
@@ -279,7 +281,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-uk/10-preferences.xml b/common/android/src/main/res/values-uk/10-preferences.xml
index ad7c8e1616d5..7125f128a896 100644
--- a/common/android/src/main/res/values-uk/10-preferences.xml
+++ b/common/android/src/main/res/values-uk/10-preferences.xml
@@ -57,7 +57,7 @@
     <string name="dangerous_js_api_denied_snackbar">Безпека: Небезпечний JavaScript запит було заблоковано.\nЯкщо ви довіряєте всім карткам і шаблонам в колекції, це можна розблокувати в додаткових налаштуваннях</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Дозволяти карткам запускати інші додатки</string>
-    <string name="allow_card_external_launch_summ">Картки можуть запускати інші додатки на вашому пристрої, що може призвести до виконання потенційно небажаних дій.\nЗалиште вимкненим, якщо ви не довіряєте всім карткам і шаблонам своєї колекції.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Безпека: Картці було заблоковано запуск постороннього додатку.\nЯкщо ви довіряєте всім карткам і шаблонам своєї колекції, це можна розблокувати у додаткових налаштуваннях</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Ширина штриха</string>
@@ -171,6 +171,16 @@
     <string name="use_current" maxLength="41">Колода для нових карт</string>
     <string name="learn_cutoff" maxLength="41">Ліміт вивчення карток наперед</string>
     <string name="time_limit" maxLength="41">Період лічильника переглядів</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="few">mins</item>
+        <item quantity="many">mins</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Початок наступного дня (0 – опівніч, 23 – 23:00)</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d година після опівночі</item>
@@ -255,6 +265,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-uk/16-multimedia-editor.xml b/common/android/src/main/res/values-uk/16-multimedia-editor.xml
index c05cc907eada..74cc90fb7fe0 100644
--- a/common/android/src/main/res/values-uk/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-uk/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Обрізати це зображення?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Поточний розмір зображення %sМБ. Розмір за замовчуванням обмежено до 1 МБ. Бажаєте стиснути його?</string>
     <string name="select_image_failed">"Не вдалося обрати зображення. Будь ласка, спробуйте ще"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Вміст поля</string>
diff --git a/common/android/src/main/res/values-ur/02-strings.xml b/common/android/src/main/res/values-ur/02-strings.xml
index 79a550b4c7c1..8ab706dbfd44 100644
--- a/common/android/src/main/res/values-ur/02-strings.xml
+++ b/common/android/src/main/res/values-ur/02-strings.xml
@@ -220,7 +220,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">حرف کا سائز</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">ٹول بار دکھائیں</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -248,7 +251,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">آپ کی ہوم اسکرین AnkiDroid کو شارٹ کٹ شامل کرنے کی اجازت نہیں دیتی ہے۔</string>
     <string name="create_shortcut_error">شارٹ کٹ شامل کرنے میں خرابی: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">جملے کیپٹلائز کریں۔</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">اسکرول ٹول بار</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -335,7 +337,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Install</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Failed to open text to speech settings</string>
-    <string name="shared_decks_login_required">مزید ڈیک ڈاؤن لوڈ کرنے کے لیے براہ کرم لاگ ان کریں</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">تفصیل</string>
     <string name="deck_description_saved">Description updated</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-ur/03-dialogs.xml b/common/android/src/main/res/values-ur/03-dialogs.xml
index b2c5583c2dc8..d050dc43f82a 100644
--- a/common/android/src/main/res/values-ur/03-dialogs.xml
+++ b/common/android/src/main/res/values-ur/03-dialogs.xml
@@ -45,8 +45,8 @@
     <string name="repair_deck_dialog">کیا آپ واقعی ڈیٹا بیس کو ٹھیک کرنے کی کوشش کرنا چاہتے ہیں؟\n\nکوشش شروع کرنے سے پہلے، ذیلی فولڈر \"%s\" میں ایک کاپی بنائی جائے گی۔</string>
     <string name="intent_aedict_empty">زمرہ \"ڈیفالٹ\" خالی ہے۔</string>
     <string name="intent_aedict_category">AnkiDroid میں کارڈز شامل کرنے کے لیے تمام نوٹ پیڈ کیٹیگریز کو ہٹا دیں یا \"ڈیفالٹ\" کے نام سے ایک شامل کریں۔</string>
-    <string name="custom_study_new_extend">آج کی نئی کارڈ کی حد (\"-3\") میں اضافہ/کم کریں۔</string>
-    <string name="custom_study_rev_extend">آج کی نظرثانی کی حد میں اضافہ/کمی (\"-3\")</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">پچھلے دنوں میں بھولے گئے کارڈز کا جائزہ لیں:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -96,7 +96,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">تمام کارڈز</string>
-    <string name="tags_dialog_option_new_cards">نئی</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">نئی</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">بقایا</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">خالی کارڈز تلاش کیے جا رہے ہیں&#8230;</string>
@@ -228,6 +228,8 @@
     <string name="webview_update_message">WebView سسٹم پرانا ہے۔ کچھ خصوصیات صحیح طریقے سے کام نہیں کریں گی۔ براہ کرم اسے اپ ڈیٹ کریں۔\n\nانسٹال شدہ ورژن: %1$d\nکم از کم مطلوبہ ورژن: %2$d</string>
     <string name="compress">کمپریس</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">زبان تعاون یافتہ نہیں ہے۔</string>
     <string name="tts_error_dialog_reason_text">ٹیکسٹ ٹو اسپیچ انجن <b>%1$s</b> درج ذیل زبان کو سپورٹ نہیں کرتا ہے: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">انجن تبدیل کریں۔</string>
@@ -263,7 +265,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-ur/10-preferences.xml b/common/android/src/main/res/values-ur/10-preferences.xml
index 7c1c5abd7aca..51f660fbc5ac 100644
--- a/common/android/src/main/res/values-ur/10-preferences.xml
+++ b/common/android/src/main/res/values-ur/10-preferences.xml
@@ -55,7 +55,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">اسٹروک کی چوڑائی</string>
@@ -169,6 +169,14 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-ur/16-multimedia-editor.xml b/common/android/src/main/res/values-ur/16-multimedia-editor.xml
index 32f8589ea05d..1d73935d30d7 100644
--- a/common/android/src/main/res/values-ur/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-ur/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">کیا آپ اس تصویر کو تراشنا چاہتے ہیں؟</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"تصویر کا انتخاب ناکام ہو گیا، براہ کرم دوبارہ کوشش کریں۔"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">فیلڈ کے مشمولات</string>
diff --git a/common/android/src/main/res/values-uz/01-core.xml b/common/android/src/main/res/values-uz/01-core.xml
index fbd04e13129e..2bb4fb49f496 100644
--- a/common/android/src/main/res/values-uz/01-core.xml
+++ b/common/android/src/main/res/values-uz/01-core.xml
@@ -29,16 +29,16 @@
     <string name="help" maxLength="28" comment="Title of the help menu and button to open it.">Yordam</string>
     <!-- The last entry "Support ankidroid" is in 03-dialogs.-->
     <!-- Entries of the "attach" in the "add card" view. -->
-    <string name="drawing" comment="Menu entry to create a drawing to attach to a card. Also a title.">Rasm chizish</string>
+    <string name="drawing" comment="Menu entry to create a drawing to attach to a card. Also a title.">Rasm çiziş</string>
     <!-- Entries of the Support ankidroid menu. -->
-    <string name="send_feedback" comment="Menu entry in the \'Help&gt;Support ankidroid\' menu, that opens the web page explaining how to send feedback.">Fikr-mulohaza joʻnatish</string>
+    <string name="send_feedback" comment="Menu entry in the \'Help&gt;Support ankidroid\' menu, that opens the web page explaining how to send feedback.">Fikr-mulohaza jönatiş</string>
     <!-- Study Options-->
-    <string name="studyoptions_start" comment="Title of the Reviewer activity. Also the button to open it.">O\'rganish</string>
+    <string name="studyoptions_start" comment="Title of the Reviewer activity. Also the button to open it.">Örganiş</string>
     <!-- DeckPicker.kt -->
-    <string name="expand" comment="In the deck picker: accessibility label of the buttons that display the subdecks of a deck.">Yoyish</string>
-    <string name="collapse" comment="In the deck picker: accessibility label of the buttons that hide the subdecks of a deck.">Yigʻish</string>
-    <string name="no_cards_placeholder_title" comment="Text shown the first time AnkiDroid is opened, to explain to the user why they can\'t yet review.">Kolleksiya boʻsh</string>
-    <string name="no_cards_placeholder_description" comment="Text shown the first time AnkiDroid is opened, to explain what should be their first action.">+ belgisi bosib kartalar qoʻshishni boshlang</string>
+    <string name="expand" comment="In the deck picker: accessibility label of the buttons that display the subdecks of a deck.">Yoyiş</string>
+    <string name="collapse" comment="In the deck picker: accessibility label of the buttons that hide the subdecks of a deck.">Yiğiş</string>
+    <string name="no_cards_placeholder_title" comment="Text shown the first time AnkiDroid is opened, to explain to the user why they can\'t yet review.">Kolleksiya böş</string>
+    <string name="no_cards_placeholder_description" comment="Text shown the first time AnkiDroid is opened, to explain what should be their first action.">+ belgisi bosib kartalar qöşişni boşlang</string>
     <!-- Reviewer -->
     <plurals name="reviewer_window_title" comment="Header of the reviewer, telling the users how many minutes remains before they have seen all cards.">
         <item quantity="one">%d daqiqa qoldi</item>
@@ -52,123 +52,123 @@
         <item quantity="one">%1$d kun %2$d soat qoldi</item>
         <item quantity="other">%1$d kun %2$d soat qoldi</item>
     </plurals>
-    <string name="type_answer_hint" comment="In the reviewer. When the user use note type with hint. It\'s the default content of the text field in which the user is invited to type their answer. It disappears as soon as the user start to type.">Javobni yozish</string>
-    <string name="show_answer" maxLength="41" comment="When displaying the question side of a card. This is the label of a button that display the answer side.">Javobini koʻrish</string>
-    <string name="hide_answer" comment="In the previewer, when the answer side is displayed. This is the label of the button that sends back to the question side.">Javobni berkitish</string>
+    <string name="type_answer_hint" comment="In the reviewer. When the user use note type with hint. It\'s the default content of the text field in which the user is invited to type their answer. It disappears as soon as the user start to type.">Javobni yoziş</string>
+    <string name="show_answer" maxLength="41" comment="When displaying the question side of a card. This is the label of a button that display the answer side.">Javobini köriş</string>
+    <string name="hide_answer" comment="In the previewer, when the answer side is displayed. This is the label of the button that sends back to the question side.">Javobni berkitiş</string>
     <string name="ease_button_again" maxLength="41" comment="In the reviewer, in the answer side. Label of the button that request the card to be shown again soon.">Qaytadan</string>
     <string name="ease_button_hard" maxLength="41" comment="In the reviewer, in the answer side. Label of the button that used by the user to state finding the correct answer was hard.">Qiyin</string>
-    <string name="ease_button_good" maxLength="41" comment="In the reviewer, in the answer side. Label of the button that used by the user to state their answer was good.">Yaxshi</string>
+    <string name="ease_button_good" maxLength="41" comment="In the reviewer, in the answer side. Label of the button that used by the user to state their answer was good.">Yaxşi</string>
     <string name="ease_button_easy" maxLength="41" comment="In the reviewer, in the answer side. Label of the button that used by the user to state that finding the answer to the question was easy.">Oson</string>
     <string name="show_answer_hint_long_press" comment="In the reviewer, hint is shown when touching the show answer button and the user has the long-press accessibility setting enabled">\'%s\' yoqilgan</string>
     <!-- General -->
-    <string name="undo" maxLength="28" comment="When tapping on this text, the last action is undone.">Bekor qilish</string>
-    <string name="redo" maxLength="28" comment="Menu entry that allows to redo action that was just undone.">Qaytarish</string>
+    <string name="undo" maxLength="28" comment="When tapping on this text, the last action is undone.">Bekor qiliş</string>
+    <string name="redo" maxLength="28" comment="Menu entry that allows to redo action that was just undone.">Qaytariş</string>
     <!-- flashcard_portrait.xml -->
-    <string name="undo_action_whiteboard_last_stroke" comment="One of the display patterns of \'Undo\' item on the action menu in the Study Screen. It is shown as the title of the item when the whiteboard (handwriting) feature is enabled and visible and has any strokes (handwritten lines)" maxLength="28">Shtrixni bekor qilish</string>
-    <string name="move_all_to_deck">Barchasini dastaga koʻchirish</string>
-    <string name="create_shortcut">Yorliq yaratish</string>
-    <string name="browse_cards">Kartalarni koʻrib chiqish</string>
-    <string name="edit_deck_description" comment="edit the deck description">Tavsifini tahrirlash</string>
-    <string name="menu_add" comment="A generic add button. Please inform us if you need more specific strings" maxLength="28">Qoʻshish</string>
-    <string name="menu_add_note" maxLength="28">Qayd qoʻshish</string>
-    <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">Akkauntni sinxronlash</string>
-    <string name="menu_dismiss_note" maxLength="41">Yashirish / Oʻchirish</string>
-    <string name="rename_flag">Bayroqlar nomini oʻzgartirish</string>
-    <string name="menu_edit_tags" maxLength="28">Teglarni tahrirlash</string>
-    <string name="delete_note_message">Rostdan ham bu qayd va uning barcha kartalarini oʻchirmoqchimisiz?\n%s</string>
-    <string name="menu_search" maxLength="28">%1$s dan izlab koʻrish</string>
-    <string name="menu_unmark_note">Qayddan belgini olib tashlash</string>
-    <string name="menu_enable_voice_playback" maxLength="28">Ovoz ijrosini yoqish</string>
-    <string name="menu_disable_voice_playback">Ovoz ijrosini oʻchirish</string>
-    <string name="menu_create_backup" maxLength="28">Zaxira yaratish</string>
-    <string name="new_dynamic_deck">Filtrlangan dasta yaratish</string>
-    <string name="directory_inaccessible">AnkiDroid katalogiga kirish imkonsiz</string>
+    <string name="undo_action_whiteboard_last_stroke" comment="One of the display patterns of \'Undo\' item on the action menu in the Study Screen. It is shown as the title of the item when the whiteboard (handwriting) feature is enabled and visible and has any strokes (handwritten lines)" maxLength="28">Ştrixni bekor qiliş</string>
+    <string name="move_all_to_deck">Barçasini dastaga köçiriş</string>
+    <string name="create_shortcut">Yorliq yaratiş</string>
+    <string name="browse_cards">Kartalarni körib çiqiş</string>
+    <string name="edit_deck_description" comment="edit the deck description">Tavsifini tahrirlaş</string>
+    <string name="menu_add" comment="A generic add button. Please inform us if you need more specific strings" maxLength="28">Qöşiş</string>
+    <string name="menu_add_note" maxLength="28">Qayd qöşiş</string>
+    <string name="menu_my_account" comment="Label of the window in which the user should enter their account. This text can\'t be found in AnkiDroid directly.">Akkauntni sinxronlaş</string>
+    <string name="menu_dismiss_note" maxLength="41">Yaşiriş / Öçiriş</string>
+    <string name="rename_flag">Bayroqlar nomini özgartiriş</string>
+    <string name="menu_edit_tags" maxLength="28">Teglarni tahrirlaş</string>
+    <string name="delete_note_message">Rostdan ham bu qayd va uning barça kartalarini öçirmoqçimisiz?\n%s</string>
+    <string name="menu_search" maxLength="28">%1$s dan izlab köriş</string>
+    <string name="menu_unmark_note">Qayddan belgini olib taşlaş</string>
+    <string name="menu_enable_voice_playback" maxLength="28">Ovoz ijrosini yoqiş</string>
+    <string name="menu_disable_voice_playback">Ovoz ijrosini öçiriş</string>
+    <string name="menu_create_backup" maxLength="28">Zaxira yaratiş</string>
+    <string name="new_dynamic_deck">Filtrlangan dasta yaratiş</string>
+    <string name="directory_inaccessible">AnkiDroid katalogiga kiriş imkonsiz</string>
     <!--This is shown when AnkiDroid starts up with no storage permissions.
     The user is taken to the "App Info" screen, and needs to click "Permissions" and
     grant AnkiDroid the \'Storage\' permission. This needs to be a fairly generic message as implementations
     of the permissions/app info screen will differ between devices. -->
-    <string name="startup_no_storage_permission">Iltimos davom etish uchun AnkiDroid ga \'Saqlash\' ruxsatini bering</string>
+    <string name="startup_no_storage_permission">Iltimos davom etiş uçun AnkiDroid ga \'Saqlaş\' ruxsatini bering</string>
     <string name="rebuild_filtered_deck">Filtrlangan dasta qayta qurilmoqda&#8230;</string>
-    <string name="empty_cram_label" maxLength="28">Boʻsh</string>
-    <string name="create_subdeck">Ichki dasta yaratish</string>
-    <string name="empty_filtered_deck">Filtrlangan dasta boʻshatilmoqda&#8230;</string>
-    <string name="search_deck" comment="Deck search for selecting it">Dastani qidirish</string>
-    <string name="empty_deck">Bu dasta boʻsh</string>
+    <string name="empty_cram_label" maxLength="28">Böş</string>
+    <string name="create_subdeck">Içki dasta yaratiş</string>
+    <string name="empty_filtered_deck">Filtrlangan dasta böşatilmoqda&#8230;</string>
+    <string name="search_deck" comment="Deck search for selecting it">Dastani qidiriş</string>
+    <string name="empty_deck">Bu dasta böş</string>
     <string name="invalid_deck_name">Dastaning nomi yaroqsiz</string>
     <string name="studyoptions_congrats_finished">Tabriklaymiz! Bugungini bitirdingiz.</string>
-    <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Dasta hozircha tugadi! %s</string>
-    <string name="studyoptions_no_cards_due">Muddati kelgan kartalar hozircha yoʻq</string>
-    <string name="sd_card_not_mounted">Qurilma saqlash xotirasi oʻrnatilmagan</string>
-    <string name="button_sync" comment="Text of the sync button" maxLength="28">Sinxronlash</string>
-    <string name="cancel_sync_confirm" tools:ignore="UnusedResources">Sinxronlashni bekor qilmoqchimisiz?</string>
-    <string name="continue_sync" tools:ignore="UnusedResources">Sinxronlashni davom ettirish</string>
-    <string name="sync_cancelled" tools:ignore="UnusedResources">Sinxronlash bekor qilindi</string>
-    <string name="sync_cancel_message" tools:ignore="UnusedResources">Bekor qilinmoqda&#8230;\nBu biroz vaqt olishi mumkin.</string>
+    <string name="studyoptions_congrats_next_due_in" comment="The param will be replaced with \'The next card will be ready in X time\'">Dasta hozirça tugadi! %s</string>
+    <string name="studyoptions_no_cards_due">Muddati kelgan kartalar hozirça yöq</string>
+    <string name="sd_card_not_mounted">Qurilma saqlaş xotirasi örnatilmagan</string>
+    <string name="button_sync" comment="Text of the sync button" maxLength="28">Sinxronlaş</string>
+    <string name="cancel_sync_confirm" tools:ignore="UnusedResources">Sinxronlaşni bekor qilmoqçimisiz?</string>
+    <string name="continue_sync" tools:ignore="UnusedResources">Sinxronlaşni davom ettiriş</string>
+    <string name="sync_cancelled" tools:ignore="UnusedResources">Sinxronlaş bekor qilindi</string>
+    <string name="sync_cancel_message" tools:ignore="UnusedResources">Bekor qilinmoqda&#8230;\nBu biroz vaqt olişi mumkin.</string>
     <string name="syncing_media">Media fayllar sinxronlanmoqda</string>
-    <string name="export_deck" maxLength="28">Dastani eksport qilish</string>
-    <string name="export_collection">Kolleksiyani eksport qilish</string>
+    <string name="export_deck" maxLength="28">Dastani eksport qiliş</string>
+    <string name="export_collection">Kolleksiyani eksport qiliş</string>
     <!-- Card template editor -->
     <string name="title_activity_template_editor">Karta turlari</string>
-    <string name="card_template_editor_deck_override" maxLength="28">Dastani oʻzgartirish</string>
-    <string name="card_template_editor_insert_field" maxLength="28">Maydon qoʻshish</string>
-    <string name="card_template_editor_select_field">Maydonni tanlash</string>
+    <string name="card_template_editor_deck_override" maxLength="28">Dastani özgartiriş</string>
+    <string name="card_template_editor_insert_field" maxLength="28">Maydon qöşiş</string>
+    <string name="card_template_editor_select_field">Maydonni tanlaş</string>
     <string name="card_template_editor_cant_delete">Kamida bitta karta turi talab qilinadi</string>
     <plurals name="card_template_editor_confirm_add">
-        <item quantity="one">Bu  %1$d ta karta yaratadi. Davom ettirmoqchimisiz?</item>
-        <item quantity="other">Bu  %1$d ta karta yaratadi. Davom ettirmoqchimisiz?</item>
+        <item quantity="one">Bu  %1$d ta karta yaratadi. Davom ettirmoqçimisiz?</item>
+        <item quantity="other">Bu  %1$d ta karta yaratadi. Davom ettirmoqçimisiz?</item>
     </plurals>
     <plurals name="card_template_editor_confirm_delete">
-        <item quantity="one">“%2$s” karta turini va shu turdagi  %1$d ta karta oʻchirilsinmi?</item>
-        <item quantity="other">“%2$s” karta turini va shu turdagi  %1$d ta karta oʻchirilsinmi?</item>
+        <item quantity="one">“%2$s” karta turini va şu turdagi  %1$d ta karta öçirilsinmi?</item>
+        <item quantity="other">“%2$s” karta turini va şu turdagi  %1$d ta karta öçirilsinmi?</item>
     </plurals>
-    <string name="card_template_editor_save_error">Karta shablon oʻzgarishlarini saqlab boʻlmadi: %s</string>
-    <string name="template_for_current_card_deleted">Joriy kartaning karta turi oʻchirilgan.</string>
+    <string name="card_template_editor_save_error">Karta şablon özgarişlarini saqlab bölmadi: %s</string>
+    <string name="template_for_current_card_deleted">Joriy kartaning karta turi öçirilgan.</string>
     <!-- Permissions -->
-    <string name="read_write_permission_label">AnkiDroid maʼlumotlar bazasidan oʼqish va yozish</string>
-    <string name="read_write_permission_description">mavjud qaydlarga, kartalarga, qayd turlariga va dastalarga, shuningdek, yangilarini yaratishga ruxsat</string>
+    <string name="read_write_permission_label">AnkiDroid maʼlumotlar bazasidan oʼqiş va yoziş</string>
+    <string name="read_write_permission_description">mavjud qaydlarga, kartalarga, qayd turlariga va dastalarga, şuningdek, yangilarini yaratişga ruxsat</string>
     <!-- Context Menu -->
-    <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">Card browser</string>
+    <string name="card_browser_context_menu" comment="The value which appears in the system context menu.">Karta brauzeri</string>
     <string name="context_menu_anki_card_label">Anki card</string>
     <!-- Sync conflict -->
-    <string name="sync_conflict_message_new">Kolleksiyalarni birlashtirib boʻlmadi.\n Qaysi kolleksiyani qoldirmoqchisiz?</string>
+    <string name="sync_conflict_message_new">Kolleksiyalarni birlaştirib bölmadi.\n Qaysi kolleksiyani qoldirmoqçisiz?</string>
     <string name="sync_conflict_keep_local_new" comment="Select AnkiDroid files to keep while syncing">AnkiDroid</string>
     <string name="sync_conflict_keep_remote_new" comment="Select AnkiWeb files to keep while syncing">AnkiWeb</string>
-    <string name="sync_conflict_remote_confirm_new">AnkiDroidʼdagi kolleksiyangizni AnkiWeb kolleksiyasi bilan almashtirmoqchimisiz?</string>
-    <string name="sync_conflict_local_confirm_new">AnkiWebʼdagi kolleksiyangizni AnkiDroid kolleksiyasi bilan almashtirmoqchimisiz?</string>
-    <string name="sync_conflict_title_new">Saqlash uchun kolleksiyani tanlang</string>
-    <string name="sync_conflict_replace_title">Kolleksiyani almashtirish</string>
+    <string name="sync_conflict_remote_confirm_new">AnkiDroidʼdagi kolleksiyangizni AnkiWeb kolleksiyasi bilan almaştirmoqçimisiz?</string>
+    <string name="sync_conflict_local_confirm_new">AnkiWebʼdagi kolleksiyangizni AnkiDroid kolleksiyasi bilan almaştirmoqçimisiz?</string>
+    <string name="sync_conflict_title_new">Saqlaş uçun kolleksiyani tanlang</string>
+    <string name="sync_conflict_replace_title">Kolleksiyani almaştiriş</string>
     <!-- Generic errors -->
-    <string name="error__etc__cannot_write_to_or_create_file">%s fayliga yozib yoki yaratib boʻlmadi</string>
-    <string name="directory_inaccessible_after_uninstall" comment="Dialog title if AnkiDroid can\'t access the collection once the app is installed">Kolleksiyani ochib boʻlmadi</string>
-    <string name="directory_inaccessible_after_uninstall_summary" comment="the parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Play Store siyosatidagi oʻzgarishlar tufayli AnkiDroid oʻchirib tashlanganidan keyin kolleksiyangizga kira olmaymiz\n\nMaʼlumotlaringiz bus-butun va qayta tiklash mumkin. \n%s manzilida joylashgan\n\nQayta tiklash uchun quyidagi variantlardan birini tanlang:</string>
-    <string name="directory_revoked_after_inactivity" comment="the first parameter is WRITE_EXTERNAL_STORAGE the second parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Ilova nofaolligi sababli Android AnkiDroidʼni %1$s ruxsatini olib tashladi.\n\nMaʼlumotlaringiz bus-butun va qayta tiklash mumkin. \n%2$s manzilida joylashgan\n\nQayta tiklash uchun quyidagi variantlardan birini tanlang:</string>
-    <string name="restore_data_from_ankiweb">AnkiWebʼdan tiklash (tavsiya etiladi)</string>
-    <string name="install_non_play_store_ankidroid_recommended">Jildga ruxsatni tiklash (tavsiya etiladi)</string>
-    <string name="install_non_play_store_ankidroid">Jildga ruxsatni tiklash (kengaytirilgan)</string>
-    <string name="restore_data_from_backup">.colpkg zaxira nusxasidan qayta tiklash (kengaytirilgan)</string>
-    <string name="create_new_collection">Yangi kolleksiya yaratish</string>
-    <string name="new_unsafe_collection">AnkiDroidʼni oʻchirib tashlasangiz, yangi kolleksiya telefoningizdan oʻchiriladi</string>
+    <string name="error__etc__cannot_write_to_or_create_file">%s fayliga yozib yoki yaratib bölmadi</string>
+    <string name="directory_inaccessible_after_uninstall" comment="Dialog title if AnkiDroid can\'t access the collection once the app is installed">Kolleksiyani oçib bölmadi</string>
+    <string name="directory_inaccessible_after_uninstall_summary" comment="the parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Play Store siyosatidagi özgarişlar tufayli AnkiDroid öçirib taşlanganidan keyin kolleksiyangizga kira olmaymiz\n\nMaʼlumotlaringiz bus-butun va qayta tiklaş mumkin. \n%s manzilida joylaşgan\n\nQayta tiklaş uçun quyidagi variantlardan birini tanlang:</string>
+    <string name="directory_revoked_after_inactivity" comment="the first parameter is WRITE_EXTERNAL_STORAGE the second parameter is the path to the AnkiDroid folder. Typically /storage/emulated/0/AnkiDroid">Ilova nofaolligi sababli Android AnkiDroidʼni %1$s ruxsatini olib taşladi.\n\nMaʼlumotlaringiz bus-butun va qayta tiklaş mumkin. \n%2$s manzilida joylaşgan\n\nQayta tiklaş uçun quyidagi variantlardan birini tanlang:</string>
+    <string name="restore_data_from_ankiweb">AnkiWebʼdan tiklaş (tavsiya etiladi)</string>
+    <string name="install_non_play_store_ankidroid_recommended">Jildga ruxsatni tiklaş (tavsiya etiladi)</string>
+    <string name="install_non_play_store_ankidroid">Jildga ruxsatni tiklaş (kengaytirilgan)</string>
+    <string name="restore_data_from_backup">.colpkg zaxira nusxasidan qayta tiklaş (kengaytirilgan)</string>
+    <string name="create_new_collection">Yangi kolleksiya yaratiş</string>
+    <string name="new_unsafe_collection">AnkiDroidʼni öçirib taşlasangiz, yangi kolleksiya telefoningizdan öçiriladi</string>
     <!-- Permissions screen -->
-    <string name="permissions_screen_headline">AnkiDroid ishlashi uchun baʼzi ruxsatlar kerak</string>
-    <string name="permissions_screen_optional_headline" comment="Explains that there are optional permissions that can be granted to AnkiDroid.">AnkiDroid quyidagi ruxsatlar bilan eng yaxshi ishlaydi</string>
-    <string name="storage_access_title">Saqlash xotirasiga ruxsat</string>
-    <string name="storage_access_summary">Kolleksiyangizni xavfsiz joyda saqlaydi. Agar ilova oʻchirilib tashlansa, kolleksiyangiz oʻchirilmaydi</string>
-    <string name="all_files_access_title" comment="Name of the “All files access” permission from Android 10 and after. See [android.permission.MANAGE_EXTERNAL_STORAGE] on https://developer.android.com/training/data-storage/manage-all-files for context.">Barcha fayllarga ruxsat</string>
-    <string name="image_occlusion">Rasmni qisman toʻsish</string>
+    <string name="permissions_screen_headline">AnkiDroid işlaşi uçun baʼzi ruxsatlar kerak</string>
+    <string name="permissions_screen_optional_headline" comment="Explains that there are optional permissions that can be granted to AnkiDroid.">AnkiDroid quyidagi ruxsatlar bilan eng yaxşi işlaydi</string>
+    <string name="storage_access_title">Saqlaş xotirasiga ruxsat</string>
+    <string name="storage_access_summary">Kolleksiyangizni xavfsiz joyda saqlaydi. Agar ilova öçirilib taşlansa, kolleksiyangiz öçirilmaydi</string>
+    <string name="all_files_access_title" comment="Name of the “All files access” permission from Android 10 and after. See [android.permission.MANAGE_EXTERNAL_STORAGE] on https://developer.android.com/training/data-storage/manage-all-files for context.">Barça fayllarga ruxsat</string>
+    <string name="image_occlusion">Rasmni qisman tösiş</string>
     <string name="microphone" comment="Title of the microphone permission in the permissions explanation screen.">Mikrofon</string>
-    <string name="microphone_permission_explanation" comment="Description explaining why AnkiDroid needs the microphone permission, shown on the permissions explanation screen.">Kartalarga ovoz yozuvini qoʻshish va ovozni qayta ijro etishga imkoniyat beradi</string>
-    <string name="notifications_permission_explanation" comment="Description explaining why AnkiDroid needs the notification permission.">Media fayllarni orqa fonda sinxronlashga imkon beradi va takrorlash bildirishnomlarini yarata olasiz</string>
+    <string name="microphone_permission_explanation" comment="Description explaining why AnkiDroid needs the microphone permission, shown on the permissions explanation screen.">Kartalarga ovoz yozuvini qöşiş va ovozni qayta ijro etişga imkoniyat beradi</string>
+    <string name="notifications_permission_explanation" comment="Description explaining why AnkiDroid needs the notification permission.">Media fayllarni orqa fonda sinxronlaşga imkon beradi va takrorlaş bildirişnomlarini yarata olasiz</string>
     <string name="heading_required_permissions" comment="Heading for the section of required permissions that the app needs to function, shown in the permissions explanation screen.">Zarur</string>
     <string name="heading_optional_permissions" comment="Heading for the section of optional permissions that the app needs to function, shown in the permissions explanation screen.">Ixtiyoriy</string>
-    <string name="manually_grant_permissions" comment="Pop-up message that is shown to the user when they want to grant an app permission that must be granted via the OS settings screen.">Bu ruxsatni sozlamalarda qoʻlda yoqishingiz kerak</string>
-    <string name="revoke_permissions" comment="Pop-up message that is shown to the user when they are revoking an app permission.">Bu ruxsatni sozlamalarda qoʻlda oʻchirishingiz kerak</string>
-    <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">Akkauntni oʻchirish</string>
+    <string name="manually_grant_permissions" comment="Pop-up message that is shown to the user when they want to grant an app permission that must be granted via the OS settings screen.">Bu ruxsatni sozlamalarda qölda yoqişingiz kerak</string>
+    <string name="revoke_permissions" comment="Pop-up message that is shown to the user when they are revoking an app permission.">Bu ruxsatni sozlamalarda qölda öçirişingiz kerak</string>
+    <string name="remove_account" comment="open a website to start the deletion of an AnkiWeb account">Akkauntni öçiriş</string>
     <!-- Instant Note Editor -->
-    <string name="instant_card" comment="Used in the Android system context menu/share dialog to quickly create a note. This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. ">Karta yaratish</string>
+    <string name="instant_card" comment="Used in the Android system context menu/share dialog to quickly create a note. This does not need to be translated literally, translate the concept of quickly adding a Cloze note with a popup. ">Karta yaratiş</string>
     <!-- Internet Permissions -->
     <string name="internet_access_title" comment="used for notifying user to unable internet access">Internet</string>
-    <string name="permission_access_summary">Ilova ishlashi uchun kerak</string>
-    <string name="permission_required_message">Davom etish uchun AnkiDroidʼga ‘%s’ ruxsatini bering</string>
+    <string name="permission_access_summary">Ilova işlaşi uçun kerak</string>
+    <string name="permission_required_message">Davom etiş uçun AnkiDroidʼga ‘%s’ ruxsatini bering</string>
     <!-- Multiple profile -->
-    <string name="add_profile">Profil qoʻshish</string>
+    <string name="add_profile">Profil qöşiş</string>
 </resources>
diff --git a/common/android/src/main/res/values-uz/02-strings.xml b/common/android/src/main/res/values-uz/02-strings.xml
index ed61f7d55286..1c3dae5a19ff 100644
--- a/common/android/src/main/res/values-uz/02-strings.xml
+++ b/common/android/src/main/res/values-uz/02-strings.xml
@@ -24,8 +24,8 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Navigation drawer strings -->
-    <string name="drawer_open">Tortmani ochish</string>
-    <string name="drawer_close">Tortmani yopish</string>
+    <string name="drawer_open">Tortmani oçiş</string>
+    <string name="drawer_close">Tortmani yopiş</string>
     <string name="note_message">Qayt saqlandi</string>
     <!-- Note editor screen -->
     <string name="CardEditorCardDeck">Karta dastai:</string>
@@ -33,87 +33,87 @@
     <string name="CardEditorModel">Turi:</string>
     <string name="CardEditorTags">Teglar: %1$s</string>
     <string name="CardEditorCards">Kartalar: %1$s</string>
-    <string name="edit_occlusions">Rasm toʻsiqlarini tahrirlash</string>
-    <string name="paste_from_clipboard" maxLength="28">Buferdan qoʻyish</string>
-    <string name="add_new_filter_tags">Teglar qoʻshish/filtrlash</string>
-    <string name="add_tag" maxLength="28">Teg qoʻshish</string>
-    <string name="check_all_tags" maxLength="28">Barcha teglarni belgila/ma</string>
-    <string name="filter_tags" maxLength="28">Teglarni filtrlash</string>
-    <string name="no_tags">Hali hech qanday teg qo\'shmagansiz</string>
+    <string name="edit_occlusions">Rasm tösiqlarini tahrirlaş</string>
+    <string name="paste_from_clipboard" maxLength="28">Buferdan qöyiş</string>
+    <string name="add_new_filter_tags">Teglar qöşiş/filtrlaş</string>
+    <string name="add_tag" maxLength="28">Teg qöşiş</string>
+    <string name="check_all_tags" maxLength="28">Barça teglarni belgila/ma</string>
+    <string name="filter_tags" maxLength="28">Teglarni filtrlaş</string>
+    <string name="no_tags">Hali heç qanday teg qöşmagansiz</string>
     <string name="updated_version">%s versiyasiga yangilandi</string>
     <!-- Reviewer.kt (Study Screen) -->
-    <string name="save_whiteboard" maxLength="28">Yozuv taxtasini saqlash</string>
-    <string name="enable_stylus" maxLength="28">Qalam rejimini yoqish</string>
-    <string name="disable_stylus">Qalam rejimini oʻchirish</string>
-    <string name="eraser" maxLength="28">Oʻchirgich</string>
-    <string name="add_brush" maxLength="28">Choʻtka qoʻshish</string>
-    <string name="whiteboard_align_left" comment="Option to align the whiteboard toolbar on the left" maxLength="28">Chap</string>
+    <string name="save_whiteboard" maxLength="28">Yozuv taxtasini saqlaş</string>
+    <string name="enable_stylus" maxLength="28">Qalam rejimini yoqiş</string>
+    <string name="disable_stylus">Qalam rejimini öçiriş</string>
+    <string name="eraser" maxLength="28">Öçirgiç</string>
+    <string name="add_brush" maxLength="28">Çötka qöşiş</string>
+    <string name="whiteboard_align_left" comment="Option to align the whiteboard toolbar on the left" maxLength="28">Çap</string>
     <string name="whiteboard_align_bottom" comment="Option to align the whiteboard toolbar on the bottom" maxLength="28">Past</string>
-    <string name="whiteboard_align_right" comment="Option to align the whiteboard toolbar on the right" maxLength="28">Oʻng</string>
-    <string name="whiteboard_more_options" comment="Tooltip of the whiteboard \'More\' button" maxLength="28">Boshqa parametrlar</string>
-    <string name="whiteboard_remove_brush_message">Rostdan ham bu choʻtkani palitradan olib tashlamoqchimisiz?</string>
+    <string name="whiteboard_align_right" comment="Option to align the whiteboard toolbar on the right" maxLength="28">Öng</string>
+    <string name="whiteboard_more_options" comment="Tooltip of the whiteboard \'More\' button" maxLength="28">Boşqa parametrlar</string>
+    <string name="whiteboard_remove_brush_message">Rostdan ham bu çötkani palitradan olib taşlamoqçimisiz?</string>
     <string name="whiteboard_ink_eraser" comment="Title of the whiteboard Ink eraser">Siyoh</string>
-    <string name="whiteboard_stroke_eraser" comment="Title of the whiteboard Stroke eraser">Chiziq</string>
+    <string name="whiteboard_stroke_eraser" comment="Title of the whiteboard Stroke eraser">Çiziq</string>
     <string name="stylus_mode" comment="Title of the menu item that toggles the whiteboard stylus mode" maxLength="28">Stilus rejimi</string>
-    <string name="cannot_remove_last_brush_message">Oxirigi choʻtkani olib tashlab boʻlmaydi</string>
-    <string name="enable_whiteboard" maxLength="28">Yozuv taxtasini yoqish</string>
-    <string name="disable_whiteboard">Yozuv taxtasini oʻchirish</string>
-    <string name="show_whiteboard">Yozuv taxtasini koʻrsatish</string>
-    <string name="enable_eraser" maxLength="28">Oʻchirgʻichni yoqish</string>
-    <string name="disable_eraser" maxLength="28">Oʻchirgʻichni oʻchirish</string>
-    <string name="hide_whiteboard" maxLength="28">Yozuv taxtasini yashirish</string>
-    <string name="clear_whiteboard" maxLength="28">Yozuv taxtasini tozalash</string>
-    <string name="hide_toolbar" maxLength="28">Asboblar panelini yashirish</string>
-    <string name="replay_media" maxLength="28">Mediani qayta ijro etish</string>
-    <string name="leech_suspend_notification">Karta yopishqoq deb belgilandi va toʻxtatildi</string>
-    <string name="leech_notification">Karta yopishqoq deb belgilandi</string>
+    <string name="cannot_remove_last_brush_message">Oxirigi çötkani olib taşlab bölmaydi</string>
+    <string name="enable_whiteboard" maxLength="28">Yozuv taxtasini yoqiş</string>
+    <string name="disable_whiteboard">Yozuv taxtasini öçiriş</string>
+    <string name="show_whiteboard">Yozuv taxtasini körsatiş</string>
+    <string name="enable_eraser" maxLength="28">Öçirğiçni yoqiş</string>
+    <string name="disable_eraser" maxLength="28">Öçirğiçni öçiriş</string>
+    <string name="hide_whiteboard" maxLength="28">Yozuv taxtasini yaşiriş</string>
+    <string name="clear_whiteboard" maxLength="28">Yozuv taxtasini tozalaş</string>
+    <string name="hide_toolbar" maxLength="28">Asboblar panelini yaşiriş</string>
+    <string name="replay_media" maxLength="28">Mediani qayta ijro etiş</string>
+    <string name="leech_suspend_notification">Karta yopişqoq deb belgilandi va töxtatildi</string>
+    <string name="leech_notification">Karta yopişqoq deb belgilandi</string>
     <string name="webview_crash_unknown">Nomaʼlum xatolik</string>
-    <string name="webview_crash_unknwon_detailed">Bunga WebViewʼdagi ichki xatolik sabab boʻldi</string>
+    <string name="webview_crash_unknwon_detailed">Bunga WebViewʼdagi içki xatolik sabab böldi</string>
     <string name="webview_crash_oom">Out of memory</string>
-    <string name="webview_crash_oom_details">WebView tizim tomonidan tugatildi. Bu, odatda, dasturning xotirasi tugashi bilan sodir bo\'ladi, ko\'pincha katta shriftlar yoki katta media fayllar tufayli.</string>
-    <string name="webview_crash_nonfatal">WebView ishdan chiqdi. Sababi: %s</string>
-    <string name="webview_crash_fatal">Kritik xatolik: WebView ishdan chiqdi. Sababi: %s</string>
+    <string name="webview_crash_oom_details">WebView tizim tomonidan tugatildi. Bu, odatda, dasturning xotirasi tugaşi bilan sodir böladi, köpinça katta şriftlar yoki katta media fayllar tufayli.</string>
+    <string name="webview_crash_nonfatal">WebView işdan çiqdi. Sababi: %s</string>
+    <string name="webview_crash_fatal">Kritik xatolik: WebView işdan çiqdi. Sababi: %s</string>
     <string name="webview_crash_loop_dialog_title">System WebView rendering failure</string>
-    <string name="webview_crash_loop_dialog_content">Tizim WebView “%1$s” kartasini koʻrsata olmadi.\n %2$s</string>
-    <string name="slide_to_cancel" comment="Message shown when pressing the record button">Bekor qilish uchun suring</string>
+    <string name="webview_crash_loop_dialog_content">Tizim WebView “%1$s” kartasini körsata olmadi.\n %2$s</string>
+    <string name="slide_to_cancel" comment="Message shown when pressing the record button">Bekor qiliş uçun suring</string>
     <string name="filter_by_flags" maxLength="41">Bayroqlar</string>
     <!-- filtered deck options -->
-    <string name="filtered_option_delay_again">“Qaytadan” uchun kechikish</string>
-    <string name="filtered_option_delay_hard">“Qiyin” uchun kechikish</string>
-    <string name="filtered_option_delay_good">“Yaxshi” uchun kechikish</string>
+    <string name="filtered_option_delay_again">“Qaytadan” uçun keçikiş</string>
+    <string name="filtered_option_delay_hard">“Qiyin” uçun keçikiş</string>
+    <string name="filtered_option_delay_good">“Yaxşi” uçun keçikiş</string>
     <!-- Custom study options -->
-    <string name="custom_study_loading_tags">Teglar roʻyxati qurilmoqda</string>
+    <string name="custom_study_loading_tags">Teglar röyxati qurilmoqda</string>
     <!-- Study options -->
     <plurals name="studyoptions_buried_count">
-        <item quantity="one">+%d koʻmildi</item>
-        <item quantity="other">+%d koʻmildi</item>
+        <item quantity="one">+%d kömildi</item>
+        <item quantity="other">+%d kömildi</item>
     </plurals>
     <string name="studyoptions_total_new_label">Jami yangi kartalar</string>
     <string name="studyoptions_total_label">Jami kartalar</string>
     <!-- Card editor -->
-    <string name="cardeditor_title_edit_card" maxLength="28">Qaydni tahrirlash</string>
-    <string name="discard">Bekor qilish</string>
-    <string name="note_editor_no_cards_created">Hech qanday karta yaratilmadi. Iltimos, koʻproq maydonlarni toʻldiring.</string>
-    <string name="note_editor_no_cards_created_all_fields">Joriy qayd turi hech qanday karta hosil qilmadi.\nBoshqa qayd turini tanlang yoki “Kartalar”ni bosib maydon oʻzgartirilishini qoʻshing</string>
-    <string name="note_editor_insert_cloze_no_cloze_note_type">Boʻshliqlarni toʻldirish faqat boʻshliqli qayd turlarida ishlaydi</string>
+    <string name="cardeditor_title_edit_card" maxLength="28">Qaydni tahrirlaş</string>
+    <string name="discard">Bekor qiliş</string>
+    <string name="note_editor_no_cards_created">Heç qanday karta yaratilmadi. Iltimos, köproq maydonlarni töldiring.</string>
+    <string name="note_editor_no_cards_created_all_fields">Joriy qayd turi heç qanday karta hosil qilmadi.\nBoşqa qayd turini tanlang yoki “Kartalar”ni bosib maydon özgartirilişini qöşing</string>
+    <string name="note_editor_insert_cloze_no_cloze_note_type">Böşliqlarni töldiriş faqat böşliqli qayd turlarida işlaydi</string>
     <string name="saving_facts">Qayd saqlanmoqda</string>
     <string name="saving_model">Qayd turi saqlanmoqda</string>
-    <string name="save" maxLength="28">Saqlash</string>
-    <string name="close">Yopish</string>
-    <string name="select">Tanlash</string>
+    <string name="save" maxLength="28">Saqlaş</string>
+    <string name="close">Yopiş</string>
+    <string name="select">Tanlaş</string>
     <string name="field_remapping">%1$s (“%2$s” dan)</string>
     <string name="missing_note_type">Qayd turi topilmadi</string>
-    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (boʻsh)</string>
+    <string name="card_previewer_empty_front_indicator" comment="Extra text appended onto a tab title in the card previewer so that the user can see at a glance whether a card has no front.">%1$s (böş)</string>
     <!-- Image cropper -->
-    <string name="image_cropper_action_rotate" maxLength="28" comment="Action in image cropper screen">Aylantirish</string>
-    <string name="image_cropper_action_flip" maxLength="28" comment="Action in image cropper screen">Oʻgirish</string>
-    <string name="image_cropper_action_flip_horizontally" maxLength="28" comment="Submenu action in image cropper screen">Gorizontal oʻgirish</string>
-    <string name="image_cropper_action_flip_vertically" maxLength="28" comment="Submenu action in image cropper screen">Vertikal oʻgirish</string>
+    <string name="image_cropper_action_rotate" maxLength="28" comment="Action in image cropper screen">Aylantiriş</string>
+    <string name="image_cropper_action_flip" maxLength="28" comment="Action in image cropper screen">Ögiriş</string>
+    <string name="image_cropper_action_flip_horizontally" maxLength="28" comment="Submenu action in image cropper screen">Gorizontal ögiriş</string>
+    <string name="image_cropper_action_flip_vertically" maxLength="28" comment="Submenu action in image cropper screen">Vertikal ögiriş</string>
     <!-- Timebox -->
-    <string name="timebox_reached_title">Oʻrganish muddati tugadi</string>
+    <string name="timebox_reached_title">Örganiş muddati tugadi</string>
     <plurals name="timebox_reached">
-        <item quantity="one">%2$sda %1$d ta karta oʻrganildi</item>
-        <item quantity="other">%2$sda %1$d ta karta oʻrganildi</item>
+        <item quantity="one">%2$sda %1$d ta karta örganildi</item>
+        <item quantity="other">%2$sda %1$d ta karta örganildi</item>
     </plurals>
     <!-- minutes used in \'[studied in] x minutes\' context, causing inflexion in some languages -->
     <plurals name="in_minutes">
@@ -121,133 +121,135 @@
         <item quantity="other">%1$d daqiqa</item>
     </plurals>
     <string name="fact_adder_intent_title" comment="Label of the \'Add Note\' window. This title can\'t be seen in AnkiDroid directly.">AnkiDroid kartasi</string>
-    <string name="note_editor_copy_note" maxLength="28">Qayddan nusxa olish</string>
-    <string name="card_editor_reposition_card" comment="reposition a card in the new queue" maxLength="28">Oʻrnini oʻzgartirish</string>
-    <string name="card_editor_reset_card" maxLength="28">Progressni oʻchirish</string>
-    <string name="card_editor_reschedule_card" comment="Action to reschedule a card" maxLength="28">Vaqtini almashtirish</string>
-    <string name="card_editor_preview_card" comment="Button offering to preview some card(s)" maxLength="28">Oldindan koʻrish</string>
-    <string name="copy_as_markdown" comment="Copies text to the clipboard as Markdown" maxLength="28">Markdown sifatida nusxa olish</string>
+    <string name="note_editor_copy_note" maxLength="28">Qayddan nusxa oliş</string>
+    <string name="card_editor_reposition_card" comment="reposition a card in the new queue" maxLength="28">Örnini özgartiriş</string>
+    <string name="card_editor_reset_card" maxLength="28">Progressni öçiriş</string>
+    <string name="card_editor_reschedule_card" comment="Action to reschedule a card" maxLength="28">Vaqtini almaştiriş</string>
+    <string name="card_editor_preview_card" comment="Button offering to preview some card(s)" maxLength="28">Oldindan köriş</string>
+    <string name="copy_as_markdown" comment="Copies text to the clipboard as Markdown" maxLength="28">Markdown sifatida nusxa oliş</string>
     <string name="preview_progress_bar_text" comment="What card we are on out of how many in card previewer progress bar">%2$d dan %1$d</string>
-    <string name="rename" comment="Confirm that the renaming action should be processed." maxLength="28">Nomini oʻzgartirish</string>
-    <string name="checks_action" maxLength="28">Tekshirish</string>
-    <string name="unknown_type_field_warning">Kiritish javobi: nomaʼlum %s maydoni</string>
-    <string name="delete_deck" comment="Message on a progress bar starting a deck is being deleted.">Dasta oʻchirilmoqda&#8230;</string>
-    <string name="info_rate">AnkiDroidʼga baho berish</string>
-    <string name="import_title">Import qilish</string>
-    <string name="import_preparing_file">Fayl import uchun tayyorlanmoqda&#8230;</string>
-    <string name="import_message_add" comment="Adding a new deck to the collection (import)">Qoʻshish</string>
-    <string name="import_message_replace_confirm">Bu sizda mavjud boʻlgan kolleksiyangizni oʻchiradi va uni %s fayl maʼlumotlari bilan almashtiradi</string>
-    <string name="import_dialog_message_add">“%s” kolleksiyaga qoʻshilsinmi? Bu koʻp vaqt olishi mumkin</string>
+    <string name="rename" comment="Confirm that the renaming action should be processed." maxLength="28">Nomini özgartiriş</string>
+    <string name="checks_action" maxLength="28">Tekşiriş</string>
+    <string name="unknown_type_field_warning">Kiritiş javobi: nomaʼlum %s maydoni</string>
+    <string name="delete_deck" comment="Message on a progress bar starting a deck is being deleted.">Dasta öçirilmoqda&#8230;</string>
+    <string name="info_rate">AnkiDroidʼga baho beriş</string>
+    <string name="import_title">Import qiliş</string>
+    <string name="import_preparing_file">Fayl import uçun tayyorlanmoqda&#8230;</string>
+    <string name="import_message_add" comment="Adding a new deck to the collection (import)">Qöşiş</string>
+    <string name="import_message_replace_confirm">Bu sizda mavjud bölgan kolleksiyangizni öçiradi va uni %s fayl maʼlumotlari bilan almaştiradi</string>
+    <string name="import_dialog_message_add">“%s” kolleksiyaga qöşilsinmi? Bu köp vaqt olişi mumkin</string>
     <string name="import_log_no_apkg">Bu yaroqli Anki paket fayli emas</string>
     <string name="import_title_error" comment="Title of error dialog">Xatolik</string>
-    <string name="import_error_handle_exception">Faylni import qilib boʻlmadi\n\n%s</string>
-    <string name="import_error_not_apkg_extension">“%s” fayl nomida .apkg yoki .colpkg kengaytmasi yoʻq</string>
-    <string name="import_error_load_imported_database">Anki maʼlumotlar bazasini (.anki2) almashtirish hali qoʻllab-quvvatlanmaydi. Iltimos, almashtirish boʻyicha koʻrsatmalar uchun qoʻllanmaga murojaat qiling.</string>
-    <string name="import_error_content_provider">Tanlangan faylni AnkiDroid tomonidan avtomatik import qilib boʻlmadi. Anki fayllarni qoʻlda import qilish uchun foydalanuvchi qoʻllanmasiga murojaat qiling: \n%s</string>
-    <string name="import_error_copy_to_cache_title">Faylni keshlash amalga oshmadi</string>
-    <string name="import_error_copy_to_cache_explanation" comment="The substitution is a list of suggested fixes in bullet point form">Bu koʻpincha faylni tanlash uchun foydalangan ilovadagi xato tufayli yuzaga keladi. Quyidagi yechimlarni sinab koʻring:\n\n%s</string>
+    <string name="import_error_handle_exception">Faylni import qilib bölmadi\n\n%s</string>
+    <string name="import_error_not_apkg_extension">“%s” fayl nomida .apkg yoki .colpkg kengaytmasi yöq</string>
+    <string name="import_error_load_imported_database">Anki maʼlumotlar bazasini (.anki2) almaştiriş hali qöllab-quvvatlanmaydi. Iltimos, almaştiriş böyiça körsatmalar uçun qöllanmaga murojaat qiling.</string>
+    <string name="import_error_content_provider">Tanlangan faylni AnkiDroid tomonidan avtomatik import qilib bölmadi. Anki fayllarni qölda import qiliş uçun foydalanuvçi qöllanmasiga murojaat qiling: \n%s</string>
+    <string name="import_error_copy_to_cache_title">Faylni keşlaş amalga oşmadi</string>
+    <string name="import_error_copy_to_cache_explanation" comment="The substitution is a list of suggested fixes in bullet point form">Bu köpinça faylni tanlaş uçun foydalangan ilovadagi xato tufayli yuzaga keladi. Quyidagi yeçimlarni sinab köring:\n\n%s</string>
     <string name="import_interrupted">Import uzuldi: AnkiDroid yopilgan</string>
     <string name="export_ready_title">Eksportga tayyor</string>
-    <string name="export_send_no_handlers">apkg bilan ishlash uchun ilova mavjud emas. Saqlanmoqda&#8230;</string>
+    <string name="export_send_no_handlers">apkg bilan işlaş uçun ilova mavjud emas. Saqlanmoqda&#8230;</string>
     <string name="export_save_apkg_successful">Anki paket muvaffaqiyatli saqlandi</string>
-    <string name="export_save_apkg_unsuccessful">Anki paketini saqlab boʻlmadi</string>
+    <string name="export_save_apkg_unsuccessful">Anki paketini saqlab bölmadi</string>
     <string name="export_share_title">Anki paketini quyidagi bilan yuboring</string>
     <string name="export_email_subject">AnkiDroid kartalarni eksport qildi: %s</string>
     <string name="export_email_text"><![CDATA[
         Salom!
         <br/><br/>
         Bu Ankidroidʼdan[1] yuborilgan kartalar dastasi.
-        Mavjud Anki distributivlaridan biri yordamida uni ochib koʻring[2] va oson va samarali o‘rganishdan bahramand boʻling!<br/><br/>
+        Mavjud Anki distributivlaridan biri yordamida uni oçib köring[2] va oson va samarali o‘rganişdan bahramand böling!<br/><br/>
         [1] %1$s<br/>
         [2] %2$s
         ]]></string>
-    <string name="export_choice_share">Ulashish</string>
-    <string name="export_choice_save_to">Saqlash</string>
+    <string name="export_choice_share">Ulaşiş</string>
+    <string name="export_choice_save_to">Saqlaş</string>
     <string name="export_saving_exported_collection">Eksport qilingan fayl saqlanmoqda&#8230;</string>
     <string name="study_options" comment="Name for a preference category in Filtered deck (aka Cram deck, aka Custom study) options" maxLength="28">Parametrlar</string>
-    <string name="menu__study_options" comment="Menu item that opens options for a Filtered deck (aka Cram deck, aka Custom study)">Oʻqish parametrlari</string>
-    <string name="select_tts" maxLength="28">TTS tilini sozlash</string>
-    <string name="dyn_deck_desc">Bu odatiy kun tartibidan tashqarida oʻqish uchun maxsus dasta. Koʻrib chiqilganidan soʻng kartalar avtomatik ravishda oʻzining asl dastalariga qaytariladi. Ushbu dastani dastalar roʻyxatidan oʻchirib tashlasangiz, qolgan barcha kartalar oʻzining asl dastalariga qaytariladi.</string>
-    <string name="tag_editor_add_feedback">“%1$s” qoʻshishni tasdiqlash uchun “%2$s” tugmasini bosing</string>
-    <string name="tag_editor_add_feedback_existing">Mavjud boʻlgan “%1$s” tegi tanlandi</string>
-    <string name="tag_already_exists">Teg allaqachon mavjud</string>
-    <string name="error_name_exists">Ushbu nom allaqachon mavjud</string>
+    <string name="menu__study_options" comment="Menu item that opens options for a Filtered deck (aka Cram deck, aka Custom study)">Öqiş parametrlari</string>
+    <string name="select_tts" maxLength="28">TTS tilini sozlaş</string>
+    <string name="dyn_deck_desc">Bu odatiy kun tartibidan taşqarida öqiş uçun maxsus dasta. Körib çiqilganidan söng kartalar avtomatik ravişda özining asl dastalariga qaytariladi. Uşbu dastani dastalar röyxatidan öçirib taşlasangiz, qolgan barça kartalar özining asl dastalariga qaytariladi.</string>
+    <string name="tag_editor_add_feedback">“%1$s” qöşişni tasdiqlaş uçun “%2$s” tugmasini bosing</string>
+    <string name="tag_editor_add_feedback_existing">Mavjud bölgan “%1$s” tegi tanlandi</string>
+    <string name="tag_already_exists">Teg allaqaçon mavjud</string>
+    <string name="error_name_exists">Uşbu nom allaqaçon mavjud</string>
     <string name="warning_find_and_replace">Consider backing up your collection from DeckPicker before using this option!</string>
     <!-- Time spans -->
     <!-- Currently only used if exporting APKG fails -->
-    <string name="apk_share_error">apkg faylni ulashishda xatolik yuz berdi</string>
+    <string name="apk_share_error">apkg faylni ulaşişda xatolik yuz berdi</string>
     <!-- Import and export v2 feedback -->
-    <string name="activity_start_failed">Tizimda bu amalni bajara oladigan ilova oʻrnatilmagan.</string>
-    <string name="multimedia_editor_image_compression_failed"><![CDATA[Kamera rasmlari katta boʻlishi mumkin. Media katalogidagi rasmlarni zichlashingiz va hajmini oʻzgartirishingiz mumkin]]></string>
-    <string name="no_browser_msg">Havolani ochish uchun brauzer topilmadi: %s</string>
-    <string name="web_page_error">Sahifa yuklashda xatolik yuz berdi: %s</string>
+    <string name="activity_start_failed">Tizimda bu amalni bajara oladigan ilova örnatilmagan.</string>
+    <string name="multimedia_editor_image_compression_failed"><![CDATA[Kamera rasmlari katta bölişi mumkin. Media katalogidagi rasmlarni ziçlaşingiz va hajmini özgartirişingiz mumkin]]></string>
+    <string name="no_browser_msg">Havolani oçiş uçun brauzer topilmadi: %s</string>
+    <string name="web_page_error">Sahifa yuklaşda xatolik yuz berdi: %s</string>
     <!-- The name of the deck which corrupt cards will be moved to -->
     <!-- Deckpicker Background -->
     <string name="background_image_title" maxLength="41">Orqa fon</string>
-    <string name="remove_wallpaper_image" maxLength="41">Orqa fonni olib tashlash</string>
-    <string name="remove_background_image">Rostan ham orqa fonni oʻchirmoqchimisiz?</string>
+    <string name="remove_wallpaper_image" maxLength="41">Orqa fonni olib taşlaş</string>
+    <string name="remove_background_image">Rostan ham orqa fonni öçirmoqçimisiz?</string>
     <!-- Card Template Browser Appearance -->
-    <string name="restore_default" maxLength="28">Birlamchiga qaytarish</string>
+    <string name="restore_default" maxLength="28">Birlamçiga qaytariş</string>
     <!-- Whiteboard eraser mode toggle message in Reviewer -->
-    <string name="white_board_eraser_enabled">Oʻchirgʻich rejimi yoqildi</string>
-    <string name="white_board_eraser_disabled">Oʻchirgʻich rejimi oʻchirildi</string>
+    <string name="white_board_eraser_enabled">Öçirğiç rejimi yoqildi</string>
+    <string name="white_board_eraser_disabled">Öçirğiç rejimi öçirildi</string>
     <string comment="Progress amount e.g. \'28 MB/141 MB\'. %1$s is the current amount, %2$s is the max." name="progress_amount_bytes">%1$s/%2$s</string>
     <string name="media_file_size_warning_title">Media fayl juda katta</string>
-    <string name="media_file_size_warning_message" comment="1$s: File name, 2$s: File size, 3$s: The size limit (e.g. 100MB)">\"%1$s\" (%2$s) fayli AnkiWebʼning %3$s limitidan oshadi va uni sinxronlab boʻlmaydi. Baribir qoʻshmoqchimisiz?</string>
-    <string name="media_file_size_add_anyway">Baribir qoʻshish</string>
+    <string name="media_file_size_warning_message" comment="1$s: File name, 2$s: File size, 3$s: The size limit (e.g. 100MB)">\"%1$s\" (%2$s) fayli AnkiWebʼning %3$s limitidan oşadi va uni sinxronlab bölmaydi. Baribir qöşmoqçimisiz?</string>
+    <string name="media_file_size_add_anyway">Baribir qöşiş</string>
     <!-- Whiteboard save image message in the Study Screen -->
-    <string name="white_board_image_save_failed">Yozuv taxtasi rasmini saqlab boʻlmadi. %s</string>
+    <string name="white_board_image_save_failed">Yozuv taxtasi rasmini saqlab bölmadi. %s</string>
     <string name="white_board_image_saved">Yozuv taxtasi rasmi %s ga saqlandi</string>
     <string name="title_whiteboard_editor" maxLength="28">Yozuv taxtasi muharriri</string>
-    <string name="user_is_a_robot">Avtomatik test aniqlandi. Agar siz inson boʻlsangiz, AnkiDroid qoʻllab-quvvatlash guruhiga murojaat qiling.</string>
+    <string name="user_is_a_robot">Avtomatik test aniqlandi. Agar siz inson bölsangiz, AnkiDroid qöllab-quvvatlaş guruhiga murojaat qiling.</string>
     <!-- JS api -->
-    <string name="api_version_developer_contact">Bu karta AnkiDroid qoʻllab-quvvatlamagan funksiyalarni ishlatadi. %1$s dasturchi bilan bogʻlaning yoki vikiga murojaat qiling. %2$s</string>
+    <string name="api_version_developer_contact">Bu karta AnkiDroid qöllab-quvvatlamagan funksiyalarni işlatadi. %1$s dasturçi bilan boğlaning yoki vikiga murojaat qiling. %2$s</string>
     <string name="invalid_json_data">Karta yaroqsiz maʼlumot taqdim etdi. %s</string>
-    <string name="valid_js_api_version">Yaroqsiz AnkiDroid JS API versiyasi. %s dasturchi bilan bogʻlaning yoki vikiga murojaat qiling</string>
-    <string name="update_js_api_version">AnkiDroid JS API yangilanishi mavjud. %s dasturchi bilan bogʻlaning yoki vikiga murojaat qiling</string>
-    <string name="reviewer_invalid_api_version_visit_documentation">Koʻrish</string>
+    <string name="valid_js_api_version">Yaroqsiz AnkiDroid JS API versiyasi. %s dasturçi bilan boğlaning yoki vikiga murojaat qiling</string>
+    <string name="update_js_api_version">AnkiDroid JS API yangilanişi mavjud. %s dasturçi bilan boğlaning yoki vikiga murojaat qiling</string>
+    <string name="reviewer_invalid_api_version_visit_documentation">Köriş</string>
     <string name="anki_js_error_code">(Xatolik kodi: %d)</string>
     <!-- About AnkiDroid screen -->
     <string name="about_ankidroid_successfully_copied_debug_info">Buferga nusxa olindi</string>
-    <string name="about_ankidroid_error_copy_debug_info">Debag maʼlumotlarini buferga nusxa olishda xatolik yuz berdi</string>
+    <string name="about_ankidroid_error_copy_debug_info">Debag maʼlumotlarini buferga nusxa olişda xatolik yuz berdi</string>
     <!-- Card Viewer -->
-    <string name="card_viewer_could_not_find_image">Karta tarkibida xatolik: “%s”ni yuklab boʻlmadi</string>
+    <string name="card_viewer_could_not_find_image">Karta tarkibida xatolik: “%s”ni yuklab bölmadi</string>
     <!-- Deck Picker -->
-    <string name="search_decks" maxLength="28">Dastalarni qidirish</string>
+    <string name="search_decks" maxLength="28">Dastalarni qidiriş</string>
     <string name="ankidroid_init_failed_webview_title">Kritik xato</string>
-    <string name="ankidroid_init_failed_webview">AnkiDroid hozirda mavjud boʻlmagan tizim WebViewʼga tayanadi. Bu tizim yangilanishlarni oʻrnatayotganda sodir boʻlishi mumkin. Bir necha daqiqadan soʻng qayta urinib koʻring.\n\n%s</string>
-    <string name="ankidroid_init_failed_storage">Android xatoligi sababli AnkiDroid diskka ruxsati yoʻq.\n\n%s</string>
+    <string name="ankidroid_init_failed_webview">AnkiDroid hozirda mavjud bölmagan tizim WebViewʼga tayanadi. Bu tizim yangilanişlarni örnatayotganda sodir bölişi mumkin. Bir neça daqiqadan söng qayta urinib köring.\n\n%s</string>
+    <string name="ankidroid_init_failed_storage">Android xatoligi sababli AnkiDroid diskka ruxsati yöq.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
-    <string name="menu_font_size" maxLength="28">Shrift oʻlchami</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Asboblar panelini koʻrsatish</string>
-    <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
+    <string name="menu_font_size" maxLength="28">Şrift ölçami</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
+    <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Şow preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
-    <string name="format_insert_bold">Qalin qilib formatlash</string>
-    <string name="format_insert_italic">Kursiv sifatida formatlash</string>
-    <string name="format_insert_underline">Tagiga chiziq tortib formatlash</string>
-    <string name="insert_horizontal_line">Gorizontal chiziq qoʻshish</string>
-    <string name="insert_heading">Sarlavha qoʻshish</string>
-    <string name="format_font_size">Shrift oʻlchamini oʻzgartirish</string>
-    <string name="insert_mathjax">MathJax tenglamasini kiritish</string>
+    <string name="format_insert_bold">Qalin qilib formatlaş</string>
+    <string name="format_insert_italic">Kursiv sifatida formatlaş</string>
+    <string name="format_insert_underline">Tagiga çiziq tortib formatlaş</string>
+    <string name="insert_horizontal_line">Gorizontal çiziq qöşiş</string>
+    <string name="insert_heading">Sarlavha qöşiş</string>
+    <string name="format_font_size">Şrift ölçamini özgartiriş</string>
+    <string name="insert_mathjax">MathJax tenglamasini kiritiş</string>
     <string name="note_editor_toolbar_icon">Tugma matni</string>
-    <string name="before_text">Tanlashdan oldin HTML</string>
-    <string name="after_text">Tanlashdan keyin HTML</string>
-    <string name="add_toolbar_item">Asboblar paneli elementini yaratish</string>
-    <string name="edit_toolbar_item">Asboblar paneli elementini tahrirlash</string>
-    <string name="toolbar_item_explain_edit_or_remove">Tanlangan matndan oldin va keyin kiritiladigan HTMLʼni kiriting\n\nUni tahrirlash yoki olib tashlash uchun asboblar paneli elementini uzoq vaqt bosib turing.</string>
-    <string name="remove_toolbar_item">Asboblar paneli elementi olib tashlansinmi?</string>
+    <string name="before_text">Tanlaşdan oldin HTML</string>
+    <string name="after_text">Tanlaşdan keyin HTML</string>
+    <string name="add_toolbar_item">Asboblar paneli elementini yaratiş</string>
+    <string name="edit_toolbar_item">Asboblar paneli elementini tahrirlaş</string>
+    <string name="toolbar_item_explain_edit_or_remove">Tanlangan matndan oldin va keyin kiritiladigan HTMLʼni kiriting\n\nUni tahrirlaş yoki olib taşlaş uçun asboblar paneli elementini uzoq vaqt bosib turing.</string>
+    <string name="remove_toolbar_item">Asboblar paneli elementi olib taşlansinmi?</string>
     <string name="note_editor_toolbar_icon_requirement_error">Button text is required</string>
     <string name="before_after_text_requirement_error">At least one HTML field is required</string>
-    <string name="note_editor_image_too_large">Rasm juda katta, rasmni qoʻlda kiriting</string>
-    <string name="note_editor_video_too_large">Video juda katta, videoni qoʻlda kiriting</string>
-    <string name="note_editor_audio_too_large">Audio fayl juda katta, audio faylni qoʻlda kiriting</string>
-    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android zaxiralashi amalga oshmoqda. Iltimos, qayta urinib koʻring</string>
-    <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">AnkiDroidʼga yorliqlar qoʻshishga ruxsat berish uchun iManagerʼdan foydalanishingiz kerak boʻlishi mumkin</string>
-    <string name="create_shortcut_error_miui" comment="Keep the message as short, as this is shown in a toast. %s is the app name: \'AnkiDroid\'">Allow ‘Home screen shortcuts’ in system settings for %s to add shortcuts</string>
-    <string name="create_shortcut_failed" comment="home screen == launcher">Asosiy ekraningiz AnkiDroidʼga yorliqlar qoʻshishga ruxsat bermaydi</string>
-    <string name="create_shortcut_error">Yorliq qoʻshishda xatolik: %s</string>
-    <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Jumlalar bosh harf bilan</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Asboblar panelini aylantirish</string>
+    <string name="note_editor_image_too_large">Rasm juda katta, rasmni qölda kiriting</string>
+    <string name="note_editor_video_too_large">Video juda katta, videoni qölda kiriting</string>
+    <string name="note_editor_audio_too_large">Audio fayl juda katta, audio faylni qölda kiriting</string>
+    <string name="ankidroid_cannot_open_after_backup_try_again" comment="After an Android backup is restored, AnkiDroid opens and shows this message.         Opening AnkiDroid again will work correctly">Android zaxiralaşi amalga oşmoqda. Iltimos, qayta urinib köring</string>
+    <string name="create_shortcut_error_vivo" comment="iManager is an app on Vivo phones">AnkiDroidʼga yorliqlar qöşişga ruxsat beriş uçun iManagerʼdan foydalanişingiz kerak bölişi mumkin</string>
+    <string name="create_shortcut_error_miui" comment="Keep the message as short, as this is shown in a toast. %s is the app name: \'AnkiDroid\'">Allow ‘Home screen şortcuts’ in system settings for %s to add şortcuts</string>
+    <string name="create_shortcut_failed" comment="home screen == launcher">Asosiy ekraningiz AnkiDroidʼga yorliqlar qöşişga ruxsat bermaydi</string>
+    <string name="create_shortcut_error">Yorliq qöşişda xatolik: %s</string>
+    <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Jumlalar boş harf bilan</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Sertifikat</string>
@@ -258,128 +260,128 @@
     <string name="maximum_value_is" comment="Error message in IncrementerNumberRangePreference. %d is the maximum allowed value">Maksimal qiymat %d</string>
     <string name="minimum_value_is" comment="Error message in IncrementerNumberRangePreference. %d is the minimum allowed value">Minimal qiymat %d</string>
     <!-- Used for credential empty warning message -->
-    <string name="invalid_email">Yaroqli e-pochta manzilini kiriting</string>
+    <string name="invalid_email">Yaroqli e-poçta manzilini kiriting</string>
     <string name="password_empty">Parol talab etiladi</string>
-    <string name="back_pressed_once">Chiqish uchun yana orqaga qayting</string>
+    <string name="back_pressed_once">Çiqiş uçun yana orqaga qayting</string>
     <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
     <string name="percentage">%s%%</string>
-    <string name="download_deck">Dastani yuklab olish</string>
-    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Brauzerda ochish</string>
-    <string name="try_again">Qayta urinib koʻrish</string>
-    <string name="cancel_download">Yuklab olishni bekor qilish</string>
-    <string name="cancel_download_question_title">Yuklab olishni bekor qilmoqchimisiz?</string>
+    <string name="download_deck">Dastani yuklab oliş</string>
+    <string name="open_in_browser" comment="Label of a button inviting to open ankiweb\'s shared deck page if automated download failed">Brauzerda oçiş</string>
+    <string name="try_again">Qayta urinib köriş</string>
+    <string name="cancel_download">Yuklab olişni bekor qiliş</string>
+    <string name="cancel_download_question_title">Yuklab olişni bekor qilmoqçimisiz?</string>
     <string name="downloading_file">%s yuklab olinmoqda</string>
-    <string name="import_deck">Dastani import qilish</string>
-    <string name="something_wrong">Nimadir xato ketdi, iltimos, qayta urinib koʻring</string>
-    <string name="download_failed">Yuklab olib boʻlmadi</string>
+    <string name="import_deck">Dastani import qiliş</string>
+    <string name="something_wrong">Nimadir xato ketdi, iltimos, qayta urinib köring</string>
+    <string name="download_failed">Yuklab olib bölmadi</string>
     <string name="download_speed_unit" comment="Download speed. %1$s is an amount of data, e.g. \'1.2 MB\', giving \'1.2 MB/s\'">%1$s/s</string>
     <string name="download_speed_unknown" comment="Placeholder shown when the current download speed is unknown">-/s</string>
     <string name="download_time_unknown" comment="Placeholder when the remaining download time is unknown">-</string>
     <string name="download_speed_label">Speed</string>
     <string name="download_time_left_label">Time left</string>
-    <string name="deck_download_progress_message">Yuklab olish jarayonida boshqa ilovalardan foydalanishingiz mumkin</string>
-    <string name="check_network">Iltimos, tarmoqqa ulanganingizni tekshiring</string>
-    <string name="external_storage_unavailable">Yuklab olish toʻxtatildi, tashqi xotira mavjud emas</string>
-    <string name="home" maxLength="28">Bosh sahifa</string>
+    <string name="deck_download_progress_message">Yuklab oliş jarayonida boşqa ilovalardan foydalanişingiz mumkin</string>
+    <string name="check_network">Iltimos, tarmoqqa ulanganingizni tekşiring</string>
+    <string name="external_storage_unavailable">Yuklab oliş töxtatildi, taşqi xotira mavjud emas</string>
+    <string name="home" maxLength="28">Boş sahifa</string>
     <!-- Study Screen actions
     Each of these strings ends with a period, following the notation of Anki Desktop -->
-    <string name="card_buried">Karta koʻmildi.</string>
+    <string name="card_buried">Karta kömildi.</string>
     <plurals name="note_suspended">
-        <item quantity="one">%d ta karta toʻxtatildi</item>
-        <item quantity="other">%d ta karta toʻxtatildi</item>
+        <item quantity="one">%d ta karta töxtatildi</item>
+        <item quantity="other">%d ta karta töxtatildi</item>
     </plurals>
     <!--  Note Editor Toggle Sticky  -->
-    <string name="note_editor_toggle_sticky">%s maydonini yopishqoq qilish</string>
-    <string name="scoped_storage_learn_more">Batafsil oʻrganish</string>
+    <string name="note_editor_toggle_sticky">%s maydonini yopişqoq qiliş</string>
+    <string name="scoped_storage_learn_more">Batafsil örganiş</string>
     <string name="search_card_js_api_no_results">Qidiruv natija bermadi</string>
     <!--  JS Addons  -->
     <string name="not_valid_js_addon_package">%s yaroqli JavaScript kengaytma paketi emas</string>
-    <string name="could_not_create_dir">%s katalogini yaratib boʻlmadi</string>
-    <string name="malicious_archive_entry_outside">Zararli arxiv. Maqsaddagi katalogdan tashqaridagi yozuvni oʻz ichiga oladi: %s</string>
-    <string name="malicious_archive_exceeds_limit">Zararli arxiv. Hajmi %1$s dan oshadi yoki %2$d dan ortiq faylni oʻz ichiga oladi</string>
-    <string name="file_extract_exceeds_storage_space">Chiqarilgan fayl boʻsh saqlash xotirasidan oshib ketadi</string>
+    <string name="could_not_create_dir">%s katalogini yaratib bölmadi</string>
+    <string name="malicious_archive_entry_outside">Zararli arxiv. Maqsaddagi katalogdan taşqaridagi yozuvni öz içiga oladi: %s</string>
+    <string name="malicious_archive_exceeds_limit">Zararli arxiv. Hajmi %1$s dan oşadi yoki %2$d dan ortiq faylni öz içiga oladi</string>
+    <string name="file_extract_exceeds_storage_space">Çiqarilgan fayl böş saqlaş xotirasidan oşib ketadi</string>
     <!--  Hierarchical Tags  -->
-    <string name="expand_tag">\'%s\' tegini yoyish</string>
+    <string name="expand_tag">\'%s\' tegini yoyiş</string>
     <!-- Manage note types -->
-    <string name="field_editor_model_not_available">Kolleksiyani ochib boʻlmadi. Iltimos, qayta urinib koʻring!</string>
-    <string name="cd_manage_notetypes_add">Yangi qayd turini qoʻshish</string>
+    <string name="field_editor_model_not_available">Kolleksiyani oçib bölmadi. Iltimos, qayta urinib köring!</string>
+    <string name="cd_manage_notetypes_add">Yangi qayd turini qöşiş</string>
     <plurals name="note_types_selected">
         <item quantity="one">%d ta qayd turi tanlandi</item>
         <item quantity="other">%d ta qayd turi tanlandi</item>
     </plurals>
     <!-- App Intro -->
-    <string name="intro_ankidroid_tagline_one">Kamroq oʻqi</string>
-    <string name="intro_ankidroid_tagline_two">Koʻproq eslab qol</string>
-    <string name="intro_short_ankidroid_explanation">Anki karta rejalashtiruvchisi eng zaif xotiralaringizni mustahkamlab va eng kuchli xotiralaringizni saqlab qolish orqali vaqtni tejaydi</string>
+    <string name="intro_ankidroid_tagline_one">Kamroq öqi</string>
+    <string name="intro_ankidroid_tagline_two">Köproq eslab qol</string>
+    <string name="intro_short_ankidroid_explanation">Anki karta rejalaştiruvçisi eng zaif xotiralaringizni mustahkamlab va eng kuçli xotiralaringizni saqlab qoliş orqali vaqtni tejaydi</string>
     <string name="intro_get_started" comment="Action to start AnkiDroid for the first time without syncing from AnkiWeb">Get started</string>
-    <string name="intro_sync_from_ankiweb">AnkiWebʼdan sinxronlash</string>
+    <string name="intro_sync_from_ankiweb">AnkiWebʼdan sinxronlaş</string>
     <!-- IntentHandler -->
-    <string name="app_not_initialized_new">AnkiDroid hali ishga tushirilmagan. AnkiDroidʼni oching va qayta urinib koʻring</string>
+    <string name="app_not_initialized_new">AnkiDroid hali işga tuşirilmagan. AnkiDroidʼni oçing va qayta urinib köring</string>
     <!-- Deck Creation -->
     <string name="deck_created">Dasta yaratildi</string>
-    <string name="deck_renamed">Dasta nomi oʻzgartirildi</string>
+    <string name="deck_renamed">Dasta nomi özgartirildi</string>
     <!-- Deck Deletion -->
-    <string name="deck_shortcut_doesnt_exist">Dasta oʻchirildi. Iltimos, yorliqni olib tashlang</string>
+    <string name="deck_shortcut_doesnt_exist">Dasta öçirildi. Iltimos, yorliqni olib taşlang</string>
     <!-- Browser Options Dialog -->
     <string name="show_cards" comment="Label for toggle cards button in BrowserOptionsDialog">Kartalar</string>
     <string name="show_notes" comment="Label for toggle notes button in BrowserOptionsDialog">Qaydlar</string>
-    <string name="truncate_content_help">Karta brauzerini har bir qator balandligini faqat dastlabki 3 ta tarkib qatorini koʻrsatish uchun qisqartirish</string>
+    <string name="truncate_content_help">Karta brauzerini har bir qator balandligini faqat dastlabki 3 ta tarkib qatorini körsatiş uçun qisqartiriş</string>
     <string name="audio_saved">Ovoz yozuvi saqlandi</string>
-    <string name="deleting_selected_notes">Tanlangan qaydlar oʻchirilmoqda</string>
-    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tinglash uchun ovozni tanlang</string>
-    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Ovoz ishlatilishidan oldin oʻrnatilgan boʻlishi kerak</string>
-    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Baribir ishlatish</string>
+    <string name="deleting_selected_notes">Tanlangan qaydlar öçirilmoqda</string>
+    <string name="tts_voices_default_text" comment="The default text to speak when selecting     Text to speech voices">Tinglaş uçun ovozni tanlang</string>
+    <string name="tts_voices_selected_voice_should_be_installed" comment="If a voice has been tapped, is installable but not installed, we want to inform the user that they should install it for the best experience There will also be an option to use it without downloading">Ovoz işlatilişidan oldin örnatilgan bölişi kerak</string>
+    <string name="tts_voices_use_selected_voice_without_install" comment="A user has been informed that a voice should be installed before use. This is text on a snackbar button which allows them to use the voice without installing it">Baribir işlatiş</string>
     <string name="tts_voices_playback_error_new" comment="an error occurred when playing a text to speech voice. The parameter is a technical error code such as \'ERROR_NOT_INSTALLED_YET\' or \'ERROR_NETWORK_TIMEOUT\'">Nutq sintezatori xatoligi (%s)</string>
     <!-- Chips should probably be in a separate file, due to the additional length req -->
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
-    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Oʻrnatish</string>
-    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Nutq sintezatori sozlamalarini ochib boʻlmadi</string>
-    <string name="shared_decks_login_required">Koʻproq dasta yuklab olish uchun, iltimos, tizimga kiring</string>
+    <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Örnatiş</string>
+    <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Nutq sintezatori sozlamalarini oçib bölmadi</string>
+    <string name="shared_decks_ankiweb_login_limit">Şared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Tavsif</string>
     <string name="deck_description_saved">Tavsif yangilandi</string>
-    <string name="format_deck_description_as_markdown">Markdown sifatida formatlash</string>
-    <string name="help_button_content_description">‘%s’ uchun yordamni ochish</string>
-    <string name="failed_to_copy">Nusxa olib boʻlmadi</string>
+    <string name="format_deck_description_as_markdown">Markdown sifatida formatlaş</string>
+    <string name="help_button_content_description">‘%s’ uçun yordamni oçiş</string>
+    <string name="failed_to_copy">Nusxa olib bölmadi</string>
     <plurals name="unbury_cards_feedback">
-        <item quantity="one">%d ta koʻmilgan karta chiqarildi</item>
-        <item quantity="other">%d ta koʻmilgan karta chiqarildi</item>
+        <item quantity="one">%d ta kömilgan karta çiqarildi</item>
+        <item quantity="other">%d ta kömilgan karta çiqarildi</item>
     </plurals>
-    <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Oʻrnini oʻzgartirish</string>
+    <string name="card_template_reposition_template" comment="move a card template to a new position" maxLength="28">Örnini özgartiriş</string>
     <string name="previewer_next" comment="Name of the next button in the previewer" maxLength="28">Keyingi</string>
     <string name="previewer_back" comment="Name of the back button in the previewer" maxLength="28">Orqaga</string>
-    <string name="start_recording">Ovoz yozish</string>
-    <string name="stop_recording">Toʻxtatish</string>
-    <string name="play_recording">Ijro etish</string>
+    <string name="start_recording">Ovoz yoziş</string>
+    <string name="stop_recording">Töxtatiş</string>
+    <string name="play_recording">Ijro etiş</string>
     <string name="next_recording" comment="Description of a button to go to the next recording">Keyingi</string>
     <!--  AlertDialog in the deleteCardTemplate  -->
-    <string name="orphan_note_title">Karta turini oʻchirib boʻlmaydi</string>
-    <string name="orphan_note_message">Ushbu karta turini oʻchirib tashlash baʼzi qaydlar kartasiz qolishiga olib keladi.</string>
-    <string name="voice_not_supported">Ovoz qoʻllab-quvvatlanmaydi. Boshqasini sinab koʻring yoki ovoz dvijogini oʻrnating.</string>
+    <string name="orphan_note_title">Karta turini öçirib bölmaydi</string>
+    <string name="orphan_note_message">Uşbu karta turini öçirib taşlaş baʼzi qaydlar kartasiz qolişiga olib keladi.</string>
+    <string name="voice_not_supported">Ovoz qöllab-quvvatlanmaydi. Boşqasini sinab köring yoki ovoz dvijogini örnating.</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Dasta tanlagich</string>
-    <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Dastani tasdiqsiz oʻchirib tashlash</string>
+    <string name="deck_picker_group" comment="Label for the group of shortcuts related to the deck picker">Dasta tanlagiç</string>
+    <string name="delete_deck_without_confirmation" comment="Description of the shortcut that deletes the deck without asking for confirmation">Dastani tasdiqsiz öçirib taşlaş</string>
     <string name="note_editor_group" comment="Label for the group of shortcuts related to the note editor">Qayd muharriri</string>
-    <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Qayd turini tanlash</string>
+    <string name="select_note_type" comment="Description of the shortcut that shows the note selection spinner">Qayd turini tanlaş</string>
     <string name="tag_editor" comment="Description of the shortcut that opens the tags dialog">Teg muharriri</string>
-    <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">Karta shabloni muharriri</string>
-    <string name="edit_front_template" comment="Description of the shortcut that shows the question side of the card template">Oldi shablonni tahrirlash</string>
-    <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">Orqa shablonni tahrirlash</string>
-    <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Stilni tahrirlash</string>
-    <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Shablonni markdown sifatida nusxa olish</string>
-    <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Karta brauzer koʻrinishini oʻzgartirish</string>
-    <string name="missing_user_action_dialog_message" comment="%s is the user action number">%s foydalanuvchi amali bu qayd turida sozlanmagan. Iltimos, uni sozlang</string>
-    <string name="feature_not_supported_by_study_screen">Ushbu kartada yangi oʻrganish ekrani tomonidan hali qoʻllab-quvvatlanmaydigan funksiyalar mavjud.</string>
-    <string name="directory_inaccessible_info">Bu yerda %s ruxsatni tiklash haqida koʻproq bilib oling yoki kolleksiya jildini yangilash uchun sozlamalarga oʻting.</string>
+    <string name="card_template_editor_group" comment="Label for the group of shortcuts related to the card template editor">Karta şabloni muharriri</string>
+    <string name="edit_front_template" comment="Description of the shortcut that shows the question side of the card template">Oldi şablonni tahrirlaş</string>
+    <string name="edit_back_template" comment="Description of the shortcut that shows the answer side of the card template">Orqa şablonni tahrirlaş</string>
+    <string name="edit_styling" comment="Description of the shortcut that shows the styling side of the card template">Stilni tahrirlaş</string>
+    <string name="copy_the_template" comment="Description of the shortcut that copy the template as markdown">Şablonni markdown sifatida nusxa oliş</string>
+    <string name="edit_browser_appearance" comment="Description of the shortcut that edits the browser appearance of card template">Karta brauzer körinişini özgartiriş</string>
+    <string name="missing_user_action_dialog_message" comment="%s is the user action number">%s foydalanuvçi amali bu qayd turida sozlanmagan. Iltimos, uni sozlang</string>
+    <string name="feature_not_supported_by_study_screen">Uşbu kartada yangi örganiş ekrani tomonidan hali qöllab-quvvatlanmaydigan funksiyalar mavjud.</string>
+    <string name="directory_inaccessible_info">Bu yerda %s ruxsatni tiklaş haqida köproq bilib oling yoki kolleksiya jildini yangilaş uçun sozlamalarga öting.</string>
     <!-- Scheduler Upgrade Required Dialog title-->
-    <string name="scheduler_upgrade_required_dialog_title" comment="Shown in a dialog when user has imported a collection using a very old version of the Anki spaced repetition scheduler">Rejalashtiruvchini yangilash kerak</string>
+    <string name="scheduler_upgrade_required_dialog_title" comment="Shown in a dialog when user has imported a collection using a very old version of the Anki spaced repetition scheduler">Rejalaştiruvçini yangilaş kerak</string>
     <!-- Whitespace is OK -->
     <string name="list_separator" comment="The character and spacing to display between elements of a list, for example \', \' in \'Apple, Banana, Cherry" tools:ignore="TranslationTypo">, </string>
     <!--Set up date-->
     <string name="set_due_date_day" comment="Used for setting due date">Kun</string>
-    <string name="set_due_date_date_range">Sana oralig\'i</string>
+    <string name="set_due_date_date_range">Sana oraliği</string>
     <string comment="Shown when retrying a running action" name="already_in_progress">Bajarilmoqda</string>
     <!-- Switch profiles screen -->
-    <string name="switch_profile" maxLength="41" comment="Title of the screen where the user switches between profiles">Switch profile</string>
+    <string name="switch_profile" maxLength="41" comment="Title of the screen where the user switches between profiles">Switç profile</string>
     <string name="edit_profile" comment="Content description of the button that edits a profile in the profile list">Edit profile</string>
     <string name="delete_profile" comment="Content description of the button that deletes a profile in the profile list">Delete profile</string>
 </resources>
diff --git a/common/android/src/main/res/values-uz/03-dialogs.xml b/common/android/src/main/res/values-uz/03-dialogs.xml
index 61d984c3a793..64eeecf469ae 100644
--- a/common/android/src/main/res/values-uz/03-dialogs.xml
+++ b/common/android/src/main/res/values-uz/03-dialogs.xml
@@ -23,138 +23,138 @@
   ~ SPDX-FileCopyrightText: Copyright (c) 2010 Norbert Nagold <norbert.nagold@gmail.com>
   -->
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="check_db_warning">Bu uzoq vaqt olishi mumkin. Davom etmoqchimisiz?</string>
-    <string name="delete_deck_title">Dasta oʻchirilsinmi?</string>
+    <string name="check_db_warning">Bu uzoq vaqt olişi mumkin. Davom etmoqçimisiz?</string>
+    <string name="delete_deck_title">Dasta öçirilsinmi?</string>
     <plurals name="delete_deck_message">
-        <item quantity="one">%1$sʼdagi barcha kartalar oʻchirilsinmi? Ichida %2$d karta mavjud</item>
-        <item quantity="other">%1$sʼdagi barcha kartalar oʻchirilsinmi? Ichida %2$d karta mavjud</item>
+        <item quantity="one">%1$sʼdagi barça kartalar öçirilsinmi? Içida %2$d karta mavjud</item>
+        <item quantity="other">%1$sʼdagi barça kartalar öçirilsinmi? Içida %2$d karta mavjud</item>
     </plurals>
-    <string name="delete_cram_deck_message">%s filtrlangan dastani oʻchirib barcha kartalar asl dastalariga qaytarilsinmi?</string>
-    <string name="no_tts_available_message">Nutq sintezatori tili yoʻq</string>
-    <string name="tts_no_tts">Ovoz chiqmasin</string>
-    <string name="reposition_card_not_new_error">Faqat yangi kartalar oʻrnini oʻzgartirish mumkin</string>
-    <string name="reset_card_dialog_title">Karta progressini oʻchirish</string>
+    <string name="delete_cram_deck_message">%s filtrlangan dastani öçirib barça kartalar asl dastalariga qaytarilsinmi?</string>
+    <string name="no_tts_available_message">Nutq sintezatori tili yöq</string>
+    <string name="tts_no_tts">Ovoz çiqmasin</string>
+    <string name="reposition_card_not_new_error">Faqat yangi kartalar örnini özgartiriş mumkin</string>
+    <string name="reset_card_dialog_title">Karta progressini öçiriş</string>
     <plurals name="reset_cards_dialog_acknowledge">
         <item quantity="one">%d ta karta qayta tiklandi</item>
         <item quantity="other">%d ta karta qayta tiklandi</item>
     </plurals>
     <string name="answering_error_title">Maʼlumotlar bazasida xatolik</string>
-    <string name="answering_error_message">Kolleksiyaga yozib boʻlmadi. Maʼlumotlar bazasi buzilgan yoki diskda yetarlicha boʻsh joy boʻlmasligi mumkin.\n\nAgar bu tez-tez sodir boʻladigan boʻlsa, maʼlumotlar bazasini tekshirib koʻring, kolleksiyani tuzatib koʻring yoki zaxiradan tiklang. Buning uchun “Parametrlar” tugmasini bosing.\n\Yoki bu AnkiDroid bagi ham boʻlishi mumkin; Buni tekshirishimiz uchun xatolik haqida xabar bering.</string>
-    <string name="answering_error_report">Xatolik haqida xabar berish</string>
-    <string name="storage_full_message">AnkiDroidʼni ochish uchun yetarlicha boʻsh joy mavjud emas. Davom etish uchun qurilmangizda biroz joy boʻshating.</string>
-    <string name="repair_deck_dialog">Rostdan ham maʼlumotlar bazasini tuzatmoqchimisiz?\n\nUrinishni boshlashdan oldin uni nusxasi “%s” ostjildiga koʻchiriladi.</string>
-    <string name="intent_aedict_empty">“default” turkumi boʻsh</string>
-    <string name="intent_aedict_category">AnkiDroidʼga kartalar qoʻshish uchun barcha Bloknot turkumlarini olib tashlang yoki \"default\" deb nomlangan turkumni qoʻshing</string>
-    <string name="custom_study_new_extend">Bugungi yangi kartalar limitini oshirish/kamaytirish (“-3”)</string>
-    <string name="custom_study_rev_extend">Bugungi takrorlanadigan kartalar limitini oshirish/kamaytirish (“-3”)</string>
-    <string name="custom_study_forgotten">Oʻtgan x kun ichida unutilgan kartalarni takrorlash:</string>
+    <string name="answering_error_message">Kolleksiyaga yozib bölmadi. Maʼlumotlar bazasi buzilgan yoki diskda yetarliça böş joy bölmasligi mumkin.\n\nAgar bu tez-tez sodir böladigan bölsa, maʼlumotlar bazasini tekşirib köring, kolleksiyani tuzatib köring yoki zaxiradan tiklang. Buning uçun “Parametrlar” tugmasini bosing.\n\Yoki bu AnkiDroid bagi ham bölişi mumkin; Buni tekşirişimiz uçun xatolik haqida xabar bering.</string>
+    <string name="answering_error_report">Xatolik haqida xabar beriş</string>
+    <string name="storage_full_message">AnkiDroidʼni oçiş uçun yetarliça böş joy mavjud emas. Davom etiş uçun qurilmangizda biroz joy böşating.</string>
+    <string name="repair_deck_dialog">Rostdan ham maʼlumotlar bazasini tuzatmoqçimisiz?\n\nUrinişni boşlaşdan oldin uni nusxasi “%s” ostjildiga köçiriladi.</string>
+    <string name="intent_aedict_empty">“default” turkumi böş</string>
+    <string name="intent_aedict_category">AnkiDroidʼga kartalar qöşiş uçun barça Bloknot turkumlarini olib taşlang yoki \"default\" deb nomlangan turkumni qöşing</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
+    <string name="custom_study_forgotten">Ötgan x kun içida unutilgan kartalarni takrorlaş:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
-    <string name="custom_study_tags">Dastadan x ta karta tanlash:</string>
-    <string name="storage_full_title">Saqlash xotirasi toʻla</string>
-    <string name="storage_almost_full_title">Saqlash xotirasi deyarli toʻla</string>
-    <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Boʻsh joy yoʻq</string>
-    <string name="no_space_to_downgrade_content" tools:ignore="UnusedResources">AnkiDroid davom etishi uchun saqlash xotirasida %s boʻsh joy kerak. Iltimos, biroz joy boʻshating</string>
+    <string name="custom_study_tags">Dastadan x ta karta tanlaş:</string>
+    <string name="storage_full_title">Saqlaş xotirasi töla</string>
+    <string name="storage_almost_full_title">Saqlaş xotirasi deyarli töla</string>
+    <string name="no_space_to_downgrade_title" tools:ignore="UnusedResources">Böş joy yöq</string>
+    <string name="no_space_to_downgrade_content" tools:ignore="UnusedResources">AnkiDroid davom etişi uçun saqlaş xotirasida %s böş joy kerak. Iltimos, biroz joy böşating</string>
     <string name="restore_backup_title">Zaxiradan tiklansinmi?</string>
-    <string name="restore_backup">Kolleksiyangiz eski nusxa bilan almashtiriladi. Har qanday saqlanmagan progressingiz yoʻqoladi.</string>
-    <string name="restore_backup_choose_another">Boshqasini tanlash</string>
-    <string name="dialog_cancel">Bekor qilish</string>
+    <string name="restore_backup">Kolleksiyangiz eski nusxa bilan almaştiriladi. Har qanday saqlanmagan progressingiz yöqoladi.</string>
+    <string name="restore_backup_choose_another">Boşqasini tanlaş</string>
+    <string name="dialog_cancel">Bekor qiliş</string>
     <string name="dialog_ok">OK</string>
-    <string name="dialog_add" comment="Positive dialog action button label to add \'something\'">Qoʻshish</string>
-    <string name="restore">Tiklash</string>
-    <string name="dialog_confirm" tools:ignore="UnusedResources">Tasdiqlash</string>
-    <string name="dialog_no">Yoʻq</string>
+    <string name="dialog_add" comment="Positive dialog action button label to add \'something\'">Qöşiş</string>
+    <string name="restore">Tiklaş</string>
+    <string name="dialog_confirm" tools:ignore="UnusedResources">Tasdiqlaş</string>
+    <string name="dialog_no">Yöq</string>
     <string name="dialog_yes">Ha</string>
-    <string name="dialog_keep">Qoldirish</string>
-    <string name="dialog_remove">Olib tashlash</string>
-    <string name="dialog_exit" comment="Label for a button which will exit/finish the current screen">Chiqish</string>
-    <string name="dialog_continue">Davom etish</string>
-    <string name="dialog_processing">Ishlamoqda&#8230;</string>
-    <string name="dialog_allow">Ruxsat berish</string>
-    <string name="dialog_positive_create" comment="Create a new collection, probably erasing the previous one, may be necessary in case of error.">Yaratish</string>
-    <string name="dialog_positive_delete" maxLength="28">Oʻchirish</string>
+    <string name="dialog_keep">Qoldiriş</string>
+    <string name="dialog_remove">Olib taşlaş</string>
+    <string name="dialog_exit" comment="Label for a button which will exit/finish the current screen">Çiqiş</string>
+    <string name="dialog_continue">Davom etiş</string>
+    <string name="dialog_processing">Işlamoqda&#8230;</string>
+    <string name="dialog_allow">Ruxsat beriş</string>
+    <string name="dialog_positive_create" comment="Create a new collection, probably erasing the previous one, may be necessary in case of error.">Yaratiş</string>
+    <string name="dialog_positive_delete" maxLength="28">Öçiriş</string>
     <!-- Currently unsued, should be useful in the future -->
-    <string name="dialog_positive_disable" tools:ignore="UnusedResources">Toʻxtatish</string>
-    <string name="dialog_positive_overwrite">Ustiga yozish</string>
-    <string name="dialog_positive_repair">Tuzatish</string>
-    <string name="dialog_positive_replace">Almashtirish</string>
+    <string name="dialog_positive_disable" tools:ignore="UnusedResources">Töxtatiş</string>
+    <string name="dialog_positive_overwrite">Ustiga yoziş</string>
+    <string name="dialog_positive_repair">Tuzatiş</string>
+    <string name="dialog_positive_replace">Almaştiriş</string>
     <string name="sync_clock_off_with_current_time">%1$s\n\nCorrect the date and time, or enable automatic date and time, then sync again.\n\nYour device’s current time is: %2$s</string>
-    <string name="dialog_collection_path_not_dir">Koʻrsatilgan yoʻl yaroqli katalog emas</string>
+    <string name="dialog_collection_path_not_dir">Körsatilgan yöl yaroqli katalog emas</string>
     <string name="dialog_invalid_custom_certificate">Taʼminlangan matn yaroqli PEM bilan kodlangan X509 sertifikatiga mos kelmaydi</string>
-    <string name="dialog_invalid_custom_certificate_title">Sertifikatni tekshirishda xatolik</string>
+    <string name="dialog_invalid_custom_certificate_title">Sertifikatni tekşirişda xatolik</string>
     <string name="dialog_updated_custom_certificate">Sertifikat yangilandi</string>
     <!-- Media checking -->
-    <string name="check_media_warning">Juda katta media kolleksiya uchun uzoq vaqt olishi mumkin. Davom etmoqchimisiz?</string>
-    <string name="check_media_message">Media fayllar tekshirilmoqda&#8230;</string>
-    <string name="check_media_adding_missing_tag">Teglar qoʻshilmoqda</string>
+    <string name="check_media_warning">Juda katta media kolleksiya uçun uzoq vaqt olişi mumkin. Davom etmoqçimisiz?</string>
+    <string name="check_media_message">Media fayllar tekşirilmoqda&#8230;</string>
+    <string name="check_media_adding_missing_tag">Teglar qöşilmoqda</string>
     <string name="check_media_tags_added">Tags added</string>
-    <string name="delete_media_message">Media fayllar oʻchirilmoqda&#8230;</string>
-    <string name="delete_media_result_title">Oʻchirish natijasi</string>
+    <string name="delete_media_message">Media fayllar öçirilmoqda&#8230;</string>
+    <string name="delete_media_result_title">Öçiriş natijasi</string>
     <plurals name="delete_media_result_message">
-        <item quantity="one">%d ta fayl oʻchirildi</item>
-        <item quantity="other">%d ta fayl oʻchirildi</item>
+        <item quantity="one">%d ta fayl öçirildi</item>
+        <item quantity="other">%d ta fayl öçirildi</item>
     </plurals>
     <!-- Tags Dialog Options -->
-    <string name="tags_dialog_option_all_cards">Barcha kartalar</string>
-    <string name="tags_dialog_option_new_cards">Yangi</string>
+    <string name="tags_dialog_option_all_cards">Barça kartalar</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Yangi</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Muddati kelgan</string>
     <!-- Empty cards -->
-    <string name="emtpy_cards_finding">Boʻsh kartalar qidirilmoqda&#8230;</string>
+    <string name="emtpy_cards_finding">Böş kartalar qidirilmoqda&#8230;</string>
     <!-- Multimedia - Edit Field Activity -->
-    <string name="multimedia_editor_audio_permission_refused">Mikrofonga ruxsat olib boʻlmadi.</string>
-    <string name="multimedia_editor_failed">Multimedia muharririni ochib boʻlmadi</string>
+    <string name="multimedia_editor_audio_permission_refused">Mikrofonga ruxsat olib bölmadi.</string>
+    <string name="multimedia_editor_failed">Multimedia muharririni oçib bölmadi</string>
     <!-- Multimedia - Audio View -->
-    <string name="multimedia_editor_audio_permission_denied">Audio yozuvga ruxsat olib boʻlmadi</string>
+    <string name="multimedia_editor_audio_permission_denied">Audio yozuvga ruxsat olib bölmadi</string>
     <string name="permission_denied">Ruxsat berilmadi</string>
     <string name="microphone_permission_denied_message">Microphone permission denied. Please grant it in the app settings.</string>
     <!-- Database Integrity Check -->
-    <string name="integrity_check_continue_anyway">Baribir davom ettirish</string>
-    <string name="integrity_check_insufficient_space">Maʼlumotlar bazasini tekshirish katta hajmdagi vaqtinchalik xotiradan foydalanadi.\n\nDavom etishdan oldin qurilmangizda kamida %s boʻsh joy boʻlishi tavsiya etiladi.</string>
-    <string name="integrity_check_insufficient_space_extra_content">\n\nHozirda sizda %s boʻsh joy mavjud.</string>
+    <string name="integrity_check_continue_anyway">Baribir davom ettiriş</string>
+    <string name="integrity_check_insufficient_space">Maʼlumotlar bazasini tekşiriş katta hajmdagi vaqtinçalik xotiradan foydalanadi.\n\nDavom etişdan oldin qurilmangizda kamida %s böş joy bölişi tavsiya etiladi.</string>
+    <string name="integrity_check_insufficient_space_extra_content">\n\nHozirda sizda %s böş joy mavjud.</string>
     <!-- Card Browser -->
     <!-- AbstractFlashCardViewer -->
-    <string name="card_viewer_url_decode_error">Kartadan maʼlumotlarni dekodlashda xatolik</string>
+    <string name="card_viewer_url_decode_error">Kartadan maʼlumotlarni dekodlaşda xatolik</string>
     <!-- Deck Options -->
     <!-- Database Errors-->
     <string name="database_locked_title">Maʼlumotlar bazasi qulflandi</string>
-    <string name="database_locked_summary_new" comment="%s is the name of the \'AnkiDroid directory\' setting">Another AnkiDroid app is using this collection. It may conflict even when it is not visibly running.\n\nTo keep using both apps, change the ‘%s’ in one app\'s Advanced settings.\n\nTo use this app now, force-stop the conflicting app.</string>
+    <string name="database_locked_summary_new" comment="%s is the name of the \'AnkiDroid directory\' setting">Another AnkiDroid app is using this collection. It may conflict even when it is not visibly running.\n\nTo keep using both apps, çange the ‘%s’ in one app\'s Advanced settings.\n\nTo use this app now, force-stop the conflicting app.</string>
     <string name="incompatible_database_version_title">Mos kelmaydigan maʼlumotlar bazasi versiyasi</string>
-    <string name="incompatible_database_version_summary">Maʼlumotlar bazasi versiyasi AnkiDroid ishlay oladigan versiyadan ancha yuqori. Ochish uchun AnkiDroidʼni yangilang yoki maʼlumotlar baza versiyasini tushiring\n\nQoʻllab-quvvatlanadigan versiya: %1$d\nMaʼlumotlar bazasi versiyasi: %2$d\n\nQuyidagi tiklash variantlar mavjud kolleksiyangizni mos keladigan maʼlumotlar bazasi versiyasi bilan qayta yozishi mumkin:</string>
+    <string name="incompatible_database_version_summary">Maʼlumotlar bazasi versiyasi AnkiDroid işlay oladigan versiyadan ança yuqori. Oçiş uçun AnkiDroidʼni yangilang yoki maʼlumotlar baza versiyasini tuşiring\n\nQöllab-quvvatlanadigan versiya: %1$d\nMaʼlumotlar bazasi versiyasi: %2$d\n\nQuyidagi tiklaş variantlar mavjud kolleksiyangizni mos keladigan maʼlumotlar bazasi versiyasi bilan qayta yozişi mumkin:</string>
     <!-- Deck Picker Background-->
-    <string name="background_image_applied">Orqa fon rasmi qoʻllandi</string>
-    <string name="background_image_removed">Orqa fon rasmi olib tashlandi</string>
+    <string name="background_image_applied">Orqa fon rasmi qöllandi</string>
+    <string name="background_image_removed">Orqa fon rasmi olib taşlandi</string>
     <string name="no_image_selected">Rasm tanlanmadi</string>
-    <string name="error_selecting_image">Rasm tanlashda xatolik yuz berdi. Iltimos qoʻllanmaga murojaat qiling. %s</string>
-    <string name="error_deleting_image">Rasmni oʻchirishda xatolik yuz berdi</string>
-    <string name="failed_to_apply_background_image">%s orqa fon rasmini qoʻllashda xatolik yuz berdi</string>
-    <string name="background_image_too_large">Dasta tanlagich orqa foni juda katta</string>
+    <string name="error_selecting_image">Rasm tanlaşda xatolik yuz berdi. Iltimos qöllanmaga murojaat qiling. %s</string>
+    <string name="error_deleting_image">Rasmni öçirişda xatolik yuz berdi</string>
+    <string name="failed_to_apply_background_image">%s orqa fon rasmini qöllaşda xatolik yuz berdi</string>
+    <string name="background_image_too_large">Dasta tanlagiç orqa foni juda katta</string>
     <string name="image_max_size_allowed" comment="Consider keeping the unbreakable space after the digit">Ruxsat etilgan maksimal rasm hajmi %d MB</string>
-    <string name="image_dimensions_too_large">Rasm oʻlchami juda katta (%1$d × %2$d)</string>
+    <string name="image_dimensions_too_large">Rasm ölçami juda katta (%1$d × %2$d)</string>
     <!-- Global Intent handler -->
     <!-- Also used by Card Browser, not renaming to save translators effort -->
-    <string name="intent_handler_failed_no_storage_permission">Xotiraga saqlash ruxsati yoʻq. Iltimos, xotiraga saqlashga ruxsat bering va qayta urinib koʻring.</string>
+    <string name="intent_handler_failed_no_storage_permission">Xotiraga saqlaş ruxsati yöq. Iltimos, xotiraga saqlaşga ruxsat bering va qayta urinib köring.</string>
     <!-- Boot Service -->
-    <string name="boot_service_failed_to_schedule_notifications">Eslatmalarni rejalashtirib boʻlmadi</string>
-    <string name="boot_service_too_many_notifications">Juda koʻp eslatmalar rejalashtirilgan. Baʻzilari paydo boʻlmaydi</string>
+    <string name="boot_service_failed_to_schedule_notifications">Eslatmalarni rejalaştirib bölmadi</string>
+    <string name="boot_service_too_many_notifications">Juda köp eslatmalar rejalaştirilgan. Baʻzilari paydo bölmaydi</string>
     <!-- Locale Selection Dialog -->
-    <string name="locale_selection_dialog_title_new">Tilni sozlash</string>
-    <string name="locale_selection_dialog_summary">GBoard kabi baʻzi koʻp tilli klaviaturalar, matnni tahrirlaganda tilni oʻzgartirishni qoʻllab-quvvatlaydi\n\nAgar klaviaturangiz tilni oʻzgartirolmasa, klaviatura ishlab chiqaruvchisidan “setImeHintLocales” funksiyasini soʻrang.</string>
+    <string name="locale_selection_dialog_title_new">Tilni sozlaş</string>
+    <string name="locale_selection_dialog_summary">GBoard kabi baʻzi köp tilli klaviaturalar, matnni tahrirlaganda tilni özgartirişni qöllab-quvvatlaydi\n\nAgar klaviaturangiz tilni özgartirolmasa, klaviatura işlab çiqaruvçisidan “setImeHintLocales” funksiyasini sörang.</string>
     <string name="locale_selection_dialog_unknown_language" comment="Used for the locales whose name is not displayed when selected and placeholder is language tag">Unknown language [%1$s]</string>
     <!-- Help Dialog -->
-    <string name="help_title_using_ankidroid">AnkiDroidʼni ishlatish</string>
-    <string name="help_item_ankidroid_manual">AnkiDroid qoʻllanmasi</string>
-    <string name="help_item_anki_manual">Anki qoʻllanmasi</string>
-    <string name="help_item_ankidroid_faq">AnkiDroid koʻp soʻraladigan savollar</string>
-    <string name="help_title_get_help">Yordam olish</string>
-    <string name="help_item_mailing_list">E-pochta roʻyxati</string>
+    <string name="help_title_using_ankidroid">AnkiDroidʼni işlatiş</string>
+    <string name="help_item_ankidroid_manual">AnkiDroid qöllanmasi</string>
+    <string name="help_item_anki_manual">Anki qöllanmasi</string>
+    <string name="help_item_ankidroid_faq">AnkiDroid köp söraladigan savollar</string>
+    <string name="help_title_get_help">Yordam oliş</string>
+    <string name="help_item_mailing_list">E-poçta röyxati</string>
     <string name="help_item_reddit">Reddit</string>
-    <string name="help_item_report_bug">Bug haqida xabar berish</string>
-    <string name="help_title_support_ankidroid" maxLength="28">AnkiDroidʼga koʻmaklashish</string>
-    <string name="help_item_support_opencollective_donate">Xayriya qilish</string>
-    <string name="help_item_support_develop_ankidroid">Dasturlash</string>
-    <string name="help_item_support_rate_ankidroid">Baho berish</string>
-    <string name="help_item_support_other_ankidroid">Boshqa</string>
-    <string name="multimedia_editor_trans_translate">Tarjima qilish</string>
+    <string name="help_item_report_bug">Bug haqida xabar beriş</string>
+    <string name="help_title_support_ankidroid" maxLength="28">AnkiDroidʼga kömaklaşiş</string>
+    <string name="help_item_support_opencollective_donate">Xayriya qiliş</string>
+    <string name="help_item_support_develop_ankidroid">Dasturlaş</string>
+    <string name="help_item_support_rate_ankidroid">Baho beriş</string>
+    <string name="help_item_support_other_ankidroid">Boşqa</string>
+    <string name="multimedia_editor_trans_translate">Tarjima qiliş</string>
     <string name="help_title_community">Hamjamiyat</string>
     <string name="help_item_anki_forums">Anki Forums</string>
     <string name="help_item_discord">Discord</string>
@@ -163,46 +163,46 @@
     <string name="help_title_privacy">Maxfiylik</string>
     <string name="help_item_ankidroid_privacy_policy">AnkiDroid maxfiylik siyosati</string>
     <string name="help_item_ankiweb_privacy_policy">AnkiWeb maxfiylik siyosati</string>
-    <string name="help_item_ankiweb_terms_and_conditions">AnkiWeb talab va shartlari</string>
-    <string name="help_title_send_exception">Nosozliklarni bartaraf etish haqida hisobotni joʻnatish</string>
-    <string name="help_dialog_exception_report_debounce">Hisobot allaqachon joʻnatildi</string>
-    <string name="help_dialog_exception_report_sent">Hisobot joʻnatildi!</string>
+    <string name="help_item_ankiweb_terms_and_conditions">AnkiWeb talab va şartlari</string>
+    <string name="help_title_send_exception">Nosozliklarni bartaraf etiş haqida hisobotni jönatiş</string>
+    <string name="help_dialog_exception_report_debounce">Hisobot allaqaçon jönatildi</string>
+    <string name="help_dialog_exception_report_sent">Hisobot jönatildi!</string>
     <!--Sync-->
     <plurals name="sync_automatic_sync_needs_more_time">
-        <item quantity="one" comment="Consider keeping the unbreakable space after the digit">Avtomatik sinxronizatsiya %d soniyadan soʻng ishga tushishi mumkin</item>
-        <item quantity="other" comment="Consider keeping the unbreakable space after the digit">Avtomatik sinxronizatsiya %d soniyadan soʻng ishga tushishi mumkin</item>
+        <item quantity="one" comment="Consider keeping the unbreakable space after the digit">Avtomatik sinxronizatsiya %d soniyadan söng işga tuşişi mumkin</item>
+        <item quantity="other" comment="Consider keeping the unbreakable space after the digit">Avtomatik sinxronizatsiya %d soniyadan söng işga tuşişi mumkin</item>
     </plurals>
-    <string name="metered_sync_data_warning">Mobil tarmoqlargaa ulanish uchun qoʻshimcha toʻlov olinishi mumkin</string>
-    <string name="deck_picker_new">Ushbu dastadagi bugungi yangi kartalar soni.</string>
-    <string name="deck_picker_rev">Ushbu dastadagi bugun muddati kelgan kartalar soni.</string>
-    <string name="deck_picker_lrn">Ushbu dastadagi oʻrganilayotgan kartalar soni.</string>
+    <string name="metered_sync_data_warning">Mobil tarmoqlargaa ulaniş uçun qöşimça tölov olinişi mumkin</string>
+    <string name="deck_picker_new">Uşbu dastadagi bugungi yangi kartalar soni.</string>
+    <string name="deck_picker_rev">Uşbu dastadagi bugun muddati kelgan kartalar soni.</string>
+    <string name="deck_picker_lrn">Uşbu dastadagi örganilayotgan kartalar soni.</string>
     <!-- This description is valid fos
     sched V2. For V1, it was counting the number of repetitions of cards in learning. This approximation is acceptable
     for the sake of simplicity and because V1 will leave.-->
-    <string name="deck_picker_counts">Bugungi kartalar sonini koʻrish uchun dasta umumiy maʼlumotlar sahifasini oching.</string>
+    <string name="deck_picker_counts">Bugungi kartalar sonini köriş uçun dasta umumiy maʼlumotlar sahifasini oçing.</string>
     <string name="import_deck_package">Dasta paketi (.apkg)</string>
     <string name="import_collection_package">Kolleksiya paketi (.colpkg)</string>
     <string name="import_csv">Matn fayl (.txt, .csv)</string>
     <!-- scoped storage -->
     <string name="backup_your_collection">Kolleksiyangizni zaxiralang</string>
-    <string name="backup_collection_message">Kolleksiyangizni uzoq vaqt zaxiralamadingiz. Maʼlumotlar yoʻqolishini oldini olish uchun buni hozir qilishingiz kerak.</string>
-    <string name="button_backup" maxLength="41">Zaxiralash</string>
-    <string name="button_disable_reminder">Eslatmani oʻchirish</string>
+    <string name="backup_collection_message">Kolleksiyangizni uzoq vaqt zaxiralamadingiz. Maʼlumotlar yöqolişini oldini oliş uçun buni hozir qilişingiz kerak.</string>
+    <string name="button_backup" maxLength="41">Zaxiralaş</string>
+    <string name="button_disable_reminder">Eslatmani öçiriş</string>
     <string name="button_backup_later" comment="dismiss the \'Backup\' dialog for around 2 weeks">Keyinroq</string>
-    <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Boshqa koʻrsatilmasin</string>
-    <string name="dismiss_backup_warning_title">Maʼlumotlar yoʻqolishi haqida ogohlantirish</string>
-    <string name="dismiss_backup_warning_new_user">Android maxfiyligidagi oʻzgarishlar tufayli ilovani oʻchirib tashlasangiz, maʼlumotlaringiz va avtomatik zahira nusxalari ham oʻchiriladi.</string>
-    <string name="dismiss_backup_warning_upgrade">Android maxfiyligidagi oʻzgarishlar tufayli ilovani oʻchirib tashlasangiz, maʼlumotlaringiz va avtomatik zahira nusxalarini ochish imkoni boʻlmaydi.</string>
-    <string name="create_deck_numeric_hint">Agar dastani tartiblashda muammoga duch kelsangiz (masalan ‘10’ ‘2’dan oldin kelsa), ‘2’ni ‘02’ bilan almashtiring</string>
+    <string name="button_do_not_show_again" comment="permanently dismisses a dialog">Boşqa körsatilmasin</string>
+    <string name="dismiss_backup_warning_title">Maʼlumotlar yöqolişi haqida ogohlantiriş</string>
+    <string name="dismiss_backup_warning_new_user">Android maxfiyligidagi özgarişlar tufayli ilovani öçirib taşlasangiz, maʼlumotlaringiz va avtomatik zahira nusxalari ham öçiriladi.</string>
+    <string name="dismiss_backup_warning_upgrade">Android maxfiyligidagi özgarişlar tufayli ilovani öçirib taşlasangiz, maʼlumotlaringiz va avtomatik zahira nusxalarini oçiş imkoni bölmaydi.</string>
+    <string name="create_deck_numeric_hint">Agar dastani tartiblaşda muammoga duç kelsangiz (masalan ‘10’ ‘2’dan oldin kelsa), ‘2’ni ‘02’ bilan almaştiring</string>
     <!-- Set Due Date -->
-    <string name="set_due_date_match_interval" comment="when setting a card\'s due date, this checkbox also changes the interval of the card">Intervalni bir xil qiymatga sozlash</string>
+    <string name="set_due_date_match_interval" comment="when setting a card\'s due date, this checkbox also changes the interval of the card">Intervalni bir xil qiymatga sozlaş</string>
     <plurals name="set_due_date_single_day_label" comment="a date control is provided afterwards">
-        <item quantity="one">Kartani shunchadan keyin koʻrsat</item>
-        <item quantity="other">Kartalarni shunchadan keyin koʻrsat</item>
+        <item quantity="one">Kartani şunçadan keyin körsat</item>
+        <item quantity="other">Kartalarni şunçadan keyin körsat</item>
     </plurals>
     <plurals name="set_due_date_range_label" comment="a date control is provided afterwards">
-        <item quantity="one">Kartani shu oraligʻda koʻrsat</item>
-        <item quantity="other">Kartalarni shu oraligʻda koʻrsat</item>
+        <item quantity="one">Kartani şu oraliğda körsat</item>
+        <item quantity="other">Kartalarni şu oraliğda körsat</item>
     </plurals>
     <plurals name="set_due_date_label_suffix" comment="a suffix on a text field allowing a user to enter a number of days">
         <item quantity="one">kun</item>
@@ -214,57 +214,60 @@
     </plurals>
     <string name="range_delimiter" comment="Placed between two input boxes to denote a range">–</string>
     <string name="set_due_date_range_start" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'minimum\' value of this range (inclusive)">Kamida</string>
-    <string name="set_due_date_range_end" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'maximum\' value of this range (inclusive)">Koʻpi bilan</string>
+    <string name="set_due_date_range_end" comment="\'Set Due Date\' may change the due date of a card to a random number of days in the future. This labels the \'maximum\' value of this range (inclusive)">Köpi bilan</string>
     <!-- Instant Note Editor -->
-    <string name="cloze_note_required">Boʻshliqni toʻldirish turidagi qayd kerak</string>
-    <string name="cloze_not_found_message">Boʻshliqni toʻldirish turidagi qayd topilmadi. Qayd muharririni oching yoki boʻshliqni toʻldirish turidagi qaydni qoʻshgandan keyin urinib koʻring.</string>
-    <string name="open">Ochish</string>
-    <string name="change_cloze_number">Boʻshliq raqaminini oʻzgartirish</string>
-    <string name="cloze_number">Boʻshliq raqami:</string>
-    <string name="change_editor_mode">Muharrir rejimini oʻzgartirish</string>
-    <string name="open_note_editor">Qayd muharririni ochish</string>
-    <string name="change_cloze_mode">Boʻshliqni toʻldirish rejimini oʻzgartirish</string>
+    <string name="cloze_note_required">Böşliqni töldiriş turidagi qayd kerak</string>
+    <string name="cloze_not_found_message">Böşliqni töldiriş turidagi qayd topilmadi. Qayd muharririni oçing yoki böşliqni töldiriş turidagi qaydni qöşgandan keyin urinib köring.</string>
+    <string name="open">Oçiş</string>
+    <string name="change_cloze_number">Böşliq raqaminini özgartiriş</string>
+    <string name="cloze_number">Böşliq raqami:</string>
+    <string name="change_editor_mode">Muharrir rejimini özgartiriş</string>
+    <string name="open_note_editor">Qayd muharririni oçiş</string>
+    <string name="change_cloze_mode">Böşliqni töldiriş rejimini özgartiriş</string>
     <!-- Outdated WebView dialog -->
-    <string name="webview_update_message">Tizim WebViewʼi eskirgan. Baʼzi xususiyatlar toʻgʻri ishlamaydi. Iltimos, yangilang.\n\nOʻrnatilgan versiya: %1$d\nMinimal talab qilinadigan versiya: %2$d</string>
-    <string name="compress">Siqish</string>
+    <string name="webview_update_message">Tizim WebViewʼi eskirgan. Baʼzi xususiyatlar töğri işlamaydi. Iltimos, yangilang.\n\nÖrnatilgan versiya: %1$d\nMinimal talab qilinadigan versiya: %2$d</string>
+    <string name="compress">Siqiş</string>
     <!-- Tts playback error dialog -->
-    <string name="tts_error_dialog_title">Til qoʻllab-quvvatlanmaydi</string>
+    <string name="tts_no_engine_title">No text-to-speeç engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speeç engine for your device.</string>
+    <string name="tts_error_dialog_title">Til qöllab-quvvatlanmaydi</string>
     <string name="tts_error_dialog_reason_text"><b>%1$s</b> nutq sintezatori quyidagi tilni qo‘llab-quvvatlamaydi: <b>%2$s</b></string>
-    <string name="tts_error_dialog_change_button_text">Nutq sintezatorini almashtirish</string>
+    <string name="tts_error_dialog_change_button_text">Nutq sintezatorini almaştiriş</string>
     <string name="tts_error_dialog_supported_voices_button_text">Ovoz parametrlari</string>
     <!-- import_cache_error_resolutions -->
-    <string name="import_error_resolution_try_again">Faylni qaytadan import qilish</string>
-    <string name="import_error_resolution_free_up_space">Qurilmangizda yetarlicha boʻsh joy borligiga ishonch hosil qiling</string>
-    <string name="import_error_resolution_check_internet">Internetga ulanganingizga ishonch hosil qiling</string>
-    <string name="import_error_resolution_copy_to_device">Faylni qurilmangizga koʻchiring va mahalliy fayl bilan qaytadan urinib koʻring</string>
-    <string name="import_error_resolution_select_file">Faylni qurilmangiz fayl brauzeri orqali ochish</string>
+    <string name="import_error_resolution_try_again">Faylni qaytadan import qiliş</string>
+    <string name="import_error_resolution_free_up_space">Qurilmangizda yetarliça böş joy borligiga işonç hosil qiling</string>
+    <string name="import_error_resolution_check_internet">Internetga ulanganingizga işonç hosil qiling</string>
+    <string name="import_error_resolution_copy_to_device">Faylni qurilmangizga köçiring va mahalliy fayl bilan qaytadan urinib köring</string>
+    <string name="import_error_resolution_select_file">Faylni qurilmangiz fayl brauzeri orqali oçiş</string>
     <!-- Post-login dialog -->
     <string name="login_successful">Muvaffaqiyatli kirdingiz</string>
     <string name="sync_now">Hozir sinxronlaysizmi?</string>
     <!--Change Note Type Dialog Fragment-->
-    <string name="card_numbers_unchanged">Karta raqamlari oʻzgarishsiz qoladi</string>
+    <string name="card_numbers_unchanged">Karta raqamlari özgarişsiz qoladi</string>
     <!-- Subset of TR.changeNotetypeToFromCloze -->
-    <string name="extra_cloze_deletions_removed">Agar oddiy qayd turiga oʻzgartirsangiz va boʻshliqni toʻldirishlar soni karta shablonlardan koʻproq boʻlsa, har qanday ortiqcha karta oʻchirib tashlanadi.</string>
+    <string name="extra_cloze_deletions_removed">Agar oddiy qayd turiga özgartirsangiz va böşliqni töldirişlar soni karta şablonlardan köproq bölsa, har qanday ortiqça karta öçirib taşlanadi.</string>
     <string name="different_note_types_selected">Faqat bitta qayd turidagi qaydlarni tanlang.</string>
-    <string name="error_no_changes_to_save">Saqlanadigan oʻzgarishlar yoʻq</string>
-    <string name="choose_color">Rang tanlash</string>
+    <string name="error_no_changes_to_save">Saqlanadigan özgarişlar yöq</string>
+    <string name="choose_color">Rang tanlaş</string>
     <!-- Special Fields -->
     <string name="standard_fields_tab_header" comment="Tab header for inserting non-special fields: {{Front}}">Maydonlar</string>
     <string name="special_fields_tab_header" comment="Tab header for inserting special fields: {{Deck}}">Maxsus</string>
     <string name="special_field_example_suffix"><![CDATA[: ‘<b>%1$s</b>’]]></string>
-    <string name="special_field_front_side_help">Oldi shablon tarkibi. Audio avtomatik ravishda ijro etilmaydi.</string>
-    <string name="special_field_deck_help" comment="%s: either blank or \' %s\'">Karta joylashgan dasta, ona dastalarni ham qoʻshganda%s</string>
-    <string name="special_field_subdeck_help" comment="%s: either blank or \' %s\'">Karta joylashgan dasta, ona dastalarsiz%s</string>
-    <string name="special_field_flag_help">‘%1$s’ natijasini chiqaradi, bu yerda %2$s — bayroq kodi (%3$s\–%4$s\)</string>
+    <string name="special_field_front_side_help">Oldi şablon tarkibi. Audio avtomatik ravişda ijro etilmaydi.</string>
+    <string name="special_field_deck_help" comment="%s: either blank or \' %s\'">Karta joylaşgan dasta, ona dastalarni ham qöşganda%s</string>
+    <string name="special_field_subdeck_help" comment="%s: either blank or \' %s\'">Karta joylaşgan dasta, ona dastalarsiz%s</string>
+    <string name="special_field_flag_help">‘%1$s’ natijasini çiqaradi, bu yerda %2$s — bayroq kodi (%3$s\–%4$s\)</string>
     <string name="special_field_tags_help" comment="%s: either blank or \' %s\'">Qayd teglari%s</string>
     <string name="special_field_card_id_help" comment="%s: either blank or \' %s\'">Karta IDʼi%s</string>
-    <string name="special_field_card_help" comment="%s: either blank or \' %s\'">Karta shabloni nomi%s</string>
+    <string name="special_field_card_help" comment="%s: either blank or \' %s\'">Karta şabloni nomi%s</string>
     <string name="special_field_type_help" comment="%s: either blank or \' %s\'">Qayd turi nomi%s</string>
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
-    <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
+    <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d çaracters or fewer</string>
 </resources>
diff --git a/common/android/src/main/res/values-uz/04-network.xml b/common/android/src/main/res/values-uz/04-network.xml
index 11d4a5aa02ce..39ecd67ed8d5 100644
--- a/common/android/src/main/res/values-uz/04-network.xml
+++ b/common/android/src/main/res/values-uz/04-network.xml
@@ -24,36 +24,36 @@
   -->
 <resources>
     <string name="youre_offline">Oflaynsiz</string>
-    <string name="sync_error">Sinxronlash xatoligi</string>
+    <string name="sync_error">Sinxronlaş xatoligi</string>
     <string name="vague_error" comment="Network error dialog title">Xatolik</string>
-    <string name="retry">Qayta urinib koʻrish</string>
-    <string name="menu_get_shared_decks">Dasta yuklab olish</string>
+    <string name="retry">Qayta urinib köriş</string>
+    <string name="menu_get_shared_decks">Dasta yuklab oliş</string>
     <string name="connection_error_message">Tarmoq xatoligi yuz berdi</string>
-    <string name="not_logged_in_title">AnkiWebʼga kirish</string>
-    <string name="login_create_account_message">Bulut sinxronizatsiya xizmatidan foydalanish uchun uchinchi tomonning akkauntiga kirishingiz kerak. Akkauntni keyingi bosqichda yaratishingiz mumkin.</string>
+    <string name="not_logged_in_title">AnkiWebʼga kiriş</string>
+    <string name="login_create_account_message">Bulut sinxronizatsiya xizmatidan foydalaniş uçun uçinçi tomonning akkauntiga kirişingiz kerak. Akkauntni keyingi bosqiçda yaratişingiz mumkin.</string>
     <!-- MyAccount.kt -->
-    <string name="username">E-pochta manzili</string>
+    <string name="username">E-poçta manzili</string>
     <string name="password">Parol</string>
-    <string name="sign_up_description">AnkiWeb akkauntingiz yoʻqmi? U bepul!</string>
-    <string name="sign_up_not_affiliated">Eslatma: AnkiWeb AnkiDroid bilan bogʻliq emas</string>
-    <string name="sign_up">Roʻyxatdan oʻtish</string>
-    <string name="logged_as">Shu orqali tizimga kirgansiz</string>
-    <string name="reset_password">Parolni tiklash</string>
-    <string name="lost_mail_instructions">E-pochtangizni unutdingizmi?</string>
+    <string name="sign_up_description">AnkiWeb akkauntingiz yöqmi? U bepul!</string>
+    <string name="sign_up_not_affiliated">Eslatma: AnkiWeb AnkiDroid bilan boğliq emas</string>
+    <string name="sign_up">Röyxatdan ötiş</string>
+    <string name="logged_as">Şu orqali tizimga kirgansiz</string>
+    <string name="reset_password">Parolni tiklaş</string>
+    <string name="lost_mail_instructions">E-poçtangizni unutdingizmi?</string>
     <string name="sign_in">Tizimga kirilmoqda</string>
     <!-- AndroidManifest.xml -->
     <string name="sync_title">Sinxronizatsiya</string>
-    <string name="sync_log_uploading_message">Qurilmadan toʻliq sinxronizatsiya</string>
+    <string name="sync_log_uploading_message">Qurilmadan töliq sinxronizatsiya</string>
     <string name="sync_database_acknowledge">Kolleksiya sinxronlandi</string>
     <string name="col_synced_media_in_background">Kolleksiya sinxronlandi. Media fayllar orqa fonda sinxronlanmoqda.</string>
-    <string name="sync_corrupt_database">Maʼlumotlar bazangiz buzilgan. Iltimos, sinxronlashdan oldin uni tuzating.\n\nMaʼlumotlar bazasini tuzatish haqida maʼlumot olish uchun %s sahifasiga oʻting.</string>
+    <string name="sync_corrupt_database">Maʼlumotlar bazangiz buzilgan. Iltimos, sinxronlaşdan oldin uni tuzating.\n\nMaʼlumotlar bazasini tuzatiş haqida maʼlumot oliş uçun %s sahifasiga öting.</string>
     <!-- Please run ‘Check database’ before syncing -->
     <string name="sync_sanity_local">Mahalliy</string>
     <string name="sync_sanity_remote">Masofaviy</string>
-    <string name="one_way_sync_title" maxLength="41">Bir tomonlama sinxronlash</string>
-    <string name="one_way_sync_confirmation">Bir tomonlama sinxronlash soʻraldi</string>
-    <string name="full_sync_confirmation">Soʻralgan oʻzgartirish kolleksiyangizni keyingi sinxronlashda maʼlumotlar bazasini toʻliq yuklashni talab qiladi. Agar boshqa qurilmangizda takrorlashlar yoki boshqa oʻzgarishlar boʻlsa va bu qurilma bilan sinxronlanmagan boʻlsa, ular yoʻqoladi. Davom ettirilsinmi?</string>
+    <string name="one_way_sync_title" maxLength="41">Bir tomonlama sinxronlaş</string>
+    <string name="one_way_sync_confirmation">Bir tomonlama sinxronlaş söraldi</string>
+    <string name="full_sync_confirmation">Söralgan özgartiriş kolleksiyangizni keyingi sinxronlaşda maʼlumotlar bazasini töliq yuklaşni talab qiladi. Agar boşqa qurilmangizda takrorlaşlar yoki boşqa özgarişlar bölsa va bu qurilma bilan sinxronlanmagan bölsa, ular yöqoladi. Davom ettirilsinmi?</string>
     <!-- Deck Picker Sync Icon -->
-    <string name="sync_menu_title_one_way_sync">Sinxronlash (bir tomonlama)</string>
-    <string name="sync_menu_title_no_account">Sinxronlash (tizimga kirish)</string>
+    <string name="sync_menu_title_one_way_sync">Sinxronlaş (bir tomonlama)</string>
+    <string name="sync_menu_title_no_account">Sinxronlaş (tizimga kiriş)</string>
 </resources>
diff --git a/common/android/src/main/res/values-uz/05-feedback.xml b/common/android/src/main/res/values-uz/05-feedback.xml
index 2399a7942c99..5d05d3819459 100644
--- a/common/android/src/main/res/values-uz/05-feedback.xml
+++ b/common/android/src/main/res/values-uz/05-feedback.xml
@@ -25,13 +25,13 @@
 <resources>
     <!-- Feedback.java -->
     <string name="empty_string"></string>
-    <string name="error_reporting_choice" maxLength="41">Xatolik haqida xabar berish rejimi</string>
-    <string name="feedback_disclaimer">Ogohlantirish: Biz sizni elektron pochta manzilingiz, telefon raqamingiz yoki telefoningiz IMEI kabi shaxsiy maʼlumotlarni toʻplamaymiz. Biz qurilmangiz haqida baʼzi maʼlumotlarni toʻplaymiz, masalan, ishlab chiqaruvchi, Android modeli va versiyasi, shuningdek, xabar qilingan xatolarning oʻzi va ularning paydo boʻlishiga olib kelgan qadamlar.</string>
+    <string name="error_reporting_choice" maxLength="41">Xatolik haqida xabar beriş rejimi</string>
+    <string name="feedback_disclaimer">Ogohlantiriş: Biz sizni elektron poçta manzilingiz, telefon raqamingiz yoki telefoningiz IMEI kabi şaxsiy maʼlumotlarni töplamaymiz. Biz qurilmangiz haqida baʼzi maʼlumotlarni töplaymiz, masalan, işlab çiqaruvçi, Android modeli va versiyasi, şuningdek, xabar qilingan xatolarning özi va ularning paydo bölişiga olib kelgan qadamlar.</string>
     <string name="feedback_title">AnkiDroid haqida fikr-mulohaza</string>
-    <string name="feedback_default_text">Fikr-mulohazalaringiz yoki duch kelayotgan xatoliklaringiz haqida maʼlumot kiriting.</string>
-    <string name="feedback_auto_toast_text">AnkiDroid muammoga duch keldi; hisobot dasturchilarga joʻnatilmoqda&#8230;</string>
-    <string name="feedback_for_manual_toast_text">Dasturchilar uchun xatolik haqida hisobot tayyorlanmoqda&#8230;</string>
-    <string name="feedback_report">Xabar berish</string>
+    <string name="feedback_default_text">Fikr-mulohazalaringiz yoki duç kelayotgan xatoliklaringiz haqida maʼlumot kiriting.</string>
+    <string name="feedback_auto_toast_text">AnkiDroid muammoga duç keldi; hisobot dasturçilarga jönatilmoqda&#8230;</string>
+    <string name="feedback_for_manual_toast_text">Dasturçilar uçun xatolik haqida hisobot tayyorlanmoqda&#8230;</string>
+    <string name="feedback_report">Xabar beriş</string>
     <string name="feedback_report_automatically">Xatolik haqida hisobotlar avtomatik tarzda yuborilsin</string>
     <string name="feedback_no_suitable_app_found">Mos ilova topilmadi</string>
 </resources>
diff --git a/common/android/src/main/res/values-uz/06-statistics.xml b/common/android/src/main/res/values-uz/06-statistics.xml
index e539edaca6d7..002992e1447e 100644
--- a/common/android/src/main/res/values-uz/06-statistics.xml
+++ b/common/android/src/main/res/values-uz/06-statistics.xml
@@ -23,5 +23,5 @@
   ~ SPDX-FileCopyrightText: Copyright (c) 2010 Norbert Nagold <norbert.nagold@gmail.com>
   -->
 <resources>
-    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">Statistikani ochish</string>
+    <string name="open_statistics" comment="Description of the shortcut that opens the statistics page">Statistikani oçiş</string>
 </resources>
diff --git a/common/android/src/main/res/values-uz/07-cardbrowser.xml b/common/android/src/main/res/values-uz/07-cardbrowser.xml
index dccb6c28d5fc..272d25af609a 100644
--- a/common/android/src/main/res/values-uz/07-cardbrowser.xml
+++ b/common/android/src/main/res/values-uz/07-cardbrowser.xml
@@ -25,77 +25,77 @@
 <resources>
     <!-- CardBrowser -->
     <plurals name="card_browser_subtitle">
-        <item quantity="one">%d ta karta koʻrsatilgan</item>
-        <item quantity="other">%d ta karta koʻrsatilgan</item>
+        <item quantity="one">%d ta karta körsatilgan</item>
+        <item quantity="other">%d ta karta körsatilgan</item>
     </plurals>
     <plurals name="card_browser_subtitle_notes_mode">
-        <item quantity="one">%d ta qayd koʻrsatilgan</item>
-        <item quantity="other">%d ta qayd koʻrsatilgan</item>
+        <item quantity="one">%d ta qayd körsatilgan</item>
+        <item quantity="other">%d ta qayd körsatilgan</item>
     </plurals>
     <plurals name="card_browser_delete_notes">
-        <item quantity="one">Qaydni oʻchirish</item>
-        <item quantity="other">Qaydlarni oʻchirish</item>
+        <item quantity="one">Qaydni öçiriş</item>
+        <item quantity="other">Qaydlarni öçiriş</item>
     </plurals>
-    <string name="delete_card_title">Qayd oʻchirilsinmi?</string>
-    <string name="card_browser_show_marked" maxLength="28">Belgilanganlarni filtrlash</string>
-    <string name="card_browser_show_suspended" maxLength="28">Toʻxtatilganlarni filtrlash</string>
-    <string name="card_browser_search_by_tag" maxLength="28">Teg boʻyicha filtrlash</string>
-    <string name="card_browser_search_by_flag" maxLength="28">Baryoq boʻyicha filtrlash</string>
+    <string name="delete_card_title">Qayd öçirilsinmi?</string>
+    <string name="card_browser_show_marked" maxLength="28">Belgilanganlarni filtrlaş</string>
+    <string name="card_browser_show_suspended" maxLength="28">Töxtatilganlarni filtrlaş</string>
+    <string name="card_browser_search_by_tag" maxLength="28">Teg böyiça filtrlaş</string>
+    <string name="card_browser_search_by_flag" maxLength="28">Baryoq böyiça filtrlaş</string>
     <string name="card_browser_list_my_searches" maxLength="28">Qidiruvlarim</string>
-    <string name="card_browser_list_my_searches_save" maxLength="28">Qidiruvni saqlash</string>
+    <string name="card_browser_list_my_searches_save" maxLength="28">Qidiruvni saqlaş</string>
     <string name="card_browser_list_my_searches_title">Saqlangan qidiruvni tanlang</string>
-    <string name="card_browser_list_my_searches_new_name">Qidiruv uchun nom</string>
-    <string name="card_browser_list_my_searches_new_search_error_empty_name">Qidiruvni nomsiz saqlab boʻlmaydi</string>
-    <string name="card_browser_list_my_searches_new_search_error_dup">Bu nom allaqachon mavjud</string>
+    <string name="card_browser_list_my_searches_new_name">Qidiruv uçun nom</string>
+    <string name="card_browser_list_my_searches_new_search_error_empty_name">Qidiruvni nomsiz saqlab bölmaydi</string>
+    <string name="card_browser_list_my_searches_new_search_error_dup">Bu nom allaqaçon mavjud</string>
     <string name="card_browser_list_my_searches_successful_save">Qidiruv saqlandi</string>
-    <string name="card_browser_list_my_searches_successful_deleted">Qidiruv oʻchirildi</string>
-    <string name="no_note_to_edit">Tahrirlash uchun qayd yoʻq</string>
-    <string name="card_browser_list_my_searches_remove_content">“%1$s” oʻchirilsinmi?</string>
-    <string name="card_browser_change_display_order" maxLength="28">Koʻrsatish tartibini oʻzgartirish</string>
+    <string name="card_browser_list_my_searches_successful_deleted">Qidiruv öçirildi</string>
+    <string name="no_note_to_edit">Tahrirlaş uçun qayd yöq</string>
+    <string name="card_browser_list_my_searches_remove_content">“%1$s” öçirilsinmi?</string>
+    <string name="card_browser_change_display_order" maxLength="28">Körsatiş tartibini özgartiriş</string>
     <string name="card_browser_search_hint" comment="Message displayed in the search text field in the card browser.">Qidiruv</string>
     <string name="card_browser_cram_search" maxLength="28" comment="Menu entry to start a search.">Qidiruv</string>
-    <string name="card_browser_change_display_order_title">Koʻrsatish tartibini oʻzgartirish</string>
+    <string name="card_browser_change_display_order_title">Körsatiş tartibini özgartiriş</string>
     <string name="card_details_tags">Teglar</string>
-    <string name="manage_browser_column">Ustunni boshqarish</string>
-    <string name="no_columns_available">Tanlab boʻladigan ustun yoʻq</string>
-    <string name="card_browser_select_all" maxLength="28">Barchasini tanlash</string>
-    <string name="card_browser_select_none" maxLength="28">Hech qaysini tanlama</string>
-    <string name="card_browser_no_cards_in_deck">‘%s’ dastasida hech qanday karta topilmadi</string>
-    <string name="card_browser_search_all_decks">Barcha dastalarni qidirish</string>
+    <string name="manage_browser_column">Ustunni boşqariş</string>
+    <string name="no_columns_available">Tanlab böladigan ustun yöq</string>
+    <string name="card_browser_select_all" maxLength="28">Barçasini tanlaş</string>
+    <string name="card_browser_select_none" maxLength="28">Heç qaysini tanlama</string>
+    <string name="card_browser_no_cards_in_deck">‘%s’ dastasida heç qanday karta topilmadi</string>
+    <string name="card_browser_search_all_decks">Barça dastalarni qidiriş</string>
     <string name="card_browser_unknown_deck_name">Nomaʼlum</string>
-    <string name="card_browser_truncate" comment="allows users to show less of a field value">Tarkibini qisqartirish</string>
+    <string name="card_browser_truncate" comment="allows users to show less of a field value">Tarkibini qisqartiriş</string>
     <string name="set_due_date_hintText" comment="plural set_due_date_label_suffix is used for parameters, parameter 1 is the plural for 0, parameter 2 is the plural for 1">Bugun  ‘0 %1$s’, ertaga ‘1 %2$s’, va hokazo&#8230;</string>
     <plurals name="card_browser_export_cards">
-        <item quantity="one">Kartani eksport qilish</item>
-        <item quantity="other">Kartalarni eksport qilish</item>
+        <item quantity="one">Kartani eksport qiliş</item>
+        <item quantity="other">Kartalarni eksport qiliş</item>
     </plurals>
     <plurals name="card_browser_export_notes">
-        <item quantity="one">Qaydni eksport qilish</item>
-        <item quantity="other">Qaydlarni eksport qilish</item>
+        <item quantity="one">Qaydni eksport qiliş</item>
+        <item quantity="other">Qaydlarni eksport qiliş</item>
     </plurals>
     <plurals name="card_browser_cards_deleted">
-        <item quantity="one">%d ta karta oʻchirildi</item>
-        <item quantity="other">%d ta karta oʻchirildi</item>
+        <item quantity="one">%d ta karta öçirildi</item>
+        <item quantity="other">%d ta karta öçirildi</item>
     </plurals>
     <!--Keyboard shortcuts dialog-->
-    <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Teglarni tahrirlash dialogi</string>
-    <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Tartib dialogini koʻrsatish</string>
+    <string name="edit_tags_dialog" comment="Description of the shortcut that opens the edit tags dialog">Teglarni tahrirlaş dialogi</string>
+    <string name="show_order_dialog" comment="Description of the shortcut that shows the order dialog">Tartib dialogini körsatiş</string>
     <!-- Manage columns dialog -->
     <string name="browse_manage_columns_main_heading">Ustunlar</string>
-    <string name="browse_manage_columns">Ustunlarni boshqarish</string>
+    <string name="browse_manage_columns">Ustunlarni boşqariş</string>
     <string name="user_active_columns">Faol</string>
     <string name="user_potential_columns">Mavjud</string>
-    <string name="include_column">Ustunni qoʻshish</string>
-    <string name="exclude_column">Ustunni chiqarish</string>
-    <string name="save_changes_message">Iltimos, avval oʻzgartirishlaringizni saqlang</string>
+    <string name="include_column">Ustunni qöşiş</string>
+    <string name="exclude_column">Ustunni çiqariş</string>
+    <string name="save_changes_message">Iltimos, avval özgartirişlaringizni saqlang</string>
     <string name="browser_find_replace_loading_fields">Maydonlar nomlari olinmoqda&#8230;</string>
     <!-- Search history -->
-    <string name="card_browser_see_more">Koʻproq koʻrish</string>
-    <string name="card_browser_see_less">Kamroq koʻrish</string>
+    <string name="card_browser_see_more">Köproq köriş</string>
+    <string name="card_browser_see_less">Kamroq köriş</string>
     <!-- Sort Order -->
     <string name="card_browser_order_no_sorting_title" comment="Title of the \'no sorting\' row in the Choose Display Order bottom sheet">Tartibsiz</string>
     <string name="card_browser_order_no_sorting_subtitle" comment="Subtitle for the \'no sorting\' row noting that no-sort is faster than sorted queries">Tezroq</string>
-    <string name="card_browser_order_snackbar_sort_by" comment="Snackbar shown after sort changes. %1$s is the column name (e.g. \'Card Type\')">%1$s boʻyicha tartiblash</string>
+    <string name="card_browser_order_snackbar_sort_by" comment="Snackbar shown after sort changes. %1$s is the column name (e.g. \'Card Type\')">%1$s böyiça tartiblaş</string>
     <string name="card_browser_order_subtitle_text_ascending" comment="Sort direction subtitle for text columns when ascending (A before Z)">A–Z</string>
     <string name="card_browser_order_subtitle_text_descending" comment="Sort direction subtitle for text columns when descending (Z before A)">Z–A</string>
     <string name="card_browser_order_subtitle_numeric_ascending" comment="Sort direction subtitle for numeric columns when ascending (smallest value first)">Low to high</string>
diff --git a/common/android/src/main/res/values-uz/08-widget.xml b/common/android/src/main/res/values-uz/08-widget.xml
index 244b731dbb0e..6c1787145f5f 100644
--- a/common/android/src/main/res/values-uz/08-widget.xml
+++ b/common/android/src/main/res/values-uz/08-widget.xml
@@ -28,7 +28,7 @@
         <item quantity="one">%d ta AnkiDroid kartasi qoldi</item>
         <item quantity="other">%d ta AnkiDroid kartasi qoldi</item>
     </plurals>
-    <string name="widget_small" comment="Label of the small ankidroid widget. This text can\'t be found directly in AnkiDroid">AnkiDroid kichkina</string>
+    <string name="widget_small" comment="Label of the small ankidroid widget. This text can\'t be found directly in AnkiDroid">AnkiDroid kiçkina</string>
     <plurals name="widget_cards_due">
         <item quantity="one">%d ta karta qoldi</item>
         <item quantity="other">%d ta karta qoldi</item>
@@ -37,19 +37,19 @@
         <item quantity="one">%d daqiqa qoldi</item>
         <item quantity="other">%d daqiqa qoldi</item>
     </plurals>
-    <string name="widget_add_note_button">Yangi AnkiDroid qayd qoʻshish</string>
-    <string name="deck_picker_widget_description" comment="Title of the Deck Picker Widget. Displayed to the user in Android\'s Widget Selection menu">Dasta tanlagich</string>
+    <string name="widget_add_note_button">Yangi AnkiDroid qayd qöşiş</string>
+    <string name="deck_picker_widget_description" comment="Title of the Deck Picker Widget. Displayed to the user in Android\'s Widget Selection menu">Dasta tanlagiç</string>
     <string name="card_analysis_extra_widget_description">Karta tahlili</string>
     <!-- Strings to explain usage in Deck Picker and Card Analysis Widget Configuration screen -->
-    <string name="select_decks_title" comment="Title for Deck Selection Dialog">Dastalarni tanlash</string>
-    <string name="select_deck_title" comment="Title for Deck Selection Dialog">Dasta tanlash</string>
-    <string name="no_selected_deck_placeholder_title" comment="Placeholder title when no decks are selected">Vidjetda koʻrsatish uchun dastalarni tanlang. Dastalarni + tugmasi orqali tanlang.</string>
-    <string name="deck_removed_from_widget" comment="Snackbar when deck is removed from widget">Dasta oʻchirildi</string>
-    <string name="deck_already_selected_message" comment="Snackbar when user try to select the same deck again">Bu dasta allaqachon tanlangan</string>
+    <string name="select_decks_title" comment="Title for Deck Selection Dialog">Dastalarni tanlaş</string>
+    <string name="select_deck_title" comment="Title for Deck Selection Dialog">Dasta tanlaş</string>
+    <string name="no_selected_deck_placeholder_title" comment="Placeholder title when no decks are selected">Vidjetda körsatiş uçun dastalarni tanlang. Dastalarni + tugmasi orqali tanlang.</string>
+    <string name="deck_removed_from_widget" comment="Snackbar when deck is removed from widget">Dasta öçirildi</string>
+    <string name="deck_already_selected_message" comment="Snackbar when user try to select the same deck again">Bu dasta allaqaçon tanlangan</string>
     <plurals name="deck_limit_reached">
-        <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d ta dastagacha tanlashingiz mumkin</item>
-        <item quantity="other" comment="Consider keeping the unbreakable space after the digit">%d ta dastagacha tanlashingiz mumkin</item>
+        <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d ta dastagaça tanlaşingiz mumkin</item>
+        <item quantity="other" comment="Consider keeping the unbreakable space after the digit">%d ta dastagaça tanlaşingiz mumkin</item>
     </plurals>
-    <string name="empty_widget_state" comment="To denote the widget is empty">Dasta mavjud emas. Sozlash uchun bosing.</string>
-    <string name="empty_collection_state_in_widget" comment="To denote the collection is empty">Kolleksiya boʻsh, dastalarni qoʻshish uchun ilovani ishlating va qayta sozlang</string>
+    <string name="empty_widget_state" comment="To denote the widget is empty">Dasta mavjud emas. Sozlaş uçun bosing.</string>
+    <string name="empty_collection_state_in_widget" comment="To denote the collection is empty">Kolleksiya böş, dastalarni qöşiş uçun ilovani işlating va qayta sozlang</string>
 </resources>
diff --git a/common/android/src/main/res/values-uz/09-backup.xml b/common/android/src/main/res/values-uz/09-backup.xml
index 1115c07c6479..ae632f6fb85c 100644
--- a/common/android/src/main/res/values-uz/09-backup.xml
+++ b/common/android/src/main/res/values-uz/09-backup.xml
@@ -23,26 +23,26 @@
   ~ SPDX-FileCopyrightText: Copyright (c) 2010 Norbert Nagold <norbert.nagold@gmail.com>
   -->
 <resources>
-    <string name="backup_deck_no_storage_left">Zaxira saqlanmadi. Xotirada yetarli joy qolmadi. Zaxira chuqurligini pasaytiring yoki boshqa fayllarni oʻchiring.</string>
-    <string name="storage_warning" comment="Consider keeping the unbreakable space after the digit">Xotirangizda %d MBdan kam joy qoldi.\nMaʼlumotlar yoʻqolishining oldini olish uchun biroz joy boʻshating.</string>
-    <string name="backup_restore" maxLength="28">Zaxira nusxasidan tiklash</string>
+    <string name="backup_deck_no_storage_left">Zaxira saqlanmadi. Xotirada yetarli joy qolmadi. Zaxira çuqurligini pasaytiring yoki boşqa fayllarni öçiring.</string>
+    <string name="storage_warning" comment="Consider keeping the unbreakable space after the digit">Xotirangizda %d MBdan kam joy qoldi.\nMaʼlumotlar yöqolişining oldini oliş uçun biroz joy böşating.</string>
+    <string name="backup_restore" maxLength="28">Zaxira nusxasidan tiklaş</string>
     <string name="backup_new_collection">Yangi kolleksiya</string>
-    <string name="backup_del_collection">Kolleksiyani oʻchirib yangisini yaratish</string>
-    <string name="backup_del_collection_question">Kolleksiyani oʻchirib yangisi yaratmoqchimisiz? Barcha oʻrganish progressingizni yoʻqotasiz va barcha kartalarni oʻchiradi.</string>
-    <string name="backup_one_way_sync_from_server">Serverdan bir tomonlama sinxronlash</string>
-    <string name="backup_use_default_folder">Birlamchi kolleksiya jildini ishlatish</string>
-    <string name="backup_full_sync_from_server_question">Kolleksiyangiz AnkiWeb kolleksiyasi bilan almashtirilsinmi? Oxirgi sinxronizatsiyadan keyingi barcha oʻrganish progressingiz va qoʻshilgan maʼlumotlaringiz yoʻqoladi.</string>
-    <string name="error_handling_title">Xatolikni bartaraf qilish</string>
+    <string name="backup_del_collection">Kolleksiyani öçirib yangisini yaratiş</string>
+    <string name="backup_del_collection_question">Kolleksiyani öçirib yangisi yaratmoqçimisiz? Barça örganiş progressingizni yöqotasiz va barça kartalarni öçiradi.</string>
+    <string name="backup_one_way_sync_from_server">Serverdan bir tomonlama sinxronlaş</string>
+    <string name="backup_use_default_folder">Birlamçi kolleksiya jildini işlatiş</string>
+    <string name="backup_full_sync_from_server_question">Kolleksiyangiz AnkiWeb kolleksiyasi bilan almaştirilsinmi? Oxirgi sinxronizatsiyadan keyingi barça örganiş progressingiz va qöşilgan maʼlumotlaringiz yöqoladi.</string>
+    <string name="error_handling_title">Xatolikni bartaraf qiliş</string>
     <string name="error_handling_options" comment="In a warning message, the label of the suggested action that the user should take">Parametrlar</string>
-    <string name="backup_retry_opening">Ochishni qayta urinib koʻrish</string>
-    <string name="backup_error_menu_repair">Maʼlumotlar bazasini tuzatish</string>
+    <string name="backup_retry_opening">Oçişni qayta urinib köriş</string>
+    <string name="backup_error_menu_repair">Maʼlumotlar bazasini tuzatiş</string>
     <!-- Collection used to be called deck. Name is kept for consistency with translation software -->
     <string name="backup_repair_deck_progress">Maʼlumotlar bazasi tuzatilmoqda&#8230;</string>
     <string name="backup_invalid_file_error">Tanlangan zaxira fayli yaroqsiz</string>
-    <string name="backup_restore_select_title">Qayta tiklash uchun zaxira faylini tanlang</string>
-    <string name="backup_restore_no_backups">Bu qurilmada zaxira nusxalari mavjud emas. Agar  kompyuteringizda zaxira nusxalari bo\'lsa, ularni qoʻlda AnkiDroid jildiga ko\'chiring.</string>
-    <string name="open_collection_failed_title">Kolleksiya ochilmadi</string>
-    <string name="corrupt_db_message">Kolleksiyangiz buzilgan.\n\nZaxiradan tiklash uchun “Parametrlar” tugmasini bosing. Agar ishlamasa, maʼlumotlar bazasini qoʻlda tuzatish boʻyicha quyidagi koʻrsatmalarga murojaat qiling:\n%1$s</string>
-    <string name="access_collection_failed_message">Kolleksiyangizga kirishda xatolik yuz berdi. Bunga zararsiz bag sabab boʻlgan boʻlishi mumkin yoki u bilan bogʻliq muammo boʻlishi ham mumkin. \n\nMaʼlumotlar bazasini tekshirib koʻring yoki “Parametrlar” tugmasini bosib zaxiradan tiklang. Agar bu xabarni ko‘rishda davom etsangiz, bag haqida xabar yuboring:\n%1$s</string>
-    <string name="deck_repair_error">Kolleksiyani tuzatib boʻlmadi</string>
+    <string name="backup_restore_select_title">Qayta tiklaş uçun zaxira faylini tanlang</string>
+    <string name="backup_restore_no_backups">Bu qurilmada zaxira nusxalari mavjud emas. Agar  kompyuteringizda zaxira nusxalari bölsa, ularni qölda AnkiDroid jildiga köçiring.</string>
+    <string name="open_collection_failed_title">Kolleksiya oçilmadi</string>
+    <string name="corrupt_db_message">Kolleksiyangiz buzilgan.\n\nZaxiradan tiklaş uçun “Parametrlar” tugmasini bosing. Agar işlamasa, maʼlumotlar bazasini qölda tuzatiş böyiça quyidagi körsatmalarga murojaat qiling:\n%1$s</string>
+    <string name="access_collection_failed_message">Kolleksiyangizga kirişda xatolik yuz berdi. Bunga zararsiz bag sabab bölgan bölişi mumkin yoki u bilan boğliq muammo bölişi ham mumkin. \n\nMaʼlumotlar bazasini tekşirib köring yoki “Parametrlar” tugmasini bosib zaxiradan tiklang. Agar bu xabarni ko‘rişda davom etsangiz, bag haqida xabar yuboring:\n%1$s</string>
+    <string name="deck_repair_error">Kolleksiyani tuzatib bölmadi</string>
 </resources>
diff --git a/common/android/src/main/res/values-uz/10-preferences.xml b/common/android/src/main/res/values-uz/10-preferences.xml
index 724bbb392269..110d5ef99691 100644
--- a/common/android/src/main/res/values-uz/10-preferences.xml
+++ b/common/android/src/main/res/values-uz/10-preferences.xml
@@ -25,190 +25,198 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- generic strings -->
     <string name="enabled" comment="Generic label for something that is turned on">Enabled</string>
-    <string name="disabled" comment="Generic label for something that is turned off">Oʻchirilgan</string>
+    <string name="disabled" comment="Generic label for something that is turned off">Öçirilgan</string>
     <plurals name="pref_summ_minutes">
         <item quantity="one">%d daqiqa</item>
         <item quantity="other">%d daqiqa</item>
     </plurals>
     <string name="pref_milliseconds">%s ms</string>
     <!-- TODO: move to 20-search-preference so we can contribute upstream (searchpreference_no_results)-->
-    <string name="pref_search_no_results">Natija yoʻq</string>
+    <string name="pref_search_no_results">Natija yöq</string>
     <!-- preferences.xml categories-->
     <string name="pref_cat_general" comment="name of the general preference category" maxLength="41">Umumiy</string>
-    <string name="pref_cat_studying" maxLength="41">Oʻrganish</string>
+    <string name="pref_cat_studying" maxLength="41">Örganiş</string>
     <string name="pref_cat_system_wide" maxLength="41">Tizim miqyosida</string>
-    <string name="pref_cat_reviewing" maxLength="41">Takrorlash</string>
+    <string name="pref_cat_reviewing" maxLength="41">Takrorlaş</string>
     <string name="pref_cat_sync" comment="title of the sync preferences category" maxLength="41">Sinxronizatsiya</string>
-    <string name="pref_cat_scheduling" maxLength="41">Rejalashtirish</string>
+    <string name="pref_cat_scheduling" maxLength="41">Rejalaştiriş</string>
     <string name="pref_cat_whiteboard" maxLength="41">Yozuv taxtasi</string>
     <string name="pref_cat_themes" maxLength="41">Temalar</string>
-    <string name="pref_cat_gestures" maxLength="41">Qoʻl ishoralari</string>
-    <string name="pref_cat_controls" maxLength="41">Boshqaruvlar</string>
+    <string name="pref_cat_gestures" maxLength="41">Qöl işoralari</string>
+    <string name="pref_cat_controls" maxLength="41">Boşqaruvlar</string>
     <string name="pref_cat_advanced" maxLength="41">Kengaytirilgan</string>
-    <string name="pref_cat_workarounds" maxLength="41">Vaqtinchalik yechimlar</string>
+    <string name="pref_cat_workarounds" maxLength="41">Vaqtinçalik yeçimlar</string>
     <string name="pref_cat_plugins" maxLength="41">Plaginlar</string>
-    <string name="pref_cat_editing" maxLength="41">Tahrirlash</string>
+    <string name="pref_cat_editing" maxLength="41">Tahrirlaş</string>
     <string name="pref_cat_security" maxLength="41">Xavfsizlik</string>
     <!-- Card template JavaScript API permissions -->
     <string name="allow_dangerous_js_api_title" maxLength="41">Globally allow dangerous JavaScript APIs</string>
     <string name="allow_dangerous_js_api_summ">Allows any card or template to read and modify other cards, or your Anki collection data.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
-    <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
-    <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
+    <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launç other apps</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="card_external_launch_denied_snackbar">Security: Card blocked from launçing another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
-    <string name="whiteboard_stroke_width" maxLength="41">Chiziq kengligi</string>
-    <string name="use_input_tag" maxLength="41">Kartaga javobni kiritish</string>
-    <string name="use_input_tag_summ">Javobni kiritish uchun karta ichidagi matn kiritish maydonidan foydalanish</string>
-    <string name="reset_languages" maxLength="41">Tillarni qayta tiklash</string>
-    <string name="reset_languages_summ">Barcha dastalar uchun til taqsimotini qayta tiklash (nutq sintezatori va lugʻatlar uchun)</string>
-    <string name="reset_languages_question">Barcha til taqsimotlari qayta tiklansinmi?</string>
-    <string name="reset_confirmation">Barcha taqsimotlar qayta tiklandi</string>
-    <string name="card_zoom" maxLength="41">Karta masshtabi</string>
-    <string name="image_zoom" maxLength="41">Rasm masshtabi</string>
-    <string name="button_size" maxLength="41">Javob tugmasini oʻlchami</string>
-    <string name="card_browser_font_size" maxLength="41">Karta brauzeri shrift masshtabi</string>
-    <string name="card_browser_hide_media" maxLength="41">Karta brauzerda fayl nomlarini koʻrsatish</string>
-    <string name="card_browser_hide_media_summary">Audio fayl nomlarini karta brauzeri savol/javob maydonlarida ko\'rsatish</string>
+    <string name="whiteboard_stroke_width" maxLength="41">Çiziq kengligi</string>
+    <string name="use_input_tag" maxLength="41">Kartaga javobni kiritiş</string>
+    <string name="use_input_tag_summ">Javobni kiritiş uçun karta içidagi matn kiritiş maydonidan foydalaniş</string>
+    <string name="reset_languages" maxLength="41">Tillarni qayta tiklaş</string>
+    <string name="reset_languages_summ">Barça dastalar uçun til taqsimotini qayta tiklaş (nutq sintezatori va luğatlar uçun)</string>
+    <string name="reset_languages_question">Barça til taqsimotlari qayta tiklansinmi?</string>
+    <string name="reset_confirmation">Barça taqsimotlar qayta tiklandi</string>
+    <string name="card_zoom" maxLength="41">Karta masştabi</string>
+    <string name="image_zoom" maxLength="41">Rasm masştabi</string>
+    <string name="button_size" maxLength="41">Javob tugmasini ölçami</string>
+    <string name="card_browser_font_size" maxLength="41">Karta brauzeri şrift masştabi</string>
+    <string name="card_browser_hide_media" maxLength="41">Karta brauzerda fayl nomlarini körsatiş</string>
+    <string name="card_browser_hide_media_summary">Audio fayl nomlarini karta brauzeri savol/javob maydonlarida körsatiş</string>
     <string name="col_path" maxLength="41">AnkiDroid katalogi</string>
     <string name="fullscreen_review" maxLength="41">Butun ekran rejimi</string>
-    <string name="full_screen_off" comment="Value of the fullscreen mode preference meaning fullscreen is not used">Oʻchiq</string>
-    <string name="full_screen_system">Tizim panellarini yashirish</string>
-    <string name="full_screen_complete">Tizim panellarini va javob tugmalarini yashirish</string>
-    <string name="answer_buttons_position" maxLength="41">Javob tugmalari joylashuvi</string>
+    <string name="full_screen_off" comment="Value of the fullscreen mode preference meaning fullscreen is not used">Öçiq</string>
+    <string name="full_screen_system">Tizim panellarini yaşiriş</string>
+    <string name="full_screen_complete">Tizim panellarini va javob tugmalarini yaşiriş</string>
+    <string name="answer_buttons_position" maxLength="41">Javob tugmalari joylaşuvi</string>
     <string-array name="answer_buttons_position_labels">
         <item>Yuqorida</item>
         <item>Pastda</item>
-        <item>Hech qaysi</item>
+        <item>Heç qaysi</item>
     </string-array>
-    <string name="gestures" maxLength="41">Qoʻl ishoralarini yoqish</string>
-    <string name="gestures_summ">Javob berish va kartalarni tahrirlash kabi amallarga qoʻl ishoralarni belgilang.</string>
-    <string name="gestures_corner_touch" maxLength="41">9 bosish nuqtalari</string>
-    <string name="gestures_corner_touch_summary">Ekran burchaklarida bosish ishoralariga ruxsat berish</string>
-    <string name="show_keyboard_shortcuts" maxLength="41">Klaviatura yorliqlarini koʻrsatish</string>
+    <string name="gestures" maxLength="41">Qöl işoralarini yoqiş</string>
+    <string name="gestures_summ">Javob beriş va kartalarni tahrirlaş kabi amallarga qöl işoralarni belgilang.</string>
+    <string name="gestures_corner_touch" maxLength="41">9 bosiş nuqtalari</string>
+    <string name="gestures_corner_touch_summary">Ekran burçaklarida bosiş işoralariga ruxsat beriş</string>
+    <string name="show_keyboard_shortcuts" maxLength="41">Klaviatura yorliqlarini körsatiş</string>
     <string name="gestures_full_screen_nav_drawer" maxLength="41">Butun ekran navigatsiya tortmasi</string>
-    <string name="gestures_fullscreen_nav_drawer_summary">Ekranning istalgan joyidan oʻngga surilganda navigatsiya tortmasini ochish</string>
-    <string name="gestures_none" maxLength="41" comment="No gestures">Hech qaysi</string>
-    <string name="gestures_swipe_up" maxLength="41">Yuqoriga surish</string>
-    <string name="gestures_swipe_down" maxLength="41">Pastga surish</string>
-    <string name="gestures_swipe_left" maxLength="41">Chapga surish</string>
-    <string name="gestures_swipe_right" maxLength="41">Oʻngga surish</string>
-    <string name="gestures_double_tap" maxLength="41">Ikki marta bosish</string>
-    <string name="gestures_tap_top" maxLength="41">Yuqorini bosish</string>
-    <string name="gestures_tap_left" maxLength="41">Chapni bosish</string>
-    <string name="gestures_tap_right" maxLength="41">Oʻngni bosish</string>
-    <string name="gestures_tap_bottom" maxLength="41">Pastni bosish</string>
-    <string name="gestures_corner_tap_top_left" maxLength="41">Yuqori chap tomonni bosish</string>
-    <string name="gestures_corner_tap_top_right" maxLength="41">Yuqori oʻng tomonni bosish</string>
-    <string name="gestures_corner_tap_middle_center" maxLength="41">Oʻrta markazni bosish</string>
-    <string name="gestures_corner_tap_bottom_left" maxLength="41">Pastki chap tomonni bosish</string>
-    <string name="gestures_corner_tap_bottom_right" maxLength="41">Pastki oʻng tomonni bosish</string>
-    <string name="gestures_two_finger_tap" maxLength="41">Ikki barmoq bilan bosish</string>
-    <string name="gestures_three_finger_tap" maxLength="41">Uch barmoq bilan bosish</string>
-    <string name="gestures_four_finger_tap" maxLength="41">Toʻrt barmoq bilan bosish</string>
-    <string name="gestures_shake" maxLength="41">Qurilmani silkitish</string>
+    <string name="gestures_fullscreen_nav_drawer_summary">Ekranning istalgan joyidan öngga surilganda navigatsiya tortmasini oçiş</string>
+    <string name="gestures_none" maxLength="41" comment="No gestures">Heç qaysi</string>
+    <string name="gestures_swipe_up" maxLength="41">Yuqoriga suriş</string>
+    <string name="gestures_swipe_down" maxLength="41">Pastga suriş</string>
+    <string name="gestures_swipe_left" maxLength="41">Çapga suriş</string>
+    <string name="gestures_swipe_right" maxLength="41">Öngga suriş</string>
+    <string name="gestures_double_tap" maxLength="41">Ikki marta bosiş</string>
+    <string name="gestures_tap_top" maxLength="41">Yuqorini bosiş</string>
+    <string name="gestures_tap_left" maxLength="41">Çapni bosiş</string>
+    <string name="gestures_tap_right" maxLength="41">Öngni bosiş</string>
+    <string name="gestures_tap_bottom" maxLength="41">Pastni bosiş</string>
+    <string name="gestures_corner_tap_top_left" maxLength="41">Yuqori çap tomonni bosiş</string>
+    <string name="gestures_corner_tap_top_right" maxLength="41">Yuqori öng tomonni bosiş</string>
+    <string name="gestures_corner_tap_middle_center" maxLength="41">Örta markazni bosiş</string>
+    <string name="gestures_corner_tap_bottom_left" maxLength="41">Pastki çap tomonni bosiş</string>
+    <string name="gestures_corner_tap_bottom_right" maxLength="41">Pastki öng tomonni bosiş</string>
+    <string name="gestures_two_finger_tap" maxLength="41">Ikki barmoq bilan bosiş</string>
+    <string name="gestures_three_finger_tap" maxLength="41">Uç barmoq bilan bosiş</string>
+    <string name="gestures_four_finger_tap" maxLength="41">Tört barmoq bilan bosiş</string>
+    <string name="gestures_shake" maxLength="41">Qurilmani silkitiş</string>
     <string name="card_browser_enable_external_context_menu" maxLength="41">‘%s’ menu</string>
     <string name="card_browser_enable_external_context_menu_summary">“%s” kontekst menyusini ilova miqyosda yoqadi</string>
-    <string name="double_scrolling_gap" maxLength="41">Tez aylantirish</string>
-    <string name="double_scrolling_gap_summ">Agar siz eReader bilan aylanma masofani ikki baravar oshirishni istasangiz, buni yoqing</string>
-    <string name="swipe_sensitivity" maxLength="41">Surish sezgirligi</string>
+    <string name="double_scrolling_gap" maxLength="41">Tez aylantiriş</string>
+    <string name="double_scrolling_gap_summ">Agar siz eReader bilan aylanma masofani ikki baravar oşirişni istasangiz, buni yoqing</string>
+    <string name="swipe_sensitivity" maxLength="41">Suriş sezgirligi</string>
     <string name="tts" maxLength="41">Nutq sintezatori</string>
-    <string name="tts_summ">Agar ovoz fayli kiritilmagan boʻlsa, savol va javobni oʻqib beradi</string>
+    <string name="tts_summ">Agar ovoz fayli kiritilmagan bölsa, savol va javobni öqib beradi</string>
     <!-- Sync -->
-    <string name="sync_fetch_missing_media" maxLength="41">Media fayllarni sinxronlashda olib kelish</string>
+    <string name="sync_fetch_missing_media" maxLength="41">Media fayllarni sinxronlaşda olib keliş</string>
     <string name="sync_account_summ_logged_out">Tizimga kirilmagan</string>
     <string name="automatic_sync_choice" maxLength="41">Avtomatik sinxronizatsiya</string>
-    <string name="automatic_sync_choice_summ">Agar oxirgi sinxronlash 10 daqiqadan oldinroq amalga oshirilgan boʻlsa, ilovani ishga tushirish/chiqish vaqtida avtomatik sinxronlash.</string>
+    <string name="automatic_sync_choice_summ">Agar oxirgi sinxronlaş 10 daqiqadan oldinroq amalga oşirilgan bölsa, ilovani işga tuşiriş/çiqiş vaqtida avtomatik sinxronlaş.</string>
     <string name="sync_media_always" comment="Option to always fetch media when syncing">Har doim</string>
-    <string name="sync_media_only_unmetered">Faqat cheklanmagan ulanishlarda</string>
-    <string name="sync_media_never">Hech qachon</string>
-    <string name="sync_status_badge" maxLength="41">Sinxronizatsiya holatini koʻrsatish</string>
-    <string name="sync_status_badge_summ">Oʻzgarishlarni yuklash mumkin boʻlganda sinxronlash belgisini oʻzgartirish</string>
-    <string name="metered_sync_title" maxLength="41">Tarifli ulanishlarda sinx. ruxsat berish</string>
-    <string name="metered_sync_summary">Agar oʻchirilgan boʻlsa, tarifli ulanishda sinxronlashga harakat qilsangiz, siz ogohlantirilasiz</string>
-    <string name="backup_limits_frequency">Chastota</string>
-    <string name="backup_limits_lifetime">Saqlash davri</string>
+    <string name="sync_media_only_unmetered">Faqat çeklanmagan ulanişlarda</string>
+    <string name="sync_media_never">Heç qaçon</string>
+    <string name="sync_status_badge" maxLength="41">Sinxronizatsiya holatini körsatiş</string>
+    <string name="sync_status_badge_summ">Özgarişlarni yuklaş mumkin bölganda sinxronlaş belgisini özgartiriş</string>
+    <string name="metered_sync_title" maxLength="41">Tarifli ulanişlarda sinx. ruxsat beriş</string>
+    <string name="metered_sync_summary">Agar öçirilgan bölsa, tarifli ulanişda sinxronlaşga harakat qilsangiz, siz ogohlantirilasiz</string>
+    <string name="backup_limits_frequency">Çastota</string>
+    <string name="backup_limits_lifetime">Saqlaş davri</string>
     <string name="app_theme" maxLength="41">Tema</string>
     <string name="day_theme" maxLength="41">Kunduzgi tema</string>
     <string name="night_theme" maxLength="41">Tungi tema</string>
     <string name="language" maxLength="41">Til</string>
     <string name="language_system">Tizim tili</string>
-    <string name="notification_pref" maxLength="41">Bildirishnomalar</string>
-    <string name="notification_pref_title" maxLength="41">Meni xabardor qil qachonki</string>
-    <string name="never_notify">Hech qachon xabardor qilma</string>
-    <string name="notify_when_pending">Kultayotgan xabarlar mavjud boʻlsa</string>
+    <string name="notification_pref" maxLength="41">Bildirişnomalar</string>
+    <string name="notification_pref_title" maxLength="41">Meni xabardor qil qaçonki</string>
+    <string name="never_notify">Heç qaçon xabardor qilma</string>
+    <string name="notify_when_pending">Kultayotgan xabarlar mavjud bölsa</string>
     <string name="notification_minimum_cards_due" comment="Consider keeping the unbreakable space after the digit">%d tadan ortiq kartani muddati kelsa</string>
-    <string name="notification_minimum_cards_due_vibrate" maxLength="41">Tebranish</string>
-    <string name="notification_minimum_cards_due_blink" maxLength="41">Chiroqni miltillatish</string>
-    <string name="select_locale_title">Tilni tanlash</string>
-    <string name="software_render" maxLength="41">Qurilma renderini oʻchirish</string>
-    <string name="software_render_summ">Qurilma renderi tezroq, lekin muammolarga duch kelishi mumkin, xususan, Android 8/8.1ʼda. Agar siz kartani takrorlash foydalanuvchi interfeysi qismlarini koʻrmasangiz, ushbu sozlamani sinab koʻring.</string>
+    <string name="notification_minimum_cards_due_vibrate" maxLength="41">Tebraniş</string>
+    <string name="notification_minimum_cards_due_blink" maxLength="41">Çiroqni miltillatiş</string>
+    <string name="select_locale_title">Tilni tanlaş</string>
+    <string name="software_render" maxLength="41">Qurilma renderini öçiriş</string>
+    <string name="software_render_summ">Qurilma renderi tezroq, lekin muammolarga duç kelişi mumkin, xususan, Android 8/8.1ʼda. Agar siz kartani takrorlaş foydalanuvçi interfeysi qismlarini körmasangiz, uşbu sozlamani sinab köring.</string>
     <string name="disable_extended_text_ui" maxLength="41">Disable single-field edit mode</string>
     <!--See: multimedia_editor_popup_cloze. We can\'t use format strings as this is auto-generated-->
     <string name="disable_extended_text_ui_summ">Allows \'Cloze deletion\' context menu when in landscape mode.</string>
-    <string name="vertical_centering" maxLength="41">Markazga tenglashtirish</string>
-    <string name="vertical_centering_summ">Kartalar tarkibini vertikal ravishda markazga tekislash</string>
-    <string name="pref_double_tap_time_interval" maxLength="41">Ikki marta bosish intervali</string>
-    <string name="pref_double_tap_time_interval_summary">Agar bu vaqt oʻtmagan boʻlsa, javob tugmasini ikkinchi marta bosish eʼtiborga olinmaydi. Bu tasodifiy ikki marta bosishni oldini oladi</string>
-    <string name="pref_show_answer_long_press_time" maxLength="41">Javob koʻrsatish uchun uzoq bosish vaqti</string>
-    <string name="pref_show_answer_long_press_time_summary">Javobni koʻrsatish tugmasi bosishni aniqlaguncha bosishning minimal vaqti</string>
-    <string name="show_estimates" maxLength="41">Tugmada vaqtni koʻrsatish</string>
-    <string name="show_estimates_summ">Javob tugmalarida keyingi takrorlash vaqtini koʻrsatish</string>
-    <string name="show_large_answer_buttons" maxLength="41">Katta javob tugmalarini koʻrsatish</string>
-    <string name="show_large_answer_buttons_summ">Javob tugmalarini 2 qatorda koʻrsatish</string>
-    <string name="remove_animations" maxLength="41">Animatsiyalarni o\'chirish</string>
+    <string name="vertical_centering" maxLength="41">Markazga tenglaştiriş</string>
+    <string name="vertical_centering_summ">Kartalar tarkibini vertikal ravişda markazga tekislaş</string>
+    <string name="pref_double_tap_time_interval" maxLength="41">Ikki marta bosiş intervali</string>
+    <string name="pref_double_tap_time_interval_summary">Agar bu vaqt ötmagan bölsa, javob tugmasini ikkinçi marta bosiş eʼtiborga olinmaydi. Bu tasodifiy ikki marta bosişni oldini oladi</string>
+    <string name="pref_show_answer_long_press_time" maxLength="41">Javob körsatiş uçun uzoq bosiş vaqti</string>
+    <string name="pref_show_answer_long_press_time_summary">Javobni körsatiş tugmasi bosişni aniqlagunça bosişning minimal vaqti</string>
+    <string name="show_estimates" maxLength="41">Tugmada vaqtni körsatiş</string>
+    <string name="show_estimates_summ">Javob tugmalarida keyingi takrorlaş vaqtini körsatiş</string>
+    <string name="show_large_answer_buttons" maxLength="41">Katta javob tugmalarini körsatiş</string>
+    <string name="show_large_answer_buttons_summ">Javob tugmalarini 2 qatorda körsatiş</string>
+    <string name="remove_animations" maxLength="41">Animatsiyalarni öçiriş</string>
     <string name="remove_animations_summary">Also enabled if animations are removed on the system settings</string>
-    <string name="show_top_bar" maxLength="41">Yuqorigi panelni koʻrsatish</string>
-    <string name="show_top_bar_summary">Kartalar soni, javob vaqti, bayroq va belgini yuqorigi panelda koʻrsatish</string>
-    <string name="show_progress" maxLength="41">Qancha qolganini koʻrsatish</string>
-    <string name="show_progress_summ">Qolgan kartalar sonini koʻrsatish</string>
-    <string name="show_eta" maxLength="41">Qolgan vaqtni koʻrsatish</string>
-    <string name="show_eta_summ">Qolgan vaqtni koʻrsatish</string>
-    <string name="use_current" maxLength="41">Yangi kartalar uchun dasta</string>
-    <string name="learn_cutoff" maxLength="41">Oldindan oʻrganish chegarasi</string>
-    <string name="time_limit" maxLength="41">Vaqt chegarasi</string>
-    <string name="day_offset_with_description" maxLength="41">Keyingi kun boshlanishi</string>
+    <string name="show_top_bar" maxLength="41">Yuqorigi panelni körsatiş</string>
+    <string name="show_top_bar_summary">Kartalar soni, javob vaqti, bayroq va belgini yuqorigi panelda körsatiş</string>
+    <string name="show_progress" maxLength="41">Qança qolganini körsatiş</string>
+    <string name="show_progress_summ">Qolgan kartalar sonini körsatiş</string>
+    <string name="show_eta" maxLength="41">Qolgan vaqtni körsatiş</string>
+    <string name="show_eta_summ">Qolgan vaqtni körsatiş</string>
+    <string name="use_current" maxLength="41">Yangi kartalar uçun dasta</string>
+    <string name="learn_cutoff" maxLength="41">Oldindan örganiş çegarasi</string>
+    <string name="time_limit" maxLength="41">Vaqt çegarasi</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into şorter sessions to help you stay focused. When the time limit is reaçed, you\'ll see how many cards you studied and can çoose to take a break or continue.</string>
+    <string name="day_offset_with_description" maxLength="41">Keyingi kun boşlanişi</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
-        <item quantity="one" comment="Consider keeping the unbreakable space after the digit">Yarim tundan %d soatdan soʻng</item>
-        <item quantity="other" comment="Consider keeping the unbreakable space after the digit">Yarim tundan %d soatdan soʻng</item>
+        <item quantity="one" comment="Consider keeping the unbreakable space after the digit">Yarim tundan %d soatdan söng</item>
+        <item quantity="other" comment="Consider keeping the unbreakable space after the digit">Yarim tundan %d soatdan söng</item>
     </plurals>
     <string name="pref_keep_screen_on" maxLength="41">Ekran yoniq qolsin</string>
-    <string name="pref_keep_screen_on_summ">Ekran taym-autini oʻchirish</string>
-    <string name="enable_api_title" maxLength="41">AnkiDroid APIʼni yoqish</string>
-    <string name="enable_api_summary">Boshqa ilovalarga AnkiDroidʼga ulanishib sizning aralashuvingizsiz maʼlumotlarni oʻqish/yozishga ruxsat berish</string>
+    <string name="pref_keep_screen_on_summ">Ekran taym-autini öçiriş</string>
+    <string name="enable_api_title" maxLength="41">AnkiDroid APIʼni yoqiş</string>
+    <string name="enable_api_summary">Boşqa ilovalarga AnkiDroidʼga ulanişib sizning aralaşuvingizsiz maʼlumotlarni öqiş/yozişga ruxsat beriş</string>
     <string name="custom_buttons" maxLength="41">Ilova paneli tugmalari</string>
-    <string name="custom_buttons_summary">Ilova panelida qaysi amallar koʻrsatilishini moslashtiring</string>
-    <string name="custom_buttons_setting_always_show">Har doim koʻrsatiladi</string>
-    <string name="custom_buttons_setting_if_room">Joy boʻlsa koʻrsatiladi</string>
+    <string name="custom_buttons_summary">Ilova panelida qaysi amallar körsatilişini moslaştiring</string>
+    <string name="custom_buttons_setting_always_show">Har doim körsatiladi</string>
+    <string name="custom_buttons_setting_if_room">Joy bölsa körsatiladi</string>
     <string name="custom_buttons_setting_menu_only">Faqat menyuda</string>
-    <string name="reset_custom_buttons" maxLength="41">Birlamchiga qaytarish</string>
-    <string name="reset_settings_to_default">Sozlamalarni birlamchiga qaytarish</string>
-    <string name="reset">Qayta tiklash</string>
-    <string name="thirdparty_apps_title" maxLength="41">Uchinchi tomon API ilovalari</string>
-    <string name="thirdparty_apps_summary">Lugʻatlar, yordamchi dasturlar kabi AnkiDroid APIʼdan foydalanadigan ilovalar roʻyxatini koʻrish.</string>
-    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Takrorlashlar</string>
-    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Oldindan koʻrish</string>
-    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Faqat orqa tarafini koʻrsatish</string>
+    <string name="reset_custom_buttons" maxLength="41">Birlamçiga qaytariş</string>
+    <string name="reset_settings_to_default">Sozlamalarni birlamçiga qaytariş</string>
+    <string name="reset">Qayta tiklaş</string>
+    <string name="thirdparty_apps_title" maxLength="41">Uçinçi tomon API ilovalari</string>
+    <string name="thirdparty_apps_summary">Luğatlar, yordamçi dasturlar kabi AnkiDroid APIʼdan foydalanadigan ilovalar röyxatini köriş.</string>
+    <string name="pref_controls_reviews_tab" maxLength="41" comment="Name of the tab to configure controls for the reviews screen">Takrorlaşlar</string>
+    <string name="pref_controls_previews_tab" maxLength="41" comment="Name of the tab to configure controls for the previews screen">Oldindan köriş</string>
+    <string name="toggle_backside_only" maxLength="41" comment="Control setting that toggles \'Backside only\' in the previews screen">Faqat orqa tarafini körsatiş</string>
     <!-- Appearance settings -->
-    <string name="pref_cat_reviewer" maxLength="41">Oʻrganish ekrani</string>
-    <string name="show_deck_title" maxLength="41">Dasta sarlavhasini koʻrsatish</string>
+    <string name="pref_cat_reviewer" maxLength="41">Örganiş ekrani</string>
+    <string name="show_deck_title" maxLength="41">Dasta sarlavhasini körsatiş</string>
     <string name="accessibility" maxLength="41">Maxsus imkoniyatlar</string>
-    <string name="exit_via_double_tap_back" maxLength="41">Orqaga qaytish/chiqish uchun \"Orqaga\" tugmasini ikki marta bosish</string>
-    <string name="exit_via_double_tap_back_summ">Oʻrganish ekranini yoki ilovani tasodifan tark etmaslik uchun</string>
+    <string name="exit_via_double_tap_back" maxLength="41">Orqaga qaytiş/çiqiş uçun \"Orqaga\" tugmasini ikki marta bosiş</string>
+    <string name="exit_via_double_tap_back_summ">Örganiş ekranini yoki ilovani tasodifan tark etmaslik uçun</string>
     <!-- Allow all files in media imports -->
-    <string name="media_import_allow_all_files" maxLength="41">Barcha media fayllar importiga ruxsat berish</string>
+    <string name="media_import_allow_all_files" maxLength="41">Barça media fayllar importiga ruxsat beriş</string>
     <string name="media_import_allow_all_files_summ">Agar Android media faylni tanimasa</string>
     <!-- Custom sync server settings -->
-    <string name="custom_sync_server_title" maxLength="41">Moslashtirilgan sinxronizatsiya serveri</string>
-    <string name="custom_sync_server_summary_none_of_the_two_servers_used" comment="This summary is shown when neither of the two custom sync servers are used,         which is the default.">Ishlatilmaydi</string>
-    <string name="custom_sync_server_help2"><![CDATA[        AnkiWeb bilan sinxronlashga muqobil sifatida,
-        sinxronlash uchun oʻz serveringizdan foydalanishingiz mumkin.
-        Agar sozlanmagan boʻlsa, oʻrniga birlamchi AnkiWeb serveri ishlatiladi.
+    <string name="custom_sync_server_title" maxLength="41">Moslaştirilgan sinxronizatsiya serveri</string>
+    <string name="custom_sync_server_summary_none_of_the_two_servers_used" comment="This summary is shown when neither of the two custom sync servers are used,         which is the default.">Işlatilmaydi</string>
+    <string name="custom_sync_server_help2"><![CDATA[        AnkiWeb bilan sinxronlaşga muqobil sifatida,
+        sinxronlaş uçun öz serveringizdan foydalanişingiz mumkin.
+        Agar sozlanmagan bölsa, örniga birlamçi AnkiWeb serveri işlatiladi.
         <a href="%s">Batafsil maʼlumot</a>
         ]]></string>
-    <string name="custom_sync_server_base_url_title" maxLength="41">Sinxronlash URLʼi</string>
-    <string name="custom_sync_certificate_title" maxLength="41">Moslashtirilgan root sertifikati (PEM)</string>
+    <string name="custom_sync_server_base_url_title" maxLength="41">Sinxronlaş URLʼi</string>
+    <string name="custom_sync_certificate_title" maxLength="41">Moslaştirilgan root sertifikati (PEM)</string>
     <!-- Key Bindings -->
     <string name="keyboard">Klaviatura</string>
     <string name="bluetooth">Bluetooth</string>
@@ -217,7 +225,7 @@
     <string name="note" maxLength="41">Qayd</string>
     <string name="navigation" maxLength="41">Navigatsiya</string>
     <string name="media" maxLength="41">Media fayllar</string>
-    <string name="misc" maxLength="41">Boshqa</string>
+    <string name="misc" maxLength="41">Boşqa</string>
     <!-- #######################################################################################
          ################################## Review reminders ###################################
          ####################################################################################### -->
@@ -227,12 +235,12 @@
     <string name="review_reminders_summary_deck_specific" comment="The descriptor for reminders attached to one particular deck.">Deck-specific</string>
     <string name="review_reminders_load_error" comment="Error dialog shown when stored review reminders could not be read back. Technical details follow this text.">An error occurred while loading your review reminders, corrupted reminders have been deleted. Details:</string>
     <!-- Schedule reminders screen -->
-    <string name="schedule_reminders_title" maxLength="28" comment="Name of the menu option for scheduling review reminders for a deck.">Schedule reminders</string>
-    <string name="add_reminder" comment="Label for the add reminder button in the screen for adding and editing review reminders">Bildirishnoma qoʻshish</string>
-    <string name="you_have_no_review_reminders" comment="Text that appears in the review reminder editing screen when there are no reminders set">Siza hech qanday takrorlash bildirishnomalari yoʻq</string>
-    <string name="schedule_reminders_troubleshoot_menu" maxLength="28" comment="Text in a menu button which opens a screen for diagnosing why review reminders may not be delivered.">Troubleshoot</string>
+    <string name="schedule_reminders_title" maxLength="28" comment="Name of the menu option for scheduling review reminders for a deck.">Sçedule reminders</string>
+    <string name="add_reminder" comment="Label for the add reminder button in the screen for adding and editing review reminders">Bildirişnoma qöşiş</string>
+    <string name="you_have_no_review_reminders" comment="Text that appears in the review reminder editing screen when there are no reminders set">Siza heç qanday takrorlaş bildirişnomalari yöq</string>
+    <string name="schedule_reminders_troubleshoot_menu" maxLength="28" comment="Text in a menu button which opens a screen for diagnosing why review reminders may not be delivered.">Troubleşoot</string>
     <string name="schedule_reminders_notification_settings_menu" maxLength="28" comment="Text in a menu button which opens the operating system notification settings for the app.">Notification settings</string>
-    <string name="schedule_reminders_list_content_description" comment="Accessibility description of the list showing scheduled review reminders.">List of scheduled review reminders</string>
+    <string name="schedule_reminders_list_content_description" comment="Accessibility description of the list showing scheduled review reminders.">List of sçeduled review reminders</string>
     <string name="schedule_reminders_deck_not_found" comment="Shown in place of a deck name when the deck a review reminder points at no longer exists.">Deck not found</string>
     <string name="schedule_reminders_unavailable" comment="Pop-up text shown when review reminders cannot be delivered at all, such as due to missing permissions.">Reminders are unavailable</string>
     <string name="schedule_reminders_fix" comment="Text for the button which, when pressed, opens the review reminder troubleshooting screen for fixing issues with review reminders.">Fix</string>
@@ -240,26 +248,27 @@
     <string name="schedule_reminders_deleted" comment="Pop-up text which confirms a review reminder was deleted.">Successfully deleted review reminder</string>
     <string name="schedule_reminders_edited" comment="Pop-up text which confirms an existing review reminder was changed.">Successfully edited review reminder</string>
     <!-- Add / edit reminder dialog -->
-    <string name="add_review_reminder" comment="Title of the dialog for creating a new review reminder.">Takrorlash bildirishnomasini qoʻshish</string>
-    <string name="edit_review_reminder" comment="Title of the dialog for editing an existing review reminder.">Takrorlash bildirishnomasini tahrirlash</string>
+    <string name="add_review_reminder" comment="Title of the dialog for creating a new review reminder.">Takrorlaş bildirişnomasini qöşiş</string>
+    <string name="edit_review_reminder" comment="Title of the dialog for editing an existing review reminder.">Takrorlaş bildirişnomasini tahrirlaş</string>
     <string name="add_edit_reminder_time_label" comment="Label of the field for choosing what time of day a review reminder fires.">Time:</string>
     <string name="add_edit_reminder_deck_label" comment="Label of the field for choosing which deck a review reminder applies to.">Deck:</string>
     <string name="add_edit_reminder_advanced_label" comment="Header of the collapsible section holding extra review reminder customization options.">Advanced settings</string>
-    <string name="add_edit_reminder_card_threshold_label" comment="Label of the field setting the minimum number of due cards needed before a review reminder fires.">Card threshold:</string>
+    <string name="add_edit_reminder_card_threshold_label" comment="Label of the field setting the minimum number of due cards needed before a review reminder fires.">Card threşold:</string>
     <string name="add_edit_reminder_card_threshold_description" comment="Explanation shown under the card threshold field.">Do not send me notifications if there are less than this many cards due</string>
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
-    <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threşold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
     <string name="reminder_troubleshooting_summary_error" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when reminders cannot be delivered at all.">Reminders are unavailable.</string>
     <string name="reminder_troubleshooting_summary_warning" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when reminders may be delayed or suppressed.">Reminders may not work correctly.</string>
-    <string name="reminder_troubleshooting_summary_ok" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when no issues are found.">Your reminders should work as expected.</string>
-    <string name="reminder_troubleshooting_footer" comment="Closing advice at the bottom of the review reminder troubleshooting screen.">Different devices have different notification restriction settings. Check your system settings or search online if issues persist.</string>
+    <string name="reminder_troubleshooting_summary_ok" comment="Overall verdict shown at the top of the review reminder troubleshooting screen when no issues are found.">Your reminders şould work as expected.</string>
+    <string name="reminder_troubleshooting_footer" comment="Closing advice at the bottom of the review reminder troubleshooting screen.">Different devices have different notification restriction settings. Çeck your system settings or searç online if issues persist.</string>
     <!-- Troubleshooting check titles -->
     <string name="reminder_troubleshooting_check_notification_permission" comment="Name of a review reminder troubleshooting check: whether the app may post notifications.">Notification permission</string>
-    <string name="reminder_troubleshooting_check_notification_channel" comment="Name of a review reminder troubleshooting check: whether the review reminders notification channel is turned on.">Notification channel</string>
+    <string name="reminder_troubleshooting_check_notification_channel" comment="Name of a review reminder troubleshooting check: whether the review reminders notification channel is turned on.">Notification çannel</string>
     <string name="reminder_troubleshooting_check_do_not_disturb" comment="Name of a review reminder troubleshooting check: whether the system Do Not Disturb mode is active.">Do not disturb</string>
     <string name="reminder_troubleshooting_check_battery_optimization" comment="Name of a review reminder troubleshooting check: whether the system restricts the app\'s background battery usage.">Battery optimization</string>
     <string name="reminder_troubleshooting_check_power_saving_mode" comment="Name of a review reminder troubleshooting check: whether the system power saving mode is active.">Power saving mode</string>
@@ -273,15 +282,15 @@
     <string name="reminder_troubleshooting_status_optimized" comment="Status of the review reminder battery optimization check: the system may delay the app in the background.">Optimized</string>
     <string name="reminder_troubleshooting_status_restricted" comment="Status of the review reminder battery optimization check: the app is barred from running in the background.">Restricted</string>
     <!-- Troubleshooting check explanations -->
-    <string name="reminder_troubleshooting_explanation_notification_channel" comment="Explains why review reminders need notification permissions to work correctly.">The review reminder notification channel must be enabled</string>
+    <string name="reminder_troubleshooting_explanation_notification_channel" comment="Explains why review reminders need notification permissions to work correctly.">The review reminder notification çannel must be enabled</string>
     <string name="reminder_troubleshooting_explanation_do_not_disturb" comment="Explains why review reminders may need Do Not Disturb to be disabled to work correctly.">Do Not Disturb may mute reminder notifications</string>
     <string name="reminder_troubleshooting_explanation_battery_optimized" comment="Explains to the user that AnkiDroid\'s battery usage is optimized, and that battery usage may need to be enabled for review reminders to work correctly.">Battery optimization may delay reminders</string>
     <string name="reminder_troubleshooting_explanation_battery_restricted" comment="Explains to the user that AnkiDroid\'s battery usage is restricted, and that battery usage may need to be enabled for review reminders to work correctly.">Background usage is disabled. Reminders may not be delivered</string>
     <string name="reminder_troubleshooting_explanation_power_saving_mode" comment="Explains why review reminders may need power saving mode to be disabled to work correctly.">Power saving mode may prevent timely delivery of reminders</string>
-    <string name="reminder_troubleshooting_explanation_exact_alarm" comment="Explains that AnkiDroid cannot schedule alarms at exact times unless the exact-alarm permission is granted.">Required to schedule reminders at exact times</string>
+    <string name="reminder_troubleshooting_explanation_exact_alarm" comment="Explains that AnkiDroid cannot schedule alarms at exact times unless the exact-alarm permission is granted.">Required to sçedule reminders at exact times</string>
     <!-- Troubleshooting check actions -->
     <string name="reminder_troubleshooting_action_grant_permission" comment="Button resolving a failing review reminder troubleshooting check by asking for a permission.">Grant permission</string>
-    <string name="reminder_troubleshooting_action_enable_notification_channel" comment="Button resolving a failing review reminder troubleshooting check by opening the operating system notification settings screen.">Enable notification channel</string>
+    <string name="reminder_troubleshooting_action_enable_notification_channel" comment="Button resolving a failing review reminder troubleshooting check by opening the operating system notification settings screen.">Enable notification çannel</string>
     <string name="reminder_troubleshooting_action_disable_battery_optimization" comment="Button resolving a failing review reminder troubleshooting check by asking the user to exempt the app from battery optimization.">Disable battery optimization</string>
     <string name="reminder_troubleshooting_action_open_battery_settings" comment="Button resolving a failing review reminder troubleshooting check by opening the operating system battery settings screen.">Open battery settings</string>
     <!-- Notification content -->
@@ -293,92 +302,92 @@
         <item quantity="other">%d cards due</item>
     </plurals>
     <!-- studyoptions -->
-    <string name="studyoptions_limit_select_tags">Teglarni tanlash</string>
+    <string name="studyoptions_limit_select_tags">Teglarni tanlaş</string>
     <!-- Deck configurations -->
     <string name="deck_conf_general" maxLength="41" comment="Label of the submenu for the general options of new deck">Umumiy</string>
-    <string name="deck_conf_cram_search" maxLength="41" comment="Label of a text field that contains a search query.">Qidirish</string>
+    <string name="deck_conf_cram_search" maxLength="41" comment="Label of a text field that contains a search query.">Qidiriş</string>
     <!-- analytics options -->
-    <string name="analytics_dialog_title">AnkiDroidʼni yaxshilashga yordamlashing!</string>
-    <string name="analytics_title" maxLength="41">Funksiyalarni ishlatishimni ulashish</string>
-    <string name="analytics_summ">Dasturchilarga odamlar qaysi funksiyalardan foydalanayotganligini koʻrishga yordam berish orqali AnkiDroidʼga hissa qoʻshishingiz mumkin</string>
-    <string name="note_editor_replace_newlines" maxLength="41">Yangi qatorlarni HTML bilan almashtirish</string>
+    <string name="analytics_dialog_title">AnkiDroidʼni yaxşilaşga yordamlaşing!</string>
+    <string name="analytics_title" maxLength="41">Funksiyalarni işlatişimni ulaşiş</string>
+    <string name="analytics_summ">Dasturçilarga odamlar qaysi funksiyalardan foydalanayotganligini körişga yordam beriş orqali AnkiDroidʼga hissa qöşişingiz mumkin</string>
+    <string name="note_editor_replace_newlines" maxLength="41">Yangi qatorlarni HTML bilan almaştiriş</string>
     <string name="note_editor_replace_newlines_summ">In the note editor, convert any instances of &lt;br&gt; to newlines when editing a card.</string>
-    <string name="type_in_answer_focus" maxLength="41">‘Javobni kiritish’ maydoniga oʻtish</string>
-    <string name="type_in_answer_focus_summ">Oʻrganish ekranida ‘javobni kiritish’ maydoniga avtomatik tarzda oʻtish</string>
+    <string name="type_in_answer_focus" maxLength="41">‘Javobni kiritiş’ maydoniga ötiş</string>
+    <string name="type_in_answer_focus_summ">Örganiş ekranida ‘javobni kiritiş’ maydoniga avtomatik tarzda ötiş</string>
     <!-- About -->
-    <string name="open_changelog">Oʻzgarishlar roʻyxatini ochish</string>
+    <string name="open_changelog">Özgarişlar röyxatini oçiş</string>
     <string name="pref_cat_about_title" maxLength="41">AnkiDroid haqida</string>
-    <string name="contributors_title">Hissa qoʻshganlar</string>
-    <string name="about_contributors_description"><![CDATA[Bular bizning ajoyib <a href=\"%1$s\">hissa qoʻshuvchilarimiz</a>. Siz ham dasturlash, tarjima qilish, xayriya qilish va <a href=\"%2$s\">boshqa yoʻllar</a> orqali AnkiDroidʼga yordam berishingiz mumkin!]]></string>
+    <string name="contributors_title">Hissa qöşganlar</string>
+    <string name="about_contributors_description"><![CDATA[Bular bizning ajoyib <a href=\"%1$s\">hissa qöşuvçilarimiz</a>. Siz ham dasturlaş, tarjima qiliş, xayriya qiliş va <a href=\"%2$s\">boşqa yöllar</a> orqali AnkiDroidʼga yordam berişingiz mumkin!]]></string>
     <string name="about_contributors_description_no_donate"><![CDATA[These are our awesome <a href=\"%1$s\">contributors</a>. You can help AnkiDroid too by programming, translating and <a href=\"%2$s\">more</a>!]]></string>
     <string name="license">Litsenziya</string>
-    <string name="license_description"><![CDATA[AnkiDroid <a href=\"%1$s\">GPL-3.0</a> va <a href=\"%2$s\">AGPL-3.0</a> litsenziyalari ostida chiqarilgan, dastur kodi <a href=\"%3$s\">GitHubda</a> mavjud]]></string>
-    <string name="other_licenses"><![CDATA[AnkiDroid, shuningdek, turli ochiq kodli <a href=\"%1$s\">litsenziyalar</a> asosida tarqatilgan uchinchi tomon kutubxonalari va piktogrammalaridan foydalanadi.]]></string>
-    <string name="donate_description"><![CDATA[<a href=\"%1$s\">Xayriya qilish</a> orqali AnkiDroid rivojini qoʻllab-quvvatlashingiz mumkin. Har qanday miqdordagi yordam yuksak qadrlanadi.]]></string>
+    <string name="license_description"><![CDATA[AnkiDroid <a href=\"%1$s\">GPL-3.0</a> va <a href=\"%2$s\">AGPL-3.0</a> litsenziyalari ostida çiqarilgan, dastur kodi <a href=\"%3$s\">GitHubda</a> mavjud]]></string>
+    <string name="other_licenses"><![CDATA[AnkiDroid, şuningdek, turli oçiq kodli <a href=\"%1$s\">litsenziyalar</a> asosida tarqatilgan uçinçi tomon kutubxonalari va piktogrammalaridan foydalanadi.]]></string>
+    <string name="donate_description"><![CDATA[<a href=\"%1$s\">Xayriya qiliş</a> orqali AnkiDroid rivojini qöllab-quvvatlaşingiz mumkin. Har qanday miqdordagi yordam yuksak qadrlanadi.]]></string>
     <!-- Controls -->
-    <string name="binding_add_gesture">Qoʻl ishorasini qoʻshish</string>
-    <string name="binding_add_key">Tugma qoʻshish</string>
+    <string name="binding_add_gesture">Qöl işorasini qöşiş</string>
+    <string name="binding_add_key">Tugma qöşiş</string>
     <string name="key_picker_default_press_key">Bironta tugmani bosing</string>
-    <string name="binding_add_axis">Joystik/harakat kontrollerini qoʻshish</string>
-    <string name="axis_picker_move_joystick">Joystik/harakat kontrollerinini harakatlantirish</string>
-    <string name="user_actions" maxLength="41">Foydalanuvchi amallari</string>
-    <string name="user_actions_summary" maxLength="41">Oʻrganish ekranidan JavaScriptʼni yoqish</string>
-    <string name="user_action_1" maxLength="28">Foydalanuvchi amali 1</string>
-    <string name="user_action_2" maxLength="28">Foydalanuvchi amali 2</string>
-    <string name="user_action_3" maxLength="28">Foydalanuvchi amali 3</string>
-    <string name="user_action_4" maxLength="28">Foydalanuvchi amali 4</string>
-    <string name="user_action_5" maxLength="28">Foydalanuvchi amali 5</string>
-    <string name="user_action_6" maxLength="28">Foydalanuvchi amali 6</string>
-    <string name="user_action_7" maxLength="28">Foydalanuvchi amali 7</string>
-    <string name="user_action_8" maxLength="28">Foydalanuvchi amali 8</string>
-    <string name="user_action_9" maxLength="28">Foydalanuvchi amali 9</string>
-    <string name="toggle_auto_advance" maxLength="28">Avtomatik ilgarilashni yoqish/oʻchirish</string>
-    <string name="enable_auto_advance" maxLength="28">Avto‑ilgarilashni yoqish</string>
-    <string name="disable_auto_advance" maxLength="28">Avto‑ilgarilashni oʻchirish</string>
+    <string name="binding_add_axis">Joystik/harakat kontrollerini qöşiş</string>
+    <string name="axis_picker_move_joystick">Joystik/harakat kontrollerinini harakatlantiriş</string>
+    <string name="user_actions" maxLength="41">Foydalanuvçi amallari</string>
+    <string name="user_actions_summary" maxLength="41">Örganiş ekranidan JavaScriptʼni yoqiş</string>
+    <string name="user_action_1" maxLength="28">Foydalanuvçi amali 1</string>
+    <string name="user_action_2" maxLength="28">Foydalanuvçi amali 2</string>
+    <string name="user_action_3" maxLength="28">Foydalanuvçi amali 3</string>
+    <string name="user_action_4" maxLength="28">Foydalanuvçi amali 4</string>
+    <string name="user_action_5" maxLength="28">Foydalanuvçi amali 5</string>
+    <string name="user_action_6" maxLength="28">Foydalanuvçi amali 6</string>
+    <string name="user_action_7" maxLength="28">Foydalanuvçi amali 7</string>
+    <string name="user_action_8" maxLength="28">Foydalanuvçi amali 8</string>
+    <string name="user_action_9" maxLength="28">Foydalanuvçi amali 9</string>
+    <string name="toggle_auto_advance" maxLength="28">Avtomatik ilgarilaşni yoqiş/öçiriş</string>
+    <string name="enable_auto_advance" maxLength="28">Avto‑ilgarilaşni yoqiş</string>
+    <string name="disable_auto_advance" maxLength="28">Avto‑ilgarilaşni öçiriş</string>
     <string name="enable_voice_recording" maxLength="28">Enable voice recording</string>
     <string name="disable_voice_recording" maxLength="28">Disable voice recording</string>
     <!-- Select card side -->
-    <string name="card_side_selection_title">Karta tarafini tanlash</string>
+    <string name="card_side_selection_title">Karta tarafini tanlaş</string>
     <string name="card_side_question">Savol</string>
     <string name="card_side_answer">Javob</string>
     <string name="card_side_both" maxLength="28">Savol va javob</string>
     <string name="display_binding_card_side_question" comment="When displaying a key bind on a preference this formatter is used if the bind only applies to the question">S: %s</string>
     <string name="display_binding_card_side_answer" comment="When displaying a key bind on a preference this formatter is used if the bind only applies to the answer">J: %s</string>
     <!-- Binding Preference -->
-    <string name="binding_remove_binding" comment="The parameter is the name of the key/gesture.     Keys cannot be translated yet.">‘%s’ni olib tashlash</string>
-    <string name="bindings_already_bound">Allaqachon ‘%s’ga bogʻlangan</string>
+    <string name="binding_remove_binding" comment="The parameter is the name of the key/gesture.     Keys cannot be translated yet.">‘%s’ni olib taşlaş</string>
+    <string name="bindings_already_bound">Allaqaçon ‘%s’ga boğlangan</string>
     <!-- Advanced -->
     <string name="pref_cat_experimental" maxLength="41" tools:ignore="UnusedResources">Tajribaviy</string>
-    <string name="readtext_deprecation_warn">AnkiDroid boshqa Anki mijozlari bilan mos tushadigan va koʻproq ovozlar va tilni ijro etish uchun takomillashtirishlarni oʻz ichiga olgan yaxshiroq nutq sintezatori mexanizmini taqdim etdi!\n\nImkon qadar tezroq yangilang, chunki bu sozlama tez orada oʻchiriladi.</string>
+    <string name="readtext_deprecation_warn">AnkiDroid boşqa Anki mijozlari bilan mos tuşadigan va köproq ovozlar va tilni ijro etiş uçun takomillaştirişlarni öz içiga olgan yaxşiroq nutq sintezatori mexanizmini taqdim etdi!\n\nImkon qadar tezroq yangilang, çunki bu sozlama tez orada öçiriladi.</string>
     <string name="readtext_reviewer_warn" tools:ignore="UnusedResources">Iltimos, yangi nutq sintezatori formatiga yangilang</string>
     <string name="allow_templates_to_record_audio" maxLength="41">Allow templates to record audio</string>
     <string name="template_is_trying_to_record_audio">This template is trying to record audio</string>
-    <string name="pref_fixed_port_title" maxLength="41">Oʻrganish ekranida localStorage</string>
-    <string name="pref_fixed_port_summary">Oʻrganish ekranida belgilangan server portidan foydalangan JavaScript localStorage funksiyasini yoqadi</string>
+    <string name="pref_fixed_port_title" maxLength="41">Örganiş ekranida localStorage</string>
+    <string name="pref_fixed_port_summary">Örganiş ekranida belgilangan server portidan foydalangan JavaScript localStorage funksiyasini yoqadi</string>
     <!-- Developer options -->
-    <string name="pref_cat_dev_options" maxLength="41">Dasturchi parametrlari</string>
-    <string name="dev_options_enabled_pref" maxLength="41">Dasturchi parametrlarini yoqish</string>
-    <string name="disable_dev_options">Dasturchi parametrlarini oʻchirish</string>
-    <string name="dev_options_warning">Iltimos, dasturchi parametrlarini yoqishdan oldin ishonch hosil qiling. Bu parametrlar xavfli boʻlib, ilovani yoki kolleksiyangizni buzishi mumkin.\n\nEsda tutingki, bu parametrlar koʻpchilik foydalanuvchilar uchun moʻljallanmagan va shuning uchun tarjima qilinmaydi, shuning uchun ular ingliz tilida.</string>
+    <string name="pref_cat_dev_options" maxLength="41">Dasturçi parametrlari</string>
+    <string name="dev_options_enabled_pref" maxLength="41">Dasturçi parametrlarini yoqiş</string>
+    <string name="disable_dev_options">Dasturçi parametrlarini öçiriş</string>
+    <string name="dev_options_warning">Iltimos, dasturçi parametrlarini yoqişdan oldin işonç hosil qiling. Bu parametrlar xavfli bölib, ilovani yoki kolleksiyangizni buzişi mumkin.\n\nEsda tutingki, bu parametrlar köpçilik foydalanuvçilar uçun möljallanmagan va şuning uçun tarjima qilinmaydi, şuning uçun ular ingliz tilida.</string>
     <!-- #######################################################################################
          #################################### Backup options ###################################
          ####################################################################################### -->
     <string name="pref__backups_help__summary"><![CDATA[        AnkiDroid vaqti-vaqti bilana kolleksiyangizni zaxiralaydi.
-        Agar zaxira nusxalari ikki kundan oshgan boʻlsa,
-        AnkiDroid diskda boʻsh joy boʻshatish uchun ularni baʻzilarini oʻchirib tashlaydi.
+        Agar zaxira nusxalari ikki kundan oşgan bölsa,
+        AnkiDroid diskda böş joy böşatiş uçun ularni baʻzilarini öçirib taşlaydi.
         <br><br>
         Eʼtibor bering, media fayllar zaxiralanmaydi.
-        Amin boʻlish uchun kolleksiyangizni vaqti-vaqti bilan sinxronlang yoki uni zaxira nusxalarini eksport qiling.
+        Amin böliş uçun kolleksiyangizni vaqti-vaqti bilan sinxronlang yoki uni zaxira nusxalarini eksport qiling.
         <br><br>
-        Dastalar roʻyxati menyusida, zaxiradan qayta tiklashingiz va kolleksiyangizni eksport qilishingiz mumkin.]]></string>
-    <string name="pref__minutes_between_automatic_backups__title" maxLength="41">Avtomatik zaxiralashlar orasidagi vaqt (daqiqa)</string>
+        Dastalar röyxati menyusida, zaxiradan qayta tiklaşingiz va kolleksiyangizni eksport qilişingiz mumkin.]]></string>
+    <string name="pref__minutes_between_automatic_backups__title" maxLength="41">Avtomatik zaxiralaşlar orasidagi vaqt (daqiqa)</string>
     <string name="pref__daily_backups_to_keep__title" maxLength="41">Har kun saqlanadigan zaxiralar soni</string>
     <string name="pref__weekly_backups_to_keep__title" maxLength="41">Har hafta saqlanadigan zaxiralar soni</string>
     <string name="pref__monthly_backups_to_keep__title" maxLength="41">Har oy saqlanadigan zaxiralar soni</string>
     <!-- #######################################################################################
          ################################# Manage space activity ###############################
          ####################################################################################### -->
-    <string name="pref__manage_space__screen_title">Xotirani boshqarish</string>
+    <string name="pref__manage_space__screen_title">Xotirani boşqariş</string>
     <!-- TextWidgetPreference widget text -->
     <string name="pref__widget_text__error" comment="Text in a small box on the end of a preference, indicating a generic error.         Must be VERY short. Can be one or two lines.">Xatolik</string>
     <string name="pref__widget_text__calculating" comment="Text in a small box on the end of a preference,         indicating that the value, such as folder size on disk, is being calculated.         Must be VERY short. Can be one or two lines.">Hisob-\nlanmoqda&#8230;</string>
@@ -387,29 +396,29 @@
         <item quantity="other">%1$d ta fayl\n%2$s</item>
     </plurals>
     <!-- Delete unused media -->
-    <string name="pref__delete_unused_media_files__title" maxLength="41" comment="Preference title">Ishlatilmagan media fayllarni oʻchirish</string>
-    <string name="pref__delete_unused_media_files__summary">_ bilan boshlanmagan va hech qanday qaydga havola qilinmagan rasmlar va boshqa media fayllarni oʻchirish</string>
-    <string name="dialog__delete_unused_media_files__title" comment="Title for a dialog where you can select unused media files to delete">Ishlatilmagan media fayllarni oʻchirish</string>
+    <string name="pref__delete_unused_media_files__title" maxLength="41" comment="Preference title">Işlatilmagan media fayllarni öçiriş</string>
+    <string name="pref__delete_unused_media_files__summary">_ bilan boşlanmagan va heç qanday qaydga havola qilinmagan rasmlar va boşqa media fayllarni öçiriş</string>
+    <string name="dialog__delete_unused_media_files__title" comment="Title for a dialog where you can select unused media files to delete">Işlatilmagan media fayllarni öçiriş</string>
     <!-- Delete backups -->
-    <string name="pref__delete_backups__title" maxLength="41" comment="Preference title">Zaxiralarni oʻchirish</string>
-    <string name="dialog__delete_backups__title" comment="Title for a dialog where you can choose backups to delete">Zaxiralarni oʻchirish</string>
-    <string name="progress__deleting_backups">Zaxiralar oʻchirilmoqda&#8230;</string>
+    <string name="pref__delete_backups__title" maxLength="41" comment="Preference title">Zaxiralarni öçiriş</string>
+    <string name="dialog__delete_backups__title" comment="Title for a dialog where you can choose backups to delete">Zaxiralarni öçiriş</string>
+    <string name="progress__deleting_backups">Zaxiralar öçirilmoqda&#8230;</string>
     <!-- Delete collection -->
-    <string name="pref__delete_collection__title" maxLength="41" comment="Preference title">Kolleksiyani oʻchirish</string>
-    <string name="pref__delete_collection__summary">Kolleksiya, media fayllar va zaxiralarni oʻchirish. Ilova sozlamalari oʻchirilmaydi.</string>
-    <string name="dialog__delete_collection__title" comment="Confirmation dialog title">Kolleksiya oʻchirish</string>
-    <string name="dialog__delete_collection__message" comment="“Close the window” here refers to the activity that the user is currently seeing.        When the collection is deleted, we exit the process, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">Kolleksiyangiz, media fayllaringiz va zaxiralaringizni rostdan ham oʻchirmoqchimisiz?\n\nQayd: bu amal oynani yopadi.</string>
-    <string name="progress__deleting_collection">Kolleksiya oʻchirilmoqda</string>
+    <string name="pref__delete_collection__title" maxLength="41" comment="Preference title">Kolleksiyani öçiriş</string>
+    <string name="pref__delete_collection__summary">Kolleksiya, media fayllar va zaxiralarni öçiriş. Ilova sozlamalari öçirilmaydi.</string>
+    <string name="dialog__delete_collection__title" comment="Confirmation dialog title">Kolleksiya öçiriş</string>
+    <string name="dialog__delete_collection__message" comment="“Close the window” here refers to the activity that the user is currently seeing.        When the collection is deleted, we exit the process, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">Kolleksiyangiz, media fayllaringiz va zaxiralaringizni rostdan ham öçirmoqçimisiz?\n\nQayd: bu amal oynani yopadi.</string>
+    <string name="progress__deleting_collection">Kolleksiya öçirilmoqda</string>
     <!-- Delete everything -->
-    <string name="pref__delete_everything__title" maxLength="41" comment="Preference title">Barchasini oʻchirish</string>
-    <string name="pref__delete_everything__summary">Kolleksiya, media fayllar zaxiralar va sozlamalarni oʻchirish</string>
-    <string name="dialog__delete_everything__title" comment="Confirmation dialog title">Barchasini oʻchirish</string>
-    <string name="dialog__delete_everything__message" comment="“Close the window” here refers to the activity that the user is currently seeing.         Deleting app data forcibly closes AnkiDroid, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">Rostdan ham barcha maʼlumotlarni oʻchirmoqchimisiz? Bunga kolleksiyangiz, media fayllaringiz, zaxiralaringiz va sozlamalaringiz ham kiradi.\n\nQayd: bu amal oynani yopadi.</string>
+    <string name="pref__delete_everything__title" maxLength="41" comment="Preference title">Barçasini öçiriş</string>
+    <string name="pref__delete_everything__summary">Kolleksiya, media fayllar zaxiralar va sozlamalarni öçiriş</string>
+    <string name="dialog__delete_everything__title" comment="Confirmation dialog title">Barçasini öçiriş</string>
+    <string name="dialog__delete_everything__message" comment="“Close the window” here refers to the activity that the user is currently seeing.         Deleting app data forcibly closes AnkiDroid, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">Rostdan ham barça maʼlumotlarni öçirmoqçimisiz? Bunga kolleksiyangiz, media fayllaringiz, zaxiralaringiz va sozlamalaringiz ham kiradi.\n\nQayd: bu amal oynani yopadi.</string>
     <!-- Delete app data -->
-    <string name="pref__delete_app_data__title" maxLength="41" comment="Preference title">Ilova maʼlumotlarini oʻchirish</string>
-    <string name="pref__delete_app_data__summary">Sozlamalar va boshqa ilova maʼlumotlarini oʻchirish</string>
-    <string name="dialog__delete_app_data__title" comment="Confirmation dialog title">Ilova maʼlumotlarini oʻchirish</string>
-    <string name="dialog__delete_app_data__message" comment="“Close the window” here refers to the activity that the user is currently seeing.         Deleting app data forcibly closes AnkiDroid, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">Rostdan ham ilova maʼlumotlarini oʻchirib tashlamoqchimisiz? Sozlamalar va boshqa ilova maʼlumotlari oʻchiriladi.\n\nEslatma: bu amal oynani yopadi.</string>
+    <string name="pref__delete_app_data__title" maxLength="41" comment="Preference title">Ilova maʼlumotlarini öçiriş</string>
+    <string name="pref__delete_app_data__summary">Sozlamalar va boşqa ilova maʼlumotlarini öçiriş</string>
+    <string name="dialog__delete_app_data__title" comment="Confirmation dialog title">Ilova maʼlumotlarini öçiriş</string>
+    <string name="dialog__delete_app_data__message" comment="“Close the window” here refers to the activity that the user is currently seeing.         Deleting app data forcibly closes AnkiDroid, which closes the activity without animation.         On some devices the entire settings app may be closed.         User might not realize that this activity comes directly from AnkiDroid,         so it might be wise to avoid words such as “AnkiDroid or “app”.">Rostdan ham ilova maʼlumotlarini öçirib taşlamoqçimisiz? Sozlamalar va boşqa ilova maʼlumotlari öçiriladi.\n\nEslatma: bu amal oynani yopadi.</string>
     <!-- #######################################################################################
          ##### Generic preference summaries & snackbars that are shown on preference click #####
          ####################################################################################### -->
@@ -419,32 +428,32 @@
     <string name="pref__etc__snackbar__fetching" comment="Generic snackbar message to be shown when user taps on a preference,         the value of which is being fetched">Maʼlumotlar olinmoqda&#8230;</string>
     <string name="pref__etc__snackbar__calculating" comment="Generic snackbar message to be shown when user taps on a preference,         the value of which, such as folder size on disk, is being calculated">Hisoblanmoqda&#8230;</string>
     <string name="pref__etc__snackbar__no_collection" comment="Generic snackbar message to be shown when user taps on a preference         that is not usable because the collection does not exist">Kolleksiya mavjud emas</string>
-    <string name="hide_system_bars" maxLength="41" comment="Title of a setting that allows to hide the system bars">Tizim panellarini yashirish</string>
-    <string name="hide_system_bars_none" comment="Setting option to not hide any of the system bars">Hech qaysi</string>
+    <string name="hide_system_bars" maxLength="41" comment="Title of a setting that allows to hide the system bars">Tizim panellarini yaşiriş</string>
+    <string name="hide_system_bars_none" comment="Setting option to not hide any of the system bars">Heç qaysi</string>
     <string name="hide_system_bars_status_bar" comment="Setting option to hide the system status bar (the top one with clock, battery status, etc)">Holat qatori</string>
     <string name="hide_system_bars_navigation_bar" comment="Setting option to hide the system navigation bar (the bottom one that can go back, to home, etc)">Navigatsiya paneli</string>
-    <string name="hide_system_bars_all_bars" comment="Setting option to hide all the system bars">Barchasi</string>
+    <string name="hide_system_bars_all_bars" comment="Setting option to hide all the system bars">Barçasi</string>
     <string name="ignore_display_cutout" maxLength="41">Displey qirqimiga eʼtibor berilmasin</string>
-    <string name="show_answer_buttons" maxLength="41">Javob tugmalarini koʻrsatish</string>
-    <string name="hide_hard_and_easy" maxLength="41">‘Qiyin’ va ‘Oson’ tugmalarini yashirish</string>
+    <string name="show_answer_buttons" maxLength="41">Javob tugmalarini körsatiş</string>
+    <string name="hide_hard_and_easy" maxLength="41">‘Qiyin’ va ‘Oson’ tugmalarini yaşiriş</string>
     <string name="reviewer_frame_style" maxLength="41">Freym stili</string>
     <string name="reviewer_frame_style_card" maxLength="41" comment="Style name of the \'Card\' card frame of the Study Screen">Karta</string>
     <string name="reviewer_frame_style_box" maxLength="41" comment="Style name of the \'Box\' card frame of the Study Screen">Quti</string>
     <string name="reviewer_toolbar_top" maxLength="41" comment="Setting to put the toolbar on the top of the study screen">Yuqorida</string>
     <string name="reviewer_toolbar_bottom" maxLength="41" comment="Setting to put the toolbar on the bottom of the study screen">Pastda</string>
-    <string name="reviewer_toolbar_none" maxLength="41" comment="Setting to remove the toolbar from the study screen">Hech qaysi</string>
+    <string name="reviewer_toolbar_none" maxLength="41" comment="Setting to remove the toolbar from the study screen">Heç qaysi</string>
     <string name="toolbar" maxLength="41">Asboblar paneli</string>
     <string name="toolbar_actions" maxLength="41">Asboblar paneli amallari</string>
-    <string name="toolbar_position" maxLength="28">Asboblar paneli joylashuvi</string>
-    <string name="new_study_screen" maxLength="41">Yangi oʻrganish ekrani</string>
-    <string name="new_study_screen_summ"><![CDATA[Oʻrganish ekrani takomillashtirildi va joriy ekranni almashtiradi. Eski ekranning baʼzi xususiyatlari oʻzgartirildi yoki oʻchirildi. Iltimos, <a href="%1$s">fikr-mulohazalaringiz</a> yoki <a href="%2$s">baglar</a> haqida xabar bering.]]></string>
-    <string name="show_answer_feedback" maxLength="41">Javob firk-mulohazalarini koʻrsatish</string>
+    <string name="toolbar_position" maxLength="28">Asboblar paneli joylaşuvi</string>
+    <string name="new_study_screen" maxLength="41">Yangi örganiş ekrani</string>
+    <string name="new_study_screen_summ"><![CDATA[Örganiş ekrani takomillaştirildi va joriy ekranni almaştiradi. Eski ekranning baʼzi xususiyatlari özgartirildi yoki öçirildi. Iltimos, <a href="%1$s">fikr-mulohazalaringiz</a> yoki <a href="%2$s">baglar</a> haqida xabar bering.]]></string>
+    <string name="show_answer_feedback" maxLength="41">Javob firk-mulohazalarini körsatiş</string>
     <string name="screen" maxLength="41">Ekran</string>
     <string name="also_assign_binding_to_show_answer" comment="Question shown after assigning binding to an \'Answer\' command, asking whether it should also be assigned to the \'Show answer\'; %1$s is \'Show answer\'">Also assign to ‘%1$s’?</string>
     <string name="dialog_skip" comment="Skip assigning binding to \'Show answer\'">Skip</string>
     <string name="dialog_assign" comment="Assign binding to \'Answer\' command">Assign</string>
     <!--Keyboard shortcuts dialog-->
-    <string name="open_settings" comment="Description of the shortcut that opens the app settings">Sozlamalarni ochish</string>
+    <string name="open_settings" comment="Description of the shortcut that opens the app settings">Sozlamalarni oçiş</string>
     <string name="related_settings_title" comment="Title of the section for related settings">Aloqador sozlamalar</string>
     <!-- External Directory Selection Preference -->
     <string name="pref_directory_not_set" comment="Summary of the AnkiDroid directory setting when no directory is set">Not set</string>
diff --git a/common/android/src/main/res/values-uz/11-arrays.xml b/common/android/src/main/res/values-uz/11-arrays.xml
index 3315c73e3686..51ac3181c9a3 100644
--- a/common/android/src/main/res/values-uz/11-arrays.xml
+++ b/common/android/src/main/res/values-uz/11-arrays.xml
@@ -23,48 +23,48 @@
     Now arrays are defined in constants.xml, and the strings are here -->
     <!-- error_reporting_choice_labels -->
     <string name="error_reporting_choice_always_report">Har doim xabar berilsin</string>
-    <string name="error_reporting_choice_never_report">Hech qachon xabar berilmasin</string>
-    <string name="error_reporting_choice_ask_user">Mendan soʻralsin</string>
+    <string name="error_reporting_choice_never_report">Heç qaçon xabar berilmasin</string>
+    <string name="error_reporting_choice_ask_user">Mendan söralsin</string>
     <!-- add_to_cur_labels -->
-    <string name="add_to_deck_use_current_deck">Joriy dastani ishlatish</string>
-    <string name="add_to_deck_decide_by_note_type">Qayd turi boʻyicha qaror qilish</string>
+    <string name="add_to_deck_use_current_deck">Joriy dastani işlatiş</string>
+    <string name="add_to_deck_decide_by_note_type">Qayd turi böyiça qaror qiliş</string>
     <!-- theme labels -->
-    <string name="theme_follow_system">Tizimga rioya qilish</string>
+    <string name="theme_follow_system">Tizimga rioya qiliş</string>
     <string name="theme_day" comment="Day/Light theme color scheme">Kun</string>
     <string name="theme_night" comment="Night/Dark theme color scheme">Tun</string>
     <!-- day_theme_labels -->
-    <string name="day_theme_light">Yorugʻ</string>
+    <string name="day_theme_light">Yoruğ</string>
     <string name="day_theme_plain">Oddiy</string>
     <string name="day_theme_eink">Elektron siyoh</string>
     <!-- night_theme_labels -->
     <string name="night_theme_black">Qora</string>
-    <string name="night_theme_dark">Qorongʻu</string>
+    <string name="night_theme_dark">Qoronğu</string>
     <!-- html_size_code_labels -->
-    <string name="html_size_code_xx_small">eng kichik</string>
-    <string name="html_size_code_x_small">kichikroq</string>
-    <string name="html_size_code_small">kichkina</string>
-    <string name="html_size_code_medium">oʻrtacha</string>
+    <string name="html_size_code_xx_small">eng kiçik</string>
+    <string name="html_size_code_x_small">kiçikroq</string>
+    <string name="html_size_code_small">kiçkina</string>
+    <string name="html_size_code_medium">örtaça</string>
     <string name="html_size_code_large">katta</string>
     <string name="html_size_code_x_large">kattaroq</string>
     <string name="html_size_code_xx_large">eng katta</string>
     <!-- gestures_labels -->
     <string name="answer_easy" comment="Match Anki\'s translations: deckConfigAnswerAgain" maxLength="41">Javobi oson</string>
-    <string name="gesture_abort_learning" maxLength="41">Oʻrganish ekranini yopish</string>
-    <string name="gesture_flag_red" maxLength="41">Qizil bayroqni yoqish/oʻchirish</string>
-    <string name="gesture_flag_orange" maxLength="41">Toʻq sariq bayroqni yoqish/oʻchirish</string>
-    <string name="gesture_flag_green" maxLength="41">Yashil bayroqni yoqish/oʻchirish</string>
-    <string name="gesture_flag_blue" maxLength="41">Koʻk bayroqni yoqish/oʻchirish</string>
-    <string name="gesture_flag_pink" maxLength="41">Pushti bayroqni yoqish/oʻchirish</string>
-    <string name="gesture_flag_turquoise" maxLength="41">Moviy bayroqni yoqish/oʻchirish</string>
-    <string name="gesture_flag_purple" maxLength="41">Binafsha bayroqni yoqish/oʻchirish</string>
-    <string name="gesture_flag_remove" maxLength="41">Bayroqni olib tashlash</string>
+    <string name="gesture_abort_learning" maxLength="41">Örganiş ekranini yopiş</string>
+    <string name="gesture_flag_red" maxLength="41">Qizil bayroqni yoqiş/öçiriş</string>
+    <string name="gesture_flag_orange" maxLength="41">Töq sariq bayroqni yoqiş/öçiriş</string>
+    <string name="gesture_flag_green" maxLength="41">Yaşil bayroqni yoqiş/öçiriş</string>
+    <string name="gesture_flag_blue" maxLength="41">Kök bayroqni yoqiş/öçiriş</string>
+    <string name="gesture_flag_pink" maxLength="41">Puşti bayroqni yoqiş/öçiriş</string>
+    <string name="gesture_flag_turquoise" maxLength="41">Moviy bayroqni yoqiş/öçiriş</string>
+    <string name="gesture_flag_purple" maxLength="41">Binafşa bayroqni yoqiş/öçiriş</string>
+    <string name="gesture_flag_remove" maxLength="41">Bayroqni olib taşlaş</string>
     <string name="gesture_page_up" maxLength="41">Bir bet yuqoriga</string>
     <string name="gesture_page_down" maxLength="41">Bir bet pastga</string>
-    <string name="gesture_toggle_whiteboard" maxLength="41">Yozuv taxtasini yoqish/oʻchirish</string>
-    <string name="gesture_toggle_eraser" maxLength="41">Oʻchirgʻichni yoqish/oʻchirish</string>
-    <string name="gesture_show_hint" maxLength="41">Ishorani koʻrsatish</string>
-    <string name="gesture_show_all_hints" maxLength="41">Barcha ishoralarni koʻrsatish</string>
-    <string name="record_voice" maxLength="41">Ovozni yozib olish</string>
-    <string name="replay_voice" maxLength="41">Ovozni ijro etish</string>
-    <string name="save_voice" maxLength="41">Ovoz yozuvini saqlash</string>
+    <string name="gesture_toggle_whiteboard" maxLength="41">Yozuv taxtasini yoqiş/öçiriş</string>
+    <string name="gesture_toggle_eraser" maxLength="41">Öçirğiçni yoqiş/öçiriş</string>
+    <string name="gesture_show_hint" maxLength="41">Işorani körsatiş</string>
+    <string name="gesture_show_all_hints" maxLength="41">Barça işoralarni körsatiş</string>
+    <string name="record_voice" maxLength="41">Ovozni yozib oliş</string>
+    <string name="replay_voice" maxLength="41">Ovozni ijro etiş</string>
+    <string name="save_voice" maxLength="41">Ovoz yozuvini saqlaş</string>
 </resources>
diff --git a/common/android/src/main/res/values-uz/16-multimedia-editor.xml b/common/android/src/main/res/values-uz/16-multimedia-editor.xml
index 43a89a628f1d..14871b22e82b 100644
--- a/common/android/src/main/res/values-uz/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-uz/16-multimedia-editor.xml
@@ -20,11 +20,11 @@
   -->
 <resources>
     <!-- Main editor popup menu items -->
-    <string name="multimedia_editor_popup_image">Rasm qoʻshish</string>
-    <string name="multimedia_editor_popup_audio_clip">Audio qoʻshish</string>
-    <string name="multimedia_editor_popup_video_clip">Video qoʻshish</string>
-    <string name="multimedia_editor_popup_audio">Audio yozib olish</string>
-    <string name="multimedia_editor_popup_cloze">Boʻshliqni toʻldirish</string>
+    <string name="multimedia_editor_popup_image">Rasm qöşiş</string>
+    <string name="multimedia_editor_popup_audio_clip">Audio qöşiş</string>
+    <string name="multimedia_editor_popup_video_clip">Video qöşiş</string>
+    <string name="multimedia_editor_popup_audio">Audio yozib oliş</string>
+    <string name="multimedia_editor_popup_cloze">Böşliqni töldiriş</string>
     <!-- Field editing general -->
     <!-- these are button names to convert field type -->
     <string name="multimedia_editor_field_editing_audio">Audio yozuv</string>
@@ -39,23 +39,24 @@
     <!-- General -->
     <!-- not a good message, when an unexpected error happens -->
     <string name="multimedia_editor_something_wrong">Nimadir xato ketdi</string>
-    <string name="multimedia_editor_png_paste_error">Bufer rasmni pngʼga oʻgirishda xatolik yuz berdi: %s</string>
-    <string name="multimedia_editor_attach_tooltip" comment="Appear when holding the finger  on the paperclip icon">Multimedia qistirish</string>
-    <string name="multimedia_editor_attach_mm_content" comment="used for screen readers. Not visible to the user">%1$s maydoniga multimedia qistirish</string>
+    <string name="multimedia_editor_png_paste_error">Bufer rasmni pngʼga ögirişda xatolik yuz berdi: %s</string>
+    <string name="multimedia_editor_attach_tooltip" comment="Appear when holding the finger  on the paperclip icon">Multimedia qistiriş</string>
+    <string name="multimedia_editor_attach_mm_content" comment="used for screen readers. Not visible to the user">%1$s maydoniga multimedia qistiriş</string>
     <!-- Audio view -->
     <!-- Message when recording fails -->
-    <string name="multimedia_editor_audio_view_recording_failed">Ovozni yozib boʻlmadi</string>
-    <string name="multimedia_editor_audio_view_playing_failed">Ijro etib boʻlmadi</string>
-    <string name="multimedia_editor_audio_view_create_failed">Diktofon asbob panelini yaratib boʻlmadi</string>
+    <string name="multimedia_editor_audio_view_recording_failed">Ovozni yozib bölmadi</string>
+    <string name="multimedia_editor_audio_view_playing_failed">Ijro etib bölmadi</string>
+    <string name="multimedia_editor_audio_view_create_failed">Diktofon asbob panelini yaratib bölmadi</string>
     <!-- Crop function-->
-    <string name="crop_image">Bu rasmni kesmoqchimisiz?</string>
+    <string name="crop_image">Bu rasmni kesmoqçimisiz?</string>
     <string name="crop_button" maxLength="28">Crop</string>
-    <string name="save_dialog_content">Joriy rasm hajmi %sMB. Birlamchi rasm hajmi 1MBʼdan oshmasligi kerak. Rasmni siqmoqchimisiz?</string>
-    <string name="select_image_failed">"Rasmni tanlab boʻlmadi, iltimos qayta urinib koʻring"</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
+    <string name="save_dialog_content">Joriy rasm hajmi %sMB. Birlamçi rasm hajmi 1MBʼdan oşmasligi kerak. Rasmni siqmoqçimisiz?</string>
+    <string name="select_image_failed">"Rasmni tanlab bölmadi, iltimos qayta urinib köring"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Maydon tarkibi</string>
-    <string name="crop_image_size_notice">Rasm kesish muharriri bilan ishlash uchun juda katta. Iltimos, rasm oʻlchamini oʻzgartiring va qayta urinib koʻring!</string>
-    <string name="reselect" maxLength="28">Qayta tanlash</string>
-    <string name="waveform_button_description">Audio toʻlqin shaklini koʻrsatish</string>
-    <string name="field_content_description">Maydon tarkibini koʻrsatish</string>
-    <string name="delete_audio_button_description">Ovoz yozuvini oʻchirish</string>
+    <string name="crop_image_size_notice">Rasm kesiş muharriri bilan işlaş uçun juda katta. Iltimos, rasm ölçamini özgartiring va qayta urinib köring!</string>
+    <string name="reselect" maxLength="28">Qayta tanlaş</string>
+    <string name="waveform_button_description">Audio tölqin şaklini körsatiş</string>
+    <string name="field_content_description">Maydon tarkibini körsatiş</string>
+    <string name="delete_audio_button_description">Ovoz yozuvini öçiriş</string>
 </resources>
diff --git a/common/android/src/main/res/values-uz/17-model-manager.xml b/common/android/src/main/res/values-uz/17-model-manager.xml
index 56fc97f5c6a5..e1b7335c8143 100644
--- a/common/android/src/main/res/values-uz/17-model-manager.xml
+++ b/common/android/src/main/res/values-uz/17-model-manager.xml
@@ -18,60 +18,60 @@
 <!-- This file contains strings related to the note types. Note type used to be called "model", hence the name of the file. -->
 <resources>
     <!--Menu Labels-->
-    <string name="model_browser_label" comment="Label of the browser of note types. The text can\'t be found in AnkiDroid directly." maxLength="28">Qayd turlarini boshqarish</string>
-    <string name="model_editor_label" comment="Label of the window to edit the fields of a note type. This text can\'t be found in Ankidroid directly">Maydonlarni boshqarish</string>
+    <string name="model_browser_label" comment="Label of the browser of note types. The text can\'t be found in AnkiDroid directly." maxLength="28">Qayd turlarini boşqariş</string>
+    <string name="model_editor_label" comment="Label of the window to edit the fields of a note type. This text can\'t be found in Ankidroid directly">Maydonlarni boşqariş</string>
     <!--Toasts-->
-    <string name="toast_last_model">Soʻnggi qayd turini oʻchiriolmaysiz</string>
-    <string name="toast_last_field">Qayd turida kamida bitta maydon boʻlishi kerak</string>
-    <string name="toast_empty_name">Nom kiritishingiz kerak</string>
-    <string name="toast_duplicate_field">Maydon nomi allaqachon ishlatilgan</string>
+    <string name="toast_last_model">Sönggi qayd turini öçiriolmaysiz</string>
+    <string name="toast_last_field">Qayd turida kamida bitta maydon bölişi kerak</string>
+    <string name="toast_empty_name">Nom kiritişingiz kerak</string>
+    <string name="toast_duplicate_field">Maydon nomi allaqaçon işlatilgan</string>
     <!--Plurals-->
     <plurals name="model_browser_of_type">
         <item quantity="one">%d ta qayd</item>
         <item quantity="other">%d ta qayd</item>
     </plurals>
     <!--Browser-->
-    <string name="model_browser_delete">Karta turini oʻchirish</string>
-    <string name="model_browser_template">Kartalarni tahrirlash</string>
+    <string name="model_browser_delete">Karta turini öçiriş</string>
+    <string name="model_browser_template">Kartalarni tahrirlaş</string>
     <!--Rename-->
-    <string name="rename_model">Qayd turi nomini oʻzgartirish</string>
-    <string name="rename_card_type" maxLength="28">Karta turi nomini oʻzgartirish</string>
+    <string name="rename_model">Qayd turi nomini özgartiriş</string>
+    <string name="rename_card_type" maxLength="28">Karta turi nomini özgartiriş</string>
     <!--Language Hint-->
     <string name="model_field_editor_language_hint_dialog_success_result">Til tavsiyasi %sga sozlandi</string>
     <!--Field Editing-->
-    <string name="model_field_editor_delete">Maydonni oʻchirib tashlash</string>
-    <string name="model_field_editor_rename">Maydon nomini oʻzgartirish</string>
-    <string name="model_field_editor_language_hint">Klaviatura tili tavsiyasini sozlash</string>
-    <string name="model_field_editor_reposition_menu">Maydon oʻrnini oʻzgartirish</string>
+    <string name="model_field_editor_delete">Maydonni öçirib taşlaş</string>
+    <string name="model_field_editor_rename">Maydon nomini özgartiriş</string>
+    <string name="model_field_editor_language_hint">Klaviatura tili tavsiyasini sozlaş</string>
+    <string name="model_field_editor_reposition_menu">Maydon örnini özgartiriş</string>
     <string name="model_field_editor_changing">Maydonlar yangilanmoqda</string>
-    <string name="model_field_editor_sort_field">Bu maydon boʻyicha tartiblash</string>
+    <string name="model_field_editor_sort_field">Bu maydon böyiça tartiblaş</string>
     <!-- Card type -->
-    <string name="delete_card_type" maxLength="28">Karta turini oʻchirish</string>
-    <string name="add_card_type" maxLength="28">Karta turini qoʻshish</string>
+    <string name="delete_card_type" maxLength="28">Karta turini öçiriş</string>
+    <string name="add_card_type" maxLength="28">Karta turini qöşiş</string>
     <!--Warnings-->
-    <string name="model_delete_warning">Rostdan ham bu qayd turini oʻchirib tashlamoqchimisiz?</string>
+    <string name="model_delete_warning">Rostdan ham bu qayd turini öçirib taşlamoqçimisiz?</string>
     <!--
         Example output:
         Delete the note types below?
         Basic, Basic (and reversed card), Cloze
      -->
-    <string name="model_delete_multiple_warning">Quyidagi qayd turlari oʻchirilsinmi?\n %s</string>
-    <string name="field_delete_warning">Rostdan ham bu maydonni oʻchirib tashlamoqchimisiz?</string>
+    <string name="model_delete_multiple_warning">Quyidagi qayd turlari öçirilsinmi?\n %s</string>
+    <string name="field_delete_warning">Rostdan ham bu maydonni öçirib taşlamoqçimisiz?</string>
     <!--Model Add Suffixes-->
-    <string name="model_browser_add_add">Qoʻsh: %1$s</string>
+    <string name="model_browser_add_add">Qöş: %1$s</string>
     <!--This prefix is used for standard note types-->
     <string name="model_browser_add_clone">Nusxala: %1$s</string>
     <!--Browser Appearance-->
-    <string name="card_template_browser_appearance_summary">Karta brauzeri kartalaringizni koʻrsatish uchun foydalanadigan shablonni kiriting. Qisqaroq javob koʻsatish uchun bundan foydalaning.\n\n“{{Mamlakat}}ning poytaxti:”ning oldi taraf shabloni\nkarta brauzerida\n“Poytaxti: {{Mamlakat}}” qilib qisqartirish mumkin.</string>
+    <string name="card_template_browser_appearance_summary">Karta brauzeri kartalaringizni körsatiş uçun foydalanadigan şablonni kiriting. Qisqaroq javob kösatiş uçun bundan foydalaning.\n\n“{{Mamlakat}}ning poytaxti:”ning oldi taraf şabloni\nkarta brauzerida\n“Poytaxti: {{Mamlakat}}” qilib qisqartiriş mumkin.</string>
     <string name="card_template_browser_appearance_question_format">Savol formati</string>
     <string name="card_template_browser_appearance_answer_format">Javob formati</string>
-    <string name="card_template_browser_appearance_restore_default_dialog">Rostan ham brauzer koʻrinishini birlamchiga qaytarmoqchimisiz?</string>
-    <string name="card_template_browser_appearance_saving_note">Ushbu oʻzgarishlar karta shabloni oʻzgarganda qoʻllanadi</string>
+    <string name="card_template_browser_appearance_restore_default_dialog">Rostan ham brauzer körinişini birlamçiga qaytarmoqçimisiz?</string>
+    <string name="card_template_browser_appearance_saving_note">Uşbu özgarişlar karta şabloni özgarganda qöllanadi</string>
     <!-- Deck Override -->
-    <string name="card_template_editor_deck_override_on">Dastani oʻzgartirish (yoniq)</string>
-    <string name="card_template_editor_deck_override_off">Dastani oʻzgartirish (oʻchiq)</string>
-    <string name="model_manager_deck_override_added_message">‘%2$s’ dastasi ‘%1$s’ uchun birlamchi dasta sifatida sozlandi</string>
-    <string name="model_manager_deck_override_removed_message">‘%s’ uchun birlamchi dasta olib tashlandi</string>
-    <string name="deck_override_explanation">Yangi “%s” kartalarini joylashtirish uchun dastani tanlang</string>
-    <string name="deck_picker_dialog_filter_decks" maxLength="28">Dastalarni filtrlash</string>
+    <string name="card_template_editor_deck_override_on">Dastani özgartiriş (yoniq)</string>
+    <string name="card_template_editor_deck_override_off">Dastani özgartiriş (öçiq)</string>
+    <string name="model_manager_deck_override_added_message">‘%2$s’ dastasi ‘%1$s’ uçun birlamçi dasta sifatida sozlandi</string>
+    <string name="model_manager_deck_override_removed_message">‘%s’ uçun birlamçi dasta olib taşlandi</string>
+    <string name="deck_override_explanation">Yangi “%s” kartalarini joylaştiriş uçun dastani tanlang</string>
+    <string name="deck_picker_dialog_filter_decks" maxLength="28">Dastalarni filtrlaş</string>
 </resources>
diff --git a/common/android/src/main/res/values-uz/20-search-preference.xml b/common/android/src/main/res/values-uz/20-search-preference.xml
index f094c27a1f5e..bcd75e717427 100644
--- a/common/android/src/main/res/values-uz/20-search-preference.xml
+++ b/common/android/src/main/res/values-uz/20-search-preference.xml
@@ -50,6 +50,6 @@
     the key names MUST NOT be changed due to this
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string tools:ignore="UnusedResources" name="searchpreference_search" comment="By submitting this string, you license it under the MIT License">Qidirish&#8230;</string>
-    <string tools:ignore="UnusedResources" name="searchpreference_clear_history" comment="By submitting this string, you license it under the MIT License">Tarixni tozalash</string>
+    <string tools:ignore="UnusedResources" name="searchpreference_search" comment="By submitting this string, you license it under the MIT License">Qidiriş&#8230;</string>
+    <string tools:ignore="UnusedResources" name="searchpreference_clear_history" comment="By submitting this string, you license it under the MIT License">Tarixni tozalaş</string>
 </resources>
diff --git a/AnkiDroid/src/main/res/values-v29/theme_dark.xml b/common/android/src/main/res/values-v29/theme_dark.xml
similarity index 100%
rename from AnkiDroid/src/main/res/values-v29/theme_dark.xml
rename to common/android/src/main/res/values-v29/theme_dark.xml
diff --git a/AnkiDroid/src/main/res/values-v29/theme_light.xml b/common/android/src/main/res/values-v29/theme_light.xml
similarity index 100%
rename from AnkiDroid/src/main/res/values-v29/theme_light.xml
rename to common/android/src/main/res/values-v29/theme_light.xml
diff --git a/AnkiDroid/src/main/res/values-v29/theme_plain.xml b/common/android/src/main/res/values-v29/theme_plain.xml
similarity index 100%
rename from AnkiDroid/src/main/res/values-v29/theme_plain.xml
rename to common/android/src/main/res/values-v29/theme_plain.xml
diff --git a/common/android/src/main/res/values-vi/02-strings.xml b/common/android/src/main/res/values-vi/02-strings.xml
index 41fdf1540e34..49b623b5e390 100644
--- a/common/android/src/main/res/values-vi/02-strings.xml
+++ b/common/android/src/main/res/values-vi/02-strings.xml
@@ -216,7 +216,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Cỡ chữ</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Hiển thị thanh công cụ</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -244,7 +247,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Màn hình chính của bạn không cho phép AnkiDroid thêm phím tắt</string>
     <string name="create_shortcut_error">Không thể thêm shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Viết hoa các câu</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Chứng chỉ</string>
@@ -329,7 +331,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">Internet</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">Cài đặt</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">Không thể mở cài đặt chuyển văn bản thành giọng nói</string>
-    <string name="shared_decks_login_required">Vui lòng đăng nhập để tải thêm các bộ thẻ</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">Mô tả</string>
     <string name="deck_description_saved">Mô tả đã được cập nhật</string>
     <string name="format_deck_description_as_markdown">Định dạng dưới dạng Markdown</string>
diff --git a/common/android/src/main/res/values-vi/03-dialogs.xml b/common/android/src/main/res/values-vi/03-dialogs.xml
index 281eaa54d92b..3e3244d9e0a4 100644
--- a/common/android/src/main/res/values-vi/03-dialogs.xml
+++ b/common/android/src/main/res/values-vi/03-dialogs.xml
@@ -43,8 +43,8 @@
     <string name="repair_deck_dialog">Bạn có thực sự muốn sửa chữa cơ sở dữ liệu? \n\nTrước khi bắt đầu, một bản sao sẽ được tạo trong thư mục con \"%s\".</string>
     <string name="intent_aedict_empty">Danh mục \"mặc định\" rỗng</string>
     <string name="intent_aedict_category">Để thêm thẻ vào AnkiDroid, hãy xoá toàn bộ danh mục Notepad hoặc thêm danh mục tên \"mặc định\"</string>
-    <string name="custom_study_new_extend">Tăng / giảm (“-3”) hạn mức thẻ mới của ngày hôm nay lên</string>
-    <string name="custom_study_rev_extend">Tăng / giảm (“-3”) giới hạn ôn tập của ngày hôm nay lên</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Ôn lại các thẻ đã quên trong x ngày trước:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -93,7 +93,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">Toàn bộ thẻ</string>
-    <string name="tags_dialog_option_new_cards">Mới</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">Mới</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Tới hạn</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">Đang tìm thẻ rỗng&#8230;</string>
@@ -220,6 +220,8 @@
     <string name="webview_update_message">Hệ thống WebView đã lỗi thời. Một số tính năng sẽ không hoạt động đúng cách. Vui lòng cập nhật.\n\nPhiên bản đã cài đặt: %1$d\nPhiên bản yêu cầu tối thiểu: %2$d</string>
     <string name="compress">Nén</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Ngôn ngữ không được hỗ trợ</string>
     <string name="tts_error_dialog_reason_text">Công cụ chuyển văn bản thành giọng nói <b>%1$s</b> không hỗ trợ ngôn ngữ sau: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Thay đổi công cụ</string>
@@ -255,7 +257,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-vi/10-preferences.xml b/common/android/src/main/res/values-vi/10-preferences.xml
index 55a22b2cd597..e88d343a7fc1 100644
--- a/common/android/src/main/res/values-vi/10-preferences.xml
+++ b/common/android/src/main/res/values-vi/10-preferences.xml
@@ -54,7 +54,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">Chiều rộng không cố định</string>
@@ -167,6 +167,13 @@
     <string name="use_current" maxLength="41">Bộ thẻ cho thẻ mới</string>
     <string name="learn_cutoff" maxLength="41">Tìm hiểu trước giới hạn</string>
     <string name="time_limit" maxLength="41">Giới hạn thời gian của hộp thời gian</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Bắt đầu ngày hôm sau (0 là nửa đêm, 23 là 11 giờ tối)</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="other" comment="Consider keeping the unbreakable space after the digit">%d giờ sau nửa đêm</item>
@@ -247,6 +254,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-vi/16-multimedia-editor.xml b/common/android/src/main/res/values-vi/16-multimedia-editor.xml
index 241d0be043be..10c46b8bdcee 100644
--- a/common/android/src/main/res/values-vi/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-vi/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">Bạn có muốn cắt hình ảnh này không?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Kích thước hình ảnh hiện tại là %sMB. Giới hạn kích thước hình ảnh mặc định là 1MB. Bạn có muốn nén nó?</string>
     <string name="select_image_failed">"Chọn hình ảnh không thành công, Vui lòng thử lại"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Nội dung đoạn</string>
diff --git a/common/android/src/main/res/values-zh-rCN/02-strings.xml b/common/android/src/main/res/values-zh-rCN/02-strings.xml
index a3f33b6b863c..aab4d93dc423 100644
--- a/common/android/src/main/res/values-zh-rCN/02-strings.xml
+++ b/common/android/src/main/res/values-zh-rCN/02-strings.xml
@@ -216,7 +216,10 @@
     <string name="ankidroid_init_failed_storage">由于 Android 系统错误，AnkiDroid 无法访问存储。\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">字体大小</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">显示工具栏</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">工具栏布局</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">滚动</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">堆叠</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">隐藏</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">显示预览</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">隐藏预览</string>
     <string name="format_insert_bold">粗体格式</string>
@@ -244,7 +247,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">您的主屏幕不允许 AnkiDroid 添加快捷方式</string>
     <string name="create_shortcut_error">添加快捷方式时出错：%s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">大写句子</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">滚动工具栏</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">证书</string>
@@ -329,7 +331,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">互联网</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">安装</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">打开文本转语音设置失败</string>
-    <string name="shared_decks_login_required">请登录以下载更多牌组</string>
+    <string name="shared_decks_ankiweb_login_limit">共享排组托管于 AnkiWeb 上，这是一个独立于 AnkiDroid的免费服务。 AnkiWeb 需要您登录以继续。</string>
     <string name="deck_description_field_hint">描述</string>
     <string name="deck_description_saved">描述已更新</string>
     <string name="format_deck_description_as_markdown">转换为 Markdown 格式</string>
diff --git a/common/android/src/main/res/values-zh-rCN/03-dialogs.xml b/common/android/src/main/res/values-zh-rCN/03-dialogs.xml
index cf2711d4424e..403f32a0cf2e 100644
--- a/common/android/src/main/res/values-zh-rCN/03-dialogs.xml
+++ b/common/android/src/main/res/values-zh-rCN/03-dialogs.xml
@@ -43,8 +43,8 @@
     <string name="repair_deck_dialog">确实要尝试修复数据库吗？\n\n在开始前，副本将保存在子目录“%s”里。</string>
     <string name="intent_aedict_empty">类别“默认”为空</string>
     <string name="intent_aedict_category">向 AnkiDroid 中添加卡牌需要删除所有 Notepad 类别，或者添加“默认”类别。</string>
-    <string name="custom_study_new_extend">增加/减少（“-3”）今天的新卡片限制</string>
-    <string name="custom_study_rev_extend">增加/减少（“-3”）今天的复习卡片限制</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">复习过去 x 天中忘记的卡片：</string>
     <string name="custom_study_ahead_description">复习接下去多久到期的卡片：</string>
     <string name="custom_study_preview">预览过去 x 天内添加的新卡片：</string>
@@ -93,7 +93,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">所有卡片</string>
-    <string name="tags_dialog_option_new_cards">新卡牌</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">新卡牌</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">待复习</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">正在查找空白卡牌&#8230;</string>
@@ -136,7 +136,7 @@
     <!-- Locale Selection Dialog -->
     <string name="locale_selection_dialog_title_new">设置语言</string>
     <string name="locale_selection_dialog_summary">某些多语言键盘，如 GBoard，支持编辑文本时更改语言\n\n如果您的键盘不会更改语言，请向您的键盘发布方请求“设置输入法编辑器本地化语言提示”特性。</string>
-    <string name="locale_selection_dialog_unknown_language" comment="Used for the locales whose name is not displayed when selected and placeholder is language tag">Unknown language [%1$s]</string>
+    <string name="locale_selection_dialog_unknown_language" comment="Used for the locales whose name is not displayed when selected and placeholder is language tag">未知语言 [%1$s]</string>
     <!-- Help Dialog -->
     <string name="help_title_using_ankidroid">使用 AnkiDroid</string>
     <string name="help_item_ankidroid_manual">AnkiDroid 手册</string>
@@ -220,6 +220,8 @@
     <string name="webview_update_message">系统 WebView 已过时。有些功能将无法正常工作。请更新它。\n\n已安装版本： %1$d\n所需最低版本： %2$d</string>
     <string name="compress">压缩</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">未安装文本转语音引擎</string>
+    <string name="tts_no_engine_message">安装一个为您的设备提供文本转语音引擎的应用程序</string>
     <string name="tts_error_dialog_title">不支持的语言</string>
     <string name="tts_error_dialog_reason_text">文本转语音引擎 <b>%1$s</b>不支持下列语言：<b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">更改引擎</string>
@@ -255,7 +257,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">从</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">到</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">重命名配置文件</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">配置方案名称</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">配置方案名称不能为空</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">配置文件名称长度必须是 %1$d 个字符或更短</string>
diff --git a/common/android/src/main/res/values-zh-rCN/10-preferences.xml b/common/android/src/main/res/values-zh-rCN/10-preferences.xml
index d9c7f7b3751e..b76dc2fa1238 100644
--- a/common/android/src/main/res/values-zh-rCN/10-preferences.xml
+++ b/common/android/src/main/res/values-zh-rCN/10-preferences.xml
@@ -54,7 +54,7 @@
     <string name="dangerous_js_api_denied_snackbar">安全性：不安全的 JavaScript 调用被阻止。\n如果您信任卡片组中所有的卡片和模板，可以在高级设置中解除屏蔽。</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">允许卡片启动其他应用</string>
-    <string name="allow_card_external_launch_summ">卡片可以打开设备上的其他应用，触发潜在的不希望的操作。\n除非信任卡片组中的所有卡片和模板，否则请不要开启。</string>
+    <string name="allow_card_external_launch_summ">卡片可以打开你设备上的其他应用，触发潜在的不需要的操作。\n禁用此设置时，Web链接仍可以打开其他应用。\n关闭此选项，除非你信任牌组集中的所有卡片和模板。</string>
     <string name="card_external_launch_denied_snackbar">安全性：阻止了卡片启动另一个应用。\n如果您信任卡片组中的所有卡片和模板，可以在高级设置中解除屏蔽。</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">笔画粗细</string>
@@ -167,6 +167,13 @@
     <string name="use_current" maxLength="41">新卡片的默认牌组</string>
     <string name="learn_cutoff" maxLength="41">提前学习的限制</string>
     <string name="time_limit" maxLength="41">限制每次学习的时长</string>
+    <string name="timeboxing" maxLength="41">时间盒</string>
+    <string name="use_timebox" maxLength="41">使用时间盒</string>
+    <string name="time_limit_label" maxLength="41">时间限制</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="other">分钟</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">时间盒将您的学习过程分为较短的小节，以此帮您保持专注。当达到单次时限时，您将会看到您学习了多少张卡片，并可以选择休息或是继续。</string>
     <string name="day_offset_with_description" maxLength="41">次日开始时间</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="other" comment="Consider keeping the unbreakable space after the digit">%d 时</item>
@@ -249,6 +256,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">仅当今天尚未复习时通知我</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">请输入一个整数</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">阈值必须至少为 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">删除此提醒？</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">无法撤消此操作。</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-zh-rCN/16-multimedia-editor.xml b/common/android/src/main/res/values-zh-rCN/16-multimedia-editor.xml
index 9899efca4574..d608fd05215d 100644
--- a/common/android/src/main/res/values-zh-rCN/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-zh-rCN/16-multimedia-editor.xml
@@ -49,7 +49,8 @@
     <string name="multimedia_editor_audio_view_create_failed">无法创建录音工具栏</string>
     <!-- Crop function-->
     <string name="crop_image">您想裁剪此图像吗？</string>
-    <string name="crop_button" maxLength="28">Crop</string>
+    <string name="crop_button" maxLength="28">裁切</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">当前图像大小是 %sMB。默认图像大小限制是 1MB。您想压缩它吗？</string>
     <string name="select_image_failed">"选择图像失败，请重试"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">字段目录</string>
diff --git a/common/android/src/main/res/values-zh-rTW/02-strings.xml b/common/android/src/main/res/values-zh-rTW/02-strings.xml
index d16aa6c1e89d..b6b58337a3df 100644
--- a/common/android/src/main/res/values-zh-rTW/02-strings.xml
+++ b/common/android/src/main/res/values-zh-rTW/02-strings.xml
@@ -216,7 +216,10 @@
     <string name="ankidroid_init_failed_storage">AnkiDroid cannot access storage due to an Android error.\n\n%s</string>
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">字型大小</string>
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">顯示工具列</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
     <string name="format_insert_bold">Format as bold</string>
@@ -244,7 +247,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">您的主畫面不允許 AnkiDroid 新增捷徑</string>
     <string name="create_shortcut_error">新增捷徑時發生錯誤：%s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">大寫句子</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">滾動工具列</string>
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
     <string name="dialog_hint_certificate">Certificate</string>
@@ -329,7 +331,7 @@
     <string name="tts_voices_chip_filter_to_internet" comment="     Filters a list of text to speech voices, to enable/disable voices which require the internet to     function.     This is on a chip control, so keep the text short, ideally one word">互聯網</string>
     <string name="tts_voices_chip_filter_to_installable_audio" comment="     Displays a list of Text to Speech voices which should be downloaded/installed before use     This is on a chip control, so keep the text short, ideally one word">下載</string>
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if opening the system text to speech settings fails">開啟文音互譯功能失敗</string>
-    <string name="shared_decks_login_required">請登錄以下載更多卡組</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
     <string name="deck_description_field_hint">描述</string>
     <string name="deck_description_saved">描述已更新</string>
     <string name="format_deck_description_as_markdown">Format as Markdown</string>
diff --git a/common/android/src/main/res/values-zh-rTW/03-dialogs.xml b/common/android/src/main/res/values-zh-rTW/03-dialogs.xml
index 796d7537611a..9bbfb7c26380 100644
--- a/common/android/src/main/res/values-zh-rTW/03-dialogs.xml
+++ b/common/android/src/main/res/values-zh-rTW/03-dialogs.xml
@@ -43,8 +43,8 @@
     <string name="repair_deck_dialog">你真的想要修復資料庫嗎？\n\n在開始修復之前，會先複製一份備份檔案放置於資料夾\'%s\'中。</string>
     <string name="intent_aedict_empty">\'default\'類別是空的</string>
     <string name="intent_aedict_category">若要增加新卡片至 AnkiDroid，刪除所有的記事本類別或新增一個 \'default\' 牌組</string>
-    <string name="custom_study_new_extend">將今天的新卡片上限新增/減少(“-3”)</string>
-    <string name="custom_study_rev_extend">將今天的複習卡片上限新增/減少(“-3”)</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">過去 x 天內忘記的複習卡:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -93,7 +93,7 @@
     </plurals>
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">所有卡片</string>
-    <string name="tags_dialog_option_new_cards">新增</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">新增</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">到期</string>
     <!-- Empty cards -->
     <string name="emtpy_cards_finding">正在搜尋空白卡片&#8230;&#8230;</string>
@@ -220,6 +220,8 @@
     <string name="webview_update_message">系統 WebView 已經過時。某些功能無法正常運作。請更新。\n\n安裝版本：%1$d%1$d最低要求版本：%2$d</string>
     <string name="compress">壓縮</string>
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">不支援的語言</string>
     <string name="tts_error_dialog_reason_text">文字轉語音引擎 <b>%1$s</b>不支援下列語言：<b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">變更引擎</string>
@@ -255,7 +257,8 @@
     <!-- Change Note Type Dialog -->
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values-zh-rTW/10-preferences.xml b/common/android/src/main/res/values-zh-rTW/10-preferences.xml
index 5c69c80fbe9d..4ab2c9af74bb 100644
--- a/common/android/src/main/res/values-zh-rTW/10-preferences.xml
+++ b/common/android/src/main/res/values-zh-rTW/10-preferences.xml
@@ -54,7 +54,7 @@
     <string name="dangerous_js_api_denied_snackbar">Security: Unsafe JavaScript call blocked.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
     <!-- preferences.xml entries-->
     <string name="whiteboard_stroke_width" maxLength="41">筆跡寬度</string>
@@ -167,6 +167,13 @@
     <string name="use_current" maxLength="41">存放新卡片的牌組</string>
     <string name="learn_cutoff" maxLength="41">提早學習上限</string>
     <string name="time_limit" maxLength="41">時間盒的時間上限</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">下一天開始的時間</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="other" comment="Consider keeping the unbreakable space after the digit">%d hours past midnight</item>
@@ -249,6 +256,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder\'s card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
     <!-- Reminder troubleshooting screen -->
diff --git a/common/android/src/main/res/values-zh-rTW/16-multimedia-editor.xml b/common/android/src/main/res/values-zh-rTW/16-multimedia-editor.xml
index efc728dfe7c8..a8713b8cb46e 100644
--- a/common/android/src/main/res/values-zh-rTW/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values-zh-rTW/16-multimedia-editor.xml
@@ -50,6 +50,7 @@
     <!-- Crop function-->
     <string name="crop_image">是否裁剪此圖像？</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">現圖像大小為 %sMB。預設圖像大小限制為1MB，你要壓縮它嗎？</string>
     <string name="select_image_failed">"選取圖像失敗，請重試"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">欄位內容</string>
diff --git a/common/android/src/main/res/values/02-strings.xml b/common/android/src/main/res/values/02-strings.xml
index 0eba17b9c243..4f48f3351e34 100644
--- a/common/android/src/main/res/values/02-strings.xml
+++ b/common/android/src/main/res/values/02-strings.xml
@@ -240,7 +240,10 @@
     <!-- A Menu item to change the Font Size (currently in the Note Editor) -->
     <string name="menu_font_size" maxLength="28">Font size</string>
 
-    <string name="menu_show_toolbar" comment="Checkable item stating whether the note editor toolbar should be shown" maxLength="28">Show toolbar</string>
+    <string name="note_editor_toolbar_layout" maxLength="28">Toolbar layout</string>
+    <string comment="The toolbar is scrollable horizontally" name="note_editor_toolbar_scroll">Scroll</string>
+    <string comment="The toolbar is stacked vertically if it overflows" name="note_editor_toolbar_stack">Stack</string>
+    <string comment="The toolbar is not shown" name="note_editor_toolbar_hidden">Hidden</string>
     <string name="note_editor_show_previewer" comment="Checkable item stating whether the note editor preview sidebar should be shown" maxLength="28">Show preview</string>
     <string name="note_editor_hide_previewer" comment="Checkable item stating whether the note editor preview sidebar should be hidden" maxLength="28">Hide preview</string>
 
@@ -275,7 +278,6 @@
     <string name="create_shortcut_failed" comment="home screen == launcher">Your home screen does not allow AnkiDroid to add shortcuts</string>
     <string name="create_shortcut_error">Error adding shortcut: %s</string>
     <string name="note_editor_capitalize" comment="This is for a switch with a checkbox - on: enabled" maxLength="28">Capitalize sentences</string>
-    <string name="menu_scroll_toolbar" comment="Checkbox stating whether note editor toolbar is scrollable or stacked. Checked: Scroll" maxLength="28">Scroll toolbar</string>
 
     <!-- Dialog hints -->
     <string name="dialog_hint_url">URL</string>
@@ -402,7 +404,7 @@ voice. The parameter is a technical error code such as 'ERROR_NOT_INSTALLED_YET'
     <string name="tts_voices_failed_opening_tts_system_settings" comment="error message if
 opening the system text to speech settings fails">Failed to open text to speech settings</string>
 
-    <string name="shared_decks_login_required">Please log in to download more decks</string>
+    <string name="shared_decks_ankiweb_login_limit">Shared decks are hosted on AnkiWeb, a free service separate from AnkiDroid. AnkiWeb asks you to log in to continue.</string>
 
     <string name="deck_description_field_hint">Description</string>
     <string name="deck_description_saved">Description updated</string>
diff --git a/common/android/src/main/res/values/03-dialogs.xml b/common/android/src/main/res/values/03-dialogs.xml
index 94f838cca1ef..33106a563179 100644
--- a/common/android/src/main/res/values/03-dialogs.xml
+++ b/common/android/src/main/res/values/03-dialogs.xml
@@ -33,8 +33,8 @@
     <string name="repair_deck_dialog">Do you really want to try to repair the database?\n\nBefore starting the attempt, a copy will be created in subfolder “%s”.</string>
     <string name="intent_aedict_empty">Category “default” is empty</string>
     <string name="intent_aedict_category">To add cards to AnkiDroid remove all Notepad categories or add one named “default”</string>
-    <string name="custom_study_new_extend">Increase/decrease (“-3”) today’s new card limit by</string>
-    <string name="custom_study_rev_extend">Increase/decrease (“-3”) today’s review limit by</string>
+    <string name="custom_study_extend_limits_title">Extend daily limits</string>
+    <string name="custom_study_increase">Increase</string>
     <string name="custom_study_forgotten">Review cards forgotten in last x days:</string>
     <string name="custom_study_ahead_description">Review cards due in the next:</string>
     <string name="custom_study_preview">Preview new cards added in the last:</string>
@@ -91,7 +91,7 @@
 
     <!-- Tags Dialog Options -->
     <string name="tags_dialog_option_all_cards">All cards</string>
-    <string name="tags_dialog_option_new_cards">New</string>
+    <string name="tags_dialog_option_new_cards" comment="Name of cards that have not ever been reviewed yet">New</string>
     <string name="tags_dialog_option_due_cards" comment="Name of cards that are already been reviewed in the past, and that should be reviewed again">Due</string>
 
     <!-- Empty cards -->
@@ -253,6 +253,8 @@ also changes the interval of the card"
     <string name="compress">Compress</string>
 
     <!-- Tts playback error dialog -->
+    <string name="tts_no_engine_title">No text-to-speech engine installed</string>
+    <string name="tts_no_engine_message">Install an app that provides a text-to-speech engine for your device.</string>
     <string name="tts_error_dialog_title">Language not supported</string>
     <string name="tts_error_dialog_reason_text">The text to speech engine <b>%1$s</b> does not support the following language: <b>%2$s</b></string>
     <string name="tts_error_dialog_change_button_text">Change engine</string>
@@ -295,7 +297,8 @@ also changes the interval of the card"
     <string name="change_note_type_from" comment="Label indicating the original note type before changing it">From</string>
     <string name="change_note_type_to" comment="Label indicating the new note type to change to">To</string>
 
-    <!-- Add profile dialog -->
+    <!-- Add and rename profile dialogs -->
+    <string name="rename_profile" comment="Title of the dialog where the user renames a profile">Rename profile</string>
     <string name="profile_name" comment="Label of the text field where the user types the name of a new profile">Profile name</string>
     <string name="profile_name_empty_error" comment="Error shown when the user leaves the profile name empty">Profile name can’t be empty</string>
     <string name="profile_name_too_long_error" comment="Error shown when a profile name exceeds the maximum length. %1$d is the maximum number of characters">Profile name must be %1$d characters or fewer</string>
diff --git a/common/android/src/main/res/values/10-preferences.xml b/common/android/src/main/res/values/10-preferences.xml
index a27c10dc368e..e14d8fec84d4 100644
--- a/common/android/src/main/res/values/10-preferences.xml
+++ b/common/android/src/main/res/values/10-preferences.xml
@@ -44,7 +44,7 @@
 
     <!-- External-app launching from card content (intent: / android-app: URLs) -->
     <string name="allow_card_external_launch_title" maxLength="41">Allow cards to launch other apps</string>
-    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nLeave off unless you trust all cards and templates in your collection.</string>
+    <string name="allow_card_external_launch_summ">Cards can open other apps on your device, triggering potentially unwanted actions.\nWeb links may still open other apps when this setting is disabled.\nLeave off unless you trust all cards and templates in your collection.</string>
     <string name="card_external_launch_denied_snackbar">Security: Card blocked from launching another app.\nIf you trust all cards and templates in your collection, this can be unblocked in the advanced settings</string>
 
     <!-- preferences.xml entries-->
@@ -159,6 +159,14 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
+    <string name="timeboxing" maxLength="41">Timeboxing</string>
+    <string name="use_timebox" maxLength="41">Use timebox</string>
+    <string name="time_limit_label" maxLength="41">Time limit</string>
+    <plurals name="timebox_minutes_suffix">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <string name="pref_timebox_help_summary">Timeboxing divides your study into shorter sessions to help you stay focused. When the time limit is reached, you\'ll see how many cards you studied and can choose to take a break or continue.</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one" comment="Consider keeping the unbreakable space after the digit">%d&#160;hour past midnight</item>
@@ -252,6 +260,7 @@
     <string name="add_edit_reminder_only_notify_if_no_reviews_label" comment="Label of the switch suppressing a review reminder on days which have already had reviews.">Only notify me if no reviews have been done today</string>
     <string name="add_edit_reminder_card_threshold_error_not_a_number" comment="Validation error shown when the review reminder card threshold field does not hold a whole number.">Please enter a whole number of cards</string>
     <string name="add_edit_reminder_card_threshold_error_negative" comment="Validation error shown when the review reminder card threshold field holds a negative number.">The threshold must be at least 0</string>
+    <string name="add_edit_reminder_count_toward_threshold_heading" comment="Heading above the advanced review reminder options for choosing which kinds of cards (new / learning / to review) count toward the reminder's card threshold.">Count these cards toward the threshold:</string>
     <string name="add_edit_reminder_delete_confirmation_title" comment="Title of the dialog confirming deletion of a review reminder.">Delete this reminder?</string>
     <string name="add_edit_reminder_delete_confirmation_message" comment="Body of the dialog confirming deletion of a review reminder.">This action cannot be undone.</string>
 
diff --git a/common/android/src/main/res/values/16-multimedia-editor.xml b/common/android/src/main/res/values/16-multimedia-editor.xml
index 36da1dd49d8f..164076fc53d7 100644
--- a/common/android/src/main/res/values/16-multimedia-editor.xml
+++ b/common/android/src/main/res/values/16-multimedia-editor.xml
@@ -42,6 +42,7 @@
     <!-- Crop function-->
     <string name="crop_image">Do you want to crop this image?</string>
     <string name="crop_button" maxLength="28">Crop</string>
+    <string name="external_image_editor_no_changes">No changes were returned.</string>
     <string name="save_dialog_content">Current image size is %sMB. Default image size limit is 1MB. Do you want to compress it?</string>
     <string name="select_image_failed">"Select image failed, Please retry"</string>
     <string name="audio_recording_field_list" comment="Displays a list of the field data in the note editor while audio recording is taking place">Field Contents</string>
diff --git a/common/android/src/main/res/values/constants.xml b/common/android/src/main/res/values/constants.xml
new file mode 100644
index 000000000000..01e8ea997835
--- /dev/null
+++ b/common/android/src/main/res/values/constants.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+  -->
+<resources>
+    <string name="app_name" translatable="false">AnkiDroid</string>
+</resources>
diff --git a/common/android/src/main/res/values/dimens.xml b/common/android/src/main/res/values/dimens.xml
new file mode 100644
index 000000000000..9e3ef4570223
--- /dev/null
+++ b/common/android/src/main/res/values/dimens.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+  -->
+<resources>
+    <!-- Material UI side margin: http://web.archive.org/web/20180105203433if_/https://material.io/guidelines/layout/metrics-keylines.html#metrics-keylines-keylines-spacing -->
+    <dimen name="side_margin">16dp</dimen>
+    <dimen name="content_textsize">18sp</dimen>
+    <dimen name="content_vertical_padding">8dp</dimen>
+</resources>
diff --git a/common/android/src/main/res/values/ids.xml b/common/android/src/main/res/values/ids.xml
new file mode 100644
index 000000000000..d28b45ab4aab
--- /dev/null
+++ b/common/android/src/main/res/values/ids.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+  -->
+<resources>
+    <item type="id" name="root_layout"/>
+    <item type="id" name="pending_snackbar"/>
+    <item type="id" name="dialog_text_input_layout"/>
+</resources>
diff --git a/common/android/src/main/res/values/preferences_notifications.xml b/common/android/src/main/res/values/preferences_notifications.xml
new file mode 100644
index 000000000000..e45ba36bb9b0
--- /dev/null
+++ b/common/android/src/main/res/values/preferences_notifications.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
+<resources>
+    <string translatable="false" name="pref_notifications_minimum_cards_due_key">minimumCardsDueForNotification</string>
+    <string translatable="false" name="pref_new_review_reminders">newReviewReminders</string>
+</resources>
diff --git a/common/android/src/main/res/values/theme_attrs.xml b/common/android/src/main/res/values/theme_attrs.xml
new file mode 100644
index 000000000000..00d471c78af0
--- /dev/null
+++ b/common/android/src/main/res/values/theme_attrs.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+  ~ SPDX-FileCopyrightText: Copyright (c) 2011 Norbert Nagold <norbert.nagold@gmail.com>
+  -->
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="DuplicateCrowdInStrings">
+
+    <!-- Android provides a straightforward way to control action bar styles; an additional color attribute
+     specifically for action bar text color isn't necessary, but it simplifies the color setting
+     while making it accessible everywhere and eases the use of themes -->
+    <attr name="actionBarTextColor" format="color"/> <!-- For title and subtitle, and any other text that may appear in action bar-->
+    <attr name="actionBarPopupTextColor" format="color"/>
+
+    <attr name="incrementerButtonBackground" format="color|reference" />
+
+    <!-- appBarColor and customTabNavBarColor are declared in :common:android (shared activity code resolves them) -->
+    <attr name="widgetColorActivated" format="color"/>
+    <!-- Deck list colors, divider, and expander -->
+    <attr name="currentDeckBackground" format="reference"/>
+    <attr name="currentDeckBackgroundColor" format="color"/>
+    <attr name="focusedRowBackgroundColor" format="color"/>
+    <attr name="dynDeckColor" format="color"/>
+    <attr name="deckDivider" format="reference"/>
+    <attr name="expandRef" format="reference"/>
+    <attr name="collapseRef" format="reference"/>
+    <!-- Navigation drawer -->
+    <attr name="navDrawerItemColor" format="reference"/>
+    <attr name="navDrawerItemBackgroundColor" format="reference"/>
+    <!-- Card count colors -->
+    <attr name="newCountColor" format="color"/>
+    <attr name="learnCountColor" format="color"/>
+    <attr name="reviewCountColor" format="color"/>
+    <attr name="zeroCountColor" format="color"/>
+    <attr name="buryCountColor" format="color"/>
+    <!-- Study Screen button backgrounds -->
+    <attr name="showAnswerButtonBackground" format="color"/>
+    <attr name="answerButtonBackground" format="color"/>
+    <attr name="againButtonBackground" format="color"/>
+    <attr name="hardButtonBackground" format="color"/>
+    <attr name="goodButtonBackground" format="color"/>
+    <attr name="easyButtonBackground" format="color"/>
+    <attr name="showAnswerColor" format="reference"/>
+    <attr name="againButtonRef" format="reference"/>
+    <attr name="hardButtonRef" format="reference"/>
+    <attr name="goodButtonRef" format="reference"/>
+    <attr name="easyButtonRef" format="reference"/>
+    <!-- Same thing but with ripples -->
+    <attr name="againButtonRippleRef" format="reference"/>
+    <attr name="hardButtonRippleRef" format="reference"/>
+    <attr name="goodButtonRippleRef" format="reference"/>
+    <attr name="easyButtonRippleRef" format="reference"/>
+    <!-- Study Screen button text colors-->
+    <attr name="answerButtonTextColor" format="color"/>
+    <attr name="againButtonTextColor" format="color"/>
+    <attr name="hardButtonTextColor" format="color"/>
+    <attr name="goodButtonTextColor" format="color"/>
+    <attr name="easyButtonTextColor" format="color"/>
+
+    <attr name="againTextColor" format="color"/>
+    <attr name="hardTextColor" format="color"/>
+    <attr name="goodTextColor" format="color"/>
+    <attr name="easyTextColor" format="color"/>
+    <attr name="againBackgroundColor" format="color"/>
+    <attr name="hardBackgroundColor" format="color"/>
+    <attr name="goodBackgroundColor" format="color"/>
+    <attr name="easyBackgroundColor" format="color"/>
+    <attr name="againIconColor" format="color"/>
+    <attr name="hardIconColor" format="color"/>
+    <attr name="goodIconColor" format="color"/>
+    <attr name="easyIconColor" format="color"/>
+    <!-- Card Browser Colors -->
+    <attr name="cardBrowserDivider" format="color"/>
+    <!-- Study Screen other colors -->
+    <attr name="topBarColor" format="color"/>
+    <attr name="maxTimerColor" format="color"/>
+    <attr name="alternativeBackgroundColor" format="color"/>
+    <!-- Browser colors -->
+    <attr name="suspendedColor" format="color"/>
+    <attr name="buriedColor" format="color"/>
+    <attr name="selectedColor" format="color"/>
+    <attr name="markedColor" format="color"/>
+    <!-- Note editor colors -->
+    <attr name="duplicateColor" format="color"/>
+    <attr name="editTextBackgroundColor" format="color"/>
+    <attr name="editTextHighlightColor" format="color"/><!-- TODO replace this with colorOnPrimaryContainer, see #19361 -->
+    <attr name="toolbarBackgroundColor" format="color"/>
+    <attr name="toolbarIconColor" format="color"/>
+    <attr name="buttonShadowColor" format="color"/>
+    <attr name="buttonRippleColor" format="color"/>
+    <attr name="buttonForegroundColor" format="color"/>
+    <!-- Images -->
+    <attr name="navDrawerImage" format="integer"/>
+
+    <!-- Introduction -->
+    <attr name="introductionLogoTransparent" format="color"/>
+
+    <!-- FAB -->
+    <attr name="fab_normal" format="color"/> <!-- Also color of the Study button in StudyOptions -->
+    <attr name="fab_pressed" format="color"/>
+    <!-- Popup menus' background color -->
+    <attr name="popupBackgroundColor" format="reference"/>
+    <attr name="overflowAndPopupMenuIconColor" format="color"/>
+
+    <attr name="editTextDisabled" format="color"/>
+
+    <attr name="snackbarBackgroundTintColor" format="color"/>
+    <attr name="dialogBackground" format="color"/>
+    <attr name="snackbarButtonTextColor" format="color"/>
+
+    <attr name="clozeColor" format="color" />
+
+    <!-- Background color for Tab layout. It is essentially the color of the toolbar.
+         The latter is set by colorPrimary, but theme overlay can't use it,
+         as it itself overrides colorPrimary, which is used by the view directly. -->
+    <attr name="tabLayoutBackgroundColor" format="color"/>
+    <attr name="tabActiveIconColor" format="color"/>
+
+    <attr name="checkMediaListBackground" format="color" />
+    <attr name="checkMediaListForeground" format="color" />
+
+    <attr name="progressDialogButtonTextColor" format="color"/>
+
+    <!-- Reminder troubleshooting -->
+    <attr name="reminderTroubleshootingOk" format="color"/>
+    <attr name="reminderTroubleshootingWarning" format="color"/>
+
+
+    <attr name="badgeWarningColor" format="color"/>
+    <attr name="badgeErrorColor" format="color"/>
+    <attr name="widgetStrokeWidth" format="dimension"/>
+    <attr name="widgetStrokeColor" format="color"/>
+    <attr name="studyScreenElevation" format="dimension"/>
+    <attr name="whiteboardToolbarCardStyle" format="reference"/>
+</resources>
diff --git a/AnkiDroid/src/main/res/values/theme_black.xml b/common/android/src/main/res/values/theme_black.xml
similarity index 91%
rename from AnkiDroid/src/main/res/values/theme_black.xml
rename to common/android/src/main/res/values/theme_black.xml
index f8164534279c..545a43b2f0e5 100644
--- a/AnkiDroid/src/main/res/values/theme_black.xml
+++ b/common/android/src/main/res/values/theme_black.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="DuplicateCrowdInStrings">
     <color name="theme_black_primary">#000000</color>
     <color name="theme_black_primary_dark">#000000</color>
@@ -12,6 +13,11 @@
         <item name="colorPrimaryDark">@color/black</item>
         <item name="colorAccent">@color/material_blue_500</item>
         <item name="colorSecondaryContainer">#252525</item>
+        <item name="colorSurfaceVariant">#252525</item>
+        <item name="colorOnSurfaceVariant">#CCCCCC</item>
+        <item name="colorOutlineVariant">#555555</item>
+        <item name="colorTertiary">#CCCCCC</item>
+        <item name="colorOnTertiary">#000000</item>
         <item name="colorSurfaceContainerHigh">#151515</item>
         <item name="android:textColor">@color/text_color_dark</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
@@ -96,6 +102,7 @@
         <!-- Dialog styles -->
         <item name="android:listPreferredItemHeight">56dip</item>
         <item name="alertDialogTheme">@style/ThemeOverlay.AnkiDroid.AlertDialog.Black</item>
+        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog.Black</item>
         <!--Custom Tabs colors-->
         <item name="customTabNavBarColor">#000000</item>
         <item name="popupBackgroundColor">@color/popup_background_theme_black</item>
@@ -135,5 +142,10 @@
         <item name="android:colorBackground">@color/theme_black_primary_light</item>
     </style>
 
+    <style name="ThemeOverlay.App.BottomSheetDialog.Black" parent="ThemeOverlay.App.BottomSheetDialog">
+        <item name="android:colorBackground">@color/theme_black_primary_light</item>
+        <item name="elevationOverlayEnabled">false</item>
+    </style>
+
     <style name="Theme_Dark.Black" parent="Base.Theme.Dark.Black"/>
 </resources>
diff --git a/common/android/src/main/res/values/theme_colors.xml b/common/android/src/main/res/values/theme_colors.xml
new file mode 100644
index 000000000000..7992e9d8f654
--- /dev/null
+++ b/common/android/src/main/res/values/theme_colors.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+  ~ SPDX-FileCopyrightText: Copyright (c) 2011 Norbert Nagold <norbert.nagold@gmail.com>
+  -->
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources,DuplicateCrowdInStrings">
+    <color name="transparent">#00000000</color>
+    <color name="white">#ffffff</color>
+    <color name="black">#000000</color>
+    <color name="semi_transparent_black">#80000000</color>
+
+    <color name="answer_buttons_highlight_color">#66FFFFFF</color>
+
+    <!-- The Material Design color palette lives in :common:android (common/android/.../res/values/colors.xml) -->
+
+    <!-- Green from the system 'Battery health' screen -->
+    <color name="google_green_300">#81c995</color>
+    <color name="google_green_700">#388E3C</color>
+
+    <color name="google_yellow_300">#fdd633</color>
+    <color name="warning_orange">#DE4900</color>
+
+    <color name="theme_light_drawer_row_current">#E8E8E8</color>
+    <color name="popup_background_theme_dark">#434343</color>
+    <color name="popup_background_theme_black">#252525</color>
+
+    <!-- color used for bury count in study options(same as anki for light and dark) -->
+    <color name="disabled_gray_light">#858585</color>
+    <color name="disabled_gray_dark">#fcfcfc</color>
+</resources>
diff --git a/AnkiDroid/src/main/res/values/theme_dark.xml b/common/android/src/main/res/values/theme_dark.xml
similarity index 97%
rename from AnkiDroid/src/main/res/values/theme_dark.xml
rename to common/android/src/main/res/values/theme_dark.xml
index b1d5eccc3865..f643d99d9a92 100644
--- a/AnkiDroid/src/main/res/values/theme_dark.xml
+++ b/common/android/src/main/res/values/theme_dark.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="DuplicateCrowdInStrings">
     <color name="theme_dark_primary">#3d3d3d</color>
     <color name="theme_dark_primary_dark">@color/material_grey_900</color>
@@ -25,6 +26,11 @@
         <item name="android:colorBackground">@color/material_theme_grey</item>
         <item name="android:windowBackground">@color/material_theme_grey</item>
         <item name="colorSecondaryContainer">#3C5A6E</item>
+        <item name="colorSurfaceVariant">#263E50</item>
+        <item name="colorOnSurfaceVariant">#D4D4D4</item>
+        <item name="colorOutlineVariant">#5B819B</item>
+        <item name="colorTertiary">#78CAFF</item>
+        <item name="colorOnTertiary">#00324D</item>
         <item name="colorOnSecondaryContainer">@color/white</item>
 
         <item name="colorSurfaceContainerHighest">?attr/colorSurfaceContainer</item>
diff --git a/common/android/src/main/res/values/theme_dimens.xml b/common/android/src/main/res/values/theme_dimens.xml
new file mode 100644
index 000000000000..1390f6c8bb67
--- /dev/null
+++ b/common/android/src/main/res/values/theme_dimens.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources,DuplicateCrowdInStrings">
+
+    <dimen name="mtrl_snackbar_background_corner_radius">8dp</dimen>
+    <dimen name="popup_corner_radius">4dp</dimen>
+    <dimen name="dialog_corner_radius">8dp</dimen>
+</resources>
diff --git a/AnkiDroid/src/main/res/values/theme_eink.xml b/common/android/src/main/res/values/theme_eink.xml
similarity index 96%
rename from AnkiDroid/src/main/res/values/theme_eink.xml
rename to common/android/src/main/res/values/theme_eink.xml
index f3a0bde56ea7..f11a4ae4b1e4 100644
--- a/AnkiDroid/src/main/res/values/theme_eink.xml
+++ b/common/android/src/main/res/values/theme_eink.xml
@@ -15,6 +15,11 @@
         <item name="android:windowBackground">@android:color/white</item>
         <item name="preferenceCategoryTitleTextColor">@color/black</item>
         <item name="colorSecondaryContainer">#CCCCCC</item>
+        <item name="colorSurfaceVariant">#EEEEEE</item>
+        <item name="colorOnSurfaceVariant">#444444</item>
+        <item name="colorOutlineVariant">#777777</item>
+        <item name="colorTertiary">#444444</item>
+        <item name="colorOnTertiary">#FFFFFF</item>
         <item name="colorOnPrimaryContainer">@color/white</item>
         <item name="fab_normal">@color/black</item>
         <item name="fab_pressed">@color/black</item>
diff --git a/AnkiDroid/src/main/res/values/theme_light.xml b/common/android/src/main/res/values/theme_light.xml
similarity index 97%
rename from AnkiDroid/src/main/res/values/theme_light.xml
rename to common/android/src/main/res/values/theme_light.xml
index bf1736b81336..c36e818720d0 100644
--- a/AnkiDroid/src/main/res/values/theme_light.xml
+++ b/common/android/src/main/res/values/theme_light.xml
@@ -12,6 +12,11 @@
         <item name="colorPrimaryContainer">@color/white</item> <!-- Switch thumb color when disabled and being pressed -->
         <item name="colorOnPrimaryContainer">@color/white</item> <!-- FAB icons -->
         <item name="colorSecondaryContainer">#C1E7FF</item>
+        <item name="colorSurfaceVariant">#D6ECFA</item>
+        <item name="colorOnSurfaceVariant">#555555</item>
+        <item name="colorOutlineVariant">#9BBDD4</item>
+        <item name="colorTertiary">#006DA8</item>
+        <item name="colorOnTertiary">#FFFFFF</item>
 
         <item name="colorSurfaceContainerHighest">?attr/colorSurfaceContainer</item>
         <item name="colorSurfaceContainerHigh">#E4F5FD</item>
diff --git a/AnkiDroid/src/main/res/values/theme_plain.xml b/common/android/src/main/res/values/theme_plain.xml
similarity index 94%
rename from AnkiDroid/src/main/res/values/theme_plain.xml
rename to common/android/src/main/res/values/theme_plain.xml
index fe6fd65760af..32fd0232d9a9 100644
--- a/AnkiDroid/src/main/res/values/theme_plain.xml
+++ b/common/android/src/main/res/values/theme_plain.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="DuplicateCrowdInStrings">
     <color name="theme_plain_primary">#9E9E9E</color>
     <color name="theme_plain_primary_dark">#616161</color>
@@ -13,6 +14,11 @@
         <item name="colorAccent">@color/theme_plain_accent</item>
         <item name="colorSurfaceContainer">#0F9E9E9E</item>
         <item name="colorSecondaryContainer">#DDDDDD</item>
+        <item name="colorSurfaceVariant">#EEEEEE</item>
+        <item name="colorOnSurfaceVariant">#555555</item>
+        <item name="colorOutlineVariant">#BBBBBB</item>
+        <item name="colorTertiary">#555555</item>
+        <item name="colorOnTertiary">#FFFFFF</item>
         <item name="colorSurfaceContainerHigh">#F4F4F4</item>
         <item name="android:textColor">@color/text_color_light</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
diff --git a/common/android/src/main/res/values/theme_preferences.xml b/common/android/src/main/res/values/theme_preferences.xml
new file mode 100644
index 000000000000..9df009155b57
--- /dev/null
+++ b/common/android/src/main/res/values/theme_preferences.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+  ~ SPDX-FileCopyrightText: Copyright (c) 2011 Norbert Nagold <norbert.nagold@gmail.com>
+  -->
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation,DuplicateCrowdInStrings">
+
+    <string name="theme_follow_system_value">0</string>
+    <string name="theme_day_scheme_value">1</string>
+    <string name="theme_night_scheme_value">2</string>
+    <string name="theme_eink_scheme_value">3</string>
+
+    <string name="theme_light_value">1</string>
+    <string name="theme_plain_value">2</string>
+    <string name="theme_black_value">3</string>
+    <string name="theme_dark_value">4</string>
+
+    <string-array name="app_theme_values">
+        <item>@string/theme_follow_system_value</item>
+        <item>@string/theme_day_scheme_value</item>
+        <item>@string/theme_night_scheme_value</item>
+    </string-array>
+    <string-array name="day_theme_values">
+        <item>@string/theme_light_value</item>
+        <item>@string/theme_plain_value</item>
+        <item>@string/theme_eink_scheme_value</item>
+    </string-array>
+    <string-array name="night_theme_values">
+        <item>@string/theme_black_value</item>
+        <item>@string/theme_dark_value</item>
+    </string-array>
+</resources>
diff --git a/common/android/src/main/res/values/theme_styles.xml b/common/android/src/main/res/values/theme_styles.xml
new file mode 100644
index 000000000000..6a2041abfee4
--- /dev/null
+++ b/common/android/src/main/res/values/theme_styles.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources,DuplicateCrowdInStrings">
+
+    <style name="OverflowMenuStyle" parent="Widget.Material3.PopupMenu.Overflow">
+        <item name="android:popupBackground">@drawable/bg_popup</item>
+    </style>
+
+    <style name="PopupMenuStyle" parent="Widget.Material3.PopupMenu">
+        <item name="android:popupBackground">@drawable/bg_popup</item>
+    </style>
+
+    <style name="SpinnerStyle" parent="Widget.AppCompat.Spinner">
+        <item name="android:popupBackground">@drawable/bg_popup</item>
+    </style>
+
+    <!-- Snackbars -->
+    <style name="SnackbarStyle" parent="Widget.Material3.Snackbar">
+        <item name="android:backgroundTint">?attr/snackbarBackgroundTintColor</item>
+    </style>
+    <style name="SnackbarButtonStyle" parent="Widget.Material3.Button.TextButton.Snackbar">
+        <item name="android:textColor">?attr/snackbarButtonTextColor</item>
+    </style>
+
+    <!-- Switches -->
+    <style name="Preference.SwitchPreferenceCompat.Material3" parent="@style/Preference.SwitchPreferenceCompat.Material">
+        <item name="widgetLayout">@layout/preference_material_switch_widget</item>
+    </style>
+
+    <style name="SliderLabelStyle" parent="Widget.MaterialComponents.Tooltip">
+        <item name="android:textColor">@color/white</item>
+    </style>
+
+    <style name="SliderStyle" parent="Widget.Material3.Slider">
+        <item name="trackColorActive">@color/slider_active_track_color</item>
+        <item name="trackColorInactive">@color/slider_inactive_track_color</item>
+        <item name="haloColor">@color/slider_halo_color</item>
+        <item name="thumbColor">@color/slider_thumb_color</item>
+        <item name="labelStyle">@style/SliderLabelStyle</item>
+        <item name="tickVisible">false</item>
+    </style>
+
+    <style name="PreferenceThemeOverlay.AnkiDroid">
+        <item name="singleLineTitle">false</item>
+    </style>
+
+    <style name="ThemeOverlay.AnkiDroid.AlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+        <item name="dialogCornerRadius">@dimen/m3_alert_dialog_corner_size</item>
+        <item name="materialAlertDialogBodyTextStyle">@style/AnkiDroid.AlertDialog.Body.Text</item>
+        <item name="android:windowBackground">@drawable/material_dialog_background</item>
+    </style>
+
+    <style name="AnkiDroid.AlertDialog.Body.Text" parent="MaterialAlertDialog.Material3.Body.Text">
+        <!-- Keep dialog body text consistent with the primary text color -->
+        <item name="android:textColor">?android:attr/textColor</item>
+    </style>
+
+    <style name="ThemeOverlay.App.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
+        <item name="android:navigationBarColor" tools:ignore="NewApi">@android:color/transparent</item>
+    </style>
+
+    <!-- TODO remove this style when a proper 'colorOnPrimaryContainer' is set in themes, without
+           this override the user doesn't see the text selection highlight in TextInputLayouts -->
+    <style name="TextInputSelectionColorFixStyle" parent="@style/Widget.Material3.TextInputLayout.OutlinedBox">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.TextInputSelectionFix</item>
+    </style>
+
+    <style name="ThemeOverlay.TextInputSelectionFix" parent="ThemeOverlay.Material3.TextInputEditText.OutlinedBox">
+        <item name="colorOnPrimaryContainer">?attr/editTextHighlightColor</item>
+    </style>
+
+    <style name="Widget.AnkiDroid.WhiteboardToolbarCard.Eink" parent="Widget.Material3.CardView.Elevated">
+        <item name="strokeWidth">?attr/widgetStrokeWidth</item>
+        <item name="strokeColor">?attr/widgetStrokeColor</item>
+        <item name="cardElevation">0dp</item>
+    </style>
+</resources>
diff --git a/common/android/src/testFixtures/java/com/ichi2/anki/ScreenshotTestCategory.kt b/common/android/src/testFixtures/java/com/ichi2/anki/ScreenshotTestCategory.kt
new file mode 100644
index 000000000000..64523fde0595
--- /dev/null
+++ b/common/android/src/testFixtures/java/com/ichi2/anki/ScreenshotTestCategory.kt
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki
+
+/** Screenshot tests selected by the root screenshot commands or `-Pscreenshot`. */
+interface ScreenshotTestCategory
diff --git a/common/src/main/java/com/ichi2/anki/common/analytics/Analytics.kt b/common/src/main/java/com/ichi2/anki/common/analytics/Analytics.kt
index 98f85b94aec4..bdb547f6a167 100644
--- a/common/src/main/java/com/ichi2/anki/common/analytics/Analytics.kt
+++ b/common/src/main/java/com/ichi2/anki/common/analytics/Analytics.kt
@@ -33,7 +33,7 @@ interface UsageAnalytics {
 
     companion object {
         /** Bumped to `_v2` for GA4 so consent given for the old backend isn't reused. */
-        const val ANALYTICS_OPTIN_KEY = "analytics_opt_in_v2"
+        const val PREF_ANALYTICS_OPTIN = "analytics_opt_in_v2"
     }
 }
 
diff --git a/common/src/main/java/com/ichi2/anki/common/preferences/NotificationPreferences.kt b/common/src/main/java/com/ichi2/anki/common/preferences/NotificationPreferences.kt
new file mode 100644
index 000000000000..d277705cc65f
--- /dev/null
+++ b/common/src/main/java/com/ichi2/anki/common/preferences/NotificationPreferences.kt
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.common.preferences
+
+/** Preferences shared by review reminders and the legacy widget notifications. */
+interface NotificationPreferences {
+    /** Whether to enable the new review reminders notification system. */
+    val newReviewRemindersEnabled: Boolean
+
+    /** Whether the legacy notification threshold allows due-card notifications. */
+    val legacyNotificationsEnabled: Boolean
+}
diff --git a/common/src/main/java/com/ichi2/anki/common/utils/ext/JSONObject.kt b/common/src/main/java/com/ichi2/anki/common/utils/ext/JSONObject.kt
index 492501098dcc..fc560c8fc539 100644
--- a/common/src/main/java/com/ichi2/anki/common/utils/ext/JSONObject.kt
+++ b/common/src/main/java/com/ichi2/anki/common/utils/ext/JSONObject.kt
@@ -159,3 +159,18 @@ fun JSONObject.jsonObjectIterable(): Iterable<JSONObject> =
         .asSequence()
         .map { getJSONObject(it) }
         .asIterable()
+
+/**
+ * @return `null` if the key doesn't exist, or the value is not a long. The long value of the key
+ * otherwise.
+ */
+fun JSONObject.getLongOrNull(key: String): Long? {
+    if (!has(key)) {
+        return null
+    }
+    try {
+        return getLong(key)
+    } catch (ex: Exception) {
+        return null
+    }
+}
diff --git a/docs/marketing/localized_description/marketdescription-ca.txt b/docs/marketing/localized_description/marketdescription-ca.txt
index f90028389ef4..928c7dcba09f 100644
--- a/docs/marketing/localized_description/marketdescription-ca.txt
+++ b/docs/marketing/localized_description/marketdescription-ca.txt
@@ -1,6 +1,6 @@
 Memoritzeu qualsevol cosa amb AnkiDroid!
 
-AnkiDroid us permet aprendre conceptes de forma molt eficient, mostrant la fitxa just abans que l'oblideu. It is fully compatible with the spaced repetition software Anki (including synchronization), which is available for Windows, Linux and macOS.
+AnkiDroid us permet aprendre conceptes de forma molt eficient, mostrant la fitxa just abans que l'oblideu. És totalment compatible amb el programari de repetició espaiada Anki (inclús la sincronització), disponible per a Windows, Linux i MacOS.
 
 Estudieu tot tipus de temes on i quan vulgueu. Aprofiteu els temps morts en el viatge d'autobús, a la cua del supermercats o en qualsevol altra situació d'espera!
 
@@ -10,9 +10,9 @@ Afegiu material a través de l'aplicació d'escriptori Anki o directament a trav
 
 ★ Característiques principals:
 • contingut permès a les fitxes: text, imatges, sons, LaTeX
-• spaced repetition (AI-optimized FSRS algorithm)
+• repetició espaiada (l'algorisme de FSRS optimitzat amb IA)
 • integra síntesi de veu
-• more than 10,000 premade decks
+• més de 10.000 baralles preparades
 • giny del vostre progrés
 • estadístiques detallades
 • sincronització amb AnkiWeb
diff --git a/docs/marketing/localized_description/marketdescription-sv-SE.txt b/docs/marketing/localized_description/marketdescription-sv-SE.txt
index cf33a9d05ffc..c4480d641985 100644
--- a/docs/marketing/localized_description/marketdescription-sv-SE.txt
+++ b/docs/marketing/localized_description/marketdescription-sv-SE.txt
@@ -10,9 +10,9 @@ Lägg till material genom skrivbordsprogrammet Anki eller direkt via AnkiDroid.
 
 ★ Huvudfunktioner:
 • fungerande innehåll för flashkort: text, bilder, ljud och LaTeX
-• spaced repetition (AI-optimized FSRS algorithm)
+• intervallbaserad repetition (AI-optimerad FSRS-algoritm)
 • text-till-tal-integration
-• more than 10,000 premade decks
+• fler än 10 000 färdiga kortlekar
 • widget som visar dina framsteg
 • detaljerad statistik
 • synkronisering med AnkiWeb
diff --git a/docs/marketing/localized_description/marketdescription-uz.txt b/docs/marketing/localized_description/marketdescription-uz.txt
index 38a64a20d8bf..830492c0d4d7 100644
--- a/docs/marketing/localized_description/marketdescription-uz.txt
+++ b/docs/marketing/localized_description/marketdescription-uz.txt
@@ -1,36 +1,36 @@
 AnkiDroid bilan istalgan narsani eslab qoling!
 
-AnkiDroid sizga flesh-kartalarni endi unutay deganingizda koʻrsatib, juda samarali oʻrganishga yordam beradi. U Windows, Linux va macOSʼda mavjud Anki oraliqli takrorlash dasturiga (shu jumladan sinxronizatsiyaga ham) toʻliq mos keladi.
+AnkiDroid sizga fleş-kartalarni endi unutay deganingizda körsatib, juda samarali örganişga yordam beradi. U Windows, Linux va macOSʼda mavjud Anki oraliqli takrorlaş dasturiga (şu jumladan sinxronizatsiyaga ham) töliq mos keladi.
 
-Turli xil narsalarni istalgan joy va istalgan vaqtingizda oʻrganing. Avtobus safarlarida, supermarket navbatlarida yoki boshqa har qanday kutish holatidagi boʻsh vaqtingizdan unumli foydalaning!
+Turli xil narsalarni istalgan joy va istalgan vaqtingizda örganing. Avtobus safarlarida, supermarket navbatlarida yoki boşqa har qanday kutiş holatidagi böş vaqtingizdan unumli foydalaning!
 
-Oʻzingizni fleshka-kartalaringizni yarating yoki koʻplab tillar va mavzular uchun tuzilgan bepul dastalarni yuklab oling (6000 dan ortiq mavjud).
+Özingizni fleşka-kartalaringizni yarating yoki köplab tillar va mavzular uçun tuzilgan bepul dastalarni yuklab oling (6000 dan ortiq mavjud).
 
-Anki Desktop orqali yoki toʻgʻridan-toʻgʻri AnkiDroid orqali material qoʻshing. Ilova hatto lugʻatdan avtomatik ravishda material qoʻshishni ham qoʻllab-quvvatlaydi!
+Anki Desktop orqali yoki töğridan-töğri AnkiDroid orqali material qöşing. Ilova hatto luğatdan avtomatik ravişda material qöşişni ham qöllab-quvvatlaydi!
 
 ★ Asosiy jihatlar:
-• qo'llab-quvvatlanadigan flesh-karta tarkibi: matn, rasmlar, ovoz, LaTeX
-• oraliqli takrorlash (SI bilan optimallashtirilgan FSRS algoritmi)
+• qöllab-quvvatlanadigan fleş-karta tarkibi: matn, rasmlar, ovoz, LaTeX
+• oraliqli takrorlaş (SI bilan optimallaştirilgan FSRS algoritmi)
 • matn sintezatori integratsiyasi
 • 10 000 dan ortiq tayyor dasta
 • progress vidjeti
 • batafsil statistika
-• AnkiWeb bilan sinxronlash
-• ochiq manbali
+• AnkiWeb bilan sinxronlaş
+• oçiq manbali
 
-★ Qoʻshimcha funksiyalar
-• javoblarni yozish (ixtiyoriy)
+★ Qöşimça funksiyalar
+• javoblarni yoziş (ixtiyoriy)
 • Yozuv taxtasi
-• karta muharriri/qoʻshuvchisi
+• karta muharriri/qöşuvçisi
 • karta brauzeri
-• planshetga moslashtirilgan
-• mavjud kolleksiya fayllarini import qilish (Anki Desktop orqali)
-• Kartalarni lugʻat kabi boshqa ilovalardan niyat bilan qoʻshing
-• shriftni moslashtirish
-• toʻliq zaxiralash tizimi
-• surish, bosish orqali navigatsiya
-• moslashtiriladigan
-• dinamik dastalar bilan ishlash
+• planşetga moslaştirilgan
+• mavjud kolleksiya fayllarini import qiliş (Anki Desktop orqali)
+• Kartalarni luğat kabi boşqa ilovalardan niyat bilan qöşing
+• şriftni moslaştiriş
+• töliq zaxiralaş tizimi
+• suriş, bosiş orqali navigatsiya
+• moslaştiriladigan
+• dinamik dastalar bilan işlaş
 • tungi rejim
 • 27 lokalizatsiya
-• AnkiDroidʼni barcha oldingi versiyalarini veb-saytdan yuklab olish mumkin
+• AnkiDroidʼni barça oldingi versiyalarini veb-saytdan yuklab oliş mumkin
diff --git a/docs/review_reminders/README.md b/docs/review_reminders/README.md
index 05f242d6d2b5..1ac32f9fd994 100644
--- a/docs/review_reminders/README.md
+++ b/docs/review_reminders/README.md
@@ -36,6 +36,11 @@ with a card trigger threshold of 1 and enable the "only notify if no reviews" op
 3. A user currently has a legacy notification that shows a permanent notification in the notification shade if they have at least ten cards due, and they wish to migrate
 this to the new review reminders system. This is not exactly possible, but they can get close by creating one review reminder per each daytime hour (or perhaps even more granularly) and setting the card trigger
 threshold to 10 for each.
+4. A user does not want to open up the app every day but would like to be reminded to review their cards if they have a large backlog. 
+They set up a review reminder for 5 PM with a card trigger threshold of 50 and count only "To Review" cards toward the threshold.
+5. A user has customized a deck to have hour-long learning steps and would like to be reminded precisely when their cards become due.
+This is not exactly possible, but they can get close by creating one review reminder per each daytime hour (or perhaps even more granularly), setting the card trigger threshold to 1 for each, and counting only "Learning" cards toward the threshold.
+
 
 ## UI / UX
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f22bf5aa5532..56839c84d0c3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -73,7 +73,7 @@ androidxWebkit = "1.16.0"
 # https://developer.android.com/jetpack/androidx/releases/work
 androidxWork = "2.12.0"
 # https://github.com/ankidroid/Anki-Android-Backend/
-ankiBackend = '0.1.71-anki26.09.3'
+ankiBackend = '0.1.73-anki26.09.3'
 autoService = "1.1.1"
 autoServiceAnnotations = "1.1.1"
 # https://github.com/skydoves/ColorPickerView/releases
@@ -189,7 +189,7 @@ commons-collections4 = { module = "org.apache.commons:commons-collections4", ver
 commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "commonsCompress" }
 desugar-jdk-libs-nio = { module = "com.android.tools:desugar_jdk_libs_nio", version.ref = "desugar-jdk-libs-nio" }
 drakeet-drawer = { module = "com.drakeet.drawer:drawer", version.ref = "drawer" }
-ankiBackend-backend = { module = "io.github.david-allison:anki-android-backend", version.ref = "ankiBackend" }
+ankiBackend-backend = { module = "io.github.david-allison:anki-backend-android", version.ref = "ankiBackend" }
 ankiBackend-testing = { module = "io.github.david-allison:anki-android-backend-testing", version.ref = "ankiBackend" }
 java-semver = { module = "com.github.zafarkhaja:java-semver", version.ref = "javaSemver" }
 jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
@@ -242,6 +242,7 @@ mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "
 mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
 robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
 roborazzi = { group = "io.github.takahirom.roborazzi", name = "roborazzi", version.ref = "roborazzi" }
+roborazzi-accessibility-check = { group = "io.github.takahirom.roborazzi", name = "roborazzi-accessibility-check", version.ref = "roborazzi" }
 roborazzi-rule = { group = "io.github.takahirom.roborazzi", name = "roborazzi-junit-rule", version.ref = "roborazzi" }
 cashapp-turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
 test-parameter-injector = { module = "com.google.testparameterinjector:test-parameter-injector", version.ref = "testParameterInjector" }
diff --git a/jitpack.yml b/jitpack.yml
index e8d84479811f..d9bbcfedc95c 100644
--- a/jitpack.yml
+++ b/jitpack.yml
@@ -18,4 +18,4 @@ before_install:
 
 # We can do the absolute minimum to build the API module, no need to build AnkiDroid module
 install:
-    - ./gradlew :api:publishToMavenLocal
+    - JAVA_TOOL_OPTIONS=-Dkotlin.daemon.options=autoshutdownIdleSeconds=10 ./gradlew :api:publishToMavenLocal
diff --git a/libanki/src/main/java/com/ichi2/anki/libanki/Deck.kt b/libanki/src/main/java/com/ichi2/anki/libanki/Deck.kt
index 20ec00ac2541..239880222ff4 100644
--- a/libanki/src/main/java/com/ichi2/anki/libanki/Deck.kt
+++ b/libanki/src/main/java/com/ichi2/anki/libanki/Deck.kt
@@ -3,84 +3,144 @@
 
 package com.ichi2.anki.libanki
 
+import androidx.annotation.VisibleForTesting
 import anki.decks.Deck.Filtered.SearchTerm.Order
-import com.ichi2.anki.common.utils.ext.deepClonedInto
+import com.ichi2.anki.common.json.JSONObjectHolder
+import com.ichi2.anki.common.json.jsonArray
+import com.ichi2.anki.common.json.jsonBoolean
+import com.ichi2.anki.common.json.jsonLong
+import com.ichi2.anki.common.json.jsonString
+import com.ichi2.anki.common.utils.ext.getLongOrNull
 import com.ichi2.anki.libanki.utils.NotInPyLib
 import net.ankiweb.rsdroid.Translations
+import org.intellij.lang.annotations.Language
+import org.json.JSONArray
 import org.json.JSONObject
 
-class Deck : JSONObject {
+/** Wraps legacy deck JSON without copying it. Property changes update the supplied object. */
+data class Deck(
+    @VisibleForTesting override val jsonObject: JSONObject,
+) : JSONObjectHolder {
     /**
-     * Creates a copy from [JSONObject] and use it as a string
-     *
-     * This function will perform deepCopy on the passed object
-     *
-     * If you want to create a Deck without deepCopy
-     * @see Deck.from
+     * Creates a deck object from a JSON string
      */
-    constructor(json: JSONObject) : super() {
-        json.deepClonedInto(this)
-    }
+    constructor(
+        @Language("JSON") json: String,
+    ) : this(JSONObject(json))
 
     /**
-     * Creates a deck object form a json string
+     * Whether this deck is a filtered deck.
      */
-    constructor(json: String) : super(json)
-
     val isFiltered: Boolean
-        get() = getInt("dyn") != 0
+        get() = jsonObject.getInt("dyn") != 0
 
+    /**
+     * Whether this deck is a normal deck. That is, not a filtered deck.
+     */
     val isNormal: Boolean
         get() = !isFiltered
 
-    var name: String
-        get() = getString("name")
-        set(value) {
-            put("name", value)
-        }
+    /**
+     * The name of the deck. Mutable. If you want a way to persistently represents this deck, use [id] instead.
+     */
+    var name by jsonString("name")
 
-    var collapsed: Boolean
-        get() = getBoolean("collapsed")
-        set(value) {
-            put("collapsed", value)
-        }
+    /**
+     * If this deck has subdecks, whether those subdecks should be collapsed in the desktop card browser.
+     * Not used in ankidroid at the moment.
+     */
+    var browserCollapsed by jsonBoolean("browserCollapsed", defaultValue = false)
 
-    var browserCollapsed: Boolean
-        get() = optBoolean("browserCollapsed", false)
-        set(value) {
-            put("browserCollapsed", value)
-        }
+    /**
+     * If this deck has subdecks, whether those subdecks should be collapsed in the deck picker.
+     */
+    var collapsed by jsonBoolean("collapsed")
 
     /**
-     * Unique identifier of the deck
+     * The id of the deck. Should be globally unique
+     * (created as a timestamp, very small chance of collision between two different decks from different users)
      *
      * @see DeckId
      */
-    var id: DeckId
-        get() = getLong("id")
-        set(value) {
-            put("id", value)
-        }
+    var id: DeckId by jsonLong("id")
 
+    /**
+     * The id of the deck option.
+     */
     var conf: DeckConfigId
         get() {
-            val value = optLong("conf")
+            val value = jsonObject.optLong("conf")
             return if (value > 0) value else 1
         }
         set(value) {
-            put("conf", value)
+            jsonObject.put("conf", value)
         }
 
+    var noteTypeId: NoteTypeId?
+        get() = jsonObject.getLongOrNull("mid")
+        set(value) {
+            jsonObject.put("mid", value)
+        }
+
+    var resched by jsonBoolean("resched")
+
+    /**
+     * The options configuring which cards are shown in a filtered deck.
+     * See https://docs.ankiweb.net/filtered-decks.html
+     */
+    @JvmInline
+    value class Term(
+        val array: JSONArray,
+    ) {
+        constructor(search: String, limit: Int, order: Int) : this(JSONArray(listOf(search, limit, order))) {}
+
+        /**
+         Only cards satisfying this search query are shown.
+         */
+        var search: String
+            get() = array.getString(0)
+            set(value) {
+                array.put(0, value)
+            }
+
+        /**
+         * At most this number of cards are shown.
+         */
+        var limit: Int
+            get() = array.getInt(1)
+            set(value) {
+                array.put(1, value)
+            }
+
+        /**
+         * The order in which cards are shown. See https://docs.ankiweb.net/filtered-decks.html#order.
+         */
+        var order: Int
+            get() = array.getInt(2)
+            set(value) {
+                array.put(2, value)
+            }
+
+        override fun toString(): String = array.toString()
+    }
+
+    /**
+     * The options deciding which cards are shown in a filtered deck.
+     */
+    val firstFilter: Term
+        get() = Term(terms.getJSONArray(0))
+
+    /**
+     * The array of filters. Only for filtered decks.
+     */
+    private val terms by jsonArray("terms")
+
     /**
      * The description, shown on the deck overview and optionally the congratulations screen.
      *
      * May be HTML or Markdown, depending on [descriptionAsMarkdown].
      */
-    var description: String
-        get() = optString("desc", "")
-        set(value) {
-            put("desc", value)
-        }
+    var description by jsonString("desc", defaultValue = "")
 
     /**
      * Treats [description] as Markdown, cleaning HTML input and stripping images.
@@ -96,11 +156,9 @@ class Deck : JSONObject {
      * @see anki.i18n.GeneratedTranslations.deckConfigDescriptionNewHandling
      * @see anki.i18n.GeneratedTranslations.deckConfigDescriptionNewHandlingHint
      */
-    var descriptionAsMarkdown: Boolean
-        get() = optBoolean("md", false)
-        set(value) {
-            put("md", value)
-        }
+    var descriptionAsMarkdown by jsonBoolean("md", defaultValue = false)
+
+    override fun toString(): String = jsonObject.toString()
 }
 
 /**
@@ -129,7 +187,7 @@ fun Order.toDisplayString(translations: Translations) =
 @NotInPyLib
 internal fun Deck.confOrNull(): DeckConfigId? =
     try {
-        val value = getLong("conf")
+        val value = jsonObject.getLong("conf")
         if (value > 0) value else null
     } catch (e: Exception) {
         null
diff --git a/libanki/src/main/java/com/ichi2/anki/libanki/Decks.kt b/libanki/src/main/java/com/ichi2/anki/libanki/Decks.kt
index ab3ff9bb4dc1..765d76b78238 100644
--- a/libanki/src/main/java/com/ichi2/anki/libanki/Decks.kt
+++ b/libanki/src/main/java/com/ichi2/anki/libanki/Decks.kt
@@ -80,7 +80,7 @@ class Decks(
     fun save(g: Deck) {
         g.id =
             col.backend.addOrUpdateDeckLegacy(
-                BackendUtils.toByteString(g),
+                toJsonBytes(g),
                 preserveUsnAndMtime = false,
             )
     }
@@ -699,7 +699,7 @@ class Decks(
             return null
         }
         val deck = getLegacy(did) ?: return null
-        return deck.getString("name") + DECK_SEPARATOR + subdeckName
+        return deck.name + DECK_SEPARATOR + subdeckName
     }
 
     @NotInPyLib
diff --git a/libanki/src/main/java/com/ichi2/anki/libanki/Notetypes.kt b/libanki/src/main/java/com/ichi2/anki/libanki/Notetypes.kt
index a68876bef9cf..eccb1f0c5fb9 100644
--- a/libanki/src/main/java/com/ichi2/anki/libanki/Notetypes.kt
+++ b/libanki/src/main/java/com/ichi2/anki/libanki/Notetypes.kt
@@ -129,7 +129,7 @@ class Notetypes(
     /** Get current model.*/
     @RustCleanup("Should use defaultsForAdding() instead")
     fun current(forDeck: Boolean = true): NotetypeJson {
-        var noteType = get(col.decks.current().getLongOrNull("mid"))
+        var noteType = get(col.decks.current().noteTypeId)
         if (!forDeck || noteType == null) {
             noteType = get(col.config.get("curModel") ?: 1L)
         }
@@ -723,23 +723,6 @@ class Notetypes(
     }
 }
 
-/**
- * @return null if the key doesn't exist, or the value is not a long. The long value of the key
- * otherwise
- *
- * This better approximates `JSON.get` in the Python
- */
-private fun Deck.getLongOrNull(key: String): Long? {
-    if (!has(key)) {
-        return null
-    }
-    try {
-        return getLong(key)
-    } catch (ex: Exception) {
-        return null
-    }
-}
-
 // These take and return bytes that the frontend TypeScript code will encode/decode.
 fun Collection.getNotetypeNamesRaw(input: ByteArray): ByteArray = backend.getNotetypeNamesRaw(input)
 
diff --git a/libanki/src/main/java/com/ichi2/anki/libanki/utils/RustCompat.kt b/libanki/src/main/java/com/ichi2/anki/libanki/utils/RustCompat.kt
new file mode 100644
index 000000000000..c6119c3c7f92
--- /dev/null
+++ b/libanki/src/main/java/com/ichi2/anki/libanki/utils/RustCompat.kt
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.libanki.utils
+
+/** Rust semantics used by the backend that differ from Kotlin/JVM. */
+object RustCompat {
+    /** Rust `char::is_whitespace` and `str::trim` use Unicode's White_Space property. */
+    fun isWhitespace(char: Char): Boolean =
+        char in '\u0009'..'\u000d' || char == ' ' || char == '\u0085' || char == '\u00a0' || char == '\u1680' ||
+            char in '\u2000'..'\u200a' || char == '\u2028' || char == '\u2029' || char == '\u202f' || char == '\u205f' ||
+            char == '\u3000'
+}
diff --git a/libanki/src/test/java/com/ichi2/anki/libanki/DeckTest.kt b/libanki/src/test/java/com/ichi2/anki/libanki/DeckTest.kt
new file mode 100644
index 000000000000..ff84ee265617
--- /dev/null
+++ b/libanki/src/test/java/com/ichi2/anki/libanki/DeckTest.kt
@@ -0,0 +1,185 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: 2025 Arthur Milchior <arthur@milchior.fr>
+
+package com.ichi2.anki.libanki
+
+import com.ichi2.anki.libanki.backend.BackendUtils
+import com.ichi2.anki.libanki.testutils.InMemoryAnkiTest
+import org.json.JSONObject
+import org.junit.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertSame
+import kotlin.test.assertTrue
+
+class DeckTest : InMemoryAnkiTest() {
+    val d = Deck("{}")
+
+    @Test
+    fun `optional properties retain legacy defaults`() {
+        assertFalse(d.browserCollapsed)
+        assertFalse(d.descriptionAsMarkdown)
+        assertEquals("", d.description)
+        assertEquals(1L, d.conf)
+        for (value in listOf(JSONObject.NULL, 0L, -1L, "invalid")) {
+            d.jsonObject.put("conf", value)
+            assertEquals(1L, d.conf)
+        }
+    }
+
+    @Test
+    fun `wrapping JSON preserves shared mutations`() {
+        val json = JSONObject("""{"name":"before"}""")
+        val deck = Deck(json)
+        assertSame(json, deck.jsonObject)
+        deck.name = "after"
+        assertEquals("after", json.getString("name"))
+        json.put("name", "updated")
+        assertEquals("updated", deck.name)
+    }
+
+    @Test
+    fun `deck serialization preserves unwrapped legacy fields`() {
+        // Legacy learning steps are numbers in minutes, not strings such as "1h".
+        val deck = Deck("""{"delays":[60,1],"previewAgainSecs":60,"previewHardSecs":600,"previewGoodSecs":0}""")
+        deck.name = "Filtered"
+        deck.resched = false
+        val serialized = JSONObject(BackendUtils.toJsonBytes(deck).toStringUtf8())
+        assertEquals(deck.jsonObject.toString(), deck.toString())
+        assertEquals("Filtered", serialized.get("name"))
+        assertEquals(false, serialized.get("resched"))
+        assertEquals(60, serialized.get("previewAgainSecs"))
+        assertEquals(600, serialized.get("previewHardSecs"))
+        assertEquals(0, serialized.get("previewGoodSecs"))
+        assertEquals("[60,1]", serialized.getJSONArray("delays").toString())
+    }
+
+    @Test
+    fun `legacy filtered deck defaults and term changes persist`() {
+        val id = col.decks.newFiltered("Filtered")
+        val deck = col.decks.get(id)!!
+        assertEquals(1, deck.jsonObject.getJSONArray("terms").length())
+        assertEquals("", deck.firstFilter.search)
+        assertEquals(0, deck.firstFilter.order)
+        assertFalse(deck.browserCollapsed)
+        assertFalse(deck.collapsed)
+        deck.firstFilter.search = "is:new"
+        deck.firstFilter.limit = 7
+        deck.firstFilter.order = 2
+        col.decks.save(deck)
+        val saved = col.decks.get(id)!!
+        assertEquals("is:new", saved.firstFilter.search)
+        assertEquals(7, saved.firstFilter.limit)
+        assertEquals(2, saved.firstFilter.order)
+    }
+
+    @Test
+    fun testFiltered() {
+        // `dyn` can't be set by the front-end anymore.
+        val d = Deck("""{"dyn" :1}""")
+        assertTrue(d.isFiltered)
+        assertFalse(d.isNormal, "This deck should not be normal")
+    }
+
+    @Test
+    fun testNormal() {
+        val d = Deck("""{"dyn" :0}""")
+        assertTrue(d.isNormal)
+        assertFalse(d.isFiltered, "this deck should not be filtered")
+    }
+
+    @Test
+    fun testName() {
+        val name = "foo"
+        d.name = name
+        assertEquals(name, d.name)
+    }
+
+    @Test
+    fun testBrowserCollapsed() {
+        d.browserCollapsed = true
+        assertTrue(d.browserCollapsed)
+        d.browserCollapsed = false
+        assertFalse(d.browserCollapsed, "browser should be collapsed")
+    }
+
+    @Test
+    fun testCollapsed() {
+        d.collapsed = true
+        assertTrue(d.collapsed)
+        d.collapsed = false
+        assertFalse(d.collapsed, "deck should be collapsed")
+    }
+
+    @Test
+    fun testId() {
+        val id = 42L
+        d.id = id
+        assertEquals(id, d.id)
+    }
+
+    @Test
+    fun testConfId() {
+        val confId = 42L
+        d.conf = confId
+        assertEquals(confId, d.conf)
+    }
+
+    @Test
+    fun testDescription() {
+        val description = "foo"
+        d.description = description
+        assertEquals(description, d.description)
+    }
+
+    @Test
+    fun testNoteTypeId() {
+        val noteTypeId = 42L
+        d.noteTypeId = noteTypeId
+        assertEquals(noteTypeId, d.noteTypeId)
+    }
+
+    @Test
+    fun testResched() {
+        d.resched = true
+        assertTrue(d.resched)
+        d.resched = false
+        assertTrue(!d.resched)
+    }
+
+    val search = "search"
+    val limit = 7
+    val order = 42
+    val t = Deck.Term(search, limit, order)
+
+    @Test
+    fun testSearch() {
+        val expectedSearch = "expectedSearch"
+        t.search = expectedSearch
+        assertEquals(expectedSearch, t.search)
+    }
+
+    @Test
+    fun testLimit() {
+        val expectedLimit = 10
+        t.limit = expectedLimit
+        assertEquals(expectedLimit, t.limit)
+    }
+
+    @Test
+    fun testOrder() {
+        val expectedOrder = 7
+        t.order = expectedOrder
+        assertEquals(expectedOrder, t.order)
+    }
+
+    @Test
+    fun testFirstFilter() {
+        // All decks are expected to have at least one term.
+        val d = Deck("""{"terms": [$t]}""")
+        val firstFilter = d.firstFilter
+        assertEquals(firstFilter.search, search)
+        assertEquals(firstFilter.limit, limit)
+        assertEquals(firstFilter.order, order)
+    }
+}
diff --git a/libanki/src/test/java/com/ichi2/anki/libanki/RustCompatTest.kt b/libanki/src/test/java/com/ichi2/anki/libanki/RustCompatTest.kt
new file mode 100644
index 000000000000..5574122b59b7
--- /dev/null
+++ b/libanki/src/test/java/com/ichi2/anki/libanki/RustCompatTest.kt
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.libanki
+
+import com.ichi2.anki.libanki.utils.RustCompat
+import org.junit.Test
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+class RustCompatTest {
+    @Test
+    fun `whitespace includes next line and non-breaking spaces`() {
+        for (char in listOf(' ', '\t', '\n', '\u0085', '\u00a0', '\u2003', '\u202f', '\u3000')) {
+            assertTrue(RustCompat.isWhitespace(char), "U+${char.code.toString(16)}")
+        }
+    }
+
+    @Test
+    fun `whitespace excludes control separators and zero width spaces`() {
+        for (char in listOf('a', '\u0000', '\u001c', '\u001d', '\u001e', '\u001f', '\u200b', '\ufeff')) {
+            assertFalse(RustCompat.isWhitespace(char), "U+${char.code.toString(16)}")
+        }
+    }
+}
diff --git a/libanki/src/test/java/com/ichi2/anki/libanki/SchedulerTest.kt b/libanki/src/test/java/com/ichi2/anki/libanki/SchedulerTest.kt
index 76d81f226e8b..04bcb44645a9 100644
--- a/libanki/src/test/java/com/ichi2/anki/libanki/SchedulerTest.kt
+++ b/libanki/src/test/java/com/ichi2/anki/libanki/SchedulerTest.kt
@@ -840,7 +840,7 @@ open class SchedulerTest : InMemoryAnkiTest() {
         // cram deck
         val did = addDynamicDeck("Cram")
         val cram = col.decks.getLegacy(did)!!
-        cram.put("resched", false)
+        cram.resched = false
         col.decks.save(cram)
         col.sched.rebuildFilteredDeck(did)
         // grab the first card
@@ -1320,7 +1320,7 @@ open class SchedulerTest : InMemoryAnkiTest() {
         addBasicNote("foo", "bar")
         val did = addDynamicDeck("test")
         val deck = decks.getLegacy(did)!!
-        deck.put("resched", false)
+        deck.resched = false
         sched.rebuildFilteredDeck(did)
         var card: Card?
         for (i in 0..2) {
diff --git a/libanki/src/testFixtures/java/com/ichi2/anki/libanki/testutils/AnkiTest.kt b/libanki/src/testFixtures/java/com/ichi2/anki/libanki/testutils/AnkiTest.kt
index 36e651234f88..a6766d82e4a7 100644
--- a/libanki/src/testFixtures/java/com/ichi2/anki/libanki/testutils/AnkiTest.kt
+++ b/libanki/src/testFixtures/java/com/ichi2/anki/libanki/testutils/AnkiTest.kt
@@ -200,7 +200,7 @@ interface AnkiTest {
             col.decks.newFiltered(name).also { did ->
                 if (search == null) return@also
                 val deck = col.decks.getLegacy(did)!!
-                deck.getJSONArray("terms").getJSONArray(0).put(0, search)
+                deck.firstFilter.search = search
                 col.decks.save(deck)
                 col.sched.rebuildFilteredDeck(did)
             }
diff --git a/lint-release.xml b/lint-release.xml
index 165da14846d1..b2e2bba2e4ee 100644
--- a/lint-release.xml
+++ b/lint-release.xml
@@ -32,6 +32,7 @@
         <!-- We only need to handle -af and all others are implicitly ignored -->
         <!-- tested and this does not block a string in /values/ from triggering lint -->
         <ignore path="res/values-af/" />
+        <ignore path="common/android/src/main/res/values-af/" />
     </issue>
     <issue id="MissingDefaultResource" severity="fatal">
         <!-- Ignore all translations except values - CrowdIn will handle deletions -->
diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/IssueRegistry.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/IssueRegistry.kt
index fcaed73b2a05..590a978652c1 100644
--- a/lint-rules/src/main/java/com/ichi2/anki/lint/IssueRegistry.kt
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/IssueRegistry.kt
@@ -16,7 +16,12 @@ import com.ichi2.anki.lint.rules.DirectSystemCurrentTimeMillisUsage
 import com.ichi2.anki.lint.rules.DirectSystemTimeInstantiation
 import com.ichi2.anki.lint.rules.DirectToastMakeTextUsage
 import com.ichi2.anki.lint.rules.DuplicateCrowdInStrings
+import com.ichi2.anki.lint.rules.FragmentArgumentKeyNamingDetector
+import com.ichi2.anki.lint.rules.FragmentRequestKeyNamingDetector
+import com.ichi2.anki.lint.rules.FragmentResultKeyNamingDetector
 import com.ichi2.anki.lint.rules.HardcodedPreferenceKey
+import com.ichi2.anki.lint.rules.IntentActionNamingDetector
+import com.ichi2.anki.lint.rules.IntentExtraNamingDetector
 import com.ichi2.anki.lint.rules.InvalidStringFormatDetector
 import com.ichi2.anki.lint.rules.JUnitNullAssertionDetector
 import com.ichi2.anki.lint.rules.LayoutPrefixDetector
@@ -24,7 +29,9 @@ import com.ichi2.anki.lint.rules.LicenseHeaderExists
 import com.ichi2.anki.lint.rules.LocaleRootDetector
 import com.ichi2.anki.lint.rules.NonPositionalFormatSubstitutions
 import com.ichi2.anki.lint.rules.OpenInputStreamSafeDetector
+import com.ichi2.anki.lint.rules.PreferenceKeyNamingDetector
 import com.ichi2.anki.lint.rules.PrintStackTraceUsage
+import com.ichi2.anki.lint.rules.SavedStateKeyNamingDetector
 import com.ichi2.anki.lint.rules.SentenceCaseConventions
 import com.ichi2.anki.lint.rules.TranslationTypo
 import com.ichi2.anki.lint.rules.VariableNamingDetector
@@ -45,13 +52,20 @@ class IssueRegistry : IssueRegistry() {
                 DirectSystemTimeInstantiation.ISSUE,
                 DirectToastMakeTextUsage.ISSUE,
                 DuplicateCrowdInStrings.ISSUE,
+                FragmentArgumentKeyNamingDetector.ISSUE,
+                FragmentRequestKeyNamingDetector.ISSUE,
+                FragmentResultKeyNamingDetector.ISSUE,
                 HardcodedPreferenceKey.ISSUE,
+                IntentActionNamingDetector.ISSUE,
+                IntentExtraNamingDetector.ISSUE,
                 JUnitNullAssertionDetector.ISSUE,
                 LicenseHeaderExists.ISSUE,
                 LocaleRootDetector.ISSUE,
                 PrintStackTraceUsage.ISSUE,
                 NonPositionalFormatSubstitutions.ISSUE,
                 OpenInputStreamSafeDetector.ISSUE,
+                PreferenceKeyNamingDetector.ISSUE,
+                SavedStateKeyNamingDetector.ISSUE,
                 SentenceCaseConventions.ISSUE,
                 TranslationTypo.ISSUE,
                 VariableNamingDetector.ISSUE,
diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/rules/FragmentArgumentKeyNamingDetector.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/FragmentArgumentKeyNamingDetector.kt
new file mode 100644
index 000000000000..bd33d65b8169
--- /dev/null
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/FragmentArgumentKeyNamingDetector.kt
@@ -0,0 +1,199 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.lint.rules
+
+import com.android.tools.lint.checks.DataFlowAnalyzer
+import com.android.tools.lint.detector.api.ConstantEvaluator
+import com.android.tools.lint.detector.api.Context
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.SourceCodeScanner
+import com.android.tools.lint.detector.api.isReturningContext
+import com.ichi2.anki.lint.utils.Constants
+import com.ichi2.anki.lint.utils.ext.resolveToField
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiMethod
+import com.intellij.psi.PsiModifier
+import org.jetbrains.uast.UCallExpression
+import org.jetbrains.uast.UClass
+import org.jetbrains.uast.UElement
+import org.jetbrains.uast.UExpression
+import org.jetbrains.uast.UMethod
+import org.jetbrains.uast.getParentOfType
+import org.jetbrains.uast.skipParenthesizedExprDown
+
+/**
+ * Requires `ARG_` names for constant keys in a fragment's arguments.
+ *
+ * ```kotlin
+ * fun newInstance(deckId: DeckId) =
+ *     DeckFragment().apply { arguments = Bundle().apply { putLong(ARG_DECK_ID, deckId) } }
+ *
+ * val deckId by lazy { requireArguments().getLong(ARG_DECK_ID) }
+ * ```
+ *
+ * Keys are checked where the arguments are written and where they are read, so a key that only
+ * a ViewModel reads, through its `SavedStateHandle`, is still checked where it is written.
+ * `EXTRA_` is also allowed, for intent extras that an activity passes on as the fragment's arguments.
+ *
+ * Literal keys, and keys read or written inside other helper methods, are not checked.
+ *
+ * @see IntentExtraNamingDetector for `EXTRA_`
+ */
+class FragmentArgumentKeyNamingDetector :
+    Detector(),
+    SourceCodeScanner {
+    /** UAST visits the `x` in `arguments = x` twice, so keys are reported once per file. */
+    private val reportedKeys = mutableSetOf<PsiElement>()
+
+    override fun beforeCheckFile(context: Context) {
+        reportedKeys.clear()
+    }
+
+    override fun getApplicableConstructorTypes() = listOf(BUNDLE)
+
+    /** Writes: checks a new `Bundle` if it becomes a fragment's arguments in the same method. */
+    override fun visitConstructor(
+        context: JavaContext,
+        node: UCallExpression,
+        constructor: PsiMethod,
+    ) {
+        val scope = node.getParentOfType<UMethod>() ?: return
+        checkBundle(context, scope, node, isArguments = false)
+    }
+
+    override fun getApplicableMethodNames() = listOf("requireArguments", "getArguments")
+
+    /**
+     * Reads: checks the bundle from `requireArguments()`, or `arguments` in Kotlin.
+     * A property initializer such as `by lazy { requireArguments() }` has no method, so its class is searched.
+     */
+    override fun visitMethodCall(
+        context: JavaContext,
+        node: UCallExpression,
+        method: PsiMethod,
+    ) {
+        if (!context.evaluator.isMemberInClass(method, FRAGMENT)) return
+        val scope = node.getParentOfType<UMethod>() ?: node.getParentOfType<UClass>() ?: return
+        checkBundle(context, scope, node, isArguments = true)
+    }
+
+    /** Collects the keys used on [bundle] and its aliases in [scope], and checks them if they are arguments. */
+    private fun checkBundle(
+        context: JavaContext,
+        scope: UElement,
+        bundle: UElement,
+        isArguments: Boolean,
+    ) {
+        val keys = mutableListOf<UExpression>()
+        var passedAsArguments = false
+        scope.accept(
+            object : DataFlowAnalyzer(listOf(bundle)) {
+                /** Follows scope functions such as `Bundle().apply { putLong(KEY, value) }`. */
+                override fun returnsSelf(call: UCallExpression) = isReturningContext(call)
+
+                /** Collects keys in bundle calls such as `args.getLong(KEY)`. */
+                override fun receiver(call: UCallExpression) {
+                    val method = call.resolve() ?: return
+                    if (!context.evaluator.isMemberInClass(method, BUNDLE) &&
+                        !context.evaluator.isMemberInClass(method, BASE_BUNDLE)
+                    ) {
+                        return
+                    }
+                    call.keyArgument(method)?.let(keys::add)
+                }
+
+                /**
+                 * Collects keys in helper calls such as `BundleCompat.getParcelable(args, KEY, type)`
+                 * or `args.getLongOrNull(KEY)`.
+                 *
+                 * Also notes when the bundle is passed on as a fragment's arguments: `setArguments(args)`,
+                 * which is how `fragment.arguments = args` is visited, or a parameter named `arguments`,
+                 * as in `SingleFragmentActivity.getIntent(context, fragmentClass, arguments)`.
+                 */
+                override fun argument(
+                    call: UCallExpression,
+                    reference: UElement,
+                ) {
+                    val method = call.resolve() ?: return
+                    val parameter = context.evaluator.computeArgumentMapping(call, method)[reference] ?: return
+                    if (parameter.type.canonicalText != BUNDLE) return
+                    val isSetArguments = method.name == "setArguments" && context.evaluator.isMemberInClass(method, FRAGMENT)
+                    if (isSetArguments || parameter.name == "arguments") {
+                        passedAsArguments = true
+                    } else if (method.containingClass?.qualifiedName in BUNDLE_HELPERS) {
+                        call.keyArgument(method)?.let(keys::add)
+                    }
+                }
+            },
+        )
+        if (isArguments || passedAsArguments) keys.forEach { checkKey(context, it) }
+    }
+
+    /** Returns the key: the first `String` argument. */
+    private fun UCallExpression.keyArgument(method: PsiMethod): UExpression? {
+        val keyIndex = method.parameterList.parameters.indexOfFirst { it.type.canonicalText == "java.lang.String" }
+        if (keyIndex < 0) return null
+        return getArgumentForParameter(keyIndex)
+    }
+
+    /** Reports a constant key unless it starts with `ARG_` or `EXTRA_`. */
+    private fun checkKey(
+        context: JavaContext,
+        expression: UExpression,
+    ) {
+        val argument = expression.skipParenthesizedExprDown()
+        val field = argument.resolveToField() ?: return
+        if (!field.hasModifierProperty(PsiModifier.STATIC) || !field.hasModifierProperty(PsiModifier.FINAL)) return
+        if (field.name.startsWith("ARG_") || field.name.startsWith("EXTRA_")) return
+        if (ConstantEvaluator.evaluate(context, argument) !is String) return
+        if (!reportedKeys.add(argument.sourcePsi ?: return)) return
+        context.report(
+            ISSUE,
+            argument,
+            context.getLocation(argument),
+            "Fragment argument key constants must start with ARG_: ${field.name}",
+        )
+    }
+
+    companion object {
+        private const val FRAGMENT = "androidx.fragment.app.Fragment"
+        private const val BUNDLE = "android.os.Bundle"
+        private const val BASE_BUNDLE = "android.os.BaseBundle"
+
+        /** Helpers which take the bundle and a key, including Kotlin extensions. */
+        private val BUNDLE_HELPERS =
+            setOf(
+                "androidx.core.os.BundleCompat",
+                "com.ichi2.anki.utils.ext.BundleUtilsKt",
+                "com.ichi2.anki.compat.CompatHelper.Companion",
+                "com.ichi2.anki.compat.CompatHelperKt",
+            )
+
+        val ISSUE =
+            Issue.create(
+                id = "FragmentArgumentKeyNaming",
+                briefDescription = "Fragment argument keys must start with ARG_",
+                explanation =
+                    """
+                    Constants used as keys in a Fragment's arguments should be named
+                    ARG_<DESCRIPTION>, for example ARG_DECK_ID.
+
+                    The check looks at a new Bundle that becomes the arguments in the same
+                    method, and at the bundle returned by requireArguments() or arguments,
+                    including reads in property initializers such as `by lazy`.
+
+                    Arguments forwarded from the hosting activity's intent extras may keep
+                    their EXTRA_ name. Literals, parameters and other non-constant keys are
+                    not checked.
+                    """.trimIndent(),
+                category = Constants.ANKI_CODE_STYLE_CATEGORY,
+                priority = Constants.ANKI_CODE_STYLE_PRIORITY,
+                severity = Constants.ANKI_CODE_STYLE_SEVERITY,
+                implementation = Implementation(FragmentArgumentKeyNamingDetector::class.java, Scope.JAVA_FILE_SCOPE),
+            )
+    }
+}
diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/rules/FragmentRequestKeyNamingDetector.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/FragmentRequestKeyNamingDetector.kt
new file mode 100644
index 000000000000..a17722dc4971
--- /dev/null
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/FragmentRequestKeyNamingDetector.kt
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.lint.rules
+
+import com.android.tools.lint.detector.api.ConstantEvaluator
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.SourceCodeScanner
+import com.ichi2.anki.lint.utils.Constants
+import com.ichi2.anki.lint.utils.ext.resolveToField
+import com.intellij.psi.PsiMethod
+import com.intellij.psi.PsiModifier
+import org.jetbrains.uast.UCallExpression
+import org.jetbrains.uast.skipParenthesizedExprDown
+
+/** Checks constant request keys, leaving runtime-generated keys and forwarded parameters alone. */
+class FragmentRequestKeyNamingDetector :
+    Detector(),
+    SourceCodeScanner {
+    override fun getApplicableMethodNames() =
+        listOf("setFragmentResult", "setFragmentResultListener", "clearFragmentResult", "clearFragmentResultListener")
+
+    override fun visitMethodCall(
+        context: JavaContext,
+        node: UCallExpression,
+        method: PsiMethod,
+    ) {
+        val owner = method.containingClass?.qualifiedName
+        if (owner != "androidx.fragment.app.FragmentManager" &&
+            owner != "androidx.fragment.app.FragmentKt" &&
+            owner != "com.ichi2.anki.utils.ext.FragmentResultKt"
+        ) {
+            return
+        }
+        // Extension methods have a receiver parameter; named arguments may also be reordered.
+        val index = method.parameterList.parameters.indexOfFirst { it.name == "requestKey" }
+        if (index < 0) return
+        val argument = node.getArgumentForParameter(index)?.skipParenthesizedExprDown() ?: return
+        val field = argument.resolveToField() ?: return
+        if (!field.hasModifierProperty(PsiModifier.STATIC) || !field.hasModifierProperty(PsiModifier.FINAL)) return
+        if (field.name.startsWith("REQUEST_")) return
+        if (ConstantEvaluator.evaluate(context, argument) !is String) return
+        context.report(
+            ISSUE,
+            argument,
+            context.getLocation(argument),
+            "Fragment Result API request key constants must start with REQUEST_: ${field.name}",
+        )
+    }
+
+    companion object {
+        val ISSUE =
+            Issue.create(
+                id = "FragmentRequestKeyNaming",
+                briefDescription = "Fragment request key constants must start with REQUEST_",
+                explanation =
+                    """
+                    Fragment Result API request key constants should be named: REQUEST_<DESCRIPTION>.
+                    The name should be an action to represent the request. e.g. REQUEST_SELECT_TAGS.
+                    """.trimIndent(),
+                category = Constants.ANKI_CODE_STYLE_CATEGORY,
+                priority = Constants.ANKI_CODE_STYLE_PRIORITY,
+                severity = Constants.ANKI_CODE_STYLE_SEVERITY,
+                implementation = Implementation(FragmentRequestKeyNamingDetector::class.java, Scope.JAVA_FILE_SCOPE),
+            )
+    }
+}
diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/rules/FragmentResultKeyNamingDetector.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/FragmentResultKeyNamingDetector.kt
new file mode 100644
index 000000000000..44971a726c18
--- /dev/null
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/FragmentResultKeyNamingDetector.kt
@@ -0,0 +1,205 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.lint.rules
+
+import com.android.tools.lint.checks.DataFlowAnalyzer
+import com.android.tools.lint.detector.api.ConstantEvaluator
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.SourceCodeScanner
+import com.android.tools.lint.detector.api.isReturningContext
+import com.ichi2.anki.lint.utils.Constants
+import com.ichi2.anki.lint.utils.ext.resolveToField
+import com.intellij.psi.PsiMethod
+import com.intellij.psi.PsiModifier
+import org.jetbrains.uast.UCallExpression
+import org.jetbrains.uast.UElement
+import org.jetbrains.uast.UExpression
+import org.jetbrains.uast.ULambdaExpression
+import org.jetbrains.uast.UMethod
+import org.jetbrains.uast.getParentOfType
+import org.jetbrains.uast.skipParenthesizedExprDown
+
+/**
+ * Requires `RESULT_` names for constant payload keys in Fragment Result API bundles.
+ *
+ * @see FragmentRequestKeyNamingDetector for `REQUEST_`
+ */
+class FragmentResultKeyNamingDetector :
+    Detector(),
+    SourceCodeScanner {
+    /** Starts tracking explicit `Bundle(...)` constructions as potential result payloads. */
+    override fun getApplicableConstructorTypes() = listOf("android.os.Bundle")
+
+    /**
+     * Checks a constructed bundle only if it flows into `setFragmentResult` in this method.
+     *
+     * ```kotlin
+     * val result = Bundle().apply { putLong(SELECTED_DECK, 1L) }
+     * parentFragmentManager.setFragmentResult(REQUEST_SELECT_DECK, result)
+     * ```
+     */
+    override fun visitConstructor(
+        context: JavaContext,
+        node: UCallExpression,
+        constructor: PsiMethod,
+    ) {
+        val scope = node.getParentOfType<UMethod>() ?: return
+        checkBundle(context, scope, node, isResult = false)
+    }
+
+    /** Selects listener registrations whose callback receives a result bundle. */
+    override fun getApplicableMethodNames() = listOf("setFragmentResultListener")
+
+    /**
+     * Tracks the second parameter of an inline result listener.
+     *
+     * ```kotlin
+     * setFragmentResultListener(REQUEST_SELECT_DECK) { _, result ->
+     *     val deckId = result.getLong(SELECTED_DECK)
+     * }
+     * ```
+     */
+    override fun visitMethodCall(
+        context: JavaContext,
+        node: UCallExpression,
+        method: PsiMethod,
+    ) {
+        if (!method.isFragmentResultApi()) return
+        val listenerIndex =
+            method.parameterList.parameters.indexOfLast {
+                it.type.canonicalText.contains("FragmentResultListener") || it.name == "listener"
+            }
+        if (listenerIndex < 0) return
+        val listener = node.getArgumentForParameter(listenerIndex)?.skipParenthesizedExprDown() as? ULambdaExpression ?: return
+        val bundle = listener.valueParameters.getOrNull(1) ?: return
+        checkBundle(context, listener.body, bundle, isResult = true)
+    }
+
+    /**
+     * Collects key accesses on [bundle] and its aliases, reporting them only for result payloads.
+     * Tracking stays within [scope]; it does not follow helper bodies or unrelated argument/saved-state bundles.
+     */
+    private fun checkBundle(
+        context: JavaContext,
+        scope: UElement,
+        bundle: UElement,
+        isResult: Boolean,
+    ) {
+        val keys = mutableListOf<UExpression>()
+        var sentAsResult = isResult
+        scope.accept(
+            object : DataFlowAnalyzer(listOf(bundle)) {
+                /** Follows scope functions such as `apply`, but treats `getBundle()` as a separate bundle. */
+                override fun returnsSelf(call: UCallExpression) = isReturningContext(call)
+
+                /** Collects string key arguments in bundle calls such as `result.putString(KEY, value)`. */
+                override fun receiver(call: UCallExpression) {
+                    val method = call.resolve() ?: return
+                    if (!context.evaluator.isMemberInClass(method, "android.os.Bundle") &&
+                        !context.evaluator.isMemberInClass(method, "android.os.BaseBundle")
+                    ) {
+                        return
+                    }
+                    if (method.parameterList.parameters
+                            .firstOrNull()
+                            ?.type
+                            ?.canonicalText != "java.lang.String"
+                    ) {
+                        return
+                    }
+                    call.getArgumentForParameter(0)?.let(keys::add)
+                }
+
+                /** Tracks helper keys such as `BundleCompat.getParcelable(result, KEY, type)` and result sends. */
+                override fun argument(
+                    call: UCallExpression,
+                    reference: UElement,
+                ) {
+                    val method = call.resolve() ?: return
+                    call.bundleHelperKey(method, reference)?.let(keys::add)
+                    if (method.name != "setFragmentResult" || !method.isFragmentResultApi()) return
+                    val index = method.parameterList.parameters.indexOfFirst { it.type.canonicalText == "android.os.Bundle" }
+                    if (index >= 0 && call.getArgumentForParameter(index) == reference) sentAsResult = true
+                }
+            },
+        )
+        if (sentAsResult) keys.forEach { checkKey(context, it) }
+    }
+
+    /**
+     * Extracts `KEY` from helper calls such as `BundleCompat.getParcelable(result, KEY, type)`.
+     * Only matches when the helper's bundle argument is the tracked [bundleReference].
+     */
+    private fun UCallExpression.bundleHelperKey(
+        method: PsiMethod,
+        bundleReference: UElement,
+    ): UExpression? {
+        if (method.containingClass?.qualifiedName !in BUNDLE_HELPERS) return null
+
+        val parameters = method.parameterList.parameters
+        val bundleIndex = parameters.indexOfFirst { it.type.canonicalText == "android.os.Bundle" }
+        if (bundleIndex < 0 || getArgumentForParameter(bundleIndex) != bundleReference) return null
+
+        val keyIndex = parameters.indexOfFirst { it.type.canonicalText == "java.lang.String" }
+        if (keyIndex < 0) return null
+        return getArgumentForParameter(keyIndex)
+    }
+
+    /** Reports non-`RESULT_` fields used as Bundle result keys. */
+    private fun checkKey(
+        context: JavaContext,
+        expression: UExpression,
+    ) {
+        val argument = expression.skipParenthesizedExprDown()
+        val field = argument.resolveToField() ?: return
+        if (!field.hasModifierProperty(PsiModifier.STATIC) || !field.hasModifierProperty(PsiModifier.FINAL)) return
+        if (field.name.startsWith("RESULT_")) return
+        if (ConstantEvaluator.evaluate(context, argument) !is String) return
+        context.report(
+            ISSUE,
+            argument,
+            context.getLocation(argument),
+            "Fragment Result API bundle key constants must start with RESULT_: ${field.name}",
+        )
+    }
+
+    /** Restricts matching to AndroidX Fragment APIs and AnkiDroid's FragmentActivity extensions. */
+    private fun PsiMethod.isFragmentResultApi() =
+        containingClass?.qualifiedName in
+            setOf(
+                "androidx.fragment.app.FragmentManager",
+                "androidx.fragment.app.FragmentKt",
+                "com.ichi2.anki.utils.ext.FragmentResultKt",
+            )
+
+    companion object {
+        /** Helpers whose bundle and string arguments represent payload access, including Kotlin extensions. */
+        private val BUNDLE_HELPERS =
+            setOf(
+                "androidx.core.os.BundleCompat",
+                "com.ichi2.anki.utils.ext.BundleUtilsKt",
+                "com.ichi2.anki.compat.CompatHelper.Companion",
+                "com.ichi2.anki.compat.CompatHelperKt",
+            )
+
+        /** Lint diagnostic for constant payload keys that do not follow the `RESULT_` naming convention. */
+        val ISSUE =
+            Issue.create(
+                id = "FragmentResultKeyNaming",
+                briefDescription = "Fragment result bundle keys must start with RESULT_",
+                explanation =
+                    """
+                    Fragment Result API bundle result keys should be named RESULT_<DESCRIPTION>,
+                    for example RESULT_SELECTED_DECK.
+                    """.trimIndent(),
+                category = Constants.ANKI_CODE_STYLE_CATEGORY,
+                priority = Constants.ANKI_CODE_STYLE_PRIORITY,
+                severity = Constants.ANKI_CODE_STYLE_SEVERITY,
+                implementation = Implementation(FragmentResultKeyNamingDetector::class.java, Scope.JAVA_FILE_SCOPE),
+            )
+    }
+}
diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/rules/IntentActionNamingDetector.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/IntentActionNamingDetector.kt
new file mode 100644
index 000000000000..b5da889fd1ec
--- /dev/null
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/IntentActionNamingDetector.kt
@@ -0,0 +1,204 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.lint.rules
+
+import com.android.tools.lint.client.api.UElementHandler
+import com.android.tools.lint.detector.api.ConstantEvaluator
+import com.android.tools.lint.detector.api.Context
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.SourceCodeScanner
+import com.ichi2.anki.lint.utils.Constants
+import com.ichi2.anki.lint.utils.ext.resolveToField
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiMethod
+import com.intellij.psi.PsiModifier
+import org.jetbrains.kotlin.asJava.unwrapped
+import org.jetbrains.kotlin.psi.KtProperty
+import org.jetbrains.uast.UBinaryExpression
+import org.jetbrains.uast.UCallExpression
+import org.jetbrains.uast.UExpression
+import org.jetbrains.uast.ULocalVariable
+import org.jetbrains.uast.UQualifiedReferenceExpression
+import org.jetbrains.uast.USwitchClauseExpression
+import org.jetbrains.uast.USwitchExpression
+import org.jetbrains.uast.UastBinaryOperator
+import org.jetbrains.uast.skipParenthesizedExprDown
+import org.jetbrains.uast.toUElementOfType
+import org.jetbrains.uast.tryResolve
+
+/**
+ * Requires intent action names to start with `ACTION_`, such as `ACTION_UPDATE_WIDGET`.
+ *
+ * Checks action arguments in `Intent` and `IntentFilter` APIs, assignments to `Intent.action`,
+ * equality comparisons, and `when` cases.
+ */
+class IntentActionNamingDetector :
+    Detector(),
+    SourceCodeScanner {
+    // Kotlin property assignments can be visited both as assignments and synthetic setter calls.
+    private val reportedActions = mutableSetOf<PsiElement>()
+
+    override fun beforeCheckFile(context: Context) {
+        reportedActions.clear()
+    }
+
+    override fun getApplicableConstructorTypes() = listOf(INTENT, INTENT_FILTER)
+
+    /** Checks the action in constructors such as `Intent(ACTION)` and `IntentFilter(ACTION, mimeType)`. */
+    override fun visitConstructor(
+        context: JavaContext,
+        node: UCallExpression,
+        constructor: PsiMethod,
+    ) {
+        // Copy constructors and explicit component intents do not have an action argument.
+        val index = constructor.parameterList.parameters.indexOfFirst { it.type.canonicalText == "java.lang.String" }
+        if (index < 0) return
+        // Only the first String parameter is the action; a later String may be a MIME type.
+        node.getArgumentForParameter(index)?.let { ensureConstantNameUsesActionPrefix(context, it) }
+    }
+
+    override fun getApplicableMethodNames() = listOf("setAction", "addAction", "create", "equals")
+
+    override fun visitMethodCall(
+        context: JavaContext,
+        node: UCallExpression,
+        method: PsiMethod,
+    ) {
+        when (method.name) {
+            "setAction" -> checkActionArgument(context, node, method, INTENT)
+            "addAction", "create" -> checkActionArgument(context, node, method, INTENT_FILTER)
+            "equals" -> checkStringEquals(context, node, method)
+        }
+    }
+
+    /** Checks the first argument of an action API, ignoring methods with the same name in unrelated classes. */
+    private fun checkActionArgument(
+        context: JavaContext,
+        node: UCallExpression,
+        method: PsiMethod,
+        owner: String,
+    ) {
+        // ensures the call is for Intent[Filter]
+        if (!context.evaluator.isMemberInClass(method, owner)) return
+        node.getArgumentForParameter(0)?.let { ensureConstantNameUsesActionPrefix(context, it) }
+    }
+
+    /** Handles `intent.action.equals(CONSTANT)` and `CONSTANT.equals(intent.action)`. */
+    private fun checkStringEquals(
+        context: JavaContext,
+        node: UCallExpression,
+        method: PsiMethod,
+    ) {
+        if (!context.evaluator.isMemberInClass(method, "java.lang.String")) return
+        val receiver = node.receiver ?: return
+        val other = node.getArgumentForParameter(0) ?: return
+        checkComparison(context, receiver, other)
+    }
+
+    override fun getApplicableUastTypes() = listOf(UBinaryExpression::class.java, USwitchExpression::class.java)
+
+    override fun createUastHandler(context: JavaContext) =
+        object : UElementHandler() {
+            override fun visitBinaryExpression(node: UBinaryExpression) {
+                // intent.action = "str"
+                if (node.operator == UastBinaryOperator.ASSIGN && isIntentAction(context, node.leftOperand)) {
+                    ensureConstantNameUsesActionPrefix(context, node.rightOperand)
+                }
+                // intent.action == "str" and identity comparisons.
+                if (node.operator in EQUALITY_OPERATORS) checkComparison(context, node.leftOperand, node.rightOperand)
+            }
+
+            override fun visitSwitchExpression(node: USwitchExpression) {
+                // when (intent.action) { CONSTANT -> ... }
+                val subject = node.expression ?: return
+                if (!isIntentAction(context, subject)) return
+                node.body.expressions.filterIsInstance<USwitchClauseExpression>().forEach { clause ->
+                    clause.caseValues.forEach { ensureConstantNameUsesActionPrefix(context, it) }
+                }
+            }
+        }
+
+    /** Checks the constant for a prefix in `intent.action == CONST` or `CONST == intent.action`. */
+    private fun checkComparison(
+        context: JavaContext,
+        left: UExpression,
+        right: UExpression,
+    ) {
+        if (isIntentAction(context, left)) ensureConstantNameUsesActionPrefix(context, right)
+        if (isIntentAction(context, right)) ensureConstantNameUsesActionPrefix(context, left)
+    }
+
+    /** Recognizes `intent.action` and `intent.getAction()`  */
+    private fun isIntentAction(
+        context: JavaContext,
+        expression: UExpression,
+    ): Boolean {
+        val value = expression.skipParenthesizedExprDown()
+        val reference = (value as? UQualifiedReferenceExpression)?.selector ?: value
+        val resolved = reference.tryResolve()
+        if (resolved is PsiMethod) {
+            return resolved.name in listOf("getAction", "setAction") && context.evaluator.isMemberInClass(resolved, INTENT)
+        }
+        val initializer = getImmutableLocalInitializer(resolved) ?: return false
+        return isIntentAction(context, initializer)
+    }
+
+    /** Returns the initializer of a local `val`; mutable variables and non-local properties are ignored. */
+    private fun getImmutableLocalInitializer(element: PsiElement?): UExpression? {
+        val variable = element?.unwrapped?.toUElementOfType<ULocalVariable>() ?: return null
+        val property = variable.sourcePsi as? KtProperty ?: return null
+        if (property.isVar) return null
+        return variable.uastInitializer
+    }
+
+    /** Reports when the name of a constant does not start with `ACTION_` */
+    private fun ensureConstantNameUsesActionPrefix(
+        context: JavaContext,
+        expression: UExpression,
+    ) {
+        val argument = expression.skipParenthesizedExprDown()
+        val field = argument.resolveToField() ?: return
+        if (!field.hasModifierProperty(PsiModifier.STATIC) || !field.hasModifierProperty(PsiModifier.FINAL)) return
+        if (field.name.startsWith("ACTION_")) return
+        if (ConstantEvaluator.evaluate(context, argument) !is String) return
+        // Report `intent.action = CONSTANT` once, even if UAST also visits it as a setter call.
+        if (!reportedActions.add(argument.sourcePsi ?: return)) return
+        context.report(
+            ISSUE,
+            argument,
+            context.getLocation(argument),
+            "Intent action constants must start with ACTION_: ${field.name}",
+        )
+    }
+
+    companion object {
+        private const val INTENT = "android.content.Intent"
+        private const val INTENT_FILTER = "android.content.IntentFilter"
+        private val EQUALITY_OPERATORS =
+            setOf(
+                UastBinaryOperator.EQUALS,
+                UastBinaryOperator.NOT_EQUALS,
+                UastBinaryOperator.IDENTITY_EQUALS,
+                UastBinaryOperator.IDENTITY_NOT_EQUALS,
+            )
+
+        val ISSUE =
+            Issue.create(
+                id = "IntentActionNaming",
+                briefDescription = "Intent action constants must start with ACTION_",
+                explanation =
+                    """
+                    Intent action constants should be named ACTION_<DESCRIPTION>, for example ACTION_UPDATE_WIDGET.
+                    Use this prefix when sending, receiving or filtering an intent action.
+                    """.trimIndent(),
+                category = Constants.ANKI_CODE_STYLE_CATEGORY,
+                priority = Constants.ANKI_CODE_STYLE_PRIORITY,
+                severity = Constants.ANKI_CODE_STYLE_SEVERITY,
+                implementation = Implementation(IntentActionNamingDetector::class.java, Scope.JAVA_FILE_SCOPE),
+            )
+    }
+}
diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/rules/IntentExtraNamingDetector.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/IntentExtraNamingDetector.kt
new file mode 100644
index 000000000000..c8a2957ea793
--- /dev/null
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/IntentExtraNamingDetector.kt
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.lint.rules
+
+import com.android.tools.lint.detector.api.ConstantEvaluator
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.SourceCodeScanner
+import com.ichi2.anki.lint.utils.Constants
+import com.ichi2.anki.lint.utils.ext.resolveToField
+import com.intellij.psi.PsiMethod
+import com.intellij.psi.PsiModifier
+import org.jetbrains.uast.UCallExpression
+import org.jetbrains.uast.skipParenthesizedExprDown
+
+class IntentExtraNamingDetector :
+    Detector(),
+    SourceCodeScanner {
+    override fun getApplicableMethodNames() =
+        listOf(
+            "putExtra",
+            "hasExtra",
+            "removeExtra",
+            "getBooleanExtra",
+            "getByteExtra",
+            "getShortExtra",
+            "getCharExtra",
+            "getIntExtra",
+            "getLongExtra",
+            "getFloatExtra",
+            "getDoubleExtra",
+            "getStringExtra",
+            "getCharSequenceExtra",
+            "getBundleExtra",
+            "getParcelableExtra",
+            "getParcelableArrayExtra",
+            "getParcelableArrayListExtra",
+            "getSerializableExtra",
+            "getIntegerArrayListExtra",
+            "getStringArrayListExtra",
+            "getCharSequenceArrayListExtra",
+            "getBooleanArrayExtra",
+            "getByteArrayExtra",
+            "getShortArrayExtra",
+            "getCharArrayExtra",
+            "getIntArrayExtra",
+            "getLongArrayExtra",
+            "getFloatArrayExtra",
+            "getDoubleArrayExtra",
+            "getStringArrayExtra",
+            "getCharSequenceArrayExtra",
+            "getParcelableExtraCompat",
+            "getSerializableExtraCompat",
+        )
+
+    override fun visitMethodCall(
+        context: JavaContext,
+        node: UCallExpression,
+        method: PsiMethod,
+    ) {
+        val keyIndex =
+            when (method.containingClass?.qualifiedName) {
+                "android.content.Intent" -> 0
+                "androidx.core.content.IntentCompat",
+                "com.ichi2.anki.common.utils.ext.IntentKt",
+                "com.ichi2.anki.compat.CompatHelper.Companion",
+                -> 1
+                else -> return
+            }
+        val argument = node.getArgumentForParameter(keyIndex)?.skipParenthesizedExprDown() ?: return
+        val field = argument.resolveToField() ?: return
+        if (!field.hasModifierProperty(PsiModifier.STATIC) || !field.hasModifierProperty(PsiModifier.FINAL)) return
+        if (field.name.startsWith("EXTRA_")) return
+        if (ConstantEvaluator.evaluate(context, argument) !is String) return
+        context.report(
+            ISSUE,
+            argument,
+            context.getLocation(argument),
+            "Intent extra key constants must start with EXTRA_: ${field.name}",
+        )
+    }
+
+    companion object {
+        val ISSUE =
+            Issue.create(
+                id = "IntentExtraNaming",
+                briefDescription = "Intent extra key constants must start with EXTRA_",
+                explanation =
+                    """
+                    Intent extra key constants should be named: EXTRA_<DESCRIPTION>.
+                    The name should describe the value being passed. e.g. EXTRA_DECK_ID.
+                    """.trimIndent(),
+                category = Constants.ANKI_CODE_STYLE_CATEGORY,
+                priority = Constants.ANKI_CODE_STYLE_PRIORITY,
+                severity = Constants.ANKI_CODE_STYLE_SEVERITY,
+                implementation = Implementation(IntentExtraNamingDetector::class.java, Scope.JAVA_FILE_SCOPE),
+            )
+    }
+}
diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/rules/InvalidStringFormatDetector.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/InvalidStringFormatDetector.kt
index 4c073865c135..b674e6bafa10 100644
--- a/lint-rules/src/main/java/com/ichi2/anki/lint/rules/InvalidStringFormatDetector.kt
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/InvalidStringFormatDetector.kt
@@ -5,6 +5,7 @@ package com.ichi2.anki.lint.rules
 
 import com.android.SdkConstants.TAG_PLURALS
 import com.android.SdkConstants.TAG_STRING
+import com.android.SdkConstants.TAG_STRING_ARRAY
 import com.android.resources.ResourceFolderType
 import com.android.tools.lint.detector.api.Implementation
 import com.android.tools.lint.detector.api.Issue
@@ -59,7 +60,7 @@ class InvalidStringFormatDetector : ResourceXmlDetector() {
 
     override fun appliesTo(folderType: ResourceFolderType): Boolean = folderType == ResourceFolderType.VALUES
 
-    override fun getApplicableElements() = listOf(TAG_STRING, TAG_PLURALS)
+    override fun getApplicableElements() = listOf(TAG_STRING, TAG_PLURALS, TAG_STRING_ARRAY)
 
     override fun visitElement(
         context: XmlContext,
@@ -73,11 +74,13 @@ class InvalidStringFormatDetector : ResourceXmlDetector() {
                 val isStringResource =
                     (child.nodeType == Node.TEXT_NODE || child.nodeType == Node.CDATA_SECTION_NODE) &&
                         TAG_STRING == element.localName
-                val isPluralItem = child.nodeType == Node.ELEMENT_NODE && TAG_PLURALS == element.localName
+                val isItem =
+                    child.nodeType == Node.ELEMENT_NODE &&
+                        (TAG_PLURALS == element.localName || TAG_STRING_ARRAY == element.localName)
 
                 if (isStringResource) {
                     checkText(context, element, child.nodeValue)
-                } else if (isPluralItem) {
+                } else if (isItem) {
                     val sb = StringBuilder()
                     StringFormatDetector.addText(sb, child)
                     if (sb.isNotEmpty()) {
diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/rules/PreferenceKeyNamingDetector.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/PreferenceKeyNamingDetector.kt
new file mode 100644
index 000000000000..e693b3a17dcd
--- /dev/null
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/PreferenceKeyNamingDetector.kt
@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.lint.rules
+
+import com.android.tools.lint.detector.api.ConstantEvaluator
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.SourceCodeScanner
+import com.ichi2.anki.lint.utils.Constants
+import com.ichi2.anki.lint.utils.ext.resolveToField
+import com.intellij.psi.PsiMethod
+import com.intellij.psi.PsiModifier
+import org.jetbrains.uast.UCallExpression
+import org.jetbrains.uast.skipParenthesizedExprDown
+
+class PreferenceKeyNamingDetector :
+    Detector(),
+    SourceCodeScanner {
+    override fun getApplicableMethodNames() =
+        listOf(
+            "contains",
+            "getBoolean",
+            "getFloat",
+            "getInt",
+            "getLong",
+            "getString",
+            "getStringSet",
+            "putBoolean",
+            "putFloat",
+            "putInt",
+            "putLong",
+            "putString",
+            "putStringSet",
+            "remove",
+            "get",
+            "getOrSetString",
+            "getOrSetLong",
+            "booleanPref",
+        )
+
+    override fun visitMethodCall(
+        context: JavaContext,
+        node: UCallExpression,
+        method: PsiMethod,
+    ) {
+        val keyIndex =
+            when (method.containingClass?.qualifiedName) {
+                "android.content.SharedPreferences",
+                "android.content.SharedPreferences.Editor",
+                "com.ichi2.anki.settings.PrefsRepository",
+                -> 0
+                "com.ichi2.anki.preferences.PreferenceUtilsKt",
+                "com.ichi2.preferences.PreferenceExtensionsKt",
+                -> 1
+                else -> return
+            }
+        val argument = node.getArgumentForParameter(keyIndex)?.skipParenthesizedExprDown() ?: return
+        val field = argument.resolveToField() ?: return
+        if (!field.hasModifierProperty(PsiModifier.STATIC) || !field.hasModifierProperty(PsiModifier.FINAL)) return
+        if (field.name.startsWith("PREF_")) return
+        if (ConstantEvaluator.evaluate(context, argument) !is String) return
+        context.report(
+            ISSUE,
+            argument,
+            context.getLocation(argument),
+            "Preference key constants must start with PREF_: ${field.name}",
+        )
+    }
+
+    companion object {
+        val ISSUE =
+            Issue.create(
+                id = "PreferenceKeyNaming",
+                briefDescription = "Preference key constants must start with PREF_",
+                explanation =
+                    """
+                    SharedPreferences key constants should be named PREF_<DESCRIPTION>,
+                    for example PREF_LAST_DECK_ID.
+                    """.trimIndent(),
+                category = Constants.ANKI_CODE_STYLE_CATEGORY,
+                priority = Constants.ANKI_CODE_STYLE_PRIORITY,
+                severity = Constants.ANKI_CODE_STYLE_SEVERITY,
+                implementation = Implementation(PreferenceKeyNamingDetector::class.java, Scope.JAVA_FILE_SCOPE),
+            )
+    }
+}
diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/rules/SavedStateKeyNamingDetector.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/SavedStateKeyNamingDetector.kt
new file mode 100644
index 000000000000..8a47da78963b
--- /dev/null
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/rules/SavedStateKeyNamingDetector.kt
@@ -0,0 +1,174 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.lint.rules
+
+import com.android.tools.lint.checks.DataFlowAnalyzer
+import com.android.tools.lint.client.api.UElementHandler
+import com.android.tools.lint.detector.api.ConstantEvaluator
+import com.android.tools.lint.detector.api.Detector
+import com.android.tools.lint.detector.api.Implementation
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.JavaContext
+import com.android.tools.lint.detector.api.Scope
+import com.android.tools.lint.detector.api.SourceCodeScanner
+import com.android.tools.lint.detector.api.isReturningContext
+import com.ichi2.anki.lint.utils.Constants
+import com.ichi2.anki.lint.utils.ext.resolveToField
+import com.intellij.psi.PsiMethod
+import com.intellij.psi.PsiModifier
+import org.jetbrains.uast.UCallExpression
+import org.jetbrains.uast.UElement
+import org.jetbrains.uast.UExpression
+import org.jetbrains.uast.UMethod
+import org.jetbrains.uast.skipParenthesizedExprDown
+
+/**
+ * Requires `STATE_` names for constant keys in saved instance state bundles.
+ *
+ * ```kotlin
+ * override fun onSaveInstanceState(outState: Bundle) {
+ *     outState.putInt(STATE_SCROLL_POSITION, position)
+ *     super.onSaveInstanceState(outState)
+ * }
+ * ```
+ *
+ * Only the `Bundle` parameters of [SAVED_STATE_METHODS] are tracked, so argument, result and
+ * intent bundles are left alone. Literal keys, `SavedStateHandle`, keys read or written inside
+ * other helper methods and bundles merged in with `putAll` are not checked.
+ *
+ * @see FragmentResultKeyNamingDetector for `RESULT_`
+ */
+class SavedStateKeyNamingDetector :
+    Detector(),
+    SourceCodeScanner {
+    override fun getApplicableUastTypes() = listOf(UMethod::class.java)
+
+    /**
+     * Matches methods by name, so overrides and same-named helpers such as
+     * `NoteEditorMultimediaController.onSaveInstanceState(outState)` are both checked.
+     */
+    override fun createUastHandler(context: JavaContext) =
+        object : UElementHandler() {
+            override fun visitMethod(node: UMethod) {
+                if (node.name !in SAVED_STATE_METHODS) return
+                val body = node.uastBody ?: return
+                node.uastParameters
+                    .filter { it.type.canonicalText == "android.os.Bundle" }
+                    .forEach { checkBundle(context, body, it) }
+            }
+        }
+
+    /**
+     * Collects key accesses on [bundle] and its aliases within [scope].
+     * Keys are deduplicated because an extension call such as `state.getLongOrNull(KEY)`
+     * reaches both [DataFlowAnalyzer.receiver] and [DataFlowAnalyzer.argument].
+     */
+    private fun checkBundle(
+        context: JavaContext,
+        scope: UElement,
+        bundle: UElement,
+    ) {
+        val keys = mutableListOf<UExpression>()
+        scope.accept(
+            object : DataFlowAnalyzer(listOf(bundle)) {
+                /** Follows scope functions such as `with(outState) { putInt(KEY, value) }`. */
+                override fun returnsSelf(call: UCallExpression) = isReturningContext(call)
+
+                /** Collects keys in bundle calls such as `outState.putInt(KEY, value)`. */
+                override fun receiver(call: UCallExpression) {
+                    val method = call.resolve() ?: return
+                    call.keyArgument(context, method)?.let(keys::add)
+                }
+
+                /** Collects keys in helper calls such as `BundleCompat.getParcelable(state, KEY, type)`. */
+                override fun argument(
+                    call: UCallExpression,
+                    reference: UElement,
+                ) {
+                    val method = call.resolve() ?: return
+                    if (method.containingClass?.qualifiedName !in BUNDLE_HELPERS) return
+                    val bundleIndex = method.parameterList.parameters.indexOfFirst { it.type.canonicalText == "android.os.Bundle" }
+                    if (bundleIndex < 0 || call.getArgumentForParameter(bundleIndex) != reference) return
+                    call.keyArgument(context, method)?.let(keys::add)
+                }
+            },
+        )
+        keys.distinctBy { it.sourcePsi }.forEach { checkKey(context, it) }
+    }
+
+    /** Returns the first `String` argument of a `Bundle` or [BUNDLE_HELPERS] call. */
+    private fun UCallExpression.keyArgument(
+        context: JavaContext,
+        method: PsiMethod,
+    ): UExpression? {
+        val isBundleMember =
+            context.evaluator.isMemberInClass(method, "android.os.Bundle") ||
+                context.evaluator.isMemberInClass(method, "android.os.BaseBundle")
+        if (!isBundleMember && method.containingClass?.qualifiedName !in BUNDLE_HELPERS) return null
+        val keyIndex = method.parameterList.parameters.indexOfFirst { it.type.canonicalText == "java.lang.String" }
+        if (keyIndex < 0) return null
+        return getArgumentForParameter(keyIndex)
+    }
+
+    /** Reports non-`STATE_` constants used as saved instance state keys. */
+    private fun checkKey(
+        context: JavaContext,
+        expression: UExpression,
+    ) {
+        val argument = expression.skipParenthesizedExprDown()
+        val field = argument.resolveToField() ?: return
+        if (!field.hasModifierProperty(PsiModifier.STATIC) || !field.hasModifierProperty(PsiModifier.FINAL)) return
+        if (field.name.startsWith("STATE_")) return
+        if (ConstantEvaluator.evaluate(context, argument) !is String) return
+        context.report(
+            ISSUE,
+            argument,
+            context.getLocation(argument),
+            "Saved instance state key constants must start with STATE_: ${field.name}",
+        )
+    }
+
+    companion object {
+        /** Activity, fragment and dialog methods whose `Bundle` parameter is saved instance state. */
+        private val SAVED_STATE_METHODS =
+            setOf(
+                "onSaveInstanceState",
+                "onRestoreInstanceState",
+                "onViewStateRestored",
+                "onCreate",
+                "onCreateView",
+                "onViewCreated",
+                "onActivityCreated",
+                "onCreateDialog",
+                "onPostCreate",
+                "onCreatePreferences",
+            )
+
+        /** Helpers whose bundle and string arguments are a key access, including Kotlin extensions. */
+        private val BUNDLE_HELPERS =
+            setOf(
+                "androidx.core.os.BundleCompat",
+                "com.ichi2.anki.utils.ext.BundleUtilsKt",
+                "com.ichi2.anki.compat.CompatHelper.Companion",
+                "com.ichi2.anki.compat.CompatHelperKt",
+            )
+
+        /** Lint diagnostic for constant saved state keys that do not follow the `STATE_` naming convention. */
+        val ISSUE =
+            Issue.create(
+                id = "SavedStateKeyNaming",
+                briefDescription = "Saved instance state keys must start with STATE_",
+                explanation =
+                    """
+                    Saved instance state key constants should be named STATE_<DESCRIPTION>,
+                    for example STATE_SCROLL_POSITION. A key that is also used as an intent
+                    extra, fragment argument or preference key needs its own STATE_ constant,
+                    even if the string value is the same.
+                    """.trimIndent(),
+                category = Constants.ANKI_CODE_STYLE_CATEGORY,
+                priority = Constants.ANKI_CODE_STYLE_PRIORITY,
+                severity = Constants.ANKI_CODE_STYLE_SEVERITY,
+                implementation = Implementation(SavedStateKeyNamingDetector::class.java, Scope.JAVA_FILE_SCOPE),
+            )
+    }
+}
diff --git a/lint-rules/src/main/java/com/ichi2/anki/lint/utils/ext/UExpression.kt b/lint-rules/src/main/java/com/ichi2/anki/lint/utils/ext/UExpression.kt
new file mode 100644
index 000000000000..a411c7422074
--- /dev/null
+++ b/lint-rules/src/main/java/com/ichi2/anki/lint/utils/ext/UExpression.kt
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.lint.utils.ext
+
+import com.intellij.psi.PsiField
+import org.jetbrains.kotlin.asJava.unwrapped
+import org.jetbrains.kotlin.psi.KtProperty
+import org.jetbrains.uast.UExpression
+import org.jetbrains.uast.UField
+import org.jetbrains.uast.UQualifiedReferenceExpression
+import org.jetbrains.uast.UReferenceExpression
+import org.jetbrains.uast.toUElementOfType
+
+/**
+ * Resolves a Kotlin property to its backing field, including access through its getter.
+ *
+ * [UReferenceExpression.resolve] can return a getter method for an ordinary Kotlin `val`.
+ *
+ * This unwraps it, so it works the same as a `const val`.
+ */
+internal fun UExpression.resolveToField(): PsiField? {
+    val reference = (this as? UQualifiedReferenceExpression)?.selector ?: this
+    val resolved = (reference as? UReferenceExpression)?.resolve() ?: return null
+    val property = resolved.unwrapped as? KtProperty ?: return null
+    return property.toUElementOfType<UField>()?.javaPsi as? PsiField
+}
diff --git a/lint-rules/src/test/java/com/ichi2/anki/lint/rules/FragmentArgumentKeyNamingDetectorTest.kt b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/FragmentArgumentKeyNamingDetectorTest.kt
new file mode 100644
index 000000000000..77786902a1d1
--- /dev/null
+++ b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/FragmentArgumentKeyNamingDetectorTest.kt
@@ -0,0 +1,227 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.lint.rules
+
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest.java
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest.kotlin
+import com.android.tools.lint.checks.infrastructure.TestLintTask.lint
+import com.android.tools.lint.checks.infrastructure.TestMode
+import org.junit.Test
+
+class FragmentArgumentKeyNamingDetectorTest {
+    @Test
+    fun `reports constants read from fragment arguments`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                bundle,
+                fragment,
+                bundleCompat,
+                bundleUtils,
+                kotlin(
+                    """
+                    package test
+                    import androidx.core.os.BundleCompat
+                    import androidx.fragment.app.Fragment
+                    import com.ichi2.anki.utils.ext.getLongOrNull
+
+                    const val DECK_ID = "deckId"
+                    object Keys {
+                        val TITLE_KEY = "title"
+                    }
+                    class Screen : Fragment() {
+                        companion object {
+                            const val CARD_INDEX = "cardIndex"
+                        }
+                        private val deckId by lazy { requireArguments().getLong(DECK_ID) }
+                        private val index = arguments?.getLong(CARD_INDEX)
+                        fun read() {
+                            requireArguments().getLong(DECK_ID)
+                            arguments?.getString(Keys.TITLE_KEY)
+                            val args = requireArguments()
+                            args.containsKey(Screen.CARD_INDEX)
+                            requireArguments().getLongOrNull(DECK_ID)
+                            BundleCompat.getParcelable(requireArguments(), CARD_INDEX, String::class.java)
+                            requireArguments().run { getString(Keys.TITLE_KEY) }
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(FragmentArgumentKeyNamingDetector.ISSUE)
+            .run()
+            .expectErrorCount(8)
+            .expectContains("Fragment argument key constants must start with ARG_: DECK_ID")
+            .expectContains("Fragment argument key constants must start with ARG_: TITLE_KEY")
+            .expectContains("Fragment argument key constants must start with ARG_: CARD_INDEX")
+    }
+
+    @Test
+    fun `reports constants written to fragment arguments`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                bundle,
+                fragment,
+                kotlin(
+                    """
+                    package test
+                    import android.os.Bundle
+                    import androidx.fragment.app.Fragment
+
+                    const val DECK_ID = "deckId"
+                    const val NOTE_ID = "noteId"
+                    const val CARD_ID = "cardId"
+                    const val TITLE = "title"
+                    fun getIntent(arguments: Bundle?) {}
+                    class Screen : Fragment() {
+                        companion object {
+                            fun newInstance(deckId: Long) = Screen().apply { arguments = Bundle().apply { putLong(DECK_ID, deckId) } }
+                            fun alias(fragment: Fragment) {
+                                val args = Bundle()
+                                args.putLong(NOTE_ID, 1L)
+                                fragment.arguments = args
+                            }
+                            fun intent() = getIntent(arguments = Bundle().apply { putLong(CARD_ID, 1L) })
+                        }
+                        fun withDefault() {
+                            arguments = arguments ?: Bundle().apply { putString(TITLE, "title") }
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(FragmentArgumentKeyNamingDetector.ISSUE)
+            .skipTestModes(TestMode.PARENTHESIZED)
+            .run()
+            .expectErrorCount(4)
+            .expectContains("Fragment argument key constants must start with ARG_: DECK_ID")
+            .expectContains("Fragment argument key constants must start with ARG_: NOTE_ID")
+            .expectContains("Fragment argument key constants must start with ARG_: CARD_ID")
+            .expectContains("Fragment argument key constants must start with ARG_: TITLE")
+    }
+
+    @Test
+    fun `allows ARG_ and EXTRA_ constants and keys that are not constants`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                bundle,
+                fragment,
+                kotlin(
+                    """
+                    package test
+                    import androidx.fragment.app.Fragment
+
+                    const val ARG_DECK_ID = "deckId"
+                    const val EXTRA_NOTE_ID = "noteId"
+                    class Screen : Fragment() {
+                        companion object {
+                            val dynamicKey = "arg_" + System.nanoTime()
+                            var mutableKey = "mutable"
+                        }
+                        fun read(key: String) {
+                            requireArguments().getLong(ARG_DECK_ID)
+                            arguments?.getLong(EXTRA_NOTE_ID)
+                            requireArguments().getString(dynamicKey)
+                            requireArguments().getString(mutableKey)
+                            requireArguments().getString(key)
+                            requireArguments().getString("literal")
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(FragmentArgumentKeyNamingDetector.ISSUE)
+            .run()
+            .expectClean()
+    }
+
+    @Test
+    fun `ignores bundles that are not fragment arguments`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                bundle,
+                fragment,
+                kotlin(
+                    """
+                    package test
+                    import android.os.Bundle
+                    import androidx.fragment.app.Fragment
+
+                    const val DECK_ID = "deckId"
+                    const val ARG_NOTE = "note"
+                    fun send(result: Bundle) {}
+                    class Screen : Fragment() {
+                        fun read(savedInstanceState: Bundle?, other: Bundle) {
+                            savedInstanceState?.getLong(DECK_ID)
+                            other.getLong(DECK_ID)
+                            Bundle().putLong(DECK_ID, 1L)
+                            send(Bundle().apply { putLong(DECK_ID, 1L) })
+                            requireArguments().getString(ARG_NOTE, DECK_ID)
+                        }
+                    }
+                    class NotAFragment {
+                        var arguments = Bundle()
+                        fun requireArguments() = arguments
+                        fun read() {
+                            requireArguments().getLong(DECK_ID)
+                            arguments.getLong(DECK_ID)
+                            arguments = Bundle().apply { putLong(DECK_ID, 1L) }
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(FragmentArgumentKeyNamingDetector.ISSUE)
+            .run()
+            .expectClean()
+    }
+
+    companion object {
+        private val bundle =
+            kotlin(
+                """
+                package android.os
+                open class BaseBundle {
+                    fun containsKey(key: String): Boolean = false
+                    fun getLong(key: String): Long = 0L
+                    fun putLong(key: String, value: Long) {}
+                    fun getString(key: String): String? = null
+                    fun putString(key: String, value: String?) {}
+                    fun getString(key: String, defaultValue: String?): String? = defaultValue
+                }
+                class Bundle : BaseBundle()
+                """,
+            ).indented()
+        private val fragment =
+            java(
+                """
+                package androidx.fragment.app;
+                import android.os.Bundle;
+                public class Fragment {
+                    public Bundle getArguments() { return null; }
+                    public void setArguments(Bundle args) {}
+                    public final Bundle requireArguments() { return new Bundle(); }
+                }
+                """,
+            ).indented()
+        private val bundleCompat =
+            kotlin(
+                """
+                package androidx.core.os
+                import android.os.Bundle
+                object BundleCompat {
+                    @JvmStatic
+                    fun <T> getParcelable(bundle: Bundle, key: String, clazz: Class<T>): T? = null
+                }
+                """,
+            ).indented()
+        private val bundleUtils =
+            kotlin(
+                """
+                @file:JvmName("BundleUtilsKt")
+                package com.ichi2.anki.utils.ext
+                import android.os.Bundle
+                fun Bundle.getLongOrNull(key: String): Long? = null
+                """,
+            ).indented()
+    }
+}
diff --git a/lint-rules/src/test/java/com/ichi2/anki/lint/rules/FragmentRequestKeyNamingDetectorTest.kt b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/FragmentRequestKeyNamingDetectorTest.kt
new file mode 100644
index 000000000000..2aaf43b2f9e1
--- /dev/null
+++ b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/FragmentRequestKeyNamingDetectorTest.kt
@@ -0,0 +1,210 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.lint.rules
+
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest.kotlin
+import com.android.tools.lint.checks.infrastructure.TestLintTask.lint
+import org.junit.Test
+
+class FragmentRequestKeyNamingDetectorTest {
+    @Test
+    fun `reports constants in manager and extension calls`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                manager,
+                fragment,
+                activity,
+                fragmentExtensions,
+                activityExtensions,
+                kotlin(
+                    """
+                    package test
+                    import androidx.fragment.app.*
+                    import com.ichi2.anki.utils.ext.setFragmentResultListener
+
+                    const val RESULT_KEY = "result"
+                    class Screen : Fragment() {
+                        companion object {
+                            const val FRAGMENT_KEY = "fragment"
+                        }
+                        fun send(manager: FragmentManager, activity: FragmentActivity) {
+                            manager.setFragmentResult(RESULT_KEY, "payload")
+                            manager.setFragmentResult(Screen.FRAGMENT_KEY, "payload")
+                            manager.setFragmentResultListener(RESULT_KEY) {}
+                            manager.clearFragmentResult(RESULT_KEY)
+                            manager.clearFragmentResultListener(RESULT_KEY)
+                            setFragmentResult(result = "payload", requestKey = RESULT_KEY)
+                            setFragmentResultListener(RESULT_KEY) {}
+                            activity.setFragmentResultListener(RESULT_KEY) {}
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(FragmentRequestKeyNamingDetector.ISSUE)
+            .run()
+            .expectErrorCount(8)
+            .expectContains("Fragment Result API request key constants must start with REQUEST_: RESULT_KEY")
+    }
+
+    @Test
+    fun `reports request key properties accessed through Kotlin getters`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                manager,
+                fragment,
+                fragmentExtensions,
+                kotlin(
+                    """
+                    package test
+                    import androidx.fragment.app.*
+
+                    val RESULT_KEY = "result"
+                    object Keys {
+                        val FRAGMENT_KEY = "fragment"
+                    }
+                    class Screen : Fragment() {
+                        companion object {
+                            val REQUE_ = "dfjdsjkfdsjfds"
+                        }
+                        fun listen(manager: FragmentManager) {
+                            setFragmentResultListener(REQUE_) {}
+                            manager.setFragmentResult(Screen.REQUE_, "payload")
+                            manager.setFragmentResult(RESULT_KEY, "payload")
+                            manager.setFragmentResult(Keys.FRAGMENT_KEY, "payload")
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(FragmentRequestKeyNamingDetector.ISSUE)
+            .run()
+            .expectErrorCount(4)
+            .expectContains("Fragment Result API request key constants must start with REQUEST_: REQUE_")
+            .expectContains("Fragment Result API request key constants must start with REQUEST_: RESULT_KEY")
+            .expectContains("Fragment Result API request key constants must start with REQUEST_: FRAGMENT_KEY")
+    }
+
+    @Test
+    fun `allows compliant and nonconstant properties accessed through Kotlin getters`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                manager,
+                fragment,
+                fragmentExtensions,
+                kotlin(
+                    """
+                    package test
+                    import androidx.fragment.app.*
+
+                    val REQUEST_TOP_LEVEL = "topLevel"
+                    object Keys {
+                        val REQUEST_OBJECT = "object"
+                    }
+                    class Screen : Fragment() {
+                        companion object {
+                            val REQUEST_LISTEN = "listen"
+                            val dynamicKey = "request_" + System.nanoTime()
+                            var mutableKey = "mutable"
+                            val computedKey get() = "request_" + System.nanoTime()
+                            val delegatedKey by lazy { "request_" + System.nanoTime() }
+                        }
+                        val instanceKey = "instance"
+                        fun listen(manager: FragmentManager) {
+                            setFragmentResultListener(REQUEST_LISTEN) {}
+                            manager.setFragmentResult(REQUEST_TOP_LEVEL, "payload")
+                            manager.setFragmentResult(Keys.REQUEST_OBJECT, "payload")
+                            manager.setFragmentResult(dynamicKey, "payload")
+                            manager.setFragmentResult(mutableKey, "payload")
+                            manager.setFragmentResult(computedKey, "payload")
+                            manager.setFragmentResult(delegatedKey, "payload")
+                            manager.setFragmentResult(instanceKey, "payload")
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(FragmentRequestKeyNamingDetector.ISSUE)
+            .run()
+            .expectClean()
+    }
+
+    @Test
+    fun `allows request constants payload keys and dynamic keys`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                manager,
+                kotlin(
+                    """
+                    package test
+                    import androidx.fragment.app.FragmentManager
+
+                    object Keys {
+                        const val REQUEST_TEST = "test"
+                        const val RESULT_VALUE = "value"
+                    }
+                    fun send(manager: FragmentManager, requestKey: String) {
+                        manager.setFragmentResult(Keys.REQUEST_TEST, Keys.RESULT_VALUE)
+                        manager.setFragmentResult(requestKey, "payload")
+                        val dynamicKey = "request_" + System.nanoTime()
+                        manager.setFragmentResult(dynamicKey, "payload")
+                    }
+                    class Unrelated {
+                        fun setFragmentResult(requestKey: String, result: String) {}
+                        fun send() = setFragmentResult(Keys.RESULT_VALUE, "payload")
+                    }
+                    """,
+                ).indented(),
+            ).issues(FragmentRequestKeyNamingDetector.ISSUE)
+            .run()
+            .expectClean()
+    }
+
+    companion object {
+        private val manager =
+            kotlin(
+                """
+                package androidx.fragment.app
+                class FragmentManager {
+                    fun setFragmentResult(requestKey: String, result: String) {}
+                    fun setFragmentResultListener(requestKey: String, listener: () -> Unit) {}
+                    fun clearFragmentResult(requestKey: String) {}
+                    fun clearFragmentResultListener(requestKey: String) {}
+                }
+                """,
+            ).indented()
+        private val fragment =
+            kotlin(
+                """
+                package androidx.fragment.app
+                open class Fragment
+                """,
+            ).indented()
+        private val activity =
+            kotlin(
+                """
+                package androidx.fragment.app
+                class FragmentActivity
+                """,
+            ).indented()
+        private val fragmentExtensions =
+            kotlin(
+                """
+                @file:JvmName("FragmentKt")
+                package androidx.fragment.app
+                fun Fragment.setFragmentResult(requestKey: String, result: String) {}
+                fun Fragment.setFragmentResultListener(requestKey: String, listener: () -> Unit) {}
+                """,
+            ).indented()
+        private val activityExtensions =
+            kotlin(
+                """
+                @file:JvmName("FragmentResultKt")
+                package com.ichi2.anki.utils.ext
+                import androidx.fragment.app.FragmentActivity
+                fun FragmentActivity.setFragmentResultListener(requestKey: String, listener: () -> Unit) {}
+                """,
+            ).indented()
+    }
+}
diff --git a/lint-rules/src/test/java/com/ichi2/anki/lint/rules/FragmentResultKeyNamingDetectorTest.kt b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/FragmentResultKeyNamingDetectorTest.kt
new file mode 100644
index 000000000000..9ef56fe41730
--- /dev/null
+++ b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/FragmentResultKeyNamingDetectorTest.kt
@@ -0,0 +1,214 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.lint.rules
+
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest.kotlin
+import com.android.tools.lint.checks.infrastructure.TestLintTask.lint
+import org.junit.Test
+
+class FragmentResultKeyNamingDetectorTest {
+    private fun check(source: String) =
+        lint()
+            .allowMissingSdk()
+            .files(bundle, manager, fragment, extensions, activityExtensions, kotlin(source).indented())
+            .issues(FragmentResultKeyNamingDetector.ISSUE)
+            .run()
+
+    @Test
+    fun `reports payload keys in inline and local bundles`() {
+        check(
+            """
+            package test
+            import android.os.Bundle
+            import androidx.fragment.app.*
+            const val BAD_KEY = "value"
+            fun send(manager: FragmentManager) {
+                manager.setFragmentResult("request", Bundle().apply { putString(BAD_KEY, "payload") })
+                val result = Bundle()
+                result.putString(BAD_KEY, "payload")
+                val alias = result
+                manager.setFragmentResult("request", alias)
+            }
+        """,
+        ).expectErrorCount(2)
+            .expectContains("Fragment Result API bundle key constants must start with RESULT_: BAD_KEY")
+    }
+
+    @Test
+    fun `reports ordinary public and private Kotlin val properties as well as const val`() {
+        check(
+            """
+            package test
+            import android.os.Bundle
+            import androidx.fragment.app.*
+            val TOP_LEVEL = "top"
+            object Keys { val OBJECT_KEY = "object" }
+            class Screen : Fragment() {
+                companion object {
+                    val PUBLIC_KEY = "public"
+                    private val PRIVATE_KEY = "private"
+                    const val CONST_KEY = "constant"
+                }
+                fun send() {
+                    setFragmentResult(result = Bundle().apply {
+                        putString(TOP_LEVEL, "value")
+                        putString(Keys.OBJECT_KEY, "value")
+                        putString(Screen.PUBLIC_KEY, "value")
+                        putString(PRIVATE_KEY, "value")
+                        putString(CONST_KEY, "value")
+                    }, requestKey = "request")
+                }
+            }
+        """,
+        ).expectErrorCount(5)
+    }
+
+    @Test
+    fun `checks manager fragment and activity listener payloads`() {
+        check(
+            """
+            package test
+            import androidx.fragment.app.*
+            import com.ichi2.anki.utils.ext.setFragmentResultListener
+            const val BAD_KEY = "value"
+            class Screen : Fragment() {
+                fun listen(manager: FragmentManager, activity: FragmentActivity) {
+                    manager.setFragmentResultListener("request", this) { _, result -> result.getString(BAD_KEY) }
+                    setFragmentResultListener("request") { _, result ->
+                        val alias = result
+                        alias.getString(BAD_KEY)
+                    }
+                    activity.setFragmentResultListener("request") { _, result -> result.getString(BAD_KEY) }
+                }
+            }
+        """,
+        ).expectErrorCount(3)
+    }
+
+    @Test
+    fun `ignores arguments saved state nested bundles values and unrelated APIs`() {
+        check(
+            """
+            package test
+            import android.os.Bundle
+            import androidx.fragment.app.*
+            const val ARG_VALUE = "argument"
+            const val STATE_VALUE = "state"
+            const val REQUEST_SEND = "send"
+            const val RESULT_VALUE = "result"
+            class Other { fun setFragmentResult(key: String, bundle: Bundle) {} }
+            fun send(manager: FragmentManager, savedState: Bundle) {
+                savedState.putString(STATE_VALUE, "value")
+                val args = Bundle().apply { putString(ARG_VALUE, "value") }
+                Other().setFragmentResult(REQUEST_SEND, args)
+                manager.setFragmentResult(REQUEST_SEND, Bundle().apply {
+                    putString(RESULT_VALUE, ARG_VALUE)
+                    args.putString(ARG_VALUE, "value")
+                    putBundle(RESULT_VALUE, args)
+                })
+                manager.setFragmentResultListener(REQUEST_SEND, Any()) { _, result ->
+                    result.getString(RESULT_VALUE)
+                    result.getBundle(RESULT_VALUE)?.getString(ARG_VALUE)
+                    args.getString(ARG_VALUE)
+                }
+            }
+        """,
+        ).expectClean()
+    }
+
+    @Test
+    fun `allows runtime keys and compliant properties`() {
+        check(
+            """
+            package test
+            import android.os.Bundle
+            import androidx.fragment.app.*
+            val RESULT_VALUE = "value"
+            val dynamicKey = "key_" + System.nanoTime()
+            var mutableKey = "mutable"
+            val computedKey get() = "computed"
+            val delegatedKey by lazy { "delegated" }
+            fun send(manager: FragmentManager, forwardedKey: String) {
+                manager.setFragmentResult("request", Bundle().apply {
+                    putString(RESULT_VALUE, "value")
+                    putString(dynamicKey, "value")
+                    putString(mutableKey, "value")
+                    putString(computedKey, "value")
+                    putString(delegatedKey, "value")
+                    putString(forwardedKey, "value")
+                })
+            }
+        """,
+        ).expectClean()
+    }
+
+    @Test
+    fun `honors suppression`() {
+        check(
+            """
+            package test
+            import android.os.Bundle
+            import androidx.fragment.app.FragmentManager
+            const val BAD_KEY = "key"
+            @Suppress("FragmentResultKeyNaming")
+            fun send(manager: FragmentManager) {
+                manager.setFragmentResult("request", Bundle().apply { putString(BAD_KEY, "value") })
+            }
+        """,
+        ).expectClean()
+    }
+
+    companion object {
+        private val bundle =
+            kotlin(
+                """
+            package android.os
+            class Bundle {
+                fun putString(key: String, value: String) {}
+                fun putBundle(key: String, value: Bundle) {}
+                fun getString(key: String): String? = null
+                fun getBundle(key: String): Bundle? = null
+            }
+        """,
+            ).indented()
+        private val manager =
+            kotlin(
+                """
+            package androidx.fragment.app
+            import android.os.Bundle
+            class FragmentManager {
+                fun setFragmentResult(requestKey: String, result: Bundle) {}
+                fun setFragmentResultListener(requestKey: String, owner: Any, listener: (String, Bundle) -> Unit) {}
+            }
+        """,
+            ).indented()
+        private val fragment =
+            kotlin(
+                """
+            package androidx.fragment.app
+            open class Fragment
+            class FragmentActivity
+        """,
+            ).indented()
+        private val extensions =
+            kotlin(
+                """
+            @file:JvmName("FragmentKt")
+            package androidx.fragment.app
+            import android.os.Bundle
+            fun Fragment.setFragmentResult(requestKey: String, result: Bundle) {}
+            fun Fragment.setFragmentResultListener(requestKey: String, listener: (String, Bundle) -> Unit) {}
+        """,
+            ).indented()
+        private val activityExtensions =
+            kotlin(
+                """
+            @file:JvmName("FragmentResultKt")
+            package com.ichi2.anki.utils.ext
+            import android.os.Bundle
+            import androidx.fragment.app.FragmentActivity
+            fun FragmentActivity.setFragmentResultListener(requestKey: String, listener: (String, Bundle) -> Unit) {}
+        """,
+            ).indented()
+    }
+}
diff --git a/lint-rules/src/test/java/com/ichi2/anki/lint/rules/IntentActionNamingDetectorTest.kt b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/IntentActionNamingDetectorTest.kt
new file mode 100644
index 000000000000..b2be175e0e28
--- /dev/null
+++ b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/IntentActionNamingDetectorTest.kt
@@ -0,0 +1,287 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.lint.rules
+
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest.java
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest.kotlin
+import com.android.tools.lint.checks.infrastructure.TestLintTask.lint
+import org.junit.Test
+
+class IntentActionNamingDetectorTest {
+    @Test
+    fun `reports constants in intent and filter constructors and methods`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                intent,
+                intentFilter,
+                context,
+                kotlin(
+                    """
+                    package test
+                    import android.content.Context
+                    import android.content.Intent
+                    import android.content.IntentFilter
+
+                    const val UPDATE_WIDGET = "update"
+                    const val MIME_TYPE = "text/plain"
+                    fun send(context: Context, intent: Intent) {
+                        Intent(UPDATE_WIDGET)
+                        Intent(UPDATE_WIDGET, null)
+                        Intent(UPDATE_WIDGET, null, context, Context::class.java)
+                        IntentFilter(UPDATE_WIDGET)
+                        IntentFilter(UPDATE_WIDGET, MIME_TYPE)
+                        IntentFilter.create(UPDATE_WIDGET, MIME_TYPE)
+                        intent.setAction(UPDATE_WIDGET)
+                        intent.action = UPDATE_WIDGET
+                        Intent().apply { action = UPDATE_WIDGET }
+                        IntentFilter().addAction(UPDATE_WIDGET)
+                        IntentFilter().apply { addAction(UPDATE_WIDGET) }
+                    }
+                    """,
+                ).indented(),
+            ).issues(IntentActionNamingDetector.ISSUE)
+            .run()
+            .expectErrorCount(11)
+            .expectContains("Intent action constants must start with ACTION_: UPDATE_WIDGET")
+    }
+
+    @Test
+    fun `reports constant properties accessed through Kotlin getters`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                intent,
+                context,
+                kotlin(
+                    """
+                    package test
+                    import android.content.Intent
+
+                    val UPDATE_WIDGET = "update"
+                    object Actions {
+                        val REFRESH_WIDGET = "refresh"
+                    }
+                    class Screen {
+                        companion object {
+                            const val OPEN_SCREEN = "open"
+                        }
+                        fun send(intent: Intent) {
+                            Intent(UPDATE_WIDGET)
+                            intent.action = Actions.REFRESH_WIDGET
+                            intent.setAction((Screen.OPEN_SCREEN))
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(IntentActionNamingDetector.ISSUE)
+            .run()
+            .expectErrorCount(3)
+            .expectContains("Intent action constants must start with ACTION_: UPDATE_WIDGET")
+            .expectContains("Intent action constants must start with ACTION_: REFRESH_WIDGET")
+            .expectContains("Intent action constants must start with ACTION_: OPEN_SCREEN")
+    }
+
+    @Test
+    fun `reports constants compared with intent actions and immutable local aliases`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                intent,
+                context,
+                kotlin(
+                    """
+                    package test
+                    import android.content.Intent
+
+                    const val COPY_DEBUG_INFO = "copy"
+                    fun receive(intent: Intent) {
+                        if ((intent.action) == COPY_DEBUG_INFO) return
+                        if (COPY_DEBUG_INFO != intent.action) return
+                        if (intent.getAction() == COPY_DEBUG_INFO) return
+                        val action = intent.action
+                        if (action == COPY_DEBUG_INFO) return
+                        val alias = action
+                        if (COPY_DEBUG_INFO != alias) return
+                        when (intent.action) {
+                            COPY_DEBUG_INFO -> return
+                        }
+                        when (alias) {
+                            COPY_DEBUG_INFO -> return
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(IntentActionNamingDetector.ISSUE)
+            .run()
+            .expectErrorCount(7)
+            .expectContains("Intent action constants must start with ACTION_: COPY_DEBUG_INFO")
+    }
+
+    @Test
+    fun `reports constants in explicit equals comparisons`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                intent,
+                context,
+                kotlin(
+                    """
+                    package test
+                    import android.content.Intent
+
+                    const val UPDATE_WIDGET = "update"
+                    fun receive(intent: Intent) {
+                        if (intent.action.equals(UPDATE_WIDGET)) return
+                        if (UPDATE_WIDGET.equals(intent.action)) return
+                        val action = intent.action
+                        if (action.equals(UPDATE_WIDGET)) return
+                        if (UPDATE_WIDGET.equals(action)) return
+                    }
+                    """,
+                ).indented(),
+            ).issues(IntentActionNamingDetector.ISSUE)
+            .run()
+            .expectErrorCount(4)
+            .expectContains("Intent action constants must start with ACTION_: UPDATE_WIDGET")
+    }
+
+    @Test
+    fun `allows compliant constants and actions that are not constants`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                intent,
+                intentFilter,
+                context,
+                kotlin(
+                    """
+                    package test
+                    import android.content.Context
+                    import android.content.Intent
+                    import android.content.IntentFilter
+
+                    const val ACTION_UPDATE_WIDGET = "update"
+                    object Actions {
+                        val ACTION_REFRESH_WIDGET = "refresh"
+                    }
+                    class Screen {
+                        companion object {
+                            val dynamicAction = "action_" + System.nanoTime()
+                            var mutableAction = "mutable"
+                            val computedAction get() = "action_" + System.nanoTime()
+                            val delegatedAction by lazy { "action_" + System.nanoTime() }
+                        }
+                        val instanceAction = "instance"
+                        fun send(context: Context, intent: Intent, action: String) {
+                            Intent(ACTION_UPDATE_WIDGET)
+                            IntentFilter(ACTION_UPDATE_WIDGET)
+                            IntentFilter.create(ACTION_UPDATE_WIDGET, "text/plain")
+                            intent.action = Actions.ACTION_REFRESH_WIDGET
+                            intent.setAction(ACTION_UPDATE_WIDGET)
+                            IntentFilter().addAction(ACTION_UPDATE_WIDGET)
+                            intent.action = dynamicAction
+                            intent.action = mutableAction
+                            intent.action = computedAction
+                            intent.action = delegatedAction
+                            intent.action = instanceAction
+                            intent.action = action
+                            intent.action = "literal"
+                            Intent(action)
+                            IntentFilter(action)
+                            Intent(intent)
+                            Intent(context, Screen::class.java)
+                            if (intent.action == ACTION_UPDATE_WIDGET) return
+                            if (intent.action == dynamicAction) return
+                            if (intent.action == action) return
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(IntentActionNamingDetector.ISSUE)
+            .run()
+            .expectClean()
+    }
+
+    @Test
+    fun `ignores unrelated methods properties and string arguments`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                intent,
+                intentFilter,
+                context,
+                kotlin(
+                    """
+                    package test
+                    import android.content.Intent
+                    import android.content.IntentFilter
+
+                    const val ACTION_UPDATE = "update"
+                    const val OTHER = "other"
+                    class Unrelated(val action: String) {
+                        fun setAction(action: String) {}
+                        fun addAction(action: String) {}
+                        fun create(action: String, type: String) {}
+                        fun send(intent: Intent) {
+                            setAction(OTHER)
+                            addAction(OTHER)
+                            create(OTHER, OTHER)
+                            IntentFilter(ACTION_UPDATE, OTHER)
+                            IntentFilter.create(ACTION_UPDATE, OTHER)
+                            intent.putExtra(OTHER, OTHER)
+                            if (action == OTHER) return
+                            var local = intent.action
+                            local = OTHER
+                            if (local == OTHER) return
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(IntentActionNamingDetector.ISSUE)
+            .run()
+            .expectClean()
+    }
+
+    companion object {
+        private val intent =
+            java(
+                """
+                package android.content;
+                public class Intent {
+                    public Intent() {}
+                    public Intent(String action) {}
+                    public Intent(String action, Object uri) {}
+                    public Intent(String action, Object uri, Context context, Class<?> cls) {}
+                    public Intent(Context context, Class<?> cls) {}
+                    public Intent(Intent other) {}
+                    public Intent setAction(String action) { return this; }
+                    public String getAction() { return null; }
+                    public Intent putExtra(String name, String value) { return this; }
+                }
+                """,
+            ).indented()
+
+        private val intentFilter =
+            java(
+                """
+                package android.content;
+                public class IntentFilter {
+                    public IntentFilter() {}
+                    public IntentFilter(String action) {}
+                    public IntentFilter(String action, String dataType) {}
+                    public void addAction(String action) {}
+                    public static IntentFilter create(String action, String dataType) { return null; }
+                }
+                """,
+            ).indented()
+
+        private val context =
+            java(
+                """
+                package android.content;
+                public class Context {}
+                """,
+            ).indented()
+    }
+}
diff --git a/lint-rules/src/test/java/com/ichi2/anki/lint/rules/IntentExtraNamingDetectorTest.kt b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/IntentExtraNamingDetectorTest.kt
new file mode 100644
index 000000000000..2434ea80a3e4
--- /dev/null
+++ b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/IntentExtraNamingDetectorTest.kt
@@ -0,0 +1,204 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.lint.rules
+
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest.kotlin
+import com.android.tools.lint.checks.infrastructure.TestLintTask.lint
+import org.junit.Test
+
+class IntentExtraNamingDetectorTest {
+    @Test
+    fun `reports constants in intent and helper calls`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                intent,
+                intentCompat,
+                intentExtensions,
+                compatHelper,
+                kotlin(
+                    """
+                    package test
+                    import android.content.Intent
+                    import androidx.core.content.IntentCompat
+                    import com.ichi2.anki.common.utils.ext.getLongExtra
+                    import com.ichi2.anki.common.utils.ext.getParcelableExtraCompat
+                    import com.ichi2.anki.compat.CompatHelper.Companion.getSerializableExtraCompat
+
+                    const val NOTE_ID = "noteId"
+                    class Screen {
+                        companion object {
+                            const val DECK_KEY = "deck"
+                        }
+                        fun read(intent: Intent) {
+                            intent.putExtra(NOTE_ID, "1")
+                            intent.putExtra(Screen.DECK_KEY, 1L)
+                            intent.getStringExtra(NOTE_ID)
+                            intent.getLongExtra(NOTE_ID, 0L)
+                            intent.hasExtra(NOTE_ID)
+                            intent.removeExtra(NOTE_ID)
+                            IntentCompat.getParcelableExtra(intent, NOTE_ID, String::class.java)
+                            intent.getLongExtra(NOTE_ID)
+                            intent.getParcelableExtraCompat<String>(NOTE_ID)
+                            intent.getSerializableExtraCompat<String>(NOTE_ID)
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(IntentExtraNamingDetector.ISSUE)
+            .run()
+            .expectErrorCount(10)
+            .expectContains("Intent extra key constants must start with EXTRA_: NOTE_ID")
+            .expectContains("Intent extra key constants must start with EXTRA_: DECK_KEY")
+    }
+
+    @Test
+    fun `reports extra key properties accessed through Kotlin getters`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                intent,
+                kotlin(
+                    """
+                    package test
+                    import android.content.Intent
+
+                    val NOTE_ID = "noteId"
+                    object Keys {
+                        val DECK_KEY = "deck"
+                    }
+                    fun read(intent: Intent) {
+                        intent.getStringExtra(NOTE_ID)
+                        intent.putExtra(Keys.DECK_KEY, "1")
+                    }
+                    """,
+                ).indented(),
+            ).issues(IntentExtraNamingDetector.ISSUE)
+            .run()
+            .expectErrorCount(2)
+            .expectContains("Intent extra key constants must start with EXTRA_: NOTE_ID")
+            .expectContains("Intent extra key constants must start with EXTRA_: DECK_KEY")
+    }
+
+    @Test
+    fun `allows compliant constants and keys that are not constants`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                intent,
+                intentCompat,
+                kotlin(
+                    """
+                    package test
+                    import android.content.Intent
+                    import androidx.core.content.IntentCompat
+
+                    const val EXTRA_NOTE_ID = "noteId"
+                    object Keys {
+                        val EXTRA_DECK_ID = "deck"
+                    }
+                    class Screen {
+                        companion object {
+                            val dynamicKey = "extra_" + System.nanoTime()
+                            var mutableKey = "mutable"
+                            val computedKey get() = "extra_" + System.nanoTime()
+                            val delegatedKey by lazy { "extra_" + System.nanoTime() }
+                        }
+                        val instanceKey = "instance"
+                        fun read(intent: Intent, key: String) {
+                            intent.getStringExtra(EXTRA_NOTE_ID)
+                            intent.putExtra(Keys.EXTRA_DECK_ID, "1")
+                            intent.getStringExtra(dynamicKey)
+                            intent.getStringExtra(mutableKey)
+                            intent.getStringExtra(computedKey)
+                            intent.getStringExtra(delegatedKey)
+                            intent.getStringExtra(instanceKey)
+                            intent.getStringExtra(key)
+                            intent.getStringExtra("literal")
+                            IntentCompat.getParcelableExtra(intent, key, String::class.java)
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(IntentExtraNamingDetector.ISSUE)
+            .run()
+            .expectClean()
+    }
+
+    @Test
+    fun `ignores values and unrelated methods with the same name`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                intent,
+                kotlin(
+                    """
+                    package test
+                    import android.content.Intent
+
+                    const val EXTRA_NOTE = "note"
+                    const val NOTE_ID = "noteId"
+                    fun write(intent: Intent) {
+                        intent.putExtra(EXTRA_NOTE, NOTE_ID)
+                    }
+                    class Unrelated {
+                        fun putExtra(name: String, value: String) {}
+                        fun send() = putExtra(NOTE_ID, "1")
+                    }
+                    """,
+                ).indented(),
+            ).issues(IntentExtraNamingDetector.ISSUE)
+            .run()
+            .expectClean()
+    }
+
+    companion object {
+        private val intent =
+            kotlin(
+                """
+                package android.content
+                class Intent {
+                    fun putExtra(name: String, value: String): Intent = this
+                    fun putExtra(name: String, value: Long): Intent = this
+                    fun getStringExtra(name: String): String? = null
+                    fun getLongExtra(name: String, defaultValue: Long): Long = defaultValue
+                    fun hasExtra(name: String): Boolean = false
+                    fun removeExtra(name: String) {}
+                }
+                """,
+            ).indented()
+        private val intentCompat =
+            kotlin(
+                """
+                package androidx.core.content
+                import android.content.Intent
+                object IntentCompat {
+                    @JvmStatic
+                    fun <T> getParcelableExtra(intent: Intent, name: String, clazz: Class<T>): T? = null
+                }
+                """,
+            ).indented()
+        private val intentExtensions =
+            kotlin(
+                """
+                @file:JvmName("IntentKt")
+                package com.ichi2.anki.common.utils.ext
+                import android.content.Intent
+                fun Intent.getLongExtra(key: String): Long? = null
+                inline fun <reified T> Intent.getParcelableExtraCompat(key: String): T? = null
+                """,
+            ).indented()
+        private val compatHelper =
+            kotlin(
+                """
+                package com.ichi2.anki.compat
+                import android.content.Intent
+                class CompatHelper {
+                    companion object {
+                        inline fun <reified T> Intent.getSerializableExtraCompat(name: String): T? = null
+                    }
+                }
+                """,
+            ).indented()
+    }
+}
diff --git a/lint-rules/src/test/java/com/ichi2/anki/lint/rules/InvalidStringFormatDetectorTest.kt b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/InvalidStringFormatDetectorTest.kt
index 7161c07c59e2..375b590716f3 100644
--- a/lint-rules/src/test/java/com/ichi2/anki/lint/rules/InvalidStringFormatDetectorTest.kt
+++ b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/InvalidStringFormatDetectorTest.kt
@@ -32,6 +32,73 @@ class InvalidStringFormatDetectorTest {
             .expectErrorCount(1)
     }
 
+    @Test
+    fun `invalid string-array item is reported once`() {
+        TestLintTask
+            .lint()
+            .allowMissingSdk()
+            .files(
+                TestFiles.xml(
+                    "res/values/strings.xml",
+                    """
+                    <resources>
+                        <string-array name="cards">
+                            <item>%D card</item>
+                            <item>%d cards</item>
+                        </string-array>
+                    </resources>
+                    """.trimIndent(),
+                ),
+            ).issues(InvalidStringFormatDetector.ISSUE)
+            .run()
+            .expectErrorCount(1)
+    }
+
+    @Test
+    fun `string-array item with misplaced percent sign is reported`() {
+        TestLintTask
+            .lint()
+            .allowMissingSdk()
+            .files(
+                TestFiles.xml(
+                    "res/values/strings.xml",
+                    """
+                    <resources>
+                        <string-array name="progress">
+                            <item>I have completed% %s cards</item>
+                        </string-array>
+                    </resources>
+                    """.trimIndent(),
+                ),
+            ).issues(InvalidStringFormatDetector.ISSUE)
+            .run()
+            .expectErrorCount(1)
+    }
+
+    @Test
+    fun `valid string-array is not reported`() {
+        TestLintTask
+            .lint()
+            .allowMissingSdk()
+            .files(
+                TestFiles.xml(
+                    "res/values/strings.xml",
+                    """
+                    <resources>
+                        <string-array name="cards">
+                            <item>%d card</item>
+                            <item>%1${'$'}d of %2${'$'}d cards</item>
+                            <item>100%%</item>
+                            <item>no format specifier</item>
+                        </string-array>
+                    </resources>
+                    """.trimIndent(),
+                ),
+            ).issues(InvalidStringFormatDetector.ISSUE)
+            .run()
+            .expectClean()
+    }
+
     @Language("XML")
     private val invalid =
         """<resources>
diff --git a/lint-rules/src/test/java/com/ichi2/anki/lint/rules/PreferenceKeyNamingDetectorTest.kt b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/PreferenceKeyNamingDetectorTest.kt
new file mode 100644
index 000000000000..64761e01f2b6
--- /dev/null
+++ b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/PreferenceKeyNamingDetectorTest.kt
@@ -0,0 +1,211 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.lint.rules
+
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest.kotlin
+import com.android.tools.lint.checks.infrastructure.TestLintTask.lint
+import org.junit.Test
+
+class PreferenceKeyNamingDetectorTest {
+    @Test
+    fun `reports constants in preference calls`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                sharedPreferences,
+                editExtension,
+                preferenceUtils,
+                preferenceExtensions,
+                kotlin(
+                    """
+                    package test
+                    import android.content.SharedPreferences
+                    import androidx.core.content.edit
+                    import com.ichi2.anki.preferences.get
+                    import com.ichi2.preferences.getOrSetString
+
+                    const val LAST_DECK = "lastDeck"
+                    object Keys {
+                        val SYNC_KEY = "sync"
+                    }
+                    class Screen {
+                        companion object {
+                            const val THEME = "theme"
+                        }
+                        fun use(prefs: SharedPreferences) {
+                            prefs.getBoolean(LAST_DECK, false)
+                            prefs.getString(Keys.SYNC_KEY, null)
+                            prefs.contains(Screen.THEME)
+                            prefs.edit().putBoolean(LAST_DECK, true).apply()
+                            prefs.edit { remove(THEME) }
+                            prefs.get(LAST_DECK)
+                            prefs.getOrSetString(Keys.SYNC_KEY) { "value" }
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(PreferenceKeyNamingDetector.ISSUE)
+            .run()
+            .expectErrorCount(7)
+            .expectContains("Preference key constants must start with PREF_: LAST_DECK")
+            .expectContains("Preference key constants must start with PREF_: SYNC_KEY")
+            .expectContains("Preference key constants must start with PREF_: THEME")
+    }
+
+    @Test
+    fun `reports string constants passed to the booleanPref delegate`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                sharedPreferences,
+                prefsRepository,
+                kotlin(
+                    """
+                    package test
+                    import com.ichi2.anki.settings.PrefsRepository
+
+                    class Repository(prefs: PrefsRepository) {
+                        var whiteboard by prefs.booleanPref(WHITEBOARD_KEY, false)
+                        var voice by prefs.booleanPref(PREF_VOICE, false)
+                        var fromResource by prefs.booleanPref(KEY_RES_ID, false)
+
+                        companion object {
+                            private const val WHITEBOARD_KEY = "whiteboard"
+                            private const val PREF_VOICE = "voice"
+                            private const val KEY_RES_ID = 1
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(PreferenceKeyNamingDetector.ISSUE)
+            .run()
+            .expectErrorCount(1)
+            .expectContains("Preference key constants must start with PREF_: WHITEBOARD_KEY")
+    }
+
+    @Test
+    fun `allows compliant constants and keys that are not constants`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                sharedPreferences,
+                kotlin(
+                    """
+                    package test
+                    import android.content.SharedPreferences
+
+                    const val PREF_LAST_DECK = "lastDeck"
+                    object Keys {
+                        val PREF_SYNC = "sync"
+                    }
+                    class Screen {
+                        companion object {
+                            val dynamicKey = "deck_" + System.nanoTime()
+                            var mutableKey = "mutable"
+                        }
+                        val instanceKey = "instance"
+                        fun use(prefs: SharedPreferences, key: String) {
+                            prefs.getBoolean(PREF_LAST_DECK, false)
+                            prefs.getString(Keys.PREF_SYNC, null)
+                            prefs.getString(dynamicKey, null)
+                            prefs.getString(mutableKey, null)
+                            prefs.getString(instanceKey, null)
+                            prefs.getString(key, null)
+                            prefs.getString("literal", null)
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(PreferenceKeyNamingDetector.ISSUE)
+            .run()
+            .expectClean()
+    }
+
+    @Test
+    fun `ignores values and unrelated methods with the same name`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                sharedPreferences,
+                kotlin(
+                    """
+                    package test
+                    import android.content.SharedPreferences
+
+                    const val PREF_THEME = "theme"
+                    const val DARK = "dark"
+                    fun write(prefs: SharedPreferences) {
+                        prefs.edit().putString(PREF_THEME, DARK).apply()
+                    }
+                    class Bundle {
+                        fun getBoolean(key: String, defaultValue: Boolean) = defaultValue
+                        fun read() = getBoolean(DARK, false)
+                    }
+                    """,
+                ).indented(),
+            ).issues(PreferenceKeyNamingDetector.ISSUE)
+            .run()
+            .expectClean()
+    }
+
+    companion object {
+        private val sharedPreferences =
+            kotlin(
+                """
+                package android.content
+                interface SharedPreferences {
+                    fun getBoolean(key: String, defValue: Boolean): Boolean
+                    fun getString(key: String, defValue: String?): String?
+                    fun contains(key: String): Boolean
+                    fun edit(): Editor
+                    interface Editor {
+                        fun putBoolean(key: String, value: Boolean): Editor
+                        fun putString(key: String, value: String?): Editor
+                        fun remove(key: String): Editor
+                        fun apply()
+                    }
+                }
+                """,
+            ).indented()
+        private val editExtension =
+            kotlin(
+                """
+                @file:JvmName("SharedPreferencesKt")
+                package androidx.core.content
+                import android.content.SharedPreferences
+                fun SharedPreferences.edit(action: SharedPreferences.Editor.() -> Unit) {
+                    edit().action()
+                }
+                """,
+            ).indented()
+        private val preferenceUtils =
+            kotlin(
+                """
+                @file:JvmName("PreferenceUtilsKt")
+                package com.ichi2.anki.preferences
+                import android.content.SharedPreferences
+                fun SharedPreferences.get(key: String): Any? = null
+                """,
+            ).indented()
+        private val preferenceExtensions =
+            kotlin(
+                """
+                @file:JvmName("PreferenceExtensionsKt")
+                package com.ichi2.preferences
+                import android.content.SharedPreferences
+                fun SharedPreferences.getOrSetString(key: String, supplier: () -> String): String = supplier()
+                """,
+            ).indented()
+        private val prefsRepository =
+            kotlin(
+                """
+                package com.ichi2.anki.settings
+                import kotlin.properties.ReadWriteProperty
+                open class PrefsRepository {
+                    fun booleanPref(key: String, defaultValue: Boolean): ReadWriteProperty<Any?, Boolean> = TODO()
+                    fun booleanPref(keyResId: Int, defaultValue: Boolean): ReadWriteProperty<Any?, Boolean> = TODO()
+                }
+                """,
+            ).indented()
+    }
+}
diff --git a/lint-rules/src/test/java/com/ichi2/anki/lint/rules/SavedStateKeyNamingDetectorTest.kt b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/SavedStateKeyNamingDetectorTest.kt
new file mode 100644
index 000000000000..57176bdb2ea5
--- /dev/null
+++ b/lint-rules/src/test/java/com/ichi2/anki/lint/rules/SavedStateKeyNamingDetectorTest.kt
@@ -0,0 +1,182 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.lint.rules
+
+import com.android.tools.lint.checks.infrastructure.LintDetectorTest.kotlin
+import com.android.tools.lint.checks.infrastructure.TestLintTask.lint
+import org.junit.Test
+
+class SavedStateKeyNamingDetectorTest {
+    @Test
+    fun `reports constants in saved state bundles`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                bundle,
+                bundleCompat,
+                bundleUtils,
+                compatHelper,
+                kotlin(
+                    """
+                    package test
+                    import android.os.Bundle
+                    import androidx.core.os.BundleCompat
+                    import com.ichi2.anki.compat.CompatHelper.Companion.getSerializableCompat
+                    import com.ichi2.anki.utils.ext.getLongOrNull
+
+                    const val NOTE_ID = "noteId"
+                    object Keys {
+                        val DECK_KEY = "deck"
+                    }
+                    class Screen {
+                        companion object {
+                            const val POSITION = "position"
+                        }
+                        fun onSaveInstanceState(outState: Bundle) {
+                            outState.putLong(NOTE_ID, 1L)
+                            outState.apply { putString(Keys.DECK_KEY, "deck") }
+                        }
+                        fun onCreate(savedInstanceState: Bundle?) {
+                            savedInstanceState?.getLong(NOTE_ID)
+                            savedInstanceState?.containsKey(Screen.POSITION)
+                            savedInstanceState?.getLongOrNull(NOTE_ID)
+                            savedInstanceState?.getSerializableCompat<String>(NOTE_ID)
+                            if (savedInstanceState != null) BundleCompat.getParcelable(savedInstanceState, POSITION, String::class.java)
+                        }
+                        fun onViewStateRestored(savedInstanceState: Bundle?) {
+                            savedInstanceState?.getString(Keys.DECK_KEY)
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(SavedStateKeyNamingDetector.ISSUE)
+            .run()
+            .expectErrorCount(8)
+            .expectContains("Saved instance state key constants must start with STATE_: NOTE_ID")
+            .expectContains("Saved instance state key constants must start with STATE_: DECK_KEY")
+            .expectContains("Saved instance state key constants must start with STATE_: POSITION")
+    }
+
+    @Test
+    fun `allows compliant constants and keys that are not constants`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                bundle,
+                kotlin(
+                    """
+                    package test
+                    import android.os.Bundle
+
+                    const val STATE_NOTE_ID = "noteId"
+                    object Keys {
+                        val STATE_DECK = "deck"
+                    }
+                    class Screen {
+                        companion object {
+                            val dynamicKey = "state_" + System.nanoTime()
+                            var mutableKey = "mutable"
+                        }
+                        val instanceKey = "instance"
+                        fun onSaveInstanceState(outState: Bundle) {
+                            outState.putLong(STATE_NOTE_ID, 1L)
+                            outState.putString(Keys.STATE_DECK, "deck")
+                            outState.putString(dynamicKey, "x")
+                            outState.putString(mutableKey, "x")
+                            outState.putString(instanceKey, "x")
+                            outState.putString("literal", "x")
+                        }
+                        fun onCreate(savedInstanceState: Bundle?) {
+                            savedInstanceState?.getLong(STATE_NOTE_ID)
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(SavedStateKeyNamingDetector.ISSUE)
+            .run()
+            .expectClean()
+    }
+
+    @Test
+    fun `ignores bundles that are not saved state`() {
+        lint()
+            .allowMissingSdk()
+            .files(
+                bundle,
+                kotlin(
+                    """
+                    package test
+                    import android.os.Bundle
+
+                    const val NOTE_ID = "noteId"
+                    const val STATE_NOTE = "note"
+                    class Screen {
+                        val arguments = Bundle()
+                        fun onCreate(savedInstanceState: Bundle?) {
+                            arguments.getLong(NOTE_ID)
+                            Bundle().putLong(NOTE_ID, 1L)
+                        }
+                        fun newInstance(): Bundle = Bundle().apply { putLong(NOTE_ID, 1L) }
+                        fun read(state: Bundle) = state.getLong(NOTE_ID)
+                        fun onSaveInstanceState(outState: Bundle) {
+                            outState.putString(STATE_NOTE, NOTE_ID)
+                            val result = Bundle()
+                            result.putLong(NOTE_ID, 1L)
+                        }
+                    }
+                    """,
+                ).indented(),
+            ).issues(SavedStateKeyNamingDetector.ISSUE)
+            .run()
+            .expectClean()
+    }
+
+    companion object {
+        private val bundle =
+            kotlin(
+                """
+                package android.os
+                open class BaseBundle {
+                    fun containsKey(key: String): Boolean = false
+                    fun getLong(key: String): Long = 0L
+                    fun putLong(key: String, value: Long) {}
+                    fun getString(key: String): String? = null
+                    fun putString(key: String, value: String?) {}
+                }
+                class Bundle : BaseBundle()
+                """,
+            ).indented()
+        private val bundleCompat =
+            kotlin(
+                """
+                package androidx.core.os
+                import android.os.Bundle
+                object BundleCompat {
+                    @JvmStatic
+                    fun <T> getParcelable(bundle: Bundle, key: String, clazz: Class<T>): T? = null
+                }
+                """,
+            ).indented()
+        private val bundleUtils =
+            kotlin(
+                """
+                @file:JvmName("BundleUtilsKt")
+                package com.ichi2.anki.utils.ext
+                import android.os.Bundle
+                fun Bundle.getLongOrNull(key: String): Long? = null
+                """,
+            ).indented()
+        private val compatHelper =
+            kotlin(
+                """
+                package com.ichi2.anki.compat
+                import android.os.Bundle
+                class CompatHelper {
+                    companion object {
+                        inline fun <reified T> Bundle.getSerializableCompat(name: String): T? = null
+                    }
+                }
+                """,
+            ).indented()
+    }
+}
diff --git a/note-editor/build.gradle.kts b/note-editor/build.gradle.kts
new file mode 100644
index 000000000000..04ce146baa50
--- /dev/null
+++ b/note-editor/build.gradle.kts
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import com.android.build.api.dsl.LibraryExtension
+
+plugins {
+    id("ankidroid.android.library")
+    id("ankidroid.android.compose")
+}
+
+configure<LibraryExtension> {
+    namespace = "com.ichi2.anki.noteeditor"
+}
+
+dependencies {
+    implementation(project(":common:android"))
+    implementation(libs.androidx.core)
+
+    testImplementation(testFixtures(project(":common:android")))
+    testImplementation(libs.robolectric)
+    testImplementation(libs.junit.vintage.engine)
+    testRuntimeOnly(libs.junit.platform.launcher)
+}
diff --git a/note-editor/src/main/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialog.kt b/note-editor/src/main/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialog.kt
new file mode 100644
index 000000000000..43736cedc0e1
--- /dev/null
+++ b/note-editor/src/main/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialog.kt
@@ -0,0 +1,273 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.noteeditor
+
+import androidx.annotation.StringRes
+import androidx.compose.foundation.LocalIndication
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.relocation.BringIntoViewRequester
+import androidx.compose.foundation.relocation.bringIntoViewRequester
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.AlertDialogDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.DialogProperties
+import com.ichi2.anki.CommonString
+import com.ichi2.anki.noteeditor.presentation.ToolbarLayoutMode
+import com.ichi2.compose.ui.dialogs.AnkiDroidDialog
+import com.ichi2.anki.common.android.R as CommonR
+
+/** Lets the user choose a scrolling, stacked or hidden [ToolbarLayoutMode] for the note editor. */
+@Composable
+fun ToolbarLayoutDialog(
+    selected: ToolbarLayoutMode,
+    onSelect: (ToolbarLayoutMode) -> Unit,
+    onDismiss: () -> Unit,
+    showSelectionBackground: Boolean = true,
+) {
+    AnkiDroidDialog(
+        onDismissRequest = onDismiss,
+        modifier = Modifier.widthIn(max = 560.dp).fillMaxWidth().padding(horizontal = 16.dp),
+        properties = DialogProperties(usePlatformDefaultWidth = false),
+    ) {
+        ToolbarLayoutDialogCard(selected, onSelect, showSelectionBackground)
+    }
+}
+
+/** Displays the dialog title and layout choices, adapting their arrangement to the available space. */
+@Composable
+private fun ToolbarLayoutDialogCard(
+    selected: ToolbarLayoutMode,
+    onSelect: (ToolbarLayoutMode) -> Unit,
+    showSelectionBackground: Boolean,
+) {
+    Surface(
+        shape = AlertDialogDefaults.shape,
+        color = AlertDialogDefaults.containerColor,
+        contentColor = AlertDialogDefaults.textContentColor,
+        tonalElevation = AlertDialogDefaults.TonalElevation,
+    ) {
+        Column(Modifier.verticalScroll(rememberScrollState()).padding(24.dp)) {
+            Text(
+                text = stringResource(CommonString.note_editor_toolbar_layout),
+                modifier = Modifier.padding(bottom = 16.dp),
+                style = MaterialTheme.typography.headlineSmall,
+                color = AlertDialogDefaults.titleContentColor,
+            )
+            BoxWithConstraints(Modifier.padding(bottom = 24.dp).fillMaxWidth()) {
+                // Use full-width rows when large text would push a choice off-screen.
+                val useVerticalList = (maxWidth - 16.dp) / 3 < 72.dp * LocalDensity.current.fontScale
+                if (useVerticalList) {
+                    Column(Modifier.selectableGroup(), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                        ToolbarLayoutMode.entries.forEach { layout ->
+                            ToolbarLayoutChoice(
+                                layout,
+                                selected,
+                                onSelect,
+                                horizontal = true,
+                                showSelectionBackground = showSelectionBackground,
+                                modifier = Modifier.fillMaxWidth(),
+                            )
+                        }
+                    }
+                } else {
+                    Row(Modifier.selectableGroup().height(IntrinsicSize.Min), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        ToolbarLayoutMode.entries.forEach { layout ->
+                            ToolbarLayoutChoice(
+                                layout,
+                                selected,
+                                onSelect,
+                                horizontal = false,
+                                showSelectionBackground = showSelectionBackground,
+                                modifier = Modifier.weight(1f).fillMaxHeight(),
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+/** Displays one selectable layout as a horizontal row or a vertical card. */
+@Composable
+private fun ToolbarLayoutChoice(
+    layout: ToolbarLayoutMode,
+    selected: ToolbarLayoutMode,
+    onSelect: (ToolbarLayoutMode) -> Unit,
+    horizontal: Boolean,
+    showSelectionBackground: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    val isSelected = layout == selected
+    var isFocused by remember { mutableStateOf(false) }
+    val showFocusBorder = isFocused && !showSelectionBackground
+    val selectionBackground =
+        if (isSelected && showSelectionBackground) MaterialTheme.colorScheme.primary.copy(alpha = 0.08f) else Color.Transparent
+    val bringIntoViewRequester = remember { BringIntoViewRequester() }
+    var isPositioned by remember { mutableStateOf(false) }
+    // Scroll to the selected choice if needed, after layout has determined its position.
+    LaunchedEffect(isSelected, isPositioned) {
+        if (isSelected && isPositioned) bringIntoViewRequester.bringIntoView()
+    }
+    val choiceModifier =
+        modifier
+            .bringIntoViewRequester(bringIntoViewRequester)
+            .onGloballyPositioned { isPositioned = true }
+            .clip(MaterialTheme.shapes.small)
+            .background(selectionBackground)
+            // A thicker border distinguishes keyboard focus from selection without grey shading.
+            .border(
+                width = if (showFocusBorder) 4.dp else 2.dp,
+                color = if (isSelected || showFocusBorder) MaterialTheme.colorScheme.primary else Color.Transparent,
+                shape = MaterialTheme.shapes.small,
+            ).onFocusChanged { isFocused = it.isFocused }
+            .selectable(
+                selected = isSelected,
+                interactionSource = null,
+                indication = if (showSelectionBackground) LocalIndication.current else null,
+                role = Role.Button,
+                onClick = { onSelect(layout) },
+            ).padding(12.dp)
+    if (horizontal) {
+        Row(choiceModifier, verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) {
+            ToolbarLayoutSample(layout, Modifier.width(72.dp))
+            Text(stringResource(layout.label()), modifier = Modifier.weight(1f), style = MaterialTheme.typography.bodyMedium)
+        }
+    } else {
+        Column(choiceModifier, horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(8.dp)) {
+            ToolbarLayoutSample(layout)
+            Text(stringResource(layout.label()), style = MaterialTheme.typography.bodyMedium, textAlign = TextAlign.Center)
+        }
+    }
+}
+
+/** Display label for a toolbar layout. */
+@StringRes
+fun ToolbarLayoutMode.label(): Int =
+    when (this) {
+        ToolbarLayoutMode.SCROLL -> CommonString.note_editor_toolbar_scroll
+        ToolbarLayoutMode.STACK -> CommonString.note_editor_toolbar_stack
+        ToolbarLayoutMode.HIDDEN -> CommonString.note_editor_toolbar_hidden
+    }
+
+/**
+ * Visual preview/image:
+ * Sample note editor, using a toolbar rendered with [layout].
+ */
+@Composable
+private fun ToolbarLayoutSample(
+    layout: ToolbarLayoutMode,
+    modifier: Modifier = Modifier,
+) {
+    val colors = MaterialTheme.colorScheme
+    val shape = RoundedCornerShape(6.dp)
+    val icons =
+        listOf(
+            R.drawable.ic_format_bold_black_24dp,
+            R.drawable.ic_format_italic_black_24dp,
+            R.drawable.ic_format_underlined_black_24dp,
+            R.drawable.ic_horizontal_rule_black_24dp,
+            R.drawable.ic_format_title_black_24dp,
+            R.drawable.ic_format_font_size_24dp,
+            R.drawable.ic_add_equation_black_24dp,
+            R.drawable.ic_add_toolbar_icon,
+        )
+    Column(
+        modifier
+            .fillMaxWidth()
+            .height(72.dp)
+            .clearAndSetSemantics {}
+            .clip(shape)
+            .background(colors.surface)
+            .border(1.dp, colors.outlineVariant, shape),
+    ) {
+        Column(Modifier.weight(1f).fillMaxWidth().padding(8.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
+            repeat(if (layout == ToolbarLayoutMode.HIDDEN) 2 else 1) {
+                Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+                    Spacer(Modifier.fillMaxWidth(0.7f).height(3.dp).background(colors.outlineVariant))
+                    Spacer(Modifier.fillMaxWidth(0.45f).height(3.dp).background(colors.outlineVariant))
+                }
+            }
+        }
+        if (layout != ToolbarLayoutMode.HIDDEN) {
+            Column(Modifier.fillMaxWidth().background(colors.surfaceContainer.compositeOver(colors.surface)).padding(4.dp)) {
+                if (layout == ToolbarLayoutMode.STACK) {
+                    icons.chunked(4).asReversed().forEach { row ->
+                        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceEvenly) {
+                            row.forEach { PreviewIcon(it, Modifier.weight(1f)) }
+                        }
+                    }
+                } else {
+                    Row(
+                        Modifier.fillMaxWidth(),
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                    ) {
+                        icons.take(3).forEach { PreviewIcon(it, Modifier.weight(1f)) }
+                        Icon(
+                            painterResource(CommonR.drawable.ic_baseline_chevron_right_24),
+                            contentDescription = null,
+                            modifier = Modifier.size(12.dp),
+                            tint = colors.primary,
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+/** Shows a toolbar icon in the layout preview. */
+@Composable
+private fun PreviewIcon(
+    icon: Int,
+    modifier: Modifier = Modifier,
+) {
+    Icon(
+        painterResource(icon),
+        contentDescription = null,
+        modifier = modifier.size(20.dp).padding(2.dp),
+        tint = MaterialTheme.colorScheme.onSurface,
+    )
+}
diff --git a/note-editor/src/main/java/com/ichi2/anki/noteeditor/data/ToolbarPreferences.kt b/note-editor/src/main/java/com/ichi2/anki/noteeditor/data/ToolbarPreferences.kt
new file mode 100644
index 000000000000..58e3fc7b1ac1
--- /dev/null
+++ b/note-editor/src/main/java/com/ichi2/anki/noteeditor/data/ToolbarPreferences.kt
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.noteeditor.data
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import com.ichi2.anki.noteeditor.presentation.ToolbarLayoutMode
+
+private const val PREF_NOTE_EDITOR_SCROLL_TOOLBAR = "noteEditorScrollToolbar"
+private const val PREF_NOTE_EDITOR_SHOW_TOOLBAR = "noteEditorShowToolbar"
+
+/**
+ * Persists the toolbar layout using the existing show/scroll preferences.
+ *
+ * TODO: migrate to a single preference value.
+ */
+class ToolbarPreferences(
+    private val preferences: SharedPreferences,
+) {
+    val isVisible: Boolean
+        get() = preferences.getBoolean(PREF_NOTE_EDITOR_SHOW_TOOLBAR, true)
+
+    /** The layout to use when visible, retained while the toolbar is hidden. */
+    val isScrollable: Boolean
+        get() = preferences.getBoolean(PREF_NOTE_EDITOR_SCROLL_TOOLBAR, true)
+
+    var layout: ToolbarLayoutMode
+        get() =
+            when {
+                !isVisible -> ToolbarLayoutMode.HIDDEN
+                isScrollable -> ToolbarLayoutMode.SCROLL
+                else -> ToolbarLayoutMode.STACK
+            }
+        set(value) {
+            preferences.edit {
+                putBoolean(PREF_NOTE_EDITOR_SHOW_TOOLBAR, value != ToolbarLayoutMode.HIDDEN)
+                if (value != ToolbarLayoutMode.HIDDEN) {
+                    putBoolean(PREF_NOTE_EDITOR_SCROLL_TOOLBAR, value == ToolbarLayoutMode.SCROLL)
+                }
+            }
+        }
+}
diff --git a/note-editor/src/main/java/com/ichi2/anki/noteeditor/presentation/ToolbarLayoutMode.kt b/note-editor/src/main/java/com/ichi2/anki/noteeditor/presentation/ToolbarLayoutMode.kt
new file mode 100644
index 000000000000..fe1a54b84b42
--- /dev/null
+++ b/note-editor/src/main/java/com/ichi2/anki/noteeditor/presentation/ToolbarLayoutMode.kt
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.noteeditor.presentation
+
+/** Layout of the formatting toolbar. */
+enum class ToolbarLayoutMode {
+    SCROLL,
+    STACK,
+    HIDDEN,
+}
diff --git a/AnkiDroid/src/main/res/drawable/ic_add_equation_black_24dp.xml b/note-editor/src/main/res/drawable/ic_add_equation_black_24dp.xml
similarity index 61%
rename from AnkiDroid/src/main/res/drawable/ic_add_equation_black_24dp.xml
rename to note-editor/src/main/res/drawable/ic_add_equation_black_24dp.xml
index 7f2f0ee27349..6c15968633fd 100644
--- a/AnkiDroid/src/main/res/drawable/ic_add_equation_black_24dp.xml
+++ b/note-editor/src/main/res/drawable/ic_add_equation_black_24dp.xml
@@ -1,18 +1,13 @@
 <!--
-  ~  Copyright (c) 2020 David Allison <davidallisongithub@gmail.com>
-  ~
-  ~  This program is free software; you can redistribute it and/or modify it under
-  ~  the terms of the GNU General Public License as published by the Free Software
-  ~  Foundation; either version 3 of the License, or (at your option) any later
-  ~  version.
-  ~
-  ~  This program is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~  PARTICULAR PURPOSE. See the GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License along with
-  ~  this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
+  SPDX-License-Identifier: GPL-3.0-or-later AND Apache-2.0
+  SPDX-FileCopyrightText: Copyright (c) 2020 David Allison <davidallisongithub@gmail.com>
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Composite icon; the add_circle_outline badge is Apache-2.0; the surrounding icon is GPL-3.0-or-later.
+  SPDX-FileComment: Style: Filled (add_circle_outline badge only).
+  SPDX-FileComment: Modified: scaled and translated the add_circle_outline badge to the bottom right of the sigma.
+  SPDX-FileComment: The source of the sigma component has not been identified.
+  Badge source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/content/add_circle_outline/materialicons/black/res/drawable/baseline_add_circle_outline_24.xml
+-->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
@@ -29,4 +24,4 @@
       android:strokeWidth="0.11356759"
       android:fillColor="#000006"
       android:fillAlpha="1"/>
-</vector>
\ No newline at end of file
+</vector>
diff --git a/AnkiDroid/src/main/res/drawable/ic_add_toolbar_icon.xml b/note-editor/src/main/res/drawable/ic_add_toolbar_icon.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/ic_add_toolbar_icon.xml
rename to note-editor/src/main/res/drawable/ic_add_toolbar_icon.xml
diff --git a/AnkiDroid/src/main/res/drawable/ic_format_bold_black_24dp.xml b/note-editor/src/main/res/drawable/ic_format_bold_black_24dp.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/ic_format_bold_black_24dp.xml
rename to note-editor/src/main/res/drawable/ic_format_bold_black_24dp.xml
diff --git a/AnkiDroid/src/main/res/drawable/ic_format_font_size_24dp.xml b/note-editor/src/main/res/drawable/ic_format_font_size_24dp.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/ic_format_font_size_24dp.xml
rename to note-editor/src/main/res/drawable/ic_format_font_size_24dp.xml
diff --git a/AnkiDroid/src/main/res/drawable/ic_format_italic_black_24dp.xml b/note-editor/src/main/res/drawable/ic_format_italic_black_24dp.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/ic_format_italic_black_24dp.xml
rename to note-editor/src/main/res/drawable/ic_format_italic_black_24dp.xml
diff --git a/AnkiDroid/src/main/res/drawable/ic_format_title_black_24dp.xml b/note-editor/src/main/res/drawable/ic_format_title_black_24dp.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/ic_format_title_black_24dp.xml
rename to note-editor/src/main/res/drawable/ic_format_title_black_24dp.xml
diff --git a/AnkiDroid/src/main/res/drawable/ic_format_underlined_black_24dp.xml b/note-editor/src/main/res/drawable/ic_format_underlined_black_24dp.xml
similarity index 100%
rename from AnkiDroid/src/main/res/drawable/ic_format_underlined_black_24dp.xml
rename to note-editor/src/main/res/drawable/ic_format_underlined_black_24dp.xml
diff --git a/note-editor/src/main/res/drawable/ic_horizontal_rule_black_24dp.xml b/note-editor/src/main/res/drawable/ic_horizontal_rule_black_24dp.xml
new file mode 100644
index 000000000000..bcbe9e517050
--- /dev/null
+++ b/note-editor/src/main/res/drawable/ic_horizontal_rule_black_24dp.xml
@@ -0,0 +1,17 @@
+<!--
+  SPDX-License-Identifier: Apache-2.0
+  SPDX-FileCopyrightText: Google LLC
+  SPDX-FileComment: Style: Filled (modified remove icon).
+  SPDX-FileComment: Modified: extended the horizontal bar from x=5..19 to x=2..22.
+  Base source: https://raw.githubusercontent.com/google/material-design-icons/10ecc14790612ca8fd164e3f4ffe9c16fc50d5b7/android/content/remove/materialicons/black/res/drawable/baseline_remove_24.xml
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M19,13H2v-2h20v2z"/>
+</vector>
diff --git a/note-editor/src/test/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialogTest.kt b/note-editor/src/test/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialogTest.kt
new file mode 100644
index 000000000000..42d0c8504ed7
--- /dev/null
+++ b/note-editor/src/test/java/com/ichi2/anki/noteeditor/ToolbarLayoutDialogTest.kt
@@ -0,0 +1,213 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.noteeditor
+
+import android.annotation.SuppressLint
+import android.content.Context
+import androidx.compose.foundation.layout.Box
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.asAndroidBitmap
+import androidx.compose.ui.input.InputMode
+import androidx.compose.ui.input.key.Key
+import androidx.compose.ui.platform.LocalInputModeManager
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.semantics.SemanticsActions
+import androidx.compose.ui.semantics.SemanticsProperties
+import androidx.compose.ui.test.SemanticsMatcher
+import androidx.compose.ui.test.assert
+import androidx.compose.ui.test.assertHasClickAction
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsFocused
+import androidx.compose.ui.test.assertIsNotFocused
+import androidx.compose.ui.test.assertIsSelected
+import androidx.compose.ui.test.captureToImage
+import androidx.compose.ui.test.hasAnyAncestor
+import androidx.compose.ui.test.hasTestTag
+import androidx.compose.ui.test.junit4.v2.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performKeyInput
+import androidx.compose.ui.test.performMouseInput
+import androidx.compose.ui.test.performScrollTo
+import androidx.compose.ui.test.performSemanticsAction
+import androidx.compose.ui.test.pressKey
+import androidx.test.core.app.ApplicationProvider
+import com.ichi2.anki.CommonString
+import com.ichi2.anki.noteeditor.presentation.ToolbarLayoutMode
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.GraphicsMode
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [36], qualifiers = "w411dp-h891dp-xxhdpi")
+@GraphicsMode(GraphicsMode.Mode.NATIVE)
+class ToolbarLayoutDialogTest {
+    @get:Rule
+    val composeRule = createComposeRule()
+
+    @Test
+    fun `layout choices announce buttons and report the chosen layout`() {
+        var chosen: ToolbarLayoutMode? = null
+        composeRule.setContent {
+            MaterialTheme {
+                ToolbarLayoutDialog(selected = ToolbarLayoutMode.SCROLL, onSelect = { chosen = it }, onDismiss = {})
+            }
+        }
+
+        ToolbarLayoutMode.entries.forEach { layout ->
+            composeRule
+                .onNodeWithText(label(layout))
+                .assertHasClickAction()
+                .assert(SemanticsMatcher.expectValue(SemanticsProperties.Role, Role.Button))
+                .performClick()
+            composeRule.runOnIdle { assertEquals(layout, chosen) }
+        }
+    }
+
+    @Test
+    fun `preview renders the title and all choices inside its host`() {
+        composeRule.setContent {
+            CompositionLocalProvider(LocalInspectionMode provides true) {
+                MaterialTheme {
+                    Box(Modifier.testTag("preview")) {
+                        ToolbarLayoutDialog(selected = ToolbarLayoutMode.SCROLL, onSelect = {}, onDismiss = {})
+                    }
+                }
+            }
+        }
+
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        val labels = listOf(CommonString.note_editor_toolbar_layout) + ToolbarLayoutMode.entries.map { it.label() }
+        labels.forEach { label ->
+            composeRule
+                .onNodeWithText(context.getString(label))
+                .assertIsDisplayed()
+                .assert(hasAnyAncestor(hasTestTag("preview")))
+        }
+        composeRule.onNodeWithText(context.getString(ToolbarLayoutMode.SCROLL.label())).assertIsSelected()
+    }
+
+    @Test
+    @SuppressLint("NewApi") // captureToImage requires API 26; Robolectric is configured for API 36.
+    fun `preview choices without selection backgrounds do not shade on hover`() {
+        composeRule.setContent {
+            CompositionLocalProvider(LocalInspectionMode provides true) {
+                MaterialTheme {
+                    ToolbarLayoutDialog(
+                        selected = ToolbarLayoutMode.SCROLL,
+                        onSelect = {},
+                        onDismiss = {},
+                        showSelectionBackground = false,
+                    )
+                }
+            }
+        }
+
+        val choice = composeRule.onNodeWithText(label(ToolbarLayoutMode.SCROLL))
+        val beforeHover = choice.captureToImage().asAndroidBitmap()
+        choice.performMouseInput { moveTo(center) }
+        composeRule.mainClock.advanceTimeBy(200)
+        val afterHover = choice.captureToImage().asAndroidBitmap()
+        assertTrue("Hover must not shade the selection or its sample", beforeHover.sameAs(afterHover))
+    }
+
+    @Test
+    @SuppressLint("NewApi") // captureToImage requires API 26; Robolectric is configured for API 36.
+    fun `choices without selection backgrounds show keyboard focus separately from selection`() {
+        var chosen: ToolbarLayoutMode? = null
+        composeRule.setContent {
+            CompositionLocalProvider(LocalInspectionMode provides true) {
+                MaterialTheme {
+                    val inputModeManager = LocalInputModeManager.current
+                    SideEffect { inputModeManager.requestInputMode(InputMode.Keyboard) }
+                    ToolbarLayoutDialog(
+                        selected = ToolbarLayoutMode.SCROLL,
+                        onSelect = { chosen = it },
+                        onDismiss = {},
+                        showSelectionBackground = false,
+                    )
+                }
+            }
+        }
+
+        val scroll = composeRule.onNodeWithText(label(ToolbarLayoutMode.SCROLL))
+        val stack = composeRule.onNodeWithText(label(ToolbarLayoutMode.STACK))
+        val hidden = composeRule.onNodeWithText(label(ToolbarLayoutMode.HIDDEN))
+        val selectedScroll = scroll.captureToImage().asAndroidBitmap()
+        val unfocusedStack = stack.captureToImage().asAndroidBitmap()
+        val unfocusedHidden = hidden.captureToImage().asAndroidBitmap()
+
+        stack.performSemanticsAction(SemanticsActions.RequestFocus) { it() }
+        stack.assertIsFocused()
+        assertFalse("An unselected choice must visibly indicate focus", unfocusedStack.sameAs(stack.captureToImage().asAndroidBitmap()))
+        scroll.assertIsSelected()
+        assertTrue("Moving focus must preserve the selection border", selectedScroll.sameAs(scroll.captureToImage().asAndroidBitmap()))
+
+        stack.performKeyInput { pressKey(Key.Tab) }
+        stack.assertIsNotFocused()
+        hidden.assertIsFocused()
+        assertTrue("The previous choice must lose its focus border", unfocusedStack.sameAs(stack.captureToImage().asAndroidBitmap()))
+        assertFalse("The next choice must visibly indicate focus", unfocusedHidden.sameAs(hidden.captureToImage().asAndroidBitmap()))
+        hidden.performKeyInput { pressKey(Key.Enter) }
+        composeRule.runOnIdle { assertEquals(ToolbarLayoutMode.HIDDEN, chosen) }
+
+        scroll.performSemanticsAction(SemanticsActions.RequestFocus) { it() }
+        scroll.assertIsFocused()
+        assertFalse("A selected choice must also visibly indicate focus", selectedScroll.sameAs(scroll.captureToImage().asAndroidBitmap()))
+    }
+
+    @Test
+    fun `large text keeps all choices visible on a regular phone`() {
+        showLargeTextDialog()
+        assertChoiceLabelsDisplayed()
+        composeRule.onNodeWithText(label(ToolbarLayoutMode.HIDDEN)).assertIsSelected()
+    }
+
+    @Test
+    @Config(qualifiers = "w320dp-h640dp-mdpi")
+    fun `large text keeps all choices visible on a small phone`() {
+        showLargeTextDialog()
+        assertChoiceLabelsDisplayed()
+        composeRule.onNodeWithText(label(ToolbarLayoutMode.HIDDEN)).assertIsSelected()
+    }
+
+    @Test
+    @Config(qualifiers = "w320dp-h240dp-mdpi")
+    fun `short windows reveal the selected choice and allow scrolling to other choices`() {
+        var selected: ToolbarLayoutMode? = null
+        showLargeTextDialog { selected = it }
+        composeRule.onNodeWithText(label(ToolbarLayoutMode.HIDDEN), useUnmergedTree = true).assertIsDisplayed()
+        composeRule.onNodeWithText(label(ToolbarLayoutMode.HIDDEN)).assertIsSelected()
+        composeRule.onNodeWithText(label(ToolbarLayoutMode.SCROLL)).performScrollTo().performClick()
+        composeRule.runOnIdle { assertEquals(ToolbarLayoutMode.SCROLL, selected) }
+    }
+
+    private fun showLargeTextDialog(onSelect: (ToolbarLayoutMode) -> Unit = {}) {
+        RuntimeEnvironment.setFontScale(2f)
+        composeRule.setContent {
+            MaterialTheme {
+                ToolbarLayoutDialog(selected = ToolbarLayoutMode.HIDDEN, onSelect = onSelect, onDismiss = {})
+            }
+        }
+    }
+
+    private fun assertChoiceLabelsDisplayed() {
+        ToolbarLayoutMode.entries.forEach {
+            composeRule.onNodeWithText(label(it), useUnmergedTree = true).assertIsDisplayed()
+        }
+    }
+
+    private fun label(layout: ToolbarLayoutMode) = ApplicationProvider.getApplicationContext<Context>().getString(layout.label())
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9aebd49b0d1b..a180c5218baf 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -37,6 +37,7 @@ include(
     ":compat",
     ":libanki",
     ":lint-rules",
+    ":note-editor",
     ":vbpd",
     ":widgets",
 )
\ No newline at end of file
diff --git a/tools/localization/yarn.lock b/tools/localization/yarn.lock
index eceed408b429..cc8447b5dfc2 100644
--- a/tools/localization/yarn.lock
+++ b/tools/localization/yarn.lock
@@ -3206,12 +3206,12 @@ __metadata:
   linkType: hard
 
 "follow-redirects@npm:^1.16.0":
-  version: 1.16.0
-  resolution: "follow-redirects@npm:1.16.0"
+  version: 1.16.1
+  resolution: "follow-redirects@npm:1.16.1"
   peerDependenciesMeta:
     debug:
       optional: true
-  checksum: 10c0/a1e2900163e6f1b4d1ed5c221b607f41decbab65534c63fe7e287e40a5d552a6496e7d9d7d976fa4ba77b4c51c11e5e9f683f10b43011ea11e442ff128d0e181
+  checksum: 10c0/544e24ccb93b7afb5dd5a2199bd556e167b84de2af7c13b2ced08494239677359d7883bae56ae43a9ca98ac5451e75cf4834a5fadd6fa79053b9248fac5447a4
   languageName: node
   linkType: hard
 
@@ -5999,9 +5999,9 @@ __metadata:
   linkType: hard
 
 "undici@npm:^6.25.0":
-  version: 6.29.0
-  resolution: "undici@npm:6.29.0"
-  checksum: 10c0/3fb2117985be977ba8b6bd6a242fec915e1b1d0f9681f5adb3f508fb1717352452d65bcfd3bed09e7c776cfda403a4e8edb24a318492f8b2d793439af2b8699b
+  version: 6.29.1
+  resolution: "undici@npm:6.29.1"
+  checksum: 10c0/2d6970289fcbaca69a484e968fbb5e6fdadf7d9bff30bb5476f71b619d143ec76df1c75a309ac3cb3b3d78238793c613dcaad47dc9d92b63f9e8e73b86ffec23
   languageName: node
   linkType: hard
 
diff --git a/tools/release.sh b/tools/release.sh
index ba68288a79a6..ccd91e3dd7af 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -112,14 +112,22 @@ then
   exit 1
 fi
 
-# If any changes go in during the release process, pushing fails, so push immediately.
-# Worst case this burns a version number despite a failure later, and we have a version/tag
-# that never launched. That's better than having to manually patch up build.gradle.kts and push a tag
-# for a release that did launch, but the push failed
+# Push the version bump before Play. A merge during the upload rejects the push,
+# and the script would otherwise carry on after Play had already accepted the build,
+# leaving main without the version that shipped.
+# If this push fails, nothing has been published yet and the release stops.
+# Worst case a later failure burns a version on main. That is better than
+# hand-patching a release that did launch but whose push failed.
+# The tag is pushed only after Play accepts, so a Play failure does not create a GitHub release.
 echo "Committing changelog and version bump via git"
 git add $GRADLEFILE $CHANGELOG
 git commit -m "Bumped version to $VERSION"
 git tag v"$VERSION"
+if ! git push
+then
+  echo "Failed to push the version bump. Nothing was published yet."
+  exit 1
+fi
 
 . tools/check-keystore.sh
 
@@ -134,9 +142,12 @@ then
   exit 1
 fi
 
-# If the Play Store accepted the builds, the version bump should be pushed / made concrete
-git push
-git push --tags
+# If the Play Store accepted the builds, the tag should be pushed / made concrete
+if ! git push --tags
+then
+  echo "Failed to push the v$VERSION tag. Play already has this build."
+  exit 1
+fi
 
 # Build the full set of release APKs for all flavors, with universals
 UCFLAVORS='Full Amazon Play'
@@ -199,8 +210,10 @@ export GITHUB_REPO="Anki-Android"
 
 if [ "$PUBLIC" = "public" ]; then
   RELEASE_TYPE="--latest"
+  RELEASE_KIND="Public release"
 else
   RELEASE_TYPE="--prerelease"
+  RELEASE_KIND="Pre-release"
 fi
 
 # Get the directory of the current script
@@ -208,7 +221,11 @@ SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
 # Read the content of the markdown file using the absolute path
 RELEASE_NOTES="$SCRIPT_DIR/release-description.md"
 echo "Creating new Github release"
-gh release create v"$VERSION" --title "AnkiDroid $VERSION" -F "$RELEASE_NOTES" $RELEASE_TYPE --draft
+if ! gh release create v"$VERSION" --verify-tag --title "AnkiDroid $VERSION" -F "$RELEASE_NOTES" $RELEASE_TYPE --draft
+then
+  echo "Failed to create the GitHub release for v$VERSION"
+  exit 1
+fi
 
 echo "Sleeping 30s to make sure the release exists, see issue 11746"
 sleep 30
@@ -276,3 +293,9 @@ then
   exit 1
 fi
 echo "Release published successfully"
+
+cat <<EOF >> "${GITHUB_STEP_SUMMARY:-/dev/null}"
+### [AnkiDroid $VERSION](https://github.com/ankidroid/Anki-Android/releases/tag/v$VERSION)
+
+$RELEASE_KIND
+EOF
diff --git a/widgets/build.gradle.kts b/widgets/build.gradle.kts
index 6b0a9b6e7728..612b61800d32 100644
--- a/widgets/build.gradle.kts
+++ b/widgets/build.gradle.kts
@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: 2026 Ashish Yadav <mailtoashish693@gmail.com>
 // SPDX-License-Identifier: GPL-3.0-or-later
 import com.android.build.api.dsl.LibraryExtension
+import com.ichi2.anki.gradle.addAnkiBackendDependencies
 
 plugins {
     id("ankidroid.android.library")
@@ -15,8 +16,11 @@ dependencies {
     implementation(project(":anki-common"))
     implementation(project(":common"))
     implementation(project(":common:android"))
+    implementation(project(":compat"))
     implementation(project(":libanki"))
 
+    addAnkiBackendDependencies(project)
+
     implementation(libs.androidx.annotation)
     implementation(libs.androidx.constraintlayout)
     implementation(libs.androidx.core)
@@ -24,4 +28,13 @@ dependencies {
     implementation(libs.google.material)
     implementation(libs.jakewharton.timber)
     implementation(libs.kotlinx.coroutines.core)
+
+    testImplementation(testFixtures(project(":anki-common")))
+    testImplementation(libs.androidx.test.core)
+    testImplementation(libs.androidx.test.junit)
+    testImplementation(libs.junit.platform.launcher)
+    testImplementation(libs.junit.vintage.engine)
+    testImplementation(libs.kotlin.test)
+    testImplementation(libs.mockk)
+    testImplementation(libs.robolectric)
 }
diff --git a/widgets/src/main/AndroidManifest.xml b/widgets/src/main/AndroidManifest.xml
index 86671732868f..c11e3f209700 100644
--- a/widgets/src/main/AndroidManifest.xml
+++ b/widgets/src/main/AndroidManifest.xml
@@ -24,6 +24,68 @@
                 <action android:name="com.ichi2.widget.UPDATE_WIDGET" />
             </intent-filter>
         </receiver>
+
+        <!-- #14372: Handles updates after the day rollover (04:00). -->
+        <receiver android:name="com.ichi2.widget.DayRolloverAlarm"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.ichi2.widget.ACTION_ROLLOVER" />
+                <action android:name="android.intent.action.TIMEZONE_CHANGED" />
+                <action android:name="android.intent.action.TIME_SET" />
+            </intent-filter>
+        </receiver>
+
+        <!-- Service to perform web API queries -->
+        <service android:name="com.ichi2.widget.AnkiDroidWidgetSmall$UpdateService" />
+
+        <!-- Don't disable/enable the widgets here until min API>=31, see issue #15747 & https://issuetracker.google.com/issues/36914010 -->
+        <!-- small widget -->
+        <receiver
+            android:name="com.ichi2.widget.AnkiDroidWidgetSmall"
+            android:label="@string/widget_small"
+            android:exported="true"
+            >
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_provider_small"
+                />
+        </receiver>
+
+        <!-- A widget that displays a deck name and number of cards to review on the Android home screen.
+             The way to add it depends on the phone. It usually consists in a long press on the screen, followed by finding a "widget" button"-->
+        <receiver
+            android:name="com.ichi2.widget.cardanalysis.CardAnalysisWidget"
+            android:label="@string/card_analysis_extra_widget_description"
+            android:exported="false"
+            >
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_provider_card_analysis" />
+        </receiver>
+
+        <!-- A widget that displays a few decks's name and number of cards to review on the Android home screen.
+             The way to add it depends on the phone. It usually consists in a long press on the screen, followed by finding a "widget" button"-->
+        <receiver
+            android:name="com.ichi2.widget.deckpicker.DeckPickerWidget"
+            android:label="@string/deck_picker_widget_description"
+            android:exported="false"
+            >
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_provider_deck_picker" />
+        </receiver>
     </application>
 
 </manifest>
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/widget/WidgetRegistry.kt b/widgets/src/main/java/com/ichi2/anki/widget/WidgetRegistry.kt
similarity index 84%
rename from AnkiDroid/src/main/java/com/ichi2/anki/widget/WidgetRegistry.kt
rename to widgets/src/main/java/com/ichi2/anki/widget/WidgetRegistry.kt
index b374060745e6..000b92022d2d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/widget/WidgetRegistry.kt
+++ b/widgets/src/main/java/com/ichi2/anki/widget/WidgetRegistry.kt
@@ -8,9 +8,6 @@ import com.ichi2.widget.AnkiDroidWidgetSmall
 import com.ichi2.widget.cardanalysis.CardAnalysisWidget
 import com.ichi2.widget.deckpicker.DeckPickerWidget
 
-// These lists reference concrete provider classes, so they stay in :AnkiDroid
-// until the providers move to :widgets
-
 val RECURRING_WIDGETS: List<Class<out AnalyticsWidgetProvider>> =
     listOf(
         DeckPickerWidget::class.java,
diff --git a/AnkiDroid/src/main/java/com/ichi2/widget/AnkiDroidWidgetSmall.kt b/widgets/src/main/java/com/ichi2/widget/AnkiDroidWidgetSmall.kt
similarity index 100%
rename from AnkiDroid/src/main/java/com/ichi2/widget/AnkiDroidWidgetSmall.kt
rename to widgets/src/main/java/com/ichi2/widget/AnkiDroidWidgetSmall.kt
diff --git a/AnkiDroid/src/main/java/com/ichi2/widget/DayRolloverAlarm.kt b/widgets/src/main/java/com/ichi2/widget/DayRolloverAlarm.kt
similarity index 98%
rename from AnkiDroid/src/main/java/com/ichi2/widget/DayRolloverAlarm.kt
rename to widgets/src/main/java/com/ichi2/widget/DayRolloverAlarm.kt
index e614de115418..ffff6727fdeb 100644
--- a/AnkiDroid/src/main/java/com/ichi2/widget/DayRolloverAlarm.kt
+++ b/widgets/src/main/java/com/ichi2/widget/DayRolloverAlarm.kt
@@ -69,7 +69,7 @@ class DayRolloverAlarm : AnkiBroadcastReceiver() {
         }
 
         @VisibleForTesting
-        internal suspend fun scheduleNextInternal(context: Context) {
+        suspend fun scheduleNextInternal(context: Context) {
             val cutoffMs = nextFutureCutoffMs() ?: return
             val pendingIntent = context.buildPendingIntent(ACTION_ROLLOVER) ?: return
             // TODO: This uses setWindow with a 10 minute window, so likely fires at 04:10, rather than 04:00
diff --git a/AnkiDroid/src/main/java/com/ichi2/widget/WidgetStatus.kt b/widgets/src/main/java/com/ichi2/widget/WidgetStatus.kt
similarity index 80%
rename from AnkiDroid/src/main/java/com/ichi2/widget/WidgetStatus.kt
rename to widgets/src/main/java/com/ichi2/widget/WidgetStatus.kt
index 539cbb8f4b78..84cd1398fdea 100644
--- a/AnkiDroid/src/main/java/com/ichi2/widget/WidgetStatus.kt
+++ b/widgets/src/main/java/com/ichi2/widget/WidgetStatus.kt
@@ -2,13 +2,13 @@
 
 package com.ichi2.widget
 
+import android.app.Application
 import android.content.Context
 import com.ichi2.anki.CollectionManager.withCol
-import com.ichi2.anki.R
+import com.ichi2.anki.common.preferences.NotificationPreferences
 import com.ichi2.anki.common.preferences.sharedPrefs
 import com.ichi2.anki.common.utils.android.SdCard
 import com.ichi2.anki.common.utils.ext.allDecksCounts
-import com.ichi2.anki.settings.Prefs
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
@@ -19,6 +19,19 @@ import timber.log.Timber
  * The status of the widget.
  */
 object WidgetStatus {
+    private lateinit var notificationPreferences: NotificationPreferences
+    private lateinit var updateWidget: (Context) -> Unit
+
+    /** Registers notification preferences and the small widget UI updater during app startup. */
+    context(_: Application)
+    fun register(
+        preferences: NotificationPreferences,
+        updater: (Context) -> Unit,
+    ) {
+        notificationPreferences = preferences
+        updateWidget = updater
+    }
+
     private var smallWidgetEnabled = false
     private var smallWidgetUpdateJob: Job? = null
 
@@ -33,7 +46,7 @@ object WidgetStatus {
         smallWidgetEnabled = preferences.getBoolean("widgetSmallEnabled", false)
         val canExecuteTask = smallWidgetUpdateJob == null || smallWidgetUpdateJob?.isActive == false
 
-        if (Prefs.newReviewRemindersEnabled) {
+        if (notificationPreferences.newReviewRemindersEnabled) {
             if (smallWidgetEnabled && canExecuteTask) {
                 Timber.d("WidgetStatus.update(): updating")
                 smallWidgetUpdateJob = launchSmallWidgetUpdateJob(context)
@@ -41,10 +54,7 @@ object WidgetStatus {
                 Timber.d("WidgetStatus.update(): already running or not enabled")
             }
         } else {
-            val notificationEnabled =
-                preferences
-                    .getString(context.getString(R.string.pref_notifications_minimum_cards_due_key), "1000001")!!
-                    .toInt() < 1000000
+            val notificationEnabled = notificationPreferences.legacyNotificationsEnabled
             if ((smallWidgetEnabled || notificationEnabled) && canExecuteTask) {
                 Timber.d("WidgetStatus.update(): updating")
                 smallWidgetUpdateJob = launchSmallWidgetUpdateJob(context)
@@ -74,9 +84,9 @@ object WidgetStatus {
         widgetRepository.storeSmallWidgetStatus(status)
         if (smallWidgetEnabled) {
             Timber.i("triggering small widget UI update")
-            AnkiDroidWidgetSmall.UpdateService().doUpdate(context)
+            updateWidget(context)
         }
-        if (!Prefs.newReviewRemindersEnabled) {
+        if (!notificationPreferences.newReviewRemindersEnabled) {
             widgetNotificationScheduler.scheduleNotification()
         }
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/widget/cardanalysis/CardAnalysisWidget.kt b/widgets/src/main/java/com/ichi2/widget/cardanalysis/CardAnalysisWidget.kt
similarity index 96%
rename from AnkiDroid/src/main/java/com/ichi2/widget/cardanalysis/CardAnalysisWidget.kt
rename to widgets/src/main/java/com/ichi2/widget/cardanalysis/CardAnalysisWidget.kt
index 06ead1aa50d1..ac2f61ab1d42 100644
--- a/AnkiDroid/src/main/java/com/ichi2/widget/cardanalysis/CardAnalysisWidget.kt
+++ b/widgets/src/main/java/com/ichi2/widget/cardanalysis/CardAnalysisWidget.kt
@@ -17,6 +17,7 @@ import com.ichi2.anki.common.crashreporting.CrashReportService
 import com.ichi2.anki.common.destinations.DeckOptionsDestination
 import com.ichi2.anki.common.destinations.DeferredNavigation
 import com.ichi2.anki.common.destinations.ReviewDeckDestination
+import com.ichi2.anki.common.destinations.WidgetConfigDestination
 import com.ichi2.anki.common.destinations.toIntent
 import com.ichi2.anki.isCollectionEmpty
 import com.ichi2.anki.libanki.DeckId
@@ -117,11 +118,7 @@ class CardAnalysisWidget : AnalyticsWidgetProvider() {
             remoteViews.setViewVisibility(R.id.cardAnalysisDataHolder, View.GONE)
             remoteViews.setViewVisibility(R.id.deckNameCardAnalysis, View.GONE)
 
-            val configIntent =
-                Intent(context, CardAnalysisWidgetConfig::class.java).apply {
-                    putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId.id)
-                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                }
+            val configIntent = with(DeferredNavigation) { WidgetConfigDestination.CardAnalysis(appWidgetId.id).toIntent() }
             val configPendingIntent =
                 PendingIntent.getActivity(
                     context,
@@ -146,11 +143,7 @@ class CardAnalysisWidget : AnalyticsWidgetProvider() {
             remoteViews.setViewVisibility(R.id.cardAnalysisDataHolder, View.GONE)
             remoteViews.setViewVisibility(R.id.deckNameCardAnalysis, View.GONE)
 
-            val configIntent =
-                Intent(context, CardAnalysisWidgetConfig::class.java).apply {
-                    putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId.id)
-                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                }
+            val configIntent = with(DeferredNavigation) { WidgetConfigDestination.CardAnalysis(appWidgetId.id).toIntent() }
             val configPendingIntent =
                 PendingIntent.getActivity(
                     context,
diff --git a/AnkiDroid/src/main/java/com/ichi2/widget/deckpicker/DeckPickerWidget.kt b/widgets/src/main/java/com/ichi2/widget/deckpicker/DeckPickerWidget.kt
similarity index 96%
rename from AnkiDroid/src/main/java/com/ichi2/widget/deckpicker/DeckPickerWidget.kt
rename to widgets/src/main/java/com/ichi2/widget/deckpicker/DeckPickerWidget.kt
index 844d362ddf71..65fe276485d0 100644
--- a/AnkiDroid/src/main/java/com/ichi2/widget/deckpicker/DeckPickerWidget.kt
+++ b/widgets/src/main/java/com/ichi2/widget/deckpicker/DeckPickerWidget.kt
@@ -24,6 +24,7 @@ import com.ichi2.anki.common.crashreporting.CrashReportService
 import com.ichi2.anki.common.destinations.DeckOptionsDestination
 import com.ichi2.anki.common.destinations.DeferredNavigation
 import com.ichi2.anki.common.destinations.ReviewDeckDestination
+import com.ichi2.anki.common.destinations.WidgetConfigDestination
 import com.ichi2.anki.common.destinations.toIntent
 import com.ichi2.anki.isCollectionEmpty
 import com.ichi2.anki.widgets.R
@@ -234,11 +235,7 @@ class DeckPickerWidget : AnalyticsWidgetProvider() {
             remoteViews.setViewVisibility(R.id.empty_widget, View.VISIBLE)
             remoteViews.setViewVisibility(R.id.deckCollection, View.GONE)
 
-            val configIntent =
-                Intent(context, DeckPickerWidgetConfig::class.java).apply {
-                    putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId.id)
-                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                }
+            val configIntent = with(DeferredNavigation) { WidgetConfigDestination.DeckPicker(appWidgetId.id).toIntent() }
             val configPendingIntent =
                 PendingIntent.getActivity(
                     context,
@@ -261,11 +258,7 @@ class DeckPickerWidget : AnalyticsWidgetProvider() {
             remoteViews.setViewVisibility(R.id.empty_widget, View.VISIBLE)
             remoteViews.setViewVisibility(R.id.deckCollection, View.GONE)
 
-            val configIntent =
-                Intent(context, DeckPickerWidgetConfig::class.java).apply {
-                    putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId.id)
-                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                }
+            val configIntent = with(DeferredNavigation) { WidgetConfigDestination.DeckPicker(appWidgetId.id).toIntent() }
             val configPendingIntent =
                 PendingIntent.getActivity(
                     context,
diff --git a/widgets/src/main/res/values/constants.xml b/widgets/src/main/res/values/constants.xml
new file mode 100644
index 000000000000..b5bbc48db525
--- /dev/null
+++ b/widgets/src/main/res/values/constants.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+  -->
+<resources>
+    <!-- Sample deck names and for Deck Picker Widget layout in widget picker screen
+       These strings are marked as `translatable=false` because translating them would defeat the purpose of the example, which relies on specific language usage.-->
+    <string name="deck1Name_deck_picker_widget" translatable="false" comment="Example of a Deck name. Android's widget provider displays it as an example of what the Deck Picker widget may look like">English</string>
+    <string name="deck2Name_deck_picker_widget" translatable="false" comment="Example of a Deck name. Android's widget provider displays it as an example of what the Deck Picker widget may look like">Español</string>
+    <string name="deck3Name_deck_picker_widget" translatable="false" comment="Example of a Deck name. Android's widget provider displays it as an example of what the Deck Picker widget may look like">日本語</string>
+</resources>
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/widget/AnalyticalWidgetProviderTest.kt b/widgets/src/test/java/com/ichi2/anki/widget/AnalyticalWidgetProviderTest.kt
similarity index 87%
rename from AnkiDroid/src/test/java/com/ichi2/anki/widget/AnalyticalWidgetProviderTest.kt
rename to widgets/src/test/java/com/ichi2/anki/widget/AnalyticalWidgetProviderTest.kt
index 5e404489b6bc..3736f255986f 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/widget/AnalyticalWidgetProviderTest.kt
+++ b/widgets/src/test/java/com/ichi2/anki/widget/AnalyticalWidgetProviderTest.kt
@@ -3,9 +3,10 @@
 
 import android.appwidget.AppWidgetManager
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.common.analytics.Analytics
 import com.ichi2.anki.common.analytics.AnalyticsEvent
+import com.ichi2.testutils.AndroidTest
+import com.ichi2.testutils.targetContext
 import com.ichi2.widget.AnalyticsWidgetProvider
 import com.ichi2.widget.AppWidgetIds
 import io.mockk.every
@@ -18,17 +19,15 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class AnalyticalWidgetProviderTest : RobolectricTest() {
+class AnalyticalWidgetProviderTest : AndroidTest {
     @Before
-    override fun setUp() {
-        super.setUp()
+    fun setUp() {
         mockkObject(Analytics)
         every { Analytics.send(any()) } answers { }
     }
 
     @After
-    override fun tearDown() {
-        super.tearDown()
+    fun tearDown() {
         unmockkObject(Analytics)
     }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/widget/WidgetAlarmTest.kt b/widgets/src/test/java/com/ichi2/widget/WidgetAlarmTest.kt
similarity index 100%
rename from AnkiDroid/src/test/java/com/ichi2/widget/WidgetAlarmTest.kt
rename to widgets/src/test/java/com/ichi2/widget/WidgetAlarmTest.kt